From 733ca8af7db4957a170713b4f97f447551009bfe Mon Sep 17 00:00:00 2001 From: All3kcis Date: Thu, 1 Mar 2018 14:23:19 +0100 Subject: [PATCH 1/2] Use correct values of eatby and sellby on batchs expeditions Use new table "product_lot" to getting eatby and sellby date --- htdocs/expedition/class/expeditionbatch.class.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index a4b3b17a98a..8599617e318 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -59,14 +59,15 @@ class ExpeditionLineBatch extends CommonObject function fetchFromStock($id_stockdluo) { $sql = "SELECT"; - $sql.= " t.sellby,"; - $sql.= " t.eatby,"; - $sql.= " t.batch,"; - $sql.= " e.fk_entrepot"; + $sql.= " pl.sellby,"; + $sql.= " pl.eatby,"; + $sql.= " pl.batch,"; + $sql.= " ps.fk_entrepot"; - $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as t inner join "; - $sql.= MAIN_DB_PREFIX."product_stock as e on t.fk_product_stock=e.rowid "; - $sql.= " WHERE t.rowid = ".(int) $id_stockdluo; + $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb"; + $sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid"; + $sql.= ' JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product"; + $sql.= " WHERE pb.rowid = ".(int) $id_stockdluo; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql=$this->db->query($sql); From 45418769b196b2c97420357a75fc382f30e3e15f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Mar 2018 18:11:03 +0100 Subject: [PATCH 2/2] Update expeditionbatch.class.php --- htdocs/expedition/class/expeditionbatch.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index 8599617e318..d94baee2a43 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -59,14 +59,14 @@ class ExpeditionLineBatch extends CommonObject function fetchFromStock($id_stockdluo) { $sql = "SELECT"; + $sql.= " pb.batch,"; $sql.= " pl.sellby,"; $sql.= " pl.eatby,"; - $sql.= " pl.batch,"; $sql.= " ps.fk_entrepot"; $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb"; $sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid"; - $sql.= ' JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product"; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product"; $sql.= " WHERE pb.rowid = ".(int) $id_stockdluo; dol_syslog(get_class($this)."::fetch", LOG_DEBUG);