@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 171 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 172 | 172 | /** |
| 173 | 173 | * List all price expressions |
| 174 | 174 | * |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function list_price_expression() |
| 178 | 178 | { |
| 179 | - // phpcs:enable |
|
| 179 | + // phpcs:enable |
|
| 180 | 180 | $sql = "SELECT rowid, title, expression"; |
| 181 | 181 | $sql .= " FROM " . $this->db->prefix() . $this->table_element; |
| 182 | 182 | $sql .= " ORDER BY title"; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | |
| 206 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 206 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 207 | 207 | /** |
| 208 | 208 | * Returns any existing rowid with specified title |
| 209 | 209 | * |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function find_title($title) |
| 214 | 214 | { |
| 215 | - // phpcs:enable |
|
| 215 | + // phpcs:enable |
|
| 216 | 216 | $sql = "SELECT rowid"; |
| 217 | 217 | $sql .= " FROM " . $this->db->prefix() . $this->table_element; |
| 218 | 218 | $sql .= " WHERE title = '" . $this->db->escape($title) . "'"; |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | return 1; |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 561 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 562 | 562 | /** |
| 563 | 563 | * Update next_update into database |
| 564 | 564 | * |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | */ |
| 570 | 570 | public function update_next_update($next_update, $user = null, $notrigger = 0) |
| 571 | 571 | { |
| 572 | - // phpcs:enable |
|
| 572 | + // phpcs:enable |
|
| 573 | 573 | $error = 0; |
| 574 | 574 | |
| 575 | 575 | $this->next_update = $next_update; |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | } |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 606 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 607 | 607 | /** |
| 608 | 608 | * Update last_status into database |
| 609 | 609 | * |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | */ |
| 615 | 615 | public function update_status($last_status, $user = null, $notrigger = 0) |
| 616 | 616 | { |
| 617 | - // phpcs:enable |
|
| 617 | + // phpcs:enable |
|
| 618 | 618 | $error = 0; |
| 619 | 619 | |
| 620 | 620 | $this->last_status = $last_status; |
@@ -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 | } |
@@ -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 | |
@@ -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'), |
@@ -855,7 +855,7 @@ discard block |
||
| 855 | 855 | return $this->LibStatut($this->status, $mode); |
| 856 | 856 | } |
| 857 | 857 | |
| 858 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 858 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 859 | 859 | /** |
| 860 | 860 | * Return the status |
| 861 | 861 | * |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | */ |
| 866 | 866 | public function LibStatut($status, $mode = 0) |
| 867 | 867 | { |
| 868 | - // phpcs:enable |
|
| 868 | + // phpcs:enable |
|
| 869 | 869 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
| 870 | 870 | global $langs; |
| 871 | 871 | //$langs->load("stocktransfer@stocktransfer"); |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase |
| 157 | 157 | * $dlc Eat-by date. Will be used if lot does not exists yet and will be created. |
| 158 | 158 | * $dluo Sell-by date. Will be used if lot does not exists yet and will be created. |
| 159 | - * |
|
| 159 | + * |
|
| 160 | 160 | * @param int $product_id Id product id {@min 1} {@from body} {@required true} |
| 161 | 161 | * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true} |
| 162 | 162 | * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true} |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | |
| 279 | 279 | |
| 280 | 280 | |
| 281 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 281 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 282 | 282 | /** |
| 283 | 283 | * Clean sensible object datas |
| 284 | 284 | * |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | */ |
| 288 | 288 | protected function _cleanObjectDatas($object) |
| 289 | 289 | { |
| 290 | - // phpcs:enable |
|
| 290 | + // phpcs:enable |
|
| 291 | 291 | $object = parent::_cleanObjectDatas($object); |
| 292 | 292 | |
| 293 | 293 | // Remove useless data |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | return $this->LibStatut($this->status, $mode); |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 550 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 551 | 551 | /** |
| 552 | 552 | * Renvoi le libelle d'un status donne |
| 553 | 553 | * |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | */ |
| 558 | 558 | public function LibStatut($status, $mode = 0) |
| 559 | 559 | { |
| 560 | - // phpcs:enable |
|
| 560 | + // phpcs:enable |
|
| 561 | 561 | global $langs; |
| 562 | 562 | |
| 563 | 563 | if ($mode == 0) { |