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

// Fixed CSV export without pagination. Fixed StockManager, with new Collection object. Fixed StockMvt : id_supply_order was missing.

Browse Source
This commit is contained in:
bMancone
2011-12-06 09:37:23 +00:00
parent b83886bd10
commit de96b5bd2e
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/StockManager.php
+6 -6
View File
@@ -88,12 +88,12 @@ class StockManagerCore implements StockManagerInterface
$stock_collection = $this->getStockCollection($id_product, $id_product_attribute, $warehouse->id);
// if this product is already in stock
if (count($stock_collection) > 0)
if ($stock_collection->count() > 0)
{
$stock_exists = true;
// for a warehouse using WA, there is one and only one stock for a given product
$stock = $stock_collection[0];
$stock = $stock_collection->current();
// calculates WA price
$last_wa = $stock->price_te;
@@ -128,12 +128,12 @@ 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 (count($stock_collection) > 0)
if ($stock_collection->count() > 0)
{
$stock_exists = true;
// there is one and only one stock for a given product in a warehouse and at the current unit price
$stock = $stock_collection[0];
$stock = $stock_collection->current();
$stock_params = array(
'physical_quantity' => ($stock->physical_quantity + $quantity),
@@ -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 (count($stock_collection) <= 0)
if ($stock_collection->count() <= 0)
return $return;
$stock_history_qty_available = array();
@@ -249,7 +249,7 @@ class StockManagerCore implements StockManagerInterface
// case CUMP mode
case 'WA':
// There is one and only one stock for a given product in a warehouse in this mode
$stock = $stock_collection[0];
$stock = $stock_collection->current();
$mvt_params = array(
'id_stock' => $stock->id,
classes/stock/StockMvt.php
+3 -1
View File
@@ -83,7 +83,7 @@ class StockMvtCore extends ObjectModel
* @since 1.5.0
* @var int Used when the movement is due to a supplier order
*/
public $id_supplier_order = null;
public $id_supply_order = null;
/**
* @since 1.5.0
@@ -146,6 +146,7 @@ class StockMvtCore extends ObjectModel
'physical_quantity' => 'isUnsignedInt',
'id_stock_mvt_reason' => 'isUnsignedId',
'id_order' => 'isUnsignedId',
'id_supply_order' => 'isUnsignedId',
'sign' => 'isInt',
'last_wa' => 'isPrice',
'current_wa' => 'isPrice',
@@ -175,6 +176,7 @@ class StockMvtCore extends ObjectModel
$fields['physical_quantity'] = (int)$this->physical_quantity;
$fields['id_stock_mvt_reason'] = (int)$this->id_stock_mvt_reason;
$fields['id_order'] = (int)$this->id_order;
$fields['id_supply_order'] = (int)$this->id_supply_order;
$fields['sign'] = (int)$this->sign;
$fields['last_wa'] = (float)Tools::ps_round($this->last_wa, 6);
$fields['current_wa'] = (float)Tools::ps_round($this->current_wa, 6);