// StockManager: fixed. AdminSupplyOrders: fixed price. AdminStockInstantState: added CSV export per warehouse + valuation field is now displayed per warehouse

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10976 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-12-06 12:51:10 +00:00
parent efe13abfd0
commit ec6dc108a9
3 changed files with 146 additions and 6 deletions
+3 -3
View File
@@ -88,7 +88,7 @@ class StockManagerCore implements StockManagerInterface
$stock_collection = $this->getStockCollection($id_product, $id_product_attribute, $warehouse->id);
// if this product is already in stock
if ($stock_collection->count() > 0)
if (count($stock_collection) > 0)
{
$stock_exists = true;
@@ -128,7 +128,7 @@ class StockManagerCore implements StockManagerInterface
$stock_collection = $this->getStockCollection($id_product, $id_product_attribute, $warehouse->id, $price_te);
// if this product is already in stock
if ($stock_collection->count() > 0)
if (count($stock_collection) > 0)
{
$stock_exists = true;
@@ -234,7 +234,7 @@ class StockManagerCore implements StockManagerInterface
$stock_collection = $this->getStockCollection($id_product, $id_product_attribute, $warehouse->id);
// check if the collection is loaded
if ($stock_collection->count() <= 0)
if (count($stock_collection) <= 0)
return $return;
$stock_history_qty_available = array();