From 7f5605861977a0c02e713975904a6a08985313ac Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Mon, 21 Jan 2013 22:23:51 +0100 Subject: [PATCH 1/2] [*] BO: we don't need to clik on a line --- controllers/admin/AdminLogsController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php index 4c170d71c..510920b12 100644 --- a/controllers/admin/AdminLogsController.php +++ b/controllers/admin/AdminLogsController.php @@ -62,6 +62,8 @@ class AdminLogsControllerCore extends AdminController ) ); + $this->list_no_link = true; + parent::__construct(); } From 35e5912def20314a53d913686bfc329bed18e773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 4 Feb 2013 19:54:14 +0100 Subject: [PATCH 2/2] [-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time --- 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 +}