@@ -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) { |
@@ -85,8 +85,8 @@ |
||
85 | 85 | // Init Hooks |
86 | 86 | $hookmanager->initHooks(array('ordersuppliercardinfo')); |
87 | 87 | |
88 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
89 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
88 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
89 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
90 | 90 | |
91 | 91 | |
92 | 92 | /* |
@@ -52,8 +52,8 @@ |
||
52 | 52 | |
53 | 53 | $object = new CommandeFournisseur($db); |
54 | 54 | |
55 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
56 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
55 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
56 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
57 | 57 | |
58 | 58 | /* |
59 | 59 | * Actions |