From b389cbb59e7ad12c444c0bb5b61419a6969bbdfa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 17 Mar 2025 00:27:40 +0100 Subject: [PATCH] Fix reponsive and NA that must not be visible --- htdocs/expedition/card.php | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 8c365e7bee5..c7fc531c605 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1180,6 +1180,7 @@ if ($action == 'create') { print '
'; + print '
'; print ''; // Load shipments already done for same order @@ -1849,6 +1850,7 @@ if ($action == 'create') { } print "
"; + print '
'; print '
'; @@ -2273,7 +2275,7 @@ if ($action == 'create') { print '
'; print '
'; - print ''; + print '
'; print ''; print ''; // Adds a line numbering column @@ -2297,15 +2299,15 @@ if ($action == 'create') { } print ''; } else { @@ -2554,7 +2556,11 @@ if ($action == 'create') { // Warehouse source print ''; // Batch number management - print ''; + print ''; print ''; } elseif (count($lines[$i]->details_entrepot) > 1) { print ''; @@ -2565,7 +2571,11 @@ if ($action == 'create') { // Warehouse source print ''; // Batch number management - print ''; + print ''; print ''; } } elseif ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
'; 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 ''.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).' - '.$langs->trans("NA").''; + if (isModEnabled('productbatch')) { + print ' - '.$langs->trans("NA"); + } + print '
'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).' - '.$langs->trans("NA").''; + if (isModEnabled('productbatch')) { + print ' - '.$langs->trans("NA"); + } + print '