@@ -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) { |
@@ -845,7 +845,7 @@ discard block |
||
845 | 845 | if (isModEnabled('category') && $user->hasRight($rightskey, 'creer')) { |
846 | 846 | $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"') . $langs->trans("AffectTag"); |
847 | 847 | } |
848 | -if (in_array($massaction, array('presend', 'predelete','preaffecttag', 'edit_extrafields', 'preupdateprice'))) { |
|
848 | +if (in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'edit_extrafields', 'preupdateprice'))) { |
|
849 | 849 | $arrayofmassactions = array(); |
850 | 850 | } |
851 | 851 | if ($user->hasRight($rightskey, 'supprimer')) { |
@@ -1928,10 +1928,10 @@ discard block |
||
1928 | 1928 | |
1929 | 1929 | // Multiprices |
1930 | 1930 | if (getDolGlobalString('PRODUIT_MULTIPRICES')) { |
1931 | - if (! isset($productpricescache)) { |
|
1931 | + if (!isset($productpricescache)) { |
|
1932 | 1932 | $productpricescache = array(); |
1933 | 1933 | } |
1934 | - if (! isset($productpricescache[$obj->rowid])) { |
|
1934 | + if (!isset($productpricescache[$obj->rowid])) { |
|
1935 | 1935 | $productpricescache[$obj->rowid] = array(); |
1936 | 1936 | } |
1937 | 1937 |
@@ -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 | } |
@@ -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')) { |
@@ -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) { |
@@ -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'); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | // Default sort order (if not yet defined by previous GETPOST) |
74 | 74 | if (!$sortfield) { |
75 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
75 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
76 | 76 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
77 | 77 | } |
78 | 78 | if (!$sortorder) { |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | // Output page |
376 | 376 | // -------------------------------------------------------------------- |
377 | 377 | |
378 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
378 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
379 | 379 | |
380 | 380 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
381 | 381 | |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | } 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'])) { |
602 | 602 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
603 | 603 | } |
604 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
604 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
605 | 605 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
606 | 606 | 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"; |
607 | 607 | $totalarray['nbfield']++; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $line = $db->fetch_object($resql); |
165 | 165 | |
166 | 166 | $qty_stock = $line->qty_stock; |
167 | - $qty_view = $line->qty_view; // The quantity viewed by inventorier, the qty we target |
|
167 | + $qty_view = $line->qty_view; // The quantity viewed by inventorier, the qty we target |
|
168 | 168 | |
169 | 169 | |
170 | 170 | // Load real stock we have now. |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | } |
222 | 222 | $sqlupdate .= " WHERE rowid = " . ((int) $line->rowid); |
223 | 223 | $resqlupdate = $db->query($sqlupdate); |
224 | - if (! $resqlupdate) { |
|
224 | + if (!$resqlupdate) { |
|
225 | 225 | $error++; |
226 | 226 | setEventMessages($db->lasterror(), null, 'errors'); |
227 | 227 | break; |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | if (!empty($line->pmp_real) && getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) { |
232 | 232 | $sqlpmp = 'UPDATE ' . MAIN_DB_PREFIX . 'product SET pmp = ' . ((float) $line->pmp_real) . ' WHERE rowid = ' . ((int) $line->fk_product); |
233 | 233 | $resqlpmp = $db->query($sqlpmp); |
234 | - if (! $resqlpmp) { |
|
234 | + if (!$resqlpmp) { |
|
235 | 235 | $error++; |
236 | 236 | setEventMessages($db->lasterror(), null, 'errors'); |
237 | 237 | break; |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) { |
240 | 240 | $sqlpmp = 'UPDATE ' . MAIN_DB_PREFIX . 'product_perentity SET pmp = ' . ((float) $line->pmp_real) . ' WHERE fk_product = ' . ((int) $line->fk_product) . ' AND entity=' . $conf->entity; |
241 | 241 | $resqlpmp = $db->query($sqlpmp); |
242 | - if (! $resqlpmp) { |
|
242 | + if (!$resqlpmp) { |
|
243 | 243 | $error++; |
244 | 244 | setEventMessages($db->lasterror(), null, 'errors'); |
245 | 245 | break; |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | $error++; |
259 | 259 | } |
260 | 260 | |
261 | - if (! $error) { |
|
261 | + if (!$error) { |
|
262 | 262 | $db->commit(); |
263 | 263 | } else { |
264 | 264 | $db->rollback(); |
@@ -298,8 +298,8 @@ discard block |
||
298 | 298 | setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors'); |
299 | 299 | } |
300 | 300 | if ($result > 0) { |
301 | - $inventoryline->qty_stock = price2num(GETPOST('stock_qty_' . $lineid, 'alpha'), 'MS'); // The new value that was set in as hidden field |
|
302 | - $inventoryline->qty_view = $qtytoupdate; // The new value we want |
|
301 | + $inventoryline->qty_stock = price2num(GETPOST('stock_qty_' . $lineid, 'alpha'), 'MS'); // The new value that was set in as hidden field |
|
302 | + $inventoryline->qty_view = $qtytoupdate; // The new value we want |
|
303 | 303 | $inventoryline->pmp_real = price2num(GETPOST('realpmp_' . $lineid, 'alpha'), 'MS'); |
304 | 304 | $inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_' . $lineid, 'alpha'), 'MS'); |
305 | 305 | $resultupdate = $inventoryline->update($user); |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | // Delete record |
309 | 309 | $result = $inventoryline->fetch($lineid); |
310 | 310 | if ($result > 0) { |
311 | - $inventoryline->qty_view = null; // The new value we want |
|
311 | + $inventoryline->qty_view = null; // The new value we want |
|
312 | 312 | $inventoryline->pmp_real = price2num(GETPOST('realpmp_' . $lineid, 'alpha'), 'MS'); |
313 | 313 | $inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_' . $lineid, 'alpha'), 'MS'); |
314 | 314 | $resultupdate = $inventoryline->update($user); |
@@ -324,12 +324,12 @@ discard block |
||
324 | 324 | } |
325 | 325 | |
326 | 326 | // Update line with id of stock movement (and the start quantity if it has changed this last recording) |
327 | - if (! $error) { |
|
327 | + if (!$error) { |
|
328 | 328 | $sqlupdate = "UPDATE " . MAIN_DB_PREFIX . "inventory"; |
329 | 329 | $sqlupdate .= " SET fk_user_modif = " . ((int) $user->id); |
330 | 330 | $sqlupdate .= " WHERE rowid = " . ((int) $object->id); |
331 | 331 | $resqlupdate = $db->query($sqlupdate); |
332 | - if (! $resqlupdate) { |
|
332 | + if (!$resqlupdate) { |
|
333 | 333 | $error++; |
334 | 334 | setEventMessages($db->lasterror(), null, 'errors'); |
335 | 335 | } |
@@ -1169,7 +1169,7 @@ discard block |
||
1169 | 1169 | print '</td>'; |
1170 | 1170 | |
1171 | 1171 | print '<td class="right nowraponall">'; |
1172 | - print $obj->qty_view; // qty found |
|
1172 | + print $obj->qty_view; // qty found |
|
1173 | 1173 | print '</td>'; |
1174 | 1174 | |
1175 | 1175 | //PMP Real |
@@ -1191,7 +1191,7 @@ discard block |
||
1191 | 1191 | $totalRealValuation += $pmp_valuation_real; |
1192 | 1192 | } else { |
1193 | 1193 | print '<td class="right nowraponall">'; |
1194 | - print $obj->qty_view; // qty found |
|
1194 | + print $obj->qty_view; // qty found |
|
1195 | 1195 | print '</td>'; |
1196 | 1196 | } |
1197 | 1197 | print '<td>'; |
@@ -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 |