@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $result = $db->query($sql); |
79 | 79 | if ($result) { |
80 | 80 | $nbline = $db->num_rows($result); |
81 | - for ($i=0; $i < $nbline; $i++) { |
|
81 | + for ($i = 0; $i < $nbline; $i++) { |
|
82 | 82 | $object = $db->fetch_object($result); |
83 | 83 | if (($mode == "barcode" && $barcode == $object->barcode) || ($mode == "lotserial" && $barcode == $object->batch)) { |
84 | 84 | $warehouse->fetch(0, $product["Warehouse"]); |
@@ -88,22 +88,22 @@ discard block |
||
88 | 88 | $fk_product = $object->fk_product; |
89 | 89 | $reelqty = $object->reel; |
90 | 90 | |
91 | - $objectreturn = array('fk_warehouse'=>$warehouseid,'fk_product'=>$fk_product,'reelqty'=>$reelqty); |
|
91 | + $objectreturn = array('fk_warehouse'=>$warehouseid, 'fk_product'=>$fk_product, 'reelqty'=>$reelqty); |
|
92 | 92 | } |
93 | 93 | } |
94 | 94 | } |
95 | 95 | if ($warehousefound < 1) { |
96 | - $response = array('status'=>'error','errorcode'=>'NotFound','message'=>'No warehouse found for barcode'.$barcode); |
|
96 | + $response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>'No warehouse found for barcode'.$barcode); |
|
97 | 97 | } elseif ($warehousefound > 1) { |
98 | - $response = array('status'=>'error','errorcode'=>'TooManyWarehouse','message'=>'Too many warehouse found'); |
|
98 | + $response = array('status'=>'error', 'errorcode'=>'TooManyWarehouse', 'message'=>'Too many warehouse found'); |
|
99 | 99 | } else { |
100 | - $response = array('status'=>'success','message'=>'Warehouse found','object'=>$objectreturn); |
|
100 | + $response = array('status'=>'success', 'message'=>'Warehouse found', 'object'=>$objectreturn); |
|
101 | 101 | } |
102 | 102 | } else { |
103 | - $response = array('status'=>'error','errorcode'=>'NotFound','message'=>"No results found for barcode"); |
|
103 | + $response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>"No results found for barcode"); |
|
104 | 104 | } |
105 | 105 | } else { |
106 | - $response = array('status'=>'error','errorcode'=>'ActionError','message'=>"Error on action"); |
|
106 | + $response = array('status'=>'error', 'errorcode'=>'ActionError', 'message'=>"Error on action"); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | if ($action == "addnewlineproduct") { |
@@ -122,12 +122,12 @@ discard block |
||
122 | 122 | |
123 | 123 | $result = $inventoryline->create($user); |
124 | 124 | if ($result > 0) { |
125 | - $response = array('status'=>'success','message'=>'Success on creating line','id_line'=>$result); |
|
125 | + $response = array('status'=>'success', 'message'=>'Success on creating line', 'id_line'=>$result); |
|
126 | 126 | } else { |
127 | - $response = array('status'=>'error','errorcode'=>'ErrorCreation','message'=>"Error on line creation"); |
|
127 | + $response = array('status'=>'error', 'errorcode'=>'ErrorCreation', 'message'=>"Error on line creation"); |
|
128 | 128 | } |
129 | 129 | } else { |
130 | - $response = array('status'=>'error','errorcode'=>'NoIdForInventory','message'=>"No id for inventory"); |
|
130 | + $response = array('status'=>'error', 'errorcode'=>'NoIdForInventory', 'message'=>"No id for inventory"); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 |
@@ -81,7 +81,7 @@ |
||
81 | 81 | $title = $langs->trans("Multicompanies"); |
82 | 82 | |
83 | 83 | // URL http://mydolibarr/core/multicompany_page?dol_use_jmobile=1 can be used for tests |
84 | -$head = '<!-- Multicompany selection -->'."\n"; // This is used by DoliDroid to know page is a multicompany selection page |
|
84 | +$head = '<!-- Multicompany selection -->'."\n"; // This is used by DoliDroid to know page is a multicompany selection page |
|
85 | 85 | $arrayofjs = array(); |
86 | 86 | $arrayofcss = array(); |
87 | 87 | top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss); |
@@ -58,7 +58,7 @@ |
||
58 | 58 | $title = $langs->trans("Bookmarks"); |
59 | 59 | |
60 | 60 | // URL http://mydolibarr/core/bookmarks_page?dol_use_jmobile=1 can be used for tests |
61 | -$head = '<!-- Bookmarks -->'."\n"; // This is used by DoliDroid to know page is a bookmark selection page |
|
61 | +$head = '<!-- Bookmarks -->'."\n"; // This is used by DoliDroid to know page is a bookmark selection page |
|
62 | 62 | $arrayofjs = array(); |
63 | 63 | $arrayofcss = array(); |
64 | 64 | top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss); |
@@ -84,7 +84,7 @@ |
||
84 | 84 | $title = $langs->trans("Menu"); |
85 | 85 | |
86 | 86 | // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests |
87 | -$head = '<!-- Menu -->'."\n"; // This is used by DoliDroid to know page is a menu page |
|
87 | +$head = '<!-- Menu -->'."\n"; // This is used by DoliDroid to know page is a menu page |
|
88 | 88 | $arrayofjs = array(); |
89 | 89 | $arrayofcss = array(); |
90 | 90 | top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss); |
@@ -149,7 +149,7 @@ |
||
149 | 149 | $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED; |
150 | 150 | $sql .= " AND ("; |
151 | 151 | $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')"; |
152 | -$sql .= " OR"; // For leave over several months |
|
152 | +$sql .= " OR"; // For leave over several months |
|
153 | 153 | $sql .= " (date_format(cp.date_debut, '%Y-%m') < '".$db->escape($year_month)."' AND date_format(cp.date_fin, '%Y-%m') > '".$db->escape($year_month)."') "; |
154 | 154 | $sql .= " )"; |
155 | 155 | if (!empty($search_ref)) { |
@@ -916,7 +916,7 @@ |
||
916 | 916 | /** |
917 | 917 | * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that |
918 | 918 | * extrafields from HTTP query can be assigned to the correct dispatch line |
919 | - */ |
|
919 | + */ |
|
920 | 920 | $suffix2numAsked = array(); |
921 | 921 | $dispatchLines = array(); |
922 | 922 |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $line_id = GETPOSTINT('lineid') ? GETPOSTINT('lineid') : 0; |
88 | 88 | $facid = GETPOSTINT('facid'); |
89 | 89 | |
90 | -$action = GETPOST('action', 'alpha'); |
|
90 | +$action = GETPOST('action', 'alpha'); |
|
91 | 91 | //Select mail models is same action as presend |
92 | 92 | if (GETPOST('modelselected')) { |
93 | 93 | $action = 'presend'; |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | |
344 | 344 | // Loop lines to calculate $totalqty |
345 | 345 | for ($i = 1; $i <= $num; $i++) { |
346 | - $idl = "idl".$i; // id line source |
|
346 | + $idl = "idl".$i; // id line source |
|
347 | 347 | |
348 | 348 | //$sub_qty = array(); |
349 | 349 | //$subtotalqty = 0; |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | //$j = 0; |
352 | 352 | //$batch = "batchl".$i."_0"; |
353 | 353 | //$stockLocation = "ent1".$i."_0"; |
354 | - $qty = "qtyl".$i; // qty |
|
354 | + $qty = "qtyl".$i; // qty |
|
355 | 355 | |
356 | 356 | //reception line for product with no batch management and no multiple stock location |
357 | 357 | if (GETPOST($qty, 'alpha') > 0) { |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | |
366 | 366 | if ($totalqty > 0) { // There is at least one thing to ship |
367 | 367 | for ($i = 1; $i <= $num; $i++) { |
368 | - $idl = "idl".$i; // id line source |
|
368 | + $idl = "idl".$i; // id line source |
|
369 | 369 | $lineToTest = ''; |
370 | 370 | $lineId = GETPOSTINT($idl); |
371 | 371 | foreach ($objectsrc->lines as $linesrc) { |
@@ -975,35 +975,35 @@ discard block |
||
975 | 975 | $reg = array(); |
976 | 976 | if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) { |
977 | 977 | $numAsked++; |
978 | - $paramSuffix = $reg[1] . '_' . $reg[2]; |
|
978 | + $paramSuffix = $reg[1].'_'.$reg[2]; |
|
979 | 979 | $suffix2numAsked[$paramSuffix] = $numAsked; |
980 | 980 | |
981 | 981 | // $numline=$reg[2] + 1; // line of product |
982 | 982 | $numline = $numAsked; |
983 | 983 | |
984 | - $prod = "product_" . $paramSuffix; |
|
985 | - $qty = "qty_" . $paramSuffix; |
|
986 | - $ent = "entrepot_" . $paramSuffix; |
|
987 | - $pu = "pu_" . $paramSuffix; // This is unit price including discount |
|
988 | - $fk_commandefourndet = "fk_commandefourndet_" . $paramSuffix; |
|
984 | + $prod = "product_".$paramSuffix; |
|
985 | + $qty = "qty_".$paramSuffix; |
|
986 | + $ent = "entrepot_".$paramSuffix; |
|
987 | + $pu = "pu_".$paramSuffix; // This is unit price including discount |
|
988 | + $fk_commandefourndet = "fk_commandefourndet_".$paramSuffix; |
|
989 | 989 | $dispatchLines[$numAsked] = array('paramSuffix' => $paramSuffix, 'prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet)); |
990 | 990 | } |
991 | 991 | |
992 | 992 | // with batch module enabled and product with lot/serial |
993 | 993 | if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg)) { |
994 | 994 | $numAsked++; |
995 | - $paramSuffix = $reg[1] . '_' . $reg[2]; |
|
995 | + $paramSuffix = $reg[1].'_'.$reg[2]; |
|
996 | 996 | $suffix2numAsked[$paramSuffix] = $numAsked; |
997 | 997 | |
998 | 998 | // eat-by date dispatch |
999 | 999 | // $numline=$reg[2] + 1; // line of product |
1000 | 1000 | $numline = $numAsked; |
1001 | 1001 | |
1002 | - $prod = 'product_batch_' . $paramSuffix; |
|
1003 | - $qty = 'qty_' . $paramSuffix; |
|
1004 | - $ent = 'entrepot_' . $paramSuffix; |
|
1005 | - $pu = 'pu_' . $paramSuffix; |
|
1006 | - $lot = 'lot_number_' . $paramSuffix; |
|
1002 | + $prod = 'product_batch_'.$paramSuffix; |
|
1003 | + $qty = 'qty_'.$paramSuffix; |
|
1004 | + $ent = 'entrepot_'.$paramSuffix; |
|
1005 | + $pu = 'pu_'.$paramSuffix; |
|
1006 | + $lot = 'lot_number_'.$paramSuffix; |
|
1007 | 1007 | $dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo_'.$paramSuffix.'month'), GETPOSTINT('dluo_'.$paramSuffix.'day'), GETPOSTINT('dluo_'.$paramSuffix.'year')); |
1008 | 1008 | $dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc_'.$paramSuffix.'month'), GETPOSTINT('dlc_'.$paramSuffix.'day'), GETPOSTINT('dlc_'.$paramSuffix.'year')); |
1009 | 1009 | $fk_commandefourndet = 'fk_commandefourndet_'.$paramSuffix; |
@@ -1037,7 +1037,7 @@ discard block |
||
1037 | 1037 | // Note that if an extrafield with the same name exists in the origin supplier order line, the value |
1038 | 1038 | // from the HTTP query will be ignored |
1039 | 1039 | foreach ($suffix2numAsked as $suffix => $n) { |
1040 | - $dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('receptiondet_batch', '_' . $suffix, ''); |
|
1040 | + $dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('receptiondet_batch', '_'.$suffix, ''); |
|
1041 | 1041 | } |
1042 | 1042 | |
1043 | 1043 | print '<script type="text/javascript"> |
@@ -1142,7 +1142,7 @@ discard block |
||
1142 | 1142 | |
1143 | 1143 | print '<input type="hidden" name="productl'.$indiceAsked.'" value="'.$line->fk_product.'">'; |
1144 | 1144 | |
1145 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1145 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1146 | 1146 | print '<input type="hidden" name="productid'.$indiceAsked.'" value="'.$line->fk_product.'">'; |
1147 | 1147 | |
1148 | 1148 | // Show product and description |
@@ -1164,7 +1164,7 @@ discard block |
||
1164 | 1164 | print '</td>'; |
1165 | 1165 | } else { |
1166 | 1166 | print "<td>"; |
1167 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1167 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1168 | 1168 | if ($type == 1) { |
1169 | 1169 | $text = img_object($langs->trans('Service'), 'service'); |
1170 | 1170 | } else { |
@@ -1193,7 +1193,7 @@ discard block |
||
1193 | 1193 | |
1194 | 1194 | // Qty in source purchase order line |
1195 | 1195 | print '<td class="center">'; |
1196 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1196 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1197 | 1197 | print $line->qty; |
1198 | 1198 | } |
1199 | 1199 | print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value="'.$line->id.'">'; |
@@ -1205,7 +1205,7 @@ discard block |
||
1205 | 1205 | // Qty already received |
1206 | 1206 | print '<td class="center">'; |
1207 | 1207 | $quantityDelivered = $objectsrc->receptions[$line->id]; |
1208 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1208 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
1209 | 1209 | print $quantityDelivered; |
1210 | 1210 | } |
1211 | 1211 | print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">'; |
@@ -2041,7 +2041,7 @@ discard block |
||
2041 | 2041 | $detail = $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $batchinfo); |
2042 | 2042 | } |
2043 | 2043 | } |
2044 | - print $detail . '</td>'; |
|
2044 | + print $detail.'</td>'; |
|
2045 | 2045 | } else { |
2046 | 2046 | print '<td></td>'; |
2047 | 2047 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function getExample() |
78 | 78 | { |
79 | - return $this->prefix.'0-0501-0001'; // TC0-0501-0001 |
|
79 | + return $this->prefix.'0-0501-0001'; // TC0-0501-0001 |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -92,10 +92,10 @@ discard block |
||
92 | 92 | $pryymm = ''; |
93 | 93 | $max = ''; |
94 | 94 | |
95 | - $pos_source = 0; // POS source = Terminal ID |
|
95 | + $pos_source = 0; // POS source = Terminal ID |
|
96 | 96 | |
97 | 97 | // First, we get the max value |
98 | - $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
98 | + $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
99 | 99 | |
100 | 100 | $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; |
101 | 101 | $sql .= " FROM ".MAIN_DB_PREFIX."facture"; |
@@ -135,10 +135,10 @@ discard block |
||
135 | 135 | { |
136 | 136 | global $db; |
137 | 137 | |
138 | - $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID |
|
138 | + $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID |
|
139 | 139 | |
140 | 140 | // First, we get the max value |
141 | - $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
141 | + $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
142 | 142 | $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL |
143 | 143 | $sql .= " FROM ".MAIN_DB_PREFIX."facture"; |
144 | 144 | $sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'"; |
@@ -80,7 +80,7 @@ |
||
80 | 80 | } else { |
81 | 81 | dol_print_error($db); |
82 | 82 | } |
83 | - dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
83 | + dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
84 | 84 | } |
85 | 85 | $head[$tab][0] = DOL_URL_ROOT.'/contact/project.php?id='.$object->id; |
86 | 86 | $head[$tab][1] = $langs->trans("Projects"); |
@@ -235,7 +235,7 @@ |
||
235 | 235 | $this->dateh = $this->db->jdate($obj->dateh); |
236 | 236 | $this->datef = $this->db->jdate($obj->datef); |
237 | 237 | $this->amount = $obj->subscription; |
238 | - $this->note = $obj->note_public; // deprecated |
|
238 | + $this->note = $obj->note_public; // deprecated |
|
239 | 239 | $this->note_public = $obj->note_public; |
240 | 240 | $this->fk_bank = $obj->fk_bank; |
241 | 241 | return 1; |