@@ -971,9 +971,9 @@ |
||
971 | 971 | if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) { |
972 | 972 | $extratitle = $langs->trans($value); |
973 | 973 | $arrayfields['ef.' . $key] = array('label' => $extratitle, 'checked' => 0, |
974 | - 'position' => (end($arrayfields)['position'] + 1), |
|
975 | - 'langfile' => $extrafields->attributes["product_fournisseur_price"]['langfile'][$key], |
|
976 | - 'help' => $extrafields->attributes["product_fournisseur_price"]['help'][$key]); |
|
974 | + 'position' => (end($arrayfields)['position'] + 1), |
|
975 | + 'langfile' => $extrafields->attributes["product_fournisseur_price"]['langfile'][$key], |
|
976 | + 'help' => $extrafields->attributes["product_fournisseur_price"]['help'][$key]); |
|
977 | 977 | } |
978 | 978 | } |
979 | 979 | } |
@@ -68,7 +68,7 @@ |
||
68 | 68 | |
69 | 69 | // If socid provided by ajax company selector |
70 | 70 | if (GETPOSTINT('search_fourn_id')) { |
71 | - $_GET['id_fourn'] = GETPOSTINT('search_fourn_id'); // Keep set to $_GET an $_POST. Used later. |
|
71 | + $_GET['id_fourn'] = GETPOSTINT('search_fourn_id'); // Keep set to $_GET an $_POST. Used later. |
|
72 | 72 | $_POST['id_fourn'] = GETPOSTINT('search_fourn_id'); // Keep set to $_GET an $_POST. Used later. |
73 | 73 | } |
74 | 74 |
@@ -152,7 +152,7 @@ |
||
152 | 152 | $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $db->escape($mysoc->country_code) . "'"; |
153 | 153 | $sql .= " AND t.taux = " . ((float) $tva_tx) . " AND t.active = 1"; |
154 | 154 | $sql .= " AND t.code = '" . $db->escape($vatratecode) . "'"; |
155 | - $sql .= " AND t.type_vat IN (0, 1)"; // Use only VAT rates type all or i.e. the sales type VAT rates. |
|
155 | + $sql .= " AND t.type_vat IN (0, 1)"; // Use only VAT rates type all or i.e. the sales type VAT rates. |
|
156 | 156 | $sql .= " AND t.entity IN (" . getEntity('c_tva') . ")"; |
157 | 157 | $resql = $db->query($sql); |
158 | 158 | if ($resql) { |
@@ -94,7 +94,7 @@ |
||
94 | 94 | |
95 | 95 | // Default sort order (if not yet defined by previous GETPOST) |
96 | 96 | if (!$sortfield) { |
97 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
97 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
98 | 98 | $sortfield = "p." . key($object->fields); // Set here default search field. By default 1st field in definition. |
99 | 99 | } |
100 | 100 | if (!$sortorder) { |
@@ -100,7 +100,7 @@ |
||
100 | 100 | if (!empty($search_date_endyear)) { |
101 | 101 | $option .= '&search_date_endyear=' . $search_date_endyear; |
102 | 102 | } |
103 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
103 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
104 | 104 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
105 | 105 | |
106 | 106 | if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | |
316 | 316 | $object->fields = dol_sort_array($object->fields, 'position'); |
317 | 317 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
318 | -'@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 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
319 | 319 | |
320 | 320 | // Security check |
321 | 321 | if ($search_type == '0') { |
@@ -863,7 +863,7 @@ discard block |
||
863 | 863 | if (isModEnabled('category') && $user->hasRight($rightskey, 'creer')) { |
864 | 864 | $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"') . $langs->trans("AffectTag"); |
865 | 865 | } |
866 | -if (in_array($massaction, array('presend', 'predelete','preaffecttag', 'edit_extrafields', 'preupdateprice'))) { |
|
866 | +if (in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'edit_extrafields', 'preupdateprice'))) { |
|
867 | 867 | $arrayofmassactions = array(); |
868 | 868 | } |
869 | 869 | if ($user->hasRight($rightskey, 'supprimer')) { |
@@ -976,7 +976,7 @@ discard block |
||
976 | 976 | } |
977 | 977 | |
978 | 978 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
979 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
979 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
980 | 980 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
981 | 981 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
982 | 982 | |
@@ -1948,10 +1948,10 @@ discard block |
||
1948 | 1948 | |
1949 | 1949 | // Multiprices |
1950 | 1950 | if (getDolGlobalString('PRODUIT_MULTIPRICES')) { |
1951 | - if (! isset($productpricescache)) { |
|
1951 | + if (!isset($productpricescache)) { |
|
1952 | 1952 | $productpricescache = array(); |
1953 | 1953 | } |
1954 | - if (! isset($productpricescache[$obj->rowid])) { |
|
1954 | + if (!isset($productpricescache[$obj->rowid])) { |
|
1955 | 1955 | $productpricescache[$obj->rowid] = array(); |
1956 | 1956 | } |
1957 | 1957 |
@@ -444,7 +444,7 @@ |
||
444 | 444 | |
445 | 445 | $unitline = price2num(($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MU'); |
446 | 446 | $totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT'); |
447 | - $total += $totalline; |
|
447 | + $total += $totalline; |
|
448 | 448 | |
449 | 449 | print '<td class="right nowraponall">'; |
450 | 450 | print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'] . 'x ' : '') . '<span class="amount">' . price($unitline, 0, '', 0, 0, -1, $conf->currency)) . '</span>'; |
@@ -227,7 +227,7 @@ |
||
227 | 227 | $i = 0; |
228 | 228 | $fail = 0; |
229 | 229 | $orders = array(); |
230 | - $suppliersid = array_keys($suppliers); // array of ids of suppliers |
|
230 | + $suppliersid = array_keys($suppliers); // array of ids of suppliers |
|
231 | 231 | foreach ($suppliers as $supplier) { |
232 | 232 | $order = new CommandeFournisseur($db); |
233 | 233 |
@@ -579,7 +579,7 @@ |
||
579 | 579 | $maxfilesizearray = getMaxFileSizeArray(); |
580 | 580 | $maxmin = $maxfilesizearray['maxmin']; |
581 | 581 | if ($maxmin > 0) { |
582 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
582 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
583 | 583 | } |
584 | 584 | print '<input type="file" name="userfile" size="20" maxlength="80"> '; |
585 | 585 | $out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : ''); |
@@ -1294,7 +1294,7 @@ |
||
1294 | 1294 | $pse = new ProductStockEntrepot($db); |
1295 | 1295 | $lines = $pse->fetchAll($id); |
1296 | 1296 | |
1297 | - $visibleWarehouseEntities = explode(',', getEntity('stock')); // For MultiCompany compatibility |
|
1297 | + $visibleWarehouseEntities = explode(',', getEntity('stock')); // For MultiCompany compatibility |
|
1298 | 1298 | |
1299 | 1299 | if (!empty($lines)) { |
1300 | 1300 | $var = false; |