diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index f5ce925efc3..c5c97ab428c 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1669,7 +1669,8 @@ if ($action == 'create') { print '
'; print '
'; - print ''; + print '
'; + print ''; print ''; // # if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { @@ -1734,6 +1735,7 @@ if ($action == 'create') { print ''; } print "\n"; + print ''; $var = false; @@ -1799,9 +1801,10 @@ if ($action == 'create') { $arrayofpurchaselinealreadyoutput = array(); // Loop on each product to send/sent. Warning: $lines must be sorted by ->fk_commandefourndet (it is a regroupment key on output) + print ''; for ($i = 0; $i < $num_prod; $i++) { print ''; // id of order line - print ''; + print ''; // # if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { @@ -1819,7 +1822,7 @@ if ($action == 'create') { $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label); } - print '\n"; } else { - print "
'; + print ''; if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) { $text = $lines[$i]->product->getNomUrl(1); $text .= ' - '.$label; @@ -1832,7 +1835,7 @@ if ($action == 'create') { } print ""; + print ''; if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) { if ($lines[$i]->product_type == Product::TYPE_SERVICE) { $text = img_object($langs->trans('Service'), 'service'); @@ -1860,7 +1863,7 @@ if ($action == 'create') { // Qty ordered - print ''; + print ''; if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) { print $lines[$i]->qty_asked; } @@ -1868,7 +1871,7 @@ if ($action == 'create') { // Qty in other receptions (with reception and warehouse used) if ($origin && $origin_id > 0) { - print ''; + print ''; if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) { foreach ($alreadysent as $key => $val) { if ($lines[$i]->fk_commandefourndet == $key) { @@ -1939,7 +1942,7 @@ if ($action == 'create') { print '
'; } else { // Qty to receive or received - print ''.$lines[$i]->qty.''; + print ''.$lines[$i]->qty.''; // Warehouse source if (!empty($conf->stock->enabled)) { @@ -1959,7 +1962,7 @@ if ($action == 'create') { if (!empty($conf->productbatch->enabled)) { if (isset($lines[$i]->batch)) { print ''; - print ''; + print ''; $detail = ''; if ($lines[$i]->product->status_batch) { $detail .= $langs->trans("Batch").': '.$lines[$i]->batch; @@ -1983,7 +1986,7 @@ if ($action == 'create') { } // Weight - print ''; + print ''; if (!empty($lines[$i]->fk_product_type) && $lines[$i]->fk_product_type == Product::TYPE_PRODUCT) { print $lines[$i]->product->weight * $lines[$i]->qty.' '.measuringUnitString(0, "weight", $lines[$i]->product->weight_units); } else { @@ -1992,7 +1995,7 @@ if ($action == 'create') { print ''; // Volume - print ''; + print ''; if (!empty($lines[$i]->fk_product_type) && $lines[$i]->fk_product_type == Product::TYPE_PRODUCT) { print $lines[$i]->product->volume * $lines[$i]->qty.' '.measuringUnitString(0, "volume", $lines[$i]->product->volume_units); } else { @@ -2040,6 +2043,7 @@ if ($action == 'create') { } } } + print ''; // TODO Show also lines ordered but not delivered