Fix reponsive and NA that must not be visible
This commit is contained in:
parent
119716bd82
commit
b389cbb59e
1 changed files with 17 additions and 7 deletions
|
|
@ -1180,6 +1180,7 @@ if ($action == 'create') {
|
|||
|
||||
print '<br>';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder centpercent">';
|
||||
|
||||
// Load shipments already done for same order
|
||||
|
|
@ -1849,6 +1850,7 @@ if ($action == 'create') {
|
|||
}
|
||||
|
||||
print "</table>";
|
||||
print '</div>';
|
||||
|
||||
print '<br>';
|
||||
|
||||
|
|
@ -2273,7 +2275,7 @@ if ($action == 'create') {
|
|||
print '<br>';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder" width="100%" id="tablelines" >';
|
||||
print '<table class="noborder centpercent" id="tablelines" >';
|
||||
print '<thead>';
|
||||
print '<tr class="liste_titre">';
|
||||
// Adds a line numbering column
|
||||
|
|
@ -2297,15 +2299,15 @@ if ($action == 'create') {
|
|||
}
|
||||
print '<td class="center linecoleditlineotherinfo" colspan="'.$editColspan.'">';
|
||||
if ($object->status <= 1) {
|
||||
print $langs->trans("QtyToShip").' - ';
|
||||
print $langs->trans("QtyToShip");
|
||||
} else {
|
||||
print $langs->trans("QtyShipped").' - ';
|
||||
print $langs->trans("QtyShipped");
|
||||
}
|
||||
if (isModEnabled('stock')) {
|
||||
print $langs->trans("WarehouseSource").' - ';
|
||||
print ' - '.$langs->trans("WarehouseSource");
|
||||
}
|
||||
if (isModEnabled('productbatch')) {
|
||||
print $langs->trans("Batch");
|
||||
print ' - '.$langs->trans("Batch");
|
||||
}
|
||||
print '</td>';
|
||||
} else {
|
||||
|
|
@ -2554,7 +2556,11 @@ if ($action == 'create') {
|
|||
// Warehouse source
|
||||
print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
|
||||
// Batch number management
|
||||
print '<td> - '.$langs->trans("NA").'</td>';
|
||||
print '<td>';
|
||||
if (isModEnabled('productbatch')) {
|
||||
print ' - '.$langs->trans("NA");
|
||||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
} elseif (count($lines[$i]->details_entrepot) > 1) {
|
||||
print '<!-- case edit 3 -->';
|
||||
|
|
@ -2565,7 +2571,11 @@ if ($action == 'create') {
|
|||
// Warehouse source
|
||||
print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
|
||||
// Batch number management
|
||||
print '<td> - '.$langs->trans("NA").'</td>';
|
||||
print '<td>';
|
||||
if (isModEnabled('productbatch')) {
|
||||
print ' - '.$langs->trans("NA");
|
||||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
} elseif ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue