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

// Small fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17132 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard committed 2012-08-31 12:58:52 +00:00
1 parent 89d0a35643
commit c4afd303f7
1 file changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/Warehouse.php
+2 -1
View File
@@ -139,8 +139,9 @@ class WarehouseCore extends ObjectModel
$query = new DbQuery(); $query = new DbQuery();
$query->select('wc.id_carrier'); $query->select('wc.id_carrier');
$query->from('warehouse_carrier', 'wc'); $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($this->def['primary'].' = '.(int)$this->id);
$query->where('c.deleted = 0');
$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
if (!is_array($res)) if (!is_array($res))