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

// It is not possible to delete a product if there are currently physical stock/supply order(s) for this product, anymore

Browse Source
This commit is contained in:
bMancone
2011-11-14 13:36:33 +00:00
parent dfd46db560
commit 74ef17ca79
4 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/StockManager.php
+6 -2
View File
@@ -421,7 +421,9 @@ class StockManagerCore implements StockManagerInterface
$query = new DbQuery();
$query->select('SUM('.($usable ? 's.usable_quantity' : 's.physical_quantity').')');
$query->from('stock s');
$query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute);
$query->where('s.id_product = '.(int)$id_product);
if (0 != $id_product_attribute)
$query->where('s.id_product_attribute = '.(int)$id_product_attribute);
if (count($ids_warehouse))
$query->where('s.id_warehouse IN('.implode(', ', $ids_warehouse).')');
@@ -439,7 +441,9 @@ class StockManagerCore implements StockManagerInterface
$query->select('SUM(od.product_quantity)');
$query->from('order_detail od');
$query->leftjoin('orders o ON o.id_order = od.id_order');
$query->where('od.product_id = '.(int)$id_product.' AND od.product_attribute_id = '.(int)$id_product_attribute);
$query->where('od.product_id = '.(int)$id_product);
if (0 != $id_product_attribute)
$query->where('od.product_attribute_id = '.(int)$id_product_attribute);
$query->where('o.delivery_number = 0');
$query->where('o.valid = 1');
$client_orders_qty = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
classes/stock/StockManagerInterface.php
+2
View File
@@ -70,6 +70,7 @@ interface StockManagerInterface
/**
* For a given product, returns its physical quantity
* If the given product has combinations and $id_product_attribute is null, returns the sum for all combinations
*
* @param int $id_product
* @param int $id_product_attribute
@@ -81,6 +82,7 @@ interface StockManagerInterface
/**
* For a given product, returns its real quantity
* If the given product has combinations and $id_product_attribute is null, returns the sum for all combinations
* Real quantity : (physical_qty + supplier_orders_qty - client_orders_qty)
* If $usable is defined, real quantity: usable_qty + supplier_orders_qty - client_orders_qty
*