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

Merge pull request #11908 from atm-john/fix_missing_col_tags

Browse Source 
Fix missing expedition table cols line's tags
This commit is contained in:
Laurent Destailleur 2019-09-27 14:58:13 +02:00 committed by GitHub
commit edade506ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
htdocs/expedition/card.php
View File

@ -2038,27 +2038,28 @@ elseif ($id || $ref)
print '<br>'; print '<br>';
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%" id="tablelines" >';
print '<thead>';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
// Adds a line numbering column // Adds a line numbering column
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{ {
print '<td width="5" class="center">&nbsp;</td>'; print '<td width="5" class="center linecolnum">&nbsp;</td>';
} }
// Product/Service // Product/Service
print '<td>'.$langs->trans("Products").'</td>'; print '<td class="linecoldescription" >'.$langs->trans("Products").'</td>';
// Qty // Qty
print '<td class="center">'.$langs->trans("QtyOrdered").'</td>'; print '<td class="center linecolqty">'.$langs->trans("QtyOrdered").'</td>';
if ($origin && $origin_id > 0) if ($origin && $origin_id > 0)
{ {
print '<td class="center">'.$langs->trans("QtyInOtherShipments").'</td>'; print '<td class="center linecolqtyinothershipments">'.$langs->trans("QtyInOtherShipments").'</td>';
} }
if ($action == 'editline') if ($action == 'editline')
{ {
$editColspan = 3; $editColspan = 3;
if (empty($conf->stock->enabled)) $editColspan--; if (empty($conf->stock->enabled)) $editColspan--;
if (empty($conf->productbatch->enabled)) $editColspan--; if (empty($conf->productbatch->enabled)) $editColspan--;
print '<td class="center" colspan="'. $editColspan . '">'; print '<td class="center linecoleditlineotherinfo" colspan="'. $editColspan . '">';
if ($object->statut <= 1) if ($object->statut <= 1)
{ {
print $langs->trans("QtyToShip").' - '; print $langs->trans("QtyToShip").' - ';
@ -2081,24 +2082,24 @@ elseif ($id || $ref)
{ {
if ($object->statut <= 1) if ($object->statut <= 1)
{ {
print '<td class="center">'.$langs->trans("QtyToShip").'</td>'; print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
} }
else else
{ {
print '<td class="center">'.$langs->trans("QtyShipped").'</td>'; print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
} }
if (! empty($conf->stock->enabled)) if (! empty($conf->stock->enabled))
{ {
print '<td class="left">'.$langs->trans("WarehouseSource").'</td>'; print '<td class="left linecolwarehousesource">'.$langs->trans("WarehouseSource").'</td>';
} }
if (! empty($conf->productbatch->enabled)) if (! empty($conf->productbatch->enabled))
{ {
print '<td class="left">'.$langs->trans("Batch").'</td>'; print '<td class="left linecolbatch">'.$langs->trans("Batch").'</td>';
} }
} }
print '<td class="center">'.$langs->trans("CalculatedWeight").'</td>'; print '<td class="center linecolweight">'.$langs->trans("CalculatedWeight").'</td>';
print '<td class="center">'.$langs->trans("CalculatedVolume").'</td>'; print '<td class="center linecolvolume">'.$langs->trans("CalculatedVolume").'</td>';
//print '<td class="center">'.$langs->trans("Size").'</td>'; //print '<td class="center">'.$langs->trans("Size").'</td>';
if ($object->statut == 0) if ($object->statut == 0)
{ {
@ -2106,7 +2107,7 @@ elseif ($id || $ref)
print '<td class="linecoldelete" width="10"></td>'; print '<td class="linecoldelete" width="10"></td>';
} }
print "</tr>\n"; print "</tr>\n";
print '</thead>';
$var=false; $var=false;
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
@ -2166,6 +2167,7 @@ elseif ($id || $ref)
//var_dump($alreadysent); //var_dump($alreadysent);
} }
print '<tbody>';
// Loop on each product to send/sent // Loop on each product to send/sent
for ($i = 0 ; $i < $num_prod ; $i++) for ($i = 0 ; $i < $num_prod ; $i++)
{ {
@ -2176,12 +2178,12 @@ elseif ($id || $ref)
if(empty($reshook)) if(empty($reshook))
{ {
print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
print '<tr class="oddeven">'; print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
// # // #
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{ {
print '<td class="center">'.($i+1).'</td>'; print '<td class="center linecolnum">'.($i+1).'</td>';
} }
// Predefined product or service // Predefined product or service
@ -2197,7 +2199,7 @@ elseif ($id || $ref)
else else
$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label); $label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
print '<td>'; print '<td class="linecoldescription">';
// Show product and description // Show product and description
$product_static->type=$lines[$i]->fk_product_type; $product_static->type=$lines[$i]->fk_product_type;
@ -2217,7 +2219,7 @@ elseif ($id || $ref)
} }
else else
{ {
print "<td>"; print '<td class="linecoldescription" >';
if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service'); if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product'); else $text = img_object($langs->trans('Product'), 'product');
@ -2233,12 +2235,12 @@ elseif ($id || $ref)
} }
// Qty ordered // Qty ordered
print '<td class="center">'.$lines[$i]->qty_asked.'</td>'; print '<td class="center linecolqty">'.$lines[$i]->qty_asked.'</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)
{ {
print '<td class="center" class="nowrap">'; print '<td class="linecolqtyinothershipments center nowrap">';
foreach ($alreadysent as $key => $val) foreach ($alreadysent as $key => $val)
{ {
if ($lines[$i]->fk_origin_line == $key) if ($lines[$i]->fk_origin_line == $key)
@ -2352,12 +2354,12 @@ elseif ($id || $ref)
else else
{ {
// Qty to ship or shipped // Qty to ship or shipped
print '<td class="center">'.$lines[$i]->qty_shipped.'</td>'; print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>';
// Warehouse source // Warehouse source
if (! empty($conf->stock->enabled)) if (! empty($conf->stock->enabled))
{ {
print '<td class="left">'; print '<td class="linecolwarehousesource left">';
if ($lines[$i]->entrepot_id > 0) if ($lines[$i]->entrepot_id > 0)
{ {
$entrepot = new Entrepot($db); $entrepot = new Entrepot($db);
@ -2387,7 +2389,7 @@ elseif ($id || $ref)
if (isset($lines[$i]->detail_batch)) if (isset($lines[$i]->detail_batch))
{ {
print '<!-- Detail of lot -->'; print '<!-- Detail of lot -->';
print '<td>'; print '<td class="linecolbatch">';
if ($lines[$i]->product_tobatch) if ($lines[$i]->product_tobatch)
{ {
$detail = ''; $detail = '';
@ -2407,19 +2409,19 @@ elseif ($id || $ref)
} }
print '</td>'; print '</td>';
} else { } else {
print '<td></td>'; print '<td class="linecolbatch" ></td>';
} }
} }
} }
// Weight // Weight
print '<td class="center">'; print '<td class="center linecolweight">';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units, "weight"); if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units, "weight");
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
// Volume // Volume
print '<td class="center">'; print '<td class="center linecolvolume">';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units, "volume"); if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units, "volume");
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
@ -2475,6 +2477,7 @@ elseif ($id || $ref)
// TODO Show also lines ordered but not delivered // TODO Show also lines ordered but not delivered
print "</table>\n"; print "</table>\n";
print '</tbody>';
print '</div>'; print '</div>';
} }