@@ -685,7 +685,7 @@ |
||
685 | 685 | //print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n"; |
686 | 686 | // Other attributes |
687 | 687 | $parameters['tdclass'] = 'titlefieldauto'; |
688 | -$parameters['tpl_context'] = 'public'; // define template context to public |
|
688 | +$parameters['tpl_context'] = 'public'; // define template context to public |
|
689 | 689 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
690 | 690 | // Comments |
691 | 691 | print '<tr>'; |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | if (!defined("NOSESSION")) { |
46 | 46 | define("NOSESSION", '1'); |
47 | 47 | } |
48 | -if (! defined('NOREQUIREHTML')) { |
|
49 | - define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php |
|
48 | +if (!defined('NOREQUIREHTML')) { |
|
49 | + define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php |
|
50 | 50 | } |
51 | -if (! defined('NOREQUIREAJAX')) { |
|
52 | - define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library |
|
51 | +if (!defined('NOREQUIREAJAX')) { |
|
52 | + define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | $mtid = GETPOST('mtid'); |
65 | 65 | $email = GETPOST('email'); |
66 | -$tag = GETPOST('tag'); // To retrieve the emailing, and recipient |
|
66 | +$tag = GETPOST('tag'); // To retrieve the emailing, and recipient |
|
67 | 67 | $unsuscrib = GETPOST('unsuscrib'); |
68 | 68 | $securitykey = GETPOST('securitykey'); |
69 | 69 |
@@ -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']++; |
@@ -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 |