@@ -158,7 +158,7 @@ |
||
158 | 158 | )); |
159 | 159 | |
160 | 160 | // Retrieve all extrafields if not already not know (should not happen) |
161 | - if (! is_object($extrafields)) { |
|
161 | + if (!is_object($extrafields)) { |
|
162 | 162 | $extrafields = new ExtraFields($this->db); |
163 | 163 | $extrafields->fetch_name_optionals_label($product->table_element); |
164 | 164 | } |
@@ -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; |
@@ -49,7 +49,7 @@ |
||
49 | 49 | |
50 | 50 | $action = GETPOST('action', 'aZ09'); |
51 | 51 | $value = GETPOST('value', 'alpha'); |
52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
53 | 53 | |
54 | 54 | $label = GETPOST('label', 'alpha'); |
55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | // type can be empty string or 0 or 1 |
51 | 51 | $type = GETPOST('type', 'int'); |
52 | 52 | $mode = GETPOSTINT('mode'); |
53 | -$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1); // status buy when mode = customer , status purchase when mode = supplier |
|
54 | -$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1); // status purchase when mode = customer |
|
53 | +$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1); // status buy when mode = customer , status purchase when mode = supplier |
|
54 | +$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1); // status purchase when mode = customer |
|
55 | 55 | $outjson = (GETPOSTINT('outjson') ? GETPOSTINT('outjson') : 0); |
56 | 56 | $price_level = GETPOSTINT('price_level'); |
57 | 57 | $action = GETPOST('action', 'aZ09'); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // Multiprice (1 price per level) |
165 | 165 | if (!$found && isset($price_level) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) { // If we need a particular price level (from 1 to 6) |
166 | 166 | $sql = "SELECT price, price_ttc, price_base_type,"; |
167 | - $sql .= " tva_tx, default_vat_code"; // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on. |
|
167 | + $sql .= " tva_tx, default_vat_code"; // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on. |
|
168 | 168 | $sql .= " FROM " . MAIN_DB_PREFIX . "product_price "; |
169 | 169 | $sql .= " WHERE fk_product = " . ((int) $id); |
170 | 170 | $sql .= " AND entity IN (" . getEntity('productprice') . ")"; |
@@ -177,12 +177,12 @@ discard block |
||
177 | 177 | $objp = $db->fetch_object($result); |
178 | 178 | if ($objp) { |
179 | 179 | $found = true; |
180 | - $outprice_ht = price($objp->price); // formatted for language user because is inserted into input field |
|
181 | - $outprice_ttc = price($objp->price_ttc); // formatted for language user because is inserted into input field |
|
180 | + $outprice_ht = price($objp->price); // formatted for language user because is inserted into input field |
|
181 | + $outprice_ttc = price($objp->price_ttc); // formatted for language user because is inserted into input field |
|
182 | 182 | $outpricebasetype = $objp->price_base_type; |
183 | 183 | if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) { |
184 | 184 | $outtva_tx_formated = price($objp->tva_tx); // formatted for language user because is inserted into input field |
185 | - $outtva_tx = price2num($objp->tva_tx); // international numeric |
|
185 | + $outtva_tx = price2num($objp->tva_tx); // international numeric |
|
186 | 186 | $outdefault_vat_code = $objp->default_vat_code; |
187 | 187 | } else { |
188 | 188 | // The common and default behaviour. |
@@ -226,8 +226,8 @@ discard block |
||
226 | 226 | } |
227 | 227 | |
228 | 228 | // VAT to use and default VAT for product are set to same value by default |
229 | - $product_outtva_tx_formated = $outtva_tx_formated; |
|
230 | - $product_outtva_tx = $outtva_tx; |
|
229 | + $product_outtva_tx_formated = $outtva_tx_formated; |
|
230 | + $product_outtva_tx = $outtva_tx; |
|
231 | 231 | $product_outdefault_vat_code = $outdefault_vat_code; |
232 | 232 | |
233 | 233 | // If we ask the price according to buyer, we change it. |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | $match = preg_grep('/(' . preg_quote($htmlname, '/') . '[0-9]+)/', array_keys($_GET)); |
296 | 296 | sort($match); |
297 | 297 | |
298 | - $idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123 |
|
298 | + $idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123 |
|
299 | 299 | |
300 | 300 | if (GETPOST($htmlname, 'alpha') == '' && (!$idprod || !GETPOST($idprod, 'alpha'))) { |
301 | 301 | print json_encode(array()); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $refalreadyexists = 0; |
99 | 99 | |
100 | 100 | // Get parameters |
101 | -$id = GETPOSTINT('id'); |
|
101 | +$id = GETPOSTINT('id'); |
|
102 | 102 | if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) { |
103 | 103 | $ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null); |
104 | 104 | } else { |
@@ -771,7 +771,7 @@ discard block |
||
771 | 771 | $object->status_batch = GETPOST('status_batch', 'aZ09'); |
772 | 772 | $object->sell_or_eat_by_mandatory = GETPOSTINT('sell_or_eat_by_mandatory'); |
773 | 773 | $object->batch_mask = GETPOST('batch_mask', 'alpha'); |
774 | - $object->fk_default_warehouse = GETPOSTINT('fk_default_warehouse'); |
|
774 | + $object->fk_default_warehouse = GETPOSTINT('fk_default_warehouse'); |
|
775 | 775 | $object->fk_default_workstation = GETPOSTINT('fk_default_workstation'); |
776 | 776 | // removed from update view so GETPOST always empty |
777 | 777 | /* |
@@ -871,7 +871,7 @@ discard block |
||
871 | 871 | $object->accountancy_code_buy_export = $accountancy_code_buy_export; |
872 | 872 | } |
873 | 873 | if ($object->isService()) { |
874 | - $object->mandatory_period = (!empty($checkmandatory)) ? 1 : 0 ; |
|
874 | + $object->mandatory_period = (!empty($checkmandatory)) ? 1 : 0; |
|
875 | 875 | } |
876 | 876 | |
877 | 877 |
@@ -92,22 +92,22 @@ discard block |
||
92 | 92 | $fk_product = $object->fk_product; |
93 | 93 | $reelqty = $object->reel; |
94 | 94 | |
95 | - $objectreturn = array('fk_warehouse' => $warehouseid,'fk_product' => $fk_product,'reelqty' => $reelqty); |
|
95 | + $objectreturn = array('fk_warehouse' => $warehouseid, 'fk_product' => $fk_product, 'reelqty' => $reelqty); |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 | } |
99 | 99 | if ($warehousefound < 1) { |
100 | - $response = array('status' => 'error','errorcode' => 'NotFound','message' => 'No warehouse found for barcode' . $barcode); |
|
100 | + $response = array('status' => 'error', 'errorcode' => 'NotFound', 'message' => 'No warehouse found for barcode' . $barcode); |
|
101 | 101 | } elseif ($warehousefound > 1) { |
102 | - $response = array('status' => 'error','errorcode' => 'TooManyWarehouse','message' => 'Too many warehouse found'); |
|
102 | + $response = array('status' => 'error', 'errorcode' => 'TooManyWarehouse', 'message' => 'Too many warehouse found'); |
|
103 | 103 | } else { |
104 | - $response = array('status' => 'success','message' => 'Warehouse found','object' => $objectreturn); |
|
104 | + $response = array('status' => 'success', 'message' => 'Warehouse found', 'object' => $objectreturn); |
|
105 | 105 | } |
106 | 106 | } else { |
107 | - $response = array('status' => 'error','errorcode' => 'NotFound','message' => "No results found for barcode"); |
|
107 | + $response = array('status' => 'error', 'errorcode' => 'NotFound', 'message' => "No results found for barcode"); |
|
108 | 108 | } |
109 | 109 | } else { |
110 | - $response = array('status' => 'error','errorcode' => 'ActionError','message' => "Error on action"); |
|
110 | + $response = array('status' => 'error', 'errorcode' => 'ActionError', 'message' => "Error on action"); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | if ($action == "addnewlineproduct") { |
@@ -126,12 +126,12 @@ discard block |
||
126 | 126 | |
127 | 127 | $result = $inventoryline->create($user); |
128 | 128 | if ($result > 0) { |
129 | - $response = array('status' => 'success','message' => 'Success on creating line','id_line' => $result); |
|
129 | + $response = array('status' => 'success', 'message' => 'Success on creating line', 'id_line' => $result); |
|
130 | 130 | } else { |
131 | - $response = array('status' => 'error','errorcode' => 'ErrorCreation','message' => "Error on line creation"); |
|
131 | + $response = array('status' => 'error', 'errorcode' => 'ErrorCreation', 'message' => "Error on line creation"); |
|
132 | 132 | } |
133 | 133 | } else { |
134 | - $response = array('status' => 'error','errorcode' => 'NoIdForInventory','message' => "No id for inventory"); |
|
134 | + $response = array('status' => 'error', 'errorcode' => 'NoIdForInventory', 'message' => "No id for inventory"); |
|
135 | 135 | } |
136 | 136 | } |
137 | 137 |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | // Default sort order (if not yet defined by previous GETPOST) |
75 | 75 | if (!$sortfield) { |
76 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
76 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
77 | 77 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
78 | 78 | } |
79 | 79 | if (!$sortorder) { |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | // Output page |
377 | 377 | // -------------------------------------------------------------------- |
378 | 378 | |
379 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
379 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
380 | 380 | |
381 | 381 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
382 | 382 | |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | } |
513 | 513 | |
514 | 514 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
515 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
515 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
516 | 516 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
517 | 517 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
518 | 518 | |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
604 | 604 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
605 | 605 | } |
606 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
606 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
607 | 607 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
608 | 608 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
609 | 609 | $totalarray['nbfield']++; |
@@ -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'), |