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

[-] Core: Fix PSCFV-3092

Browse Source
This commit is contained in:
rGaillard
2012-08-03 14:40:31 +00:00
parent 2ad34b2c88
commit ae5acf0be9
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/Warehouse.php
+4 -1
View File
@@ -304,7 +304,10 @@ class WarehouseCore extends ObjectModel
if (Shop::getContext() == Shop::CONTEXT_GROUP)
$shop_group = Shop::getContextShopGroup();
else
{
$shop_group = Context::getContext()->shop->getGroup();
$id_shop = (int)Context::getContext()->shop->id;
}
$share_stock = $shop_group->share_stock;
}
else
@@ -316,7 +319,7 @@ class WarehouseCore extends ObjectModel
if ($share_stock)
$ids_shop = Shop::getShops(true, (int)$shop_group->id, true);
else
$ids_shop = array((int)Context::getContext()->shop->id);
$ids_shop = array((int)$id_shop);
$query = new DbQuery();
$query->select('wpl.id_warehouse, CONCAT(w.reference, " - ", w.name) as name');