dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Core: Fix #PSCFV-4737

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17896 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-17 13:45:27 +00:00
parent 5d2dd17567
commit 367f0abc78
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/Warehouse.php
+2 -2
View File
@@ -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);