lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update card.php

Browse Source
This commit is contained in:
henrynopo 2021-08-28 15:19:45 +08:00 committed by GitHub
parent 2c7a788678
commit c219b8f576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/expedition/card.php
View File

@ -1134,10 +1134,16 @@ if ($action == 'create') {
print "</td>\n"; print "</td>\n";
} }
// unit of order
$unit_order = ''
if ($conf->global->PRODUCT_USE_UNITS) {
$unit_order = measuringUnitString($line->fk_unit);
}
// Qty // Qty
print '<td class="center">'.$line->qty; print '<td class="center">'.$line->qty;
print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">'; print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
print '</td>'; print ''.$unit_order.'</td>';
$qtyProdCom = $line->qty; $qtyProdCom = $line->qty;
// Qty already shipped // Qty already shipped
@ -1145,7 +1151,7 @@ if ($action == 'create') {
$quantityDelivered = $object->expeditions[$line->id]; $quantityDelivered = $object->expeditions[$line->id];
print $quantityDelivered; print $quantityDelivered;
print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">'; print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
print '</td>'; print ''.$unit_order.'</td>';
// Qty to ship // Qty to ship
$quantityAsked = $line->qty; $quantityAsked = $line->qty;
@ -2030,7 +2036,7 @@ if ($action == 'create') {
// Get list of products already sent for same source object into $alreadysent // Get list of products already sent for same source object into $alreadysent
$alreadysent = array(); $alreadysent = array();
if ($origin && $origin_id > 0) { if ($origin && $origin_id > 0) {
$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end"; $sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.fk_unit, obj.date_start, obj.date_end";
$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot"; $sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition"; $sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received"; //if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
@ -2150,8 +2156,13 @@ if ($action == 'create') {
print "</td>\n"; print "</td>\n";
} }
$unit_order = ''
if ($conf->global->PRODUCT_USE_UNITS) {
$unit_order = measuringUnitString($lines[$i]->fk_unit);
}
// Qty ordered // Qty ordered
print '<td class="center linecolqty">'.$lines[$i]->qty_asked.'</td>'; print '<td class="center linecolqty">'.$lines[$i]->qty_asked.' '.$unit_order.'</td>';
// Qty in other shipments (with shipment and warehouse used) // Qty in other shipments (with shipment and warehouse used)
if ($origin && $origin_id > 0) { if ($origin && $origin_id > 0) {
@ -2215,7 +2226,7 @@ if ($action == 'create') {
print '<!-- case edit 2 -->'; print '<!-- case edit 2 -->';
print '<tr>'; print '<tr>';
// Qty to ship or shipped // Qty to ship or shipped
print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>'; print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
// Warehouse source // Warehouse source
print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>'; print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
// Batch number managment // Batch number managment
@ -2226,7 +2237,7 @@ if ($action == 'create') {
foreach ($lines[$i]->details_entrepot as $detail_entrepot) { foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
print '<tr>'; print '<tr>';
// Qty to ship or shipped // Qty to ship or shipped
print '<td><input class="qtyl" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'"></td>'; print '<td><input class="qtyl" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
// Warehouse source // Warehouse source
print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>'; print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
// Batch number managment // Batch number managment
@ -2241,7 +2252,7 @@ if ($action == 'create') {
print '<!-- case edit 5 -->'; print '<!-- case edit 5 -->';
print '<tr>'; print '<tr>';
// Qty to ship or shipped // Qty to ship or shipped
print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>'; print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
// Warehouse source // Warehouse source
print '<td></td>'; print '<td></td>';
// Batch number managment // Batch number managment
@ -2253,7 +2264,7 @@ if ($action == 'create') {
print '</table></td>'; print '</table></td>';
} else { } else {
// Qty to ship or shipped // Qty to ship or shipped
print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>'; print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.' '.$unit_order.'</td>';
// Warehouse source // Warehouse source
if (!empty($conf->stock->enabled)) { if (!empty($conf->stock->enabled)) {