From af9182dad549bc77bd26c4ca038a27e5daa0488a Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 10:51:17 +0200 Subject: [PATCH] [-] CORE , follow up https://github.com/kiropowered/PrestaShop/commit/b87e934a66a15d4f68e573f5afa9494505a60e28 and https://github.com/kiropowered/PrestaShop/commit/a10dcab6e74d138a2f3a3f558ec7d66b1e9d9e10 --- classes/stock/StockMvt.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php index 2245cf648..de75d91aa 100644 --- a/classes/stock/StockMvt.php +++ b/classes/stock/StockMvt.php @@ -236,7 +236,10 @@ class StockMvtCore extends ObjectModel $query->innerJoin('stock', 's', 's.id_stock = sm.id_stock'); $query->innerJoin('warehouse', 'w', 'w.id_warehouse = s.id_warehouse'); $query->where('sm.sign = 1'); - $query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute); + if ($id_product_attribute) + $query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute); + else + $query->where('s.id_product = '.(int)$id_product); $query->orderBy('date_add DESC'); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);