From b9fec8eb0c23064cce8987657ab2d1ae7967f76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 5 Feb 2013 11:02:05 +0100 Subject: [PATCH] // Fix merge bug --- classes/stock/StockManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php index f74e343f2..1ad67d77b 100644 --- a/classes/stock/StockManager.php +++ b/classes/stock/StockManager.php @@ -473,7 +473,7 @@ class StockManagerCore implements StockManagerInterface $query->where('od.product_id = '.(int)$id_product); if (0 != $id_product_attribute) $query->where('od.product_attribute_id = '.(int)$id_product_attribute); - $query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.date_add = o.date_upd'); + $query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.id_order_state = o.current_state'); $query->leftJoin('order_state', 'os', 'os.id_order_state = oh.id_order_state'); $query->where('os.shipped != 1'); $query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').' @@ -658,4 +658,4 @@ class StockManagerCore implements StockManagerInterface return $stocks; } -} \ No newline at end of file +}