From 804480ca2d07f80025927c7a4c33124aba8def6e Mon Sep 17 00:00:00 2001 From: JC Prieto Date: Thu, 25 Aug 2022 12:51:18 +0200 Subject: [PATCH 1/3] Update card.php Same behavior as products with not lot. (See line 1338). --- htdocs/expedition/card.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 4bec4220c6c..1bd4ca72dc2 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1445,6 +1445,11 @@ if ($action == 'create') { } foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) { + if (!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)) { + // if a warehouse was selected by user, picking is limited to this warehouse and his children. + + continue; + } $tmpwarehouseObject->fetch($warehouse_id); if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) { foreach ($stock_warehouse->detail_batch as $dbatch) { From 215f89d5452abdde7282077a7d48ba49d25333a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 25 Aug 2022 23:44:57 +0200 Subject: [PATCH 2/3] Fix phpcs --- htdocs/expedition/card.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 1bd4ca72dc2..e8bfb0249b1 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1446,8 +1446,7 @@ if ($action == 'create') { foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) { if (!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)) { - // if a warehouse was selected by user, picking is limited to this warehouse and his children. - + // if a warehouse was selected by user, picking is limited to this warehouse and his children. continue; } $tmpwarehouseObject->fetch($warehouse_id); From 185f8896c596f624dba5702346262b62ccac5d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 29 Aug 2022 16:52:27 +0200 Subject: [PATCH 3/3] fix display date creation --- htdocs/reception/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 9a679c067f8..3ee755bef37 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1434,7 +1434,7 @@ if ($action == 'create') { // Date creation print ''.$langs->trans("DateCreation").''; - print ''.dol_print_date($object->date_creation, "dayhour")."\n"; + print ''.dol_print_date($object->date_creation, "dayhour", "tzuserrel")."\n"; print ''; // Delivery date planned