From 69eec07f13d42992c0882d8e87a028e24c2e1649 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 14 Nov 2022 14:40:11 +0100 Subject: [PATCH] Debug v17 --- htdocs/fourn/commande/dispatch.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 41c15dabb68..c639e622337 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -1153,8 +1153,8 @@ if ($id > 0 || !empty($ref)) { } // Product print ''.$langs->trans("Product").''; - print ''.$langs->trans("DateCreation").''; - print ''.$langs->trans("DateDeliveryPlanned").''; + print ''.$langs->trans("DateCreation").''; + print ''.$langs->trans("DateDeliveryPlanned").''; if (isModEnabled('productbatch')) { print ''.$langs->trans("batch_number").''; if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) { @@ -1195,7 +1195,7 @@ if ($id > 0 || !empty($ref)) { // Reception ref if (isModEnabled("reception")) { - print ''; + print ''; if (!empty($objp->fk_reception)) { $reception = new Reception($db); $reception->fetch($objp->fk_reception); @@ -1206,7 +1206,7 @@ if ($id > 0 || !empty($ref)) { } // Product - print ''; + print ''; if (empty($conf->cache['product'][$objp->fk_product])) { $tmpproduct = new Product($db); $tmpproduct->fetch($objp->fk_product); @@ -1217,9 +1217,14 @@ if ($id > 0 || !empty($ref)) { print $tmpproduct->getNomUrl(1); print ' - '.$objp->label; print "\n"; - print ''.dol_print_date($db->jdate($objp->datec), 'day').''; - print ''.dol_print_date($db->jdate($objp->date_delivery), 'day').''; + // Date creation + print ''.dol_print_date($db->jdate($objp->datec), 'day').''; + + // Date delivery + print ''.dol_print_date($db->jdate($objp->date_delivery), 'day').''; + + // Batch / Eat by / Sell by if (isModEnabled('productbatch')) { if ($objp->batch) { include_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; @@ -1254,7 +1259,7 @@ if ($id > 0 || !empty($ref)) { print ''; // Warehouse - print ''; + print ''; if ($action == 'editline' && $lineid == $objp->dispatchlineid) { if (count($listwarehouses) > 1) { print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse'); @@ -1318,6 +1323,8 @@ if ($id > 0 || !empty($ref)) { } print ''; } + + // Action if ($action != 'editline' || $lineid != $objp->dispatchlineid) { if (empty($reception->id) || ($reception->statut == Reception::STATUS_DRAFT)) { // only allow edit on draft reception print '';