@@ -648,7 +648,7 @@ discard block |
||
648 | 648 | return $this->LibStatut($this->status, $mode); |
649 | 649 | } |
650 | 650 | |
651 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
651 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
652 | 652 | /** |
653 | 653 | * Return the status |
654 | 654 | * |
@@ -658,7 +658,7 @@ discard block |
||
658 | 658 | */ |
659 | 659 | public static function LibStatut($status, $mode = 0) |
660 | 660 | { |
661 | - // phpcs:enable |
|
661 | + // phpcs:enable |
|
662 | 662 | global $langs; |
663 | 663 | |
664 | 664 | $labelStatus = array(); |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public $picto = 'inventory'; |
66 | 66 | |
67 | - const STATUS_DRAFT = 0; // Draft |
|
68 | - const STATUS_VALIDATED = 1; // Inventory is in process |
|
69 | - const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
70 | - const STATUS_CANCELED = 9; // Canceled |
|
67 | + const STATUS_DRAFT = 0; // Draft |
|
68 | + const STATUS_VALIDATED = 1; // Inventory is in process |
|
69 | + const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
70 | + const STATUS_CANCELED = 9; // Canceled |
|
71 | 71 | |
72 | 72 | /** |
73 | 73 | * 'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password') |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | 'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'InventoryForASpecificWarehouse', 'picto' => 'stock', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'), |
108 | 108 | 'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'InventoryForASpecificProduct', 'picto' => 'product', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'), |
109 | 109 | 'categories_product' => array('type' => 'chkbxlst:categorie:label:rowid::type=0:0:', 'label' => 'OrProductsWithCategories', 'visible' => 3, 'enabled' => 1, 'position' => 33, 'help' => '', 'picto' => 'category', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx'), |
110 | - 'date_inventory' => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default. |
|
110 | + 'date_inventory' => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default. |
|
111 | 111 | 'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500, 'csslist' => 'nowraponall'), |
112 | 112 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501, 'csslist' => 'nowraponall'), |
113 | 113 | 'date_validation' => array('type' => 'datetime', 'label' => 'DateValidation', 'visible' => -2, 'enabled' => 1, 'position' => 502, 'csslist' => 'nowraponall'), |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $line = $db->fetch_object($resql); |
166 | 166 | |
167 | 167 | $qty_stock = $line->qty_stock; |
168 | - $qty_view = $line->qty_view; // The quantity viewed by inventorier, the qty we target |
|
168 | + $qty_view = $line->qty_view; // The quantity viewed by inventorier, the qty we target |
|
169 | 169 | |
170 | 170 | |
171 | 171 | // Load real stock we have now. |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | } |
223 | 223 | $sqlupdate .= " WHERE rowid = " . ((int) $line->rowid); |
224 | 224 | $resqlupdate = $db->query($sqlupdate); |
225 | - if (! $resqlupdate) { |
|
225 | + if (!$resqlupdate) { |
|
226 | 226 | $error++; |
227 | 227 | setEventMessages($db->lasterror(), null, 'errors'); |
228 | 228 | break; |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | if (!empty($line->pmp_real) && getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) { |
233 | 233 | $sqlpmp = 'UPDATE ' . MAIN_DB_PREFIX . 'product SET pmp = ' . ((float) $line->pmp_real) . ' WHERE rowid = ' . ((int) $line->fk_product); |
234 | 234 | $resqlpmp = $db->query($sqlpmp); |
235 | - if (! $resqlpmp) { |
|
235 | + if (!$resqlpmp) { |
|
236 | 236 | $error++; |
237 | 237 | setEventMessages($db->lasterror(), null, 'errors'); |
238 | 238 | break; |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) { |
241 | 241 | $sqlpmp = 'UPDATE ' . MAIN_DB_PREFIX . 'product_perentity SET pmp = ' . ((float) $line->pmp_real) . ' WHERE fk_product = ' . ((int) $line->fk_product) . ' AND entity=' . $conf->entity; |
242 | 242 | $resqlpmp = $db->query($sqlpmp); |
243 | - if (! $resqlpmp) { |
|
243 | + if (!$resqlpmp) { |
|
244 | 244 | $error++; |
245 | 245 | setEventMessages($db->lasterror(), null, 'errors'); |
246 | 246 | break; |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $error++; |
260 | 260 | } |
261 | 261 | |
262 | - if (! $error) { |
|
262 | + if (!$error) { |
|
263 | 263 | $db->commit(); |
264 | 264 | } else { |
265 | 265 | $db->rollback(); |
@@ -299,8 +299,8 @@ discard block |
||
299 | 299 | setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors'); |
300 | 300 | } |
301 | 301 | if ($result > 0) { |
302 | - $inventoryline->qty_stock = (float) price2num(GETPOST('stock_qty_' . $lineid, 'alpha'), 'MS'); // The new value that was set in as hidden field |
|
303 | - $inventoryline->qty_view = $qtytoupdate; // The new value we want |
|
302 | + $inventoryline->qty_stock = (float) price2num(GETPOST('stock_qty_' . $lineid, 'alpha'), 'MS'); // The new value that was set in as hidden field |
|
303 | + $inventoryline->qty_view = $qtytoupdate; // The new value we want |
|
304 | 304 | $inventoryline->pmp_real = price2num(GETPOST('realpmp_' . $lineid, 'alpha'), 'MS'); |
305 | 305 | $inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_' . $lineid, 'alpha'), 'MS'); |
306 | 306 | $resultupdate = $inventoryline->update($user); |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | // Delete record |
310 | 310 | $result = $inventoryline->fetch($lineid); |
311 | 311 | if ($result > 0) { |
312 | - $inventoryline->qty_view = null; // The new value we want |
|
312 | + $inventoryline->qty_view = null; // The new value we want |
|
313 | 313 | $inventoryline->pmp_real = price2num(GETPOST('realpmp_' . $lineid, 'alpha'), 'MS'); |
314 | 314 | $inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_' . $lineid, 'alpha'), 'MS'); |
315 | 315 | $resultupdate = $inventoryline->update($user); |
@@ -325,12 +325,12 @@ discard block |
||
325 | 325 | } |
326 | 326 | |
327 | 327 | // Update line with id of stock movement (and the start quantity if it has changed this last recording) |
328 | - if (! $error) { |
|
328 | + if (!$error) { |
|
329 | 329 | $sqlupdate = "UPDATE " . MAIN_DB_PREFIX . "inventory"; |
330 | 330 | $sqlupdate .= " SET fk_user_modif = " . ((int) $user->id); |
331 | 331 | $sqlupdate .= " WHERE rowid = " . ((int) $object->id); |
332 | 332 | $resqlupdate = $db->query($sqlupdate); |
333 | - if (! $resqlupdate) { |
|
333 | + if (!$resqlupdate) { |
|
334 | 334 | $error++; |
335 | 335 | setEventMessages($db->lasterror(), null, 'errors'); |
336 | 336 | } |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | } |
415 | 415 | } else { |
416 | 416 | // Clear var |
417 | - $_POST['batch'] = ''; // TODO Replace this with a var |
|
417 | + $_POST['batch'] = ''; // TODO Replace this with a var |
|
418 | 418 | $_POST['qtytoadd'] = ''; |
419 | 419 | } |
420 | 420 | } |
@@ -1170,7 +1170,7 @@ discard block |
||
1170 | 1170 | print '</td>'; |
1171 | 1171 | |
1172 | 1172 | print '<td class="right nowraponall">'; |
1173 | - print $obj->qty_view; // qty found |
|
1173 | + print $obj->qty_view; // qty found |
|
1174 | 1174 | print '</td>'; |
1175 | 1175 | |
1176 | 1176 | //PMP Real |
@@ -1192,7 +1192,7 @@ discard block |
||
1192 | 1192 | $totalRealValuation += $pmp_valuation_real; |
1193 | 1193 | } else { |
1194 | 1194 | print '<td class="right nowraponall">'; |
1195 | - print $obj->qty_view; // qty found |
|
1195 | + print $obj->qty_view; // qty found |
|
1196 | 1196 | print '</td>'; |
1197 | 1197 | } |
1198 | 1198 | print '<td>'; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | |
96 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
96 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
97 | 97 | /** |
98 | 98 | * Assign custom values for canvas (for example into this->tpl to be used by templates) |
99 | 99 | * |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | */ |
105 | 105 | public function assign_values(&$action, $id = 0, $ref = '') |
106 | 106 | { |
107 | - // phpcs:enable |
|
107 | + // phpcs:enable |
|
108 | 108 | global $conf, $langs, $user, $mysoc, $canvas; |
109 | 109 | global $form, $formproduct; |
110 | 110 |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | |
105 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
105 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
106 | 106 | /** |
107 | 107 | * Assign custom values for canvas (for example into this->tpl to be used by templates) |
108 | 108 | * |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function assign_values(&$action, $id = 0, $ref = '') |
115 | 115 | { |
116 | - // phpcs:enable |
|
116 | + // phpcs:enable |
|
117 | 117 | global $conf, $langs, $user, $mysoc, $canvas; |
118 | 118 | global $form; |
119 | 119 |
@@ -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 |