@@ -176,8 +176,8 @@ discard block |
||
176 | 176 | $sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps"; |
177 | 177 | $sql .= " ON ps.rowid = pb.fk_product_stock"; |
178 | 178 | $sql .= " WHERE pb.batch = '" . $db->escape($lot) . "'"; |
179 | - $sql .= " AND ps.fk_product = " . ((int) $prod_id) ; |
|
180 | - $sql .= " AND ps.fk_entrepot = " . ((int) $warehouse_id) ; |
|
179 | + $sql .= " AND ps.fk_product = " . ((int) $prod_id); |
|
180 | + $sql .= " AND ps.fk_entrepot = " . ((int) $warehouse_id); |
|
181 | 181 | |
182 | 182 | $resql = $db->query($sql); |
183 | 183 | if ($resql) { |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | $qtystart = 0; |
206 | 206 | |
207 | 207 | if ($idline > 0) { |
208 | - $result = $expeditiondispatch->fetch($idline); // get line from llx_expeditiondet |
|
208 | + $result = $expeditiondispatch->fetch($idline); // get line from llx_expeditiondet |
|
209 | 209 | if ($result < 0) { |
210 | 210 | setEventMessages($expeditiondispatch->error, $expeditiondispatch->errors, 'errors'); |
211 | 211 | $error++; |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | llxHeader('', $title, $help_url, '', 0, 0, $morejs); |
379 | 379 | |
380 | 380 | if ($object->id > 0 || !empty($object->ref)) { |
381 | - $lines = $object->lines; // This is an array of detail of line, on line per source order line found intolines[]->fk_elementdet, then each line may have sub data |
|
381 | + $lines = $object->lines; // This is an array of detail of line, on line per source order line found intolines[]->fk_elementdet, then each line may have sub data |
|
382 | 382 | //var_dump($lines[0]->fk_elementdet); exit; |
383 | 383 | |
384 | 384 | $num_prod = count($lines); |
@@ -527,7 +527,7 @@ discard block |
||
527 | 527 | print '<center>'; |
528 | 528 | |
529 | 529 | print '<br>'; |
530 | - $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
530 | + $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
531 | 531 | |
532 | 532 | if ($object->statut == Expedition::STATUS_DRAFT) { |
533 | 533 | $formproduct = new FormProduct($db); |
@@ -630,7 +630,7 @@ discard block |
||
630 | 630 | } |
631 | 631 | print '<td class="right">' . $langs->trans("QtyOrdered") . '</td>'; |
632 | 632 | if ($object->status == Expedition::STATUS_DRAFT) { |
633 | - print '<td class="right">' . $langs->trans("QtyToShip"); // Qty to dispatch (sum for all lines of batch detail if there is) |
|
633 | + print '<td class="right">' . $langs->trans("QtyToShip"); // Qty to dispatch (sum for all lines of batch detail if there is) |
|
634 | 634 | } else { |
635 | 635 | print '<td class="right">' . $langs->trans("QtyDispatchedShort") . '</td>'; |
636 | 636 | } |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | print '<center>'; |
439 | 439 | |
440 | 440 | print '<br>'; |
441 | - $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
441 | + $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
442 | 442 | |
443 | 443 | if ($object->statut == Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION'))) { |
444 | 444 | $formproduct = new FormProduct($db); |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | print '<td class="right">' . $langs->trans("SupplierRef") . '</td>'; |
542 | 542 | print '<td class="right">' . $langs->trans("QtyOrdered") . '</td>'; |
543 | 543 | if ($object->status == Reception::STATUS_DRAFT) { |
544 | - print '<td class="right">' . $langs->trans("QtyToReceive"); // Qty to dispatch (sum for all lines of batch detail if there is) |
|
544 | + print '<td class="right">' . $langs->trans("QtyToReceive"); // Qty to dispatch (sum for all lines of batch detail if there is) |
|
545 | 545 | } else { |
546 | 546 | print '<td class="right">' . $langs->trans("QtyDispatchedShort") . '</td>'; |
547 | 547 | } |
@@ -591,7 +591,7 @@ |
||
591 | 591 | for ($i = 0; $i < $count; $i++) { |
592 | 592 | foreach ($ecmfile->lines as $line) { |
593 | 593 | if ($filearray[$i]['name'] == $line->filename) { |
594 | - $filearray[$i] = array_merge($filearray[$i], (array)$line); |
|
594 | + $filearray[$i] = array_merge($filearray[$i], (array) $line); |
|
595 | 595 | } |
596 | 596 | } |
597 | 597 | } |