@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | } |
607 | 607 | } |
608 | 608 | |
609 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
609 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
610 | 610 | /** |
611 | 611 | * Load array lines |
612 | 612 | * |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | */ |
616 | 616 | public function fetch_lines($only_product = 0) |
617 | 617 | { |
618 | - // phpcs:enable |
|
618 | + // phpcs:enable |
|
619 | 619 | |
620 | 620 | $this->lines = array(); |
621 | 621 | |
@@ -880,7 +880,7 @@ discard block |
||
880 | 880 | return $this->LibStatut($this->statut, $mode, $this->billed); |
881 | 881 | } |
882 | 882 | |
883 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
883 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
884 | 884 | /** |
885 | 885 | * Return label of a status |
886 | 886 | * |
@@ -891,7 +891,7 @@ discard block |
||
891 | 891 | */ |
892 | 892 | public function LibStatut($status, $mode = 0, $billed = 0) |
893 | 893 | { |
894 | - // phpcs:enable |
|
894 | + // phpcs:enable |
|
895 | 895 | global $langs, $hookmanager; |
896 | 896 | |
897 | 897 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
@@ -1389,7 +1389,7 @@ discard block |
||
1389 | 1389 | return $result; |
1390 | 1390 | } |
1391 | 1391 | |
1392 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1392 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1393 | 1393 | /** |
1394 | 1394 | * Cancel an approved order. |
1395 | 1395 | * The cancellation is done after approval |
@@ -1400,7 +1400,7 @@ discard block |
||
1400 | 1400 | */ |
1401 | 1401 | public function Cancel($user, $idwarehouse = -1) |
1402 | 1402 | { |
1403 | - // phpcs:enable |
|
1403 | + // phpcs:enable |
|
1404 | 1404 | global $langs, $conf; |
1405 | 1405 | |
1406 | 1406 | $error = 0; |
@@ -2537,7 +2537,7 @@ discard block |
||
2537 | 2537 | return $ret; |
2538 | 2538 | } |
2539 | 2539 | |
2540 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2540 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2541 | 2541 | /** |
2542 | 2542 | * Set a delivery in database for this supplier order |
2543 | 2543 | * |
@@ -2549,7 +2549,7 @@ discard block |
||
2549 | 2549 | */ |
2550 | 2550 | public function Livraison($user, $date, $type, $comment) |
2551 | 2551 | { |
2552 | - // phpcs:enable |
|
2552 | + // phpcs:enable |
|
2553 | 2553 | global $conf, $langs; |
2554 | 2554 | |
2555 | 2555 | $result = 0; |
@@ -2651,7 +2651,7 @@ discard block |
||
2651 | 2651 | return $result; |
2652 | 2652 | } |
2653 | 2653 | |
2654 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2654 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2655 | 2655 | /** |
2656 | 2656 | * Set delivery date |
2657 | 2657 | * |
@@ -2663,7 +2663,7 @@ discard block |
||
2663 | 2663 | */ |
2664 | 2664 | public function set_date_livraison($user, $delivery_date, $notrigger = 0) |
2665 | 2665 | { |
2666 | - // phpcs:enable |
|
2666 | + // phpcs:enable |
|
2667 | 2667 | return $this->setDeliveryDate($user, $delivery_date, $notrigger); |
2668 | 2668 | } |
2669 | 2669 | |
@@ -2723,7 +2723,7 @@ discard block |
||
2723 | 2723 | } |
2724 | 2724 | } |
2725 | 2725 | |
2726 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2726 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2727 | 2727 | /** |
2728 | 2728 | * Set the id projet |
2729 | 2729 | * |
@@ -2734,7 +2734,7 @@ discard block |
||
2734 | 2734 | */ |
2735 | 2735 | public function set_id_projet($user, $id_projet, $notrigger = 0) |
2736 | 2736 | { |
2737 | - // phpcs:enable |
|
2737 | + // phpcs:enable |
|
2738 | 2738 | if ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")) { |
2739 | 2739 | $error = 0; |
2740 | 2740 | |
@@ -3242,7 +3242,7 @@ discard block |
||
3242 | 3242 | } |
3243 | 3243 | } |
3244 | 3244 | |
3245 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3245 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3246 | 3246 | /** |
3247 | 3247 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
3248 | 3248 | * |
@@ -3252,7 +3252,7 @@ discard block |
||
3252 | 3252 | */ |
3253 | 3253 | public function load_board($user, $mode = 'opened') |
3254 | 3254 | { |
3255 | - // phpcs:enable |
|
3255 | + // phpcs:enable |
|
3256 | 3256 | global $conf, $langs; |
3257 | 3257 | |
3258 | 3258 | $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date, c.total_ht"; |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | $this->ref_supplier = $obj->ref_supplier; |
521 | 521 | $this->socid = $obj->fk_soc; |
522 | 522 | $this->fourn_id = $obj->fk_soc; |
523 | - $this->statut = $obj->status; // deprecated |
|
523 | + $this->statut = $obj->status; // deprecated |
|
524 | 524 | $this->status = $obj->status; |
525 | 525 | $this->billed = $obj->billed; |
526 | 526 | $this->user_author_id = $obj->user_author_id; |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | $this->fk_project = $obj->fk_project; |
552 | 552 | $this->cond_reglement_id = $obj->fk_cond_reglement; |
553 | 553 | $this->cond_reglement_code = $obj->cond_reglement_code; |
554 | - $this->cond_reglement = $obj->cond_reglement_label; // deprecated |
|
554 | + $this->cond_reglement = $obj->cond_reglement_label; // deprecated |
|
555 | 555 | $this->cond_reglement_label = $obj->cond_reglement_label; |
556 | 556 | $this->cond_reglement_doc = $obj->cond_reglement_doc; |
557 | 557 | $this->fk_account = $obj->fk_account; |
@@ -684,10 +684,10 @@ discard block |
||
684 | 684 | $sqlsearchpackage .= ' WHERE entity IN (' . getEntity('product_fournisseur_price') . ")"; |
685 | 685 | $sqlsearchpackage .= " AND fk_product = " . ((int) $objp->fk_product); |
686 | 686 | $sqlsearchpackage .= " AND ref_fourn = '" . $this->db->escape($objp->ref_supplier) . "'"; |
687 | - $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified |
|
688 | - $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified |
|
687 | + $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified |
|
688 | + $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified |
|
689 | 689 | $sqlsearchpackage .= " AND fk_soc = " . ((int) $this->socid); |
690 | - $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first |
|
690 | + $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first |
|
691 | 691 | $sqlsearchpackage .= " LIMIT 1"; |
692 | 692 | |
693 | 693 | $resqlsearchpackage = $this->db->query($sqlsearchpackage); |
@@ -1623,10 +1623,10 @@ discard block |
||
1623 | 1623 | $line->date_end, |
1624 | 1624 | $line->array_options, |
1625 | 1625 | $line->fk_unit, |
1626 | - $line->multicurrency_subprice, // pu_ht_devise |
|
1627 | - $line->origin, // origin |
|
1628 | - $line->origin_id, // origin_id |
|
1629 | - $line->rang, // rang |
|
1626 | + $line->multicurrency_subprice, // pu_ht_devise |
|
1627 | + $line->origin, // origin |
|
1628 | + $line->origin_id, // origin_id |
|
1629 | + $line->rang, // rang |
|
1630 | 1630 | $line->special_code |
1631 | 1631 | ); |
1632 | 1632 | if ($result < 0) { |
@@ -2000,7 +2000,7 @@ discard block |
||
2000 | 2000 | $this->db->begin(); |
2001 | 2001 | |
2002 | 2002 | $product_type = $type; |
2003 | - $label = ''; // deprecated |
|
2003 | + $label = ''; // deprecated |
|
2004 | 2004 | |
2005 | 2005 | if ($fk_product > 0) { |
2006 | 2006 | if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) { // Not the common case |
@@ -2143,7 +2143,7 @@ discard block |
||
2143 | 2143 | $this->line->total_localtax2 = $total_localtax2; |
2144 | 2144 | $this->line->total_ttc = $total_ttc; |
2145 | 2145 | $this->line->product_type = $type; |
2146 | - $this->line->special_code = (!empty($special_code) ? $special_code : 0); |
|
2146 | + $this->line->special_code = (!empty($special_code) ? $special_code : 0); |
|
2147 | 2147 | $this->line->origin = $origin; |
2148 | 2148 | $this->line->origin_id = $origin_id; |
2149 | 2149 | $this->line->fk_unit = $fk_unit; |
@@ -3350,7 +3350,7 @@ discard block |
||
3350 | 3350 | global $conf, $langs; |
3351 | 3351 | |
3352 | 3352 | if (!dol_strlen($modele)) { |
3353 | - $modele = ''; // No doc template/generation by default |
|
3353 | + $modele = ''; // No doc template/generation by default |
|
3354 | 3354 | |
3355 | 3355 | if (!empty($this->model_pdf)) { |
3356 | 3356 | $modele = $this->model_pdf; |
@@ -3892,10 +3892,10 @@ discard block |
||
3892 | 3892 | $sqlsearchpackage .= ' WHERE entity IN (' . getEntity('product_fournisseur_price') . ")"; |
3893 | 3893 | $sqlsearchpackage .= " AND fk_product = " . ((int) $objp->fk_product); |
3894 | 3894 | $sqlsearchpackage .= " AND ref_fourn = '" . $this->db->escape($objp->ref_supplier) . "'"; |
3895 | - $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified |
|
3896 | - $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified |
|
3895 | + $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified |
|
3896 | + $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified |
|
3897 | 3897 | $sqlsearchpackage .= " AND fk_soc = " . ((int) $objp->socid); |
3898 | - $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first |
|
3898 | + $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first |
|
3899 | 3899 | $sqlsearchpackage .= " LIMIT 1"; |
3900 | 3900 | |
3901 | 3901 | $resqlsearchpackage = $this->db->query($sqlsearchpackage); |
@@ -1012,7 +1012,7 @@ discard block |
||
1012 | 1012 | } |
1013 | 1013 | |
1014 | 1014 | |
1015 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1015 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1016 | 1016 | /** |
1017 | 1017 | * Load this->lines |
1018 | 1018 | * |
@@ -1020,7 +1020,7 @@ discard block |
||
1020 | 1020 | */ |
1021 | 1021 | public function fetch_lines() |
1022 | 1022 | { |
1023 | - // phpcs:enable |
|
1023 | + // phpcs:enable |
|
1024 | 1024 | $this->lines = array(); |
1025 | 1025 | |
1026 | 1026 | $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as line_desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx'; |
@@ -1307,7 +1307,7 @@ discard block |
||
1307 | 1307 | } |
1308 | 1308 | } |
1309 | 1309 | |
1310 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1310 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1311 | 1311 | /** |
1312 | 1312 | * Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount) |
1313 | 1313 | * |
@@ -1316,7 +1316,7 @@ discard block |
||
1316 | 1316 | */ |
1317 | 1317 | public function insert_discount($idremise) |
1318 | 1318 | { |
1319 | - // phpcs:enable |
|
1319 | + // phpcs:enable |
|
1320 | 1320 | global $conf, $langs; |
1321 | 1321 | |
1322 | 1322 | include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; |
@@ -1542,7 +1542,7 @@ discard block |
||
1542 | 1542 | } |
1543 | 1543 | |
1544 | 1544 | |
1545 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1545 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1546 | 1546 | /** |
1547 | 1547 | * Tag invoice as a paid invoice |
1548 | 1548 | * |
@@ -1555,7 +1555,7 @@ discard block |
||
1555 | 1555 | */ |
1556 | 1556 | public function set_paid($user, $close_code = '', $close_note = '') |
1557 | 1557 | { |
1558 | - // phpcs:enable |
|
1558 | + // phpcs:enable |
|
1559 | 1559 | dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE); |
1560 | 1560 | return $this->setPaid($user, $close_code, $close_note); |
1561 | 1561 | } |
@@ -1620,7 +1620,7 @@ discard block |
||
1620 | 1620 | } |
1621 | 1621 | } |
1622 | 1622 | |
1623 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1623 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1624 | 1624 | /** |
1625 | 1625 | * Tag the invoice as not fully paid + trigger call BILL_UNPAYED |
1626 | 1626 | * Function used when a direct debit payment is refused, |
@@ -1633,7 +1633,7 @@ discard block |
||
1633 | 1633 | */ |
1634 | 1634 | public function set_unpaid($user) |
1635 | 1635 | { |
1636 | - // phpcs:enable |
|
1636 | + // phpcs:enable |
|
1637 | 1637 | dol_syslog(get_class($this) . "::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE); |
1638 | 1638 | return $this->setUnpaid($user); |
1639 | 1639 | } |
@@ -2568,7 +2568,7 @@ discard block |
||
2568 | 2568 | } |
2569 | 2569 | } |
2570 | 2570 | |
2571 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2571 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2572 | 2572 | /** |
2573 | 2573 | * Return list of replaceable invoices |
2574 | 2574 | * Status valid or abandoned for other reason + not paid + no payment + not already replaced |
@@ -2579,7 +2579,7 @@ discard block |
||
2579 | 2579 | */ |
2580 | 2580 | public function list_replacable_supplier_invoices($socid = 0) |
2581 | 2581 | { |
2582 | - // phpcs:enable |
|
2582 | + // phpcs:enable |
|
2583 | 2583 | global $conf; |
2584 | 2584 | |
2585 | 2585 | $return = array(); |
@@ -2617,7 +2617,7 @@ discard block |
||
2617 | 2617 | } |
2618 | 2618 | } |
2619 | 2619 | |
2620 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2620 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2621 | 2621 | /** |
2622 | 2622 | * Return list of qualifying invoices for correction by credit note |
2623 | 2623 | * Invoices that respect the following rules are returned: |
@@ -2629,7 +2629,7 @@ discard block |
||
2629 | 2629 | */ |
2630 | 2630 | public function list_qualified_avoir_supplier_invoices($socid = 0) |
2631 | 2631 | { |
2632 | - // phpcs:enable |
|
2632 | + // phpcs:enable |
|
2633 | 2633 | global $conf; |
2634 | 2634 | |
2635 | 2635 | $return = array(); |
@@ -2671,7 +2671,7 @@ discard block |
||
2671 | 2671 | } |
2672 | 2672 | } |
2673 | 2673 | |
2674 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2674 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2675 | 2675 | /** |
2676 | 2676 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
2677 | 2677 | * |
@@ -2680,7 +2680,7 @@ discard block |
||
2680 | 2680 | */ |
2681 | 2681 | public function load_board($user) |
2682 | 2682 | { |
2683 | - // phpcs:enable |
|
2683 | + // phpcs:enable |
|
2684 | 2684 | global $conf, $langs; |
2685 | 2685 | |
2686 | 2686 | $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut as status, ff.total_ht, ff.total_ttc'; |
@@ -4431,7 +4431,7 @@ discard block |
||
4431 | 4431 | } |
4432 | 4432 | } |
4433 | 4433 | |
4434 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
4434 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
4435 | 4435 | /** |
4436 | 4436 | * Mise a jour de l'objet ligne de commande en base |
4437 | 4437 | * |
@@ -4439,7 +4439,7 @@ discard block |
||
4439 | 4439 | */ |
4440 | 4440 | public function update_total() |
4441 | 4441 | { |
4442 | - // phpcs:enable |
|
4442 | + // phpcs:enable |
|
4443 | 4443 | $this->db->begin(); |
4444 | 4444 | |
4445 | 4445 | // Mise a jour ligne en base |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | /** |
228 | 228 | * @var int ID |
229 | 229 | */ |
230 | - public $fk_account; // default bank account |
|
230 | + public $fk_account; // default bank account |
|
231 | 231 | |
232 | 232 | /** |
233 | 233 | * @var int Transport mode id |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | $this->location_incoterms = $_facrec->location_incoterms; |
464 | 464 | |
465 | 465 | // Clean parameters |
466 | - if (! $this->type) { |
|
466 | + if (!$this->type) { |
|
467 | 467 | $this->type = self::TYPE_STANDARD; |
468 | 468 | } |
469 | 469 | if (!empty(GETPOST('ref_supplier'))) { |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | |
478 | 478 | $this->array_options = $_facrec->array_options; |
479 | 479 | |
480 | - if (! $this->mode_reglement_id) { |
|
480 | + if (!$this->mode_reglement_id) { |
|
481 | 481 | $this->mode_reglement_id = 0; |
482 | 482 | } |
483 | 483 | $this->status = self::STATUS_DRAFT; |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | /* |
727 | 727 | * Insert lines of template invoices |
728 | 728 | */ |
729 | - if (! $error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) { |
|
729 | + if (!$error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) { |
|
730 | 730 | foreach ($_facrec->lines as $i => $val) { |
731 | 731 | if ($_facrec->lines[$i]->fk_product) { |
732 | 732 | $prod = new Product($this->db); |
@@ -753,7 +753,7 @@ discard block |
||
753 | 753 | $buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice; |
754 | 754 | |
755 | 755 | // If buyprice not defined from template invoice, we try to guess the best value |
756 | - if (! $buyprice && $_facrec->lines[$i]->fk_product > 0) { |
|
756 | + if (!$buyprice && $_facrec->lines[$i]->fk_product > 0) { |
|
757 | 757 | require_once constant('DOL_DOCUMENT_ROOT') . '/fourn/class/fournisseur.product.class.php'; |
758 | 758 | $producttmp = new ProductFournisseur($this->db); |
759 | 759 | $producttmp->fetch($_facrec->lines[$i]->fk_product); |
@@ -1004,7 +1004,7 @@ discard block |
||
1004 | 1004 | |
1005 | 1005 | $this->extraparams = isset($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array(); |
1006 | 1006 | |
1007 | - $this->socid = $obj->socid; |
|
1007 | + $this->socid = $obj->socid; |
|
1008 | 1008 | |
1009 | 1009 | // Retrieve all extrafield |
1010 | 1010 | // fetch optionals attributes and labels |
@@ -2278,7 +2278,7 @@ discard block |
||
2278 | 2278 | // Multicurrency |
2279 | 2279 | $supplierinvoiceline->fk_multicurrency = $this->fk_multicurrency; |
2280 | 2280 | $supplierinvoiceline->multicurrency_code = $this->multicurrency_code; |
2281 | - $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise |
|
2281 | + $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise |
|
2282 | 2282 | |
2283 | 2283 | $supplierinvoiceline->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative |
2284 | 2284 | $supplierinvoiceline->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative |
@@ -2444,7 +2444,7 @@ discard block |
||
2444 | 2444 | |
2445 | 2445 | $line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs((float) $qty) : $qty); // For credit note, quantity is always positive and unit price negative |
2446 | 2446 | $line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise |
2447 | - $line->pu_ht = $line->subprice; // deprecated |
|
2447 | + $line->pu_ht = $line->subprice; // deprecated |
|
2448 | 2448 | $line->pu_ttc = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ttc) : $pu_ttc); // For credit note, unit price always negative, always positive otherwise |
2449 | 2449 | |
2450 | 2450 | $line->remise_percent = $remise_percent; |
@@ -2729,7 +2729,7 @@ discard block |
||
2729 | 2729 | |
2730 | 2730 | while ($obj = $this->db->fetch_object($resql)) { |
2731 | 2731 | $facturestatic->date_echeance = $this->db->jdate($obj->datefin); |
2732 | - $facturestatic->statut = $obj->status; // For backward compatibility |
|
2732 | + $facturestatic->statut = $obj->status; // For backward compatibility |
|
2733 | 2733 | $facturestatic->status = $obj->status; |
2734 | 2734 | |
2735 | 2735 | $response->nbtodo++; |
@@ -3164,15 +3164,15 @@ discard block |
||
3164 | 3164 | // Load source object |
3165 | 3165 | $object->fetch($fromid); |
3166 | 3166 | $object->id = 0; |
3167 | - $object->statut = self::STATUS_DRAFT; // For backward compatibility |
|
3167 | + $object->statut = self::STATUS_DRAFT; // For backward compatibility |
|
3168 | 3168 | $object->status = self::STATUS_DRAFT; |
3169 | 3169 | |
3170 | 3170 | $object->fetch_thirdparty(); // We need it to recalculate VAT localtaxes according to main sale taxes and vendor |
3171 | 3171 | |
3172 | 3172 | // Clear fields |
3173 | 3173 | $object->ref_supplier = (empty($this->ref_supplier) ? $langs->trans("CopyOf") . ' ' . $object->ref_supplier : $this->ref_supplier); |
3174 | - $object->author = $user->id; // FIXME? user_validation_id is replacement for author |
|
3175 | - $object->user_validation_id = 0; // FIXME? user_validation_id is replacement for author |
|
3174 | + $object->author = $user->id; // FIXME? user_validation_id is replacement for author |
|
3175 | + $object->user_validation_id = 0; // FIXME? user_validation_id is replacement for author |
|
3176 | 3176 | $object->fk_facture_source = 0; |
3177 | 3177 | $object->date_creation = ''; |
3178 | 3178 | $object->date_validation = ''; |
@@ -3475,14 +3475,14 @@ discard block |
||
3475 | 3475 | if (!empty($paymentmode) && $paymentmode != 'all') { |
3476 | 3476 | $sql .= ", " . MAIN_DB_PREFIX . "c_paiement as cp"; |
3477 | 3477 | } |
3478 | - $sql .= " WHERE f.paye = 0"; // Only unpaid |
|
3479 | - $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED; // Only validated status |
|
3478 | + $sql .= " WHERE f.paye = 0"; // Only unpaid |
|
3479 | + $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED; // Only validated status |
|
3480 | 3480 | if ($datetouse == 'invoicedate') { |
3481 | 3481 | $sql .= " AND f.datef = '" . $this->db->idate($tmpidate, 'gmt') . "'"; |
3482 | 3482 | } else { |
3483 | 3483 | $sql .= " AND f.date_lim_reglement = '" . $this->db->idate($tmpidate, 'gmt') . "'"; |
3484 | 3484 | } |
3485 | - $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")"; // One batch process only one company (no sharing) |
|
3485 | + $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")"; // One batch process only one company (no sharing) |
|
3486 | 3486 | if (!empty($paymentmode) && $paymentmode != 'all') { |
3487 | 3487 | $sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '" . $this->db->escape($paymentmode) . "'"; |
3488 | 3488 | } |
@@ -3702,7 +3702,7 @@ discard block |
||
3702 | 3702 | $actioncomm->create($user); |
3703 | 3703 | } |
3704 | 3704 | |
3705 | - $this->db->commit(); // We always commit |
|
3705 | + $this->db->commit(); // We always commit |
|
3706 | 3706 | } |
3707 | 3707 | |
3708 | 3708 | if ($errormesg) { |
@@ -4377,8 +4377,7 @@ discard block |
||
4377 | 4377 | $sql .= " " . ($this->fk_parent_line > 0 ? "'" . $this->db->escape($this->fk_parent_line) . "'" : "null") . ","; |
4378 | 4378 | $product_label |
4379 | 4379 | = !empty($this->product_label) |
4380 | - ? $this->product_label : |
|
4381 | - (!empty($this->label) ? $this->label : null); |
|
4380 | + ? $this->product_label : (!empty($this->label) ? $this->label : null); |
|
4382 | 4381 | $sql .= " " . (!empty($product_label) ? "'" . $this->db->escape($product_label) . "'" : "null") . ","; |
4383 | 4382 | $sql .= " '" . $this->db->escape($this->desc ? $this->desc : $this->description) . "',"; |
4384 | 4383 | $sql .= " '" . $this->db->escape($this->ref_supplier) . "',"; |
@@ -712,7 +712,7 @@ discard block |
||
712 | 712 | ); |
713 | 713 | } |
714 | 714 | |
715 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
715 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
716 | 716 | /** |
717 | 717 | * Clean sensible object datas |
718 | 718 | * |
@@ -721,7 +721,7 @@ discard block |
||
721 | 721 | */ |
722 | 722 | protected function _cleanObjectDatas($object) |
723 | 723 | { |
724 | - // phpcs:enable |
|
724 | + // phpcs:enable |
|
725 | 725 | $object = parent::_cleanObjectDatas($object); |
726 | 726 | |
727 | 727 | unset($object->rowid); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | } |
162 | 162 | } |
163 | 163 | |
164 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
164 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
165 | 165 | /** |
166 | 166 | * Create a supplier category |
167 | 167 | * |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public function CreateCategory($user, $name) |
173 | 173 | { |
174 | - // phpcs:enable |
|
174 | + // phpcs:enable |
|
175 | 175 | $sql = "INSERT INTO " . MAIN_DB_PREFIX . "categorie (label,visible,type)"; |
176 | 176 | $sql .= " VALUES "; |
177 | 177 | $sql .= " ('" . $this->db->escape($name) . "',1,1)"; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | } |
189 | 189 | } |
190 | 190 | |
191 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
191 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
192 | 192 | /** |
193 | 193 | * Return the suppliers list |
194 | 194 | * |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | */ |
197 | 197 | public function ListArray() |
198 | 198 | { |
199 | - // phpcs:enable |
|
199 | + // phpcs:enable |
|
200 | 200 | global $conf; |
201 | 201 | global $user; |
202 | 202 |
@@ -596,7 +596,7 @@ discard block |
||
596 | 596 | return $this->LibStatut($this->statut, $mode); |
597 | 597 | } |
598 | 598 | |
599 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
599 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
600 | 600 | /** |
601 | 601 | * Return the label of a given status |
602 | 602 | * |
@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | */ |
607 | 607 | public function LibStatut($status, $mode = 0) |
608 | 608 | { |
609 | - // phpcs:enable |
|
609 | + // phpcs:enable |
|
610 | 610 | global $langs; |
611 | 611 | |
612 | 612 | $langs->load('compta'); |
@@ -893,7 +893,7 @@ discard block |
||
893 | 893 | } |
894 | 894 | |
895 | 895 | |
896 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
896 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
897 | 897 | /** |
898 | 898 | * Load the third party of object, from id into this->thirdparty |
899 | 899 | * |
@@ -902,7 +902,7 @@ discard block |
||
902 | 902 | */ |
903 | 903 | public function fetch_thirdparty($force_thirdparty_id = 0) |
904 | 904 | { |
905 | - // phpcs:enable |
|
905 | + // phpcs:enable |
|
906 | 906 | require_once constant('DOL_DOCUMENT_ROOT') . '/fourn/class/fournisseur.facture.class.php'; |
907 | 907 | |
908 | 908 | if (empty($force_thirdparty_id)) { |
@@ -143,7 +143,7 @@ |
||
143 | 143 | $this->note_private = $obj->note; |
144 | 144 | $this->type_code = $obj->payment_code; |
145 | 145 | $this->type_label = $obj->payment_type; |
146 | - $this->fk_paiement = $obj->fk_paiement; |
|
146 | + $this->fk_paiement = $obj->fk_paiement; |
|
147 | 147 | $this->statut = $obj->statut; |
148 | 148 | |
149 | 149 | $error = 1; |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | $this->reputations = array('-1' => '', 'FAVORITE' => $langs->trans('Favorite'), 'NOTTHGOOD' => $langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER' => $langs->trans('DoNotOrderThisProductToThisSupplier')); |
229 | 229 | } |
230 | 230 | |
231 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
231 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
232 | 232 | /** |
233 | 233 | * Remove all prices for this couple supplier-product |
234 | 234 | * |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | public function remove_fournisseur($id_fourn) |
239 | 239 | { |
240 | - // phpcs:enable |
|
240 | + // phpcs:enable |
|
241 | 241 | $ok = 1; |
242 | 242 | |
243 | 243 | $this->db->begin(); |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | } |
263 | 263 | |
264 | 264 | |
265 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
265 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
266 | 266 | /** |
267 | 267 | * Remove a price for a couple supplier-product |
268 | 268 | * |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | */ |
272 | 272 | public function remove_product_fournisseur_price($rowid) |
273 | 273 | { |
274 | - // phpcs:enable |
|
274 | + // phpcs:enable |
|
275 | 275 | global $conf, $user; |
276 | 276 | |
277 | 277 | $error = 0; |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | } |
308 | 308 | |
309 | 309 | |
310 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
310 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
311 | 311 | /** |
312 | 312 | * Modify the purchase price for a supplier |
313 | 313 | * |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | $fk_barcode_type = 0, |
364 | 364 | $options = array() |
365 | 365 | ) { |
366 | - // phpcs:enable |
|
366 | + // phpcs:enable |
|
367 | 367 | global $conf, $langs; |
368 | 368 | //global $mysoc; |
369 | 369 | |
@@ -667,7 +667,7 @@ discard block |
||
667 | 667 | } |
668 | 668 | } |
669 | 669 | |
670 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
670 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
671 | 671 | /** |
672 | 672 | * Loads the price information of a provider |
673 | 673 | * |
@@ -677,7 +677,7 @@ discard block |
||
677 | 677 | */ |
678 | 678 | public function fetch_product_fournisseur_price($rowid, $ignore_expression = 0) |
679 | 679 | { |
680 | - // phpcs:enable |
|
680 | + // phpcs:enable |
|
681 | 681 | global $conf; |
682 | 682 | |
683 | 683 | $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.default_vat_code, pfp.info_bits as fourn_tva_npr, pfp.fk_availability,"; |
@@ -762,7 +762,7 @@ discard block |
||
762 | 762 | } |
763 | 763 | |
764 | 764 | |
765 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
765 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
766 | 766 | /** |
767 | 767 | * List all supplier prices of a product |
768 | 768 | * |
@@ -777,7 +777,7 @@ discard block |
||
777 | 777 | */ |
778 | 778 | public function list_product_fournisseur_price($prodid, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0, $socid = 0) |
779 | 779 | { |
780 | - // phpcs:enable |
|
780 | + // phpcs:enable |
|
781 | 781 | global $conf; |
782 | 782 | |
783 | 783 | $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id, p.ref as product_ref, p.tosell as status, p.tobuy as status_buy, "; |
@@ -877,7 +877,7 @@ discard block |
||
877 | 877 | } |
878 | 878 | } |
879 | 879 | |
880 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
880 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
881 | 881 | /** |
882 | 882 | * Load properties for minimum price |
883 | 883 | * |
@@ -889,7 +889,7 @@ discard block |
||
889 | 889 | */ |
890 | 890 | public function find_min_price_product_fournisseur($prodid, $qty = 0, $socid = 0) |
891 | 891 | { |
892 | - // phpcs:enable |
|
892 | + // phpcs:enable |
|
893 | 893 | global $conf; |
894 | 894 | |
895 | 895 | if (empty($prodid)) { |
@@ -1062,7 +1062,7 @@ discard block |
||
1062 | 1062 | return $thirdparty->getNomUrl($withpicto, $option, $maxlen, $notooltip); |
1063 | 1063 | } |
1064 | 1064 | |
1065 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1065 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1066 | 1066 | /** |
1067 | 1067 | * Display price of product |
1068 | 1068 | * |
@@ -1076,7 +1076,7 @@ discard block |
||
1076 | 1076 | */ |
1077 | 1077 | public function display_price_product_fournisseur($showunitprice = 1, $showsuptitle = 1, $maxlen = 0, $notooltip = 0, $productFournList = array()) |
1078 | 1078 | { |
1079 | - // phpcs:enable |
|
1079 | + // phpcs:enable |
|
1080 | 1080 | global $conf, $langs; |
1081 | 1081 | |
1082 | 1082 | $out = ''; |
@@ -1414,7 +1414,7 @@ discard block |
||
1414 | 1414 | return $this->LibStatut($this->status, $mode); |
1415 | 1415 | } |
1416 | 1416 | |
1417 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1417 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1418 | 1418 | /** |
1419 | 1419 | * Return the status |
1420 | 1420 | * |
@@ -1425,7 +1425,7 @@ discard block |
||
1425 | 1425 | */ |
1426 | 1426 | public function LibStatut($status, $mode = 0, $type = 0) |
1427 | 1427 | { |
1428 | - // phpcs:enable |
|
1428 | + // phpcs:enable |
|
1429 | 1429 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
1430 | 1430 | global $langs; |
1431 | 1431 | //$langs->load("mymodule@mymodule"); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public $fourn_remise; |
139 | 139 | |
140 | - public $fourn_charges; // when getDolGlobalString('PRODUCT_CHARGES') is set |
|
140 | + public $fourn_charges; // when getDolGlobalString('PRODUCT_CHARGES') is set |
|
141 | 141 | |
142 | 142 | /** |
143 | 143 | * @var int product-supplier id |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | public $fk_availability; |
158 | 158 | |
159 | 159 | public $fourn_unitprice; |
160 | - public $fourn_unitprice_with_discount; // not saved into database |
|
160 | + public $fourn_unitprice_with_discount; // not saved into database |
|
161 | 161 | public $fourn_tva_tx; |
162 | 162 | public $fourn_tva_npr; |
163 | 163 | |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | } |
476 | 476 | $sql = "UPDATE " . MAIN_DB_PREFIX . "product_fournisseur_price"; |
477 | 477 | $sql .= " SET fk_user = " . ((int) $user->id) . " ,"; |
478 | - $sql .= " datec = '" . $this->db->idate($now) . "' ,"; // Note: Even if this is an update, we update the creation date as the log of each change is tracked into product_fournisseur_log. |
|
478 | + $sql .= " datec = '" . $this->db->idate($now) . "' ,"; // Note: Even if this is an update, we update the creation date as the log of each change is tracked into product_fournisseur_log. |
|
479 | 479 | $sql .= " ref_fourn = '" . $this->db->escape($ref_fourn) . "',"; |
480 | 480 | $sql .= " desc_fourn = '" . $this->db->escape($desc_fourn) . "',"; |
481 | 481 | $sql .= " price = " . ((float) $buyprice) . ","; |
@@ -825,10 +825,10 @@ discard block |
||
825 | 825 | $prodfourn->fourn_tva_tx = $record["tva_tx"]; |
826 | 826 | $prodfourn->fourn_id = $record["fourn_id"]; |
827 | 827 | $prodfourn->fourn_name = $record["supplier_name"]; |
828 | - $prodfourn->fk_availability = $record["fk_availability"]; |
|
828 | + $prodfourn->fk_availability = $record["fk_availability"]; |
|
829 | 829 | $prodfourn->delivery_time_days = $record["delivery_time_days"]; |
830 | 830 | $prodfourn->id = $prodid; |
831 | - $prodfourn->fourn_tva_npr = $record["info_bits"]; |
|
831 | + $prodfourn->fourn_tva_npr = $record["info_bits"]; |
|
832 | 832 | $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"]; |
833 | 833 | $prodfourn->supplier_reputation = $record["supplier_reputation"]; |
834 | 834 | $prodfourn->fourn_date_creation = $this->db->jdate($record['datec']); |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | } |
717 | 717 | } |
718 | 718 | |
719 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
719 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
720 | 720 | /** |
721 | 721 | * Clean sensible object datas |
722 | 722 | * |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | */ |
726 | 726 | protected function _cleanObjectDatas($object) |
727 | 727 | { |
728 | - // phpcs:enable |
|
728 | + // phpcs:enable |
|
729 | 729 | $object = parent::_cleanObjectDatas($object); |
730 | 730 | |
731 | 731 | unset($object->rowid); |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | $idprod = GETPOSTINT('idprod'); |
447 | 447 | } |
448 | 448 | |
449 | - $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
449 | + $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
450 | 450 | |
451 | 451 | $price_ht = price2num(GETPOST('price_ht'), 'MU', 2); |
452 | 452 | $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2); |
@@ -1249,7 +1249,7 @@ discard block |
||
1249 | 1249 | $object->mode_reglement_id = GETPOSTINT('mode_reglement_id'); |
1250 | 1250 | $object->fk_account = GETPOSTINT('fk_account'); |
1251 | 1251 | $object->note_private = GETPOST('note_private', 'restricthtml'); |
1252 | - $object->note_public = GETPOST('note_public', 'restricthtml'); |
|
1252 | + $object->note_public = GETPOST('note_public', 'restricthtml'); |
|
1253 | 1253 | $object->delivery_date = $datelivraison; |
1254 | 1254 | $object->fk_incoterms = GETPOSTINT('incoterm_id'); |
1255 | 1255 | $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); |
@@ -1685,7 +1685,7 @@ discard block |
||
1685 | 1685 | $demand_reason_id = (!empty($objectsrc->demand_reason_id) ? $objectsrc->demand_reason_id : (!empty($soc->demand_reason_id) ? $soc->demand_reason_id : 0)); |
1686 | 1686 | //$remise_percent = (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0)); |
1687 | 1687 | //$remise_absolue = (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0)); |
1688 | - $dateinvoice = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : ''; |
|
1688 | + $dateinvoice = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : ''; |
|
1689 | 1689 | |
1690 | 1690 | $datedelivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : ''); |
1691 | 1691 | |
@@ -1801,7 +1801,7 @@ discard block |
||
1801 | 1801 | // Payment term |
1802 | 1802 | print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td>'; |
1803 | 1803 | print img_picto('', 'payment', 'class="pictofixedwidth"'); |
1804 | - print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1); |
|
1804 | + print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1); |
|
1805 | 1805 | print '</td></tr>'; |
1806 | 1806 | |
1807 | 1807 | // Payment mode |
@@ -2051,7 +2051,7 @@ discard block |
||
2051 | 2051 | 'morecss' => 'minwidth300' |
2052 | 2052 | ) |
2053 | 2053 | ); |
2054 | - $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1); |
|
2054 | + $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1); |
|
2055 | 2055 | } |
2056 | 2056 | |
2057 | 2057 | // Confirmation of cancellation |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | accessforbidden(); |
103 | 103 | } |
104 | 104 | |
105 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
106 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
105 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
106 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
107 | 107 | |
108 | 108 | |
109 | 109 | /* |
@@ -629,7 +629,7 @@ discard block |
||
629 | 629 | if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) { |
630 | 630 | $disabled = 0; |
631 | 631 | }*/ |
632 | - $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
632 | + $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
633 | 633 | |
634 | 634 | // Line of orders |
635 | 635 | if ($object->statut <= CommandeFournisseur::STATUS_ACCEPTED || $object->statut >= CommandeFournisseur::STATUS_CANCELED) { |