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

[-] Core: Fix #PSCFV-5327 the computation of real stock quantities was bad sometimes

Browse Source
This commit is contained in:
rGaillard
2012-11-16 13:38:32 +00:00
parent 06fca34bd6
commit eac368cf10
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/StockManager.php
+7 -2
View File
@@ -468,7 +468,7 @@ class StockManagerCore implements StockManagerInterface
// Gets client_orders_qty // Gets client_orders_qty
$query = new DbQuery(); $query = new DbQuery();
$query->select('SUM(od.product_quantity) + SUM(od.product_quantity_refunded)'); $query->select('od.product_quantity, od.product_quantity_refunded');
$query->from('order_detail', 'od'); $query->from('order_detail', 'od');
$query->leftjoin('orders', 'o', 'o.id_order = od.id_order'); $query->leftjoin('orders', 'o', 'o.id_order = od.id_order');
$query->where('od.product_id = '.(int)$id_product); $query->where('od.product_id = '.(int)$id_product);
@@ -479,9 +479,14 @@ class StockManagerCore implements StockManagerInterface
$query->where('os.shipped != 1'); $query->where('os.shipped != 1');
$query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').' $query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').'
AND os.id_order_state != '.(int)Configuration::get('PS_OS_CANCELED').')'); AND os.id_order_state != '.(int)Configuration::get('PS_OS_CANCELED').')');
$query->groupBy('od.id_order_detail');
//if (count($ids_warehouse)) //if (count($ids_warehouse))
//$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')'); //$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')');
$client_orders_qty = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
$client_orders_qty = 0;
if (count($res))
foreach ($res as $row)
$client_orders_qty += $row['product_quantity'] + $row['product_quantity_refunded'];
// Gets supply_orders_qty // Gets supply_orders_qty
$query = new DbQuery(); $query = new DbQuery();