From 367f0abc786e0b96df606c7cbdde853597af1794 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Wed, 17 Oct 2012 13:45:27 +0000 Subject: [PATCH] [-] Core: Fix #PSCFV-4737 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17896 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/stock/Warehouse.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/stock/Warehouse.php b/classes/stock/Warehouse.php index 35a7ce063..955460ed1 100644 --- a/classes/stock/Warehouse.php +++ b/classes/stock/Warehouse.php @@ -137,9 +137,9 @@ class WarehouseCore extends ObjectModel $ids_carrier = array(); $query = new DbQuery(); - $query->select('wc.id_carrier'); + $query->select('c.id_carrier'); $query->from('warehouse_carrier', 'wc'); - $query->innerJoin('carrier', 'c', 'c.id_carrier = wc.id_carrier'); + $query->innerJoin('carrier', 'c', 'c.id_reference = 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);