@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $search_deliverymonth = ''; |
149 | 149 | $search_deliveryyear = ''; |
150 | 150 | |
151 | -$search_import_key = trim(GETPOST("search_import_key", "alpha")); |
|
151 | +$search_import_key = trim(GETPOST("search_import_key", "alpha")); |
|
152 | 152 | |
153 | 153 | $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; |
154 | 154 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | 'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55), |
215 | 215 | 'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60, 'csslist' => 'nowraponall'), |
216 | 216 | 'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65, 'csslist' => 'nowraponall'), |
217 | - 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("shipping")), |
|
217 | + 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66, 'enabled' => isModEnabled("shipping")), |
|
218 | 218 | 'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67), |
219 | 219 | 'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68), |
220 | 220 | 'c.fk_input_reason' => array('label' => "Origin", 'checked' => -1, 'position' => 69), |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | 'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130), |
238 | 238 | 'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position' => 135, 'searchall' => 1), |
239 | 239 | 'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position' => 140), |
240 | - 'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("shipping")), 'position' => 990), |
|
240 | + 'shippable' => array('label' => "Shippable", 'checked' => 1, 'enabled' => (isModEnabled("shipping")), 'position' => 990), |
|
241 | 241 | 'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995), |
242 | 242 | 'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999), |
243 | 243 | 'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000) |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | $object->fields = dol_sort_array($object->fields, 'position'); |
258 | 258 | //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right'); |
259 | 259 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
260 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
260 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
261 | 261 | |
262 | 262 | |
263 | 263 | // Security check |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | } |
428 | 428 | |
429 | 429 | if (empty($objecttmp->note_public)) { |
430 | - $objecttmp->note_public = $langs->transnoentities("Orders"); |
|
430 | + $objecttmp->note_public = $langs->transnoentities("Orders"); |
|
431 | 431 | } |
432 | 432 | |
433 | 433 | $datefacture = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear')); |
@@ -749,7 +749,7 @@ discard block |
||
749 | 749 | $db->rollback(); |
750 | 750 | |
751 | 751 | $action = 'create'; |
752 | - $_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ? |
|
752 | + $_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ? |
|
753 | 753 | $_GET["originid"] = $_POST["originid"]; // Keep GET and POST here ? |
754 | 754 | if (!empty($errors)) { |
755 | 755 | setEventMessages(null, $errors, 'errors'); |
@@ -1118,7 +1118,7 @@ discard block |
||
1118 | 1118 | if ($searchCategoryCustomerOperator == 0) { |
1119 | 1119 | $searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")"; |
1120 | 1120 | } else { |
1121 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer); |
|
1121 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer); |
|
1122 | 1122 | } |
1123 | 1123 | } |
1124 | 1124 | } |
@@ -1148,7 +1148,7 @@ discard block |
||
1148 | 1148 | if ($searchCategoryProductOperator == 0) { |
1149 | 1149 | $searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")"; |
1150 | 1150 | } else { |
1151 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct); |
|
1151 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct); |
|
1152 | 1152 | } |
1153 | 1153 | } |
1154 | 1154 | } |
@@ -1606,7 +1606,7 @@ discard block |
||
1606 | 1606 | } |
1607 | 1607 | |
1608 | 1608 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1609 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1609 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1610 | 1610 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1611 | 1611 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1612 | 1612 | |
@@ -2758,15 +2758,15 @@ discard block |
||
2758 | 2758 | if (!empty($show_shippable_command) && isModEnabled('stock')) { |
2759 | 2759 | $text_icon = ''; |
2760 | 2760 | if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) { |
2761 | - $generic_commande->getLinesArray(); // Load array ->lines |
|
2762 | - $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
2761 | + $generic_commande->getLinesArray(); // Load array ->lines |
|
2762 | + $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
2763 | 2763 | |
2764 | 2764 | $numlines = count($generic_commande->lines); // Loop on each line of order |
2765 | 2765 | for ($lig = 0; $lig < $numlines; $lig++) { |
2766 | 2766 | $orderLine = $generic_commande->lines[$lig]; |
2767 | 2767 | '@phan-var-force OrderLine $orderLine'; |
2768 | 2768 | if (isset($generic_commande->expeditions[$orderLine->id])) { |
2769 | - $reliquat = $orderLine->qty - $generic_commande->expeditions[$orderLine->id]; |
|
2769 | + $reliquat = $orderLine->qty - $generic_commande->expeditions[$orderLine->id]; |
|
2770 | 2770 | } else { |
2771 | 2771 | $reliquat = $orderLine->qty; |
2772 | 2772 | } |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | $search_product_category = GETPOST('search_product_category', 'intcomma'); |
159 | 159 | $search_fac_rec_source_title = GETPOST("search_fac_rec_source_title", 'alpha'); |
160 | 160 | $search_fk_fac_rec_source = GETPOST('search_fk_fac_rec_source', 'int'); |
161 | -$search_import_key = trim(GETPOST("search_import_key", "alpha")); |
|
161 | +$search_import_key = trim(GETPOST("search_import_key", "alpha")); |
|
162 | 162 | |
163 | 163 | $search_option = GETPOST('search_option'); |
164 | 164 | if ($search_option == 'late') { |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | |
315 | 315 | $object->fields = dol_sort_array($object->fields, 'position'); |
316 | 316 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
317 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
317 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
318 | 318 | |
319 | 319 | if (!$user->hasRight('societe', 'client', 'voir')) { |
320 | 320 | $search_sale = $user->id; |
@@ -891,7 +891,7 @@ discard block |
||
891 | 891 | $sql .= natural_search('facrec.titre', $search_fac_rec_source_title); |
892 | 892 | } |
893 | 893 | if ($search_fk_fac_rec_source) { |
894 | - $sql .= ' AND f.fk_fac_rec_source = ' . (int) $search_fk_fac_rec_source; |
|
894 | + $sql .= ' AND f.fk_fac_rec_source = '.(int) $search_fk_fac_rec_source; |
|
895 | 895 | } |
896 | 896 | if ($search_import_key) { |
897 | 897 | $sql .= natural_search("s.import_key", $search_import_key); |
@@ -926,7 +926,7 @@ discard block |
||
926 | 926 | if ($searchCategoryProductOperator == 0) { |
927 | 927 | $searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")"; |
928 | 928 | } else { |
929 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct); |
|
929 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct); |
|
930 | 930 | } |
931 | 931 | } |
932 | 932 | } |
@@ -956,7 +956,7 @@ discard block |
||
956 | 956 | if ($searchCategoryCustomerOperator == 0) { |
957 | 957 | $searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategoryCustomer).")"; |
958 | 958 | } else { |
959 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer); |
|
959 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer); |
|
960 | 960 | } |
961 | 961 | } |
962 | 962 | } |
@@ -1232,7 +1232,7 @@ discard block |
||
1232 | 1232 | $param .= '&search_fac_rec_source_title='.urlencode($search_fac_rec_source_title); |
1233 | 1233 | } |
1234 | 1234 | if ($search_fk_fac_rec_source) { |
1235 | - $param .= '&search_fk_fac_rec_source=' . (int) $search_fk_fac_rec_source; |
|
1235 | + $param .= '&search_fk_fac_rec_source='.(int) $search_fk_fac_rec_source; |
|
1236 | 1236 | } |
1237 | 1237 | if ($search_import_key != '') { |
1238 | 1238 | $param .= '&search_import_key='.urlencode($search_import_key); |
@@ -2001,7 +2001,7 @@ discard block |
||
2001 | 2001 | |
2002 | 2002 | $facturestatic->id = $obj->id; |
2003 | 2003 | $facturestatic->ref = $obj->ref; |
2004 | - $facturestatic->ref_client = $obj->ref_client; // deprecated |
|
2004 | + $facturestatic->ref_client = $obj->ref_client; // deprecated |
|
2005 | 2005 | $facturestatic->ref_customer = $obj->ref_client; |
2006 | 2006 | $facturestatic->type = $obj->type; |
2007 | 2007 | $facturestatic->subtype = $obj->subtype; |
@@ -2013,7 +2013,7 @@ discard block |
||
2013 | 2013 | $facturestatic->multicurrency_total_ht = $obj->multicurrency_total_ht; |
2014 | 2014 | $facturestatic->multicurrency_total_tva = $obj->multicurrency_total_vat; |
2015 | 2015 | $facturestatic->multicurrency_total_ttc = $obj->multicurrency_total_ttc; |
2016 | - $facturestatic->statut = $obj->fk_statut; // deprecated |
|
2016 | + $facturestatic->statut = $obj->fk_statut; // deprecated |
|
2017 | 2017 | $facturestatic->status = $obj->fk_statut; |
2018 | 2018 | $facturestatic->close_code = $obj->close_code; |
2019 | 2019 | $facturestatic->total_ttc = $obj->total_ttc; |