From 7fb2d570c3f93c6da401fa36ca6bca6daa49829d Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Wed, 17 Jan 2024 10:55:08 +0100 Subject: [PATCH] Fix default lot number not shown in mode SHIPPING_DISPLAY_STOCK_ENTRY_DATE --- htdocs/product/class/productbatch.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index c1f48884e84..0d6d4f52e68 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -477,14 +477,13 @@ class Productbatch extends CommonObject } if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) { $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock AS ps ON (ps.rowid = fk_product_stock)'; - $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'stock_mouvement AS sm ON (sm.batch = t.batch AND ps.fk_entrepot=sm.fk_entrepot)'; + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'stock_mouvement AS sm ON (sm.batch = t.batch AND ps.fk_entrepot=sm.fk_entrepot AND sm.type_mouvement IN (0,3))'; } $sql .= " WHERE fk_product_stock=".((int) $fk_product_stock); if ($with_qty) { $sql .= " AND t.qty <> 0"; } if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) { - $sql .= ' AND sm.type_mouvement IN (0,3)'; $sql .= ' GROUP BY t.rowid, t.tms, t.fk_product_stock,t.sellby,t.eatby , t.batch,t.qty,t.import_key'; if ($fk_product > 0) { $sql .= ', pl.rowid, pl.eatby, pl.sellby';