From c4afd303f7d12c27ef81e120707ea1c0d09f17ee Mon Sep 17 00:00:00 2001 From: rGaillard Date: Fri, 31 Aug 2012 12:58:52 +0000 Subject: [PATCH] // Small fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17132 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/stock/Warehouse.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/stock/Warehouse.php b/classes/stock/Warehouse.php index 308332140..35a7ce063 100644 --- a/classes/stock/Warehouse.php +++ b/classes/stock/Warehouse.php @@ -139,8 +139,9 @@ class WarehouseCore extends ObjectModel $query = new DbQuery(); $query->select('wc.id_carrier'); $query->from('warehouse_carrier', 'wc'); + $query->innerJoin('carrier', 'c', 'c.id_carrier = wc.id_carrier'); $query->where($this->def['primary'].' = '.(int)$this->id); - + $query->where('c.deleted = 0'); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); if (!is_array($res))