[-] Core: Fix PSCFV-3092

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16687 b9a71923-0436-4b27-9f14-aed3839534dd

classes/stock/Warehouse.php

@@ -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');