mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-20 16:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1360 from RuleDomain/suspended-sale-inventory-fix

Browse Source 
Fix for #1354, inventory update issue for suspended sales
This commit is contained in:
FrancescoUK
2017-06-26 05:55:38 +01:00
committed by GitHub
parent ee2f66aa61 69e56d06ae
commit 643c5d91a6
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
application/models/Sale.php
View File

@@ -614,34 +614,34 @@ class Sale extends CI_Model
$this->db->insert('sales_items', $sales_items_data);
if($cur_item_info->stock_type === '0')
if($cur_item_info->stock_type === '0' && $sale_status === '0')
{
// Update stock quantity if item type is not non-stock
// Update stock quantity if item type is a standard stock item and the sale is a standard sale
$item_quantity = $this->Item_quantity->get_item_quantity($item['item_id'], $item['item_location']);
$this->Item_quantity->save(array('quantity' => $item_quantity->quantity - $item['quantity'],
'item_id' => $item['item_id'],
'location_id' => $item['item_location']), $item['item_id'], $item['item_location']);
// if an items was deleted but later returned it's restored with this rule
if($item['quantity'] < 0)
{
$this->Item->undelete($item['item_id']);
}
// Inventory Count Details
$sale_remarks = 'POS '.$sale_id;
$inv_data = array(
'trans_date' => date('Y-m-d H:i:s'),
'trans_items' => $item['item_id'],
'trans_user' => $employee_id,
'trans_location' => $item['item_location'],
'trans_comment' => $sale_remarks,
'trans_inventory' => -$item['quantity']
);
$this->Inventory->insert($inv_data);
}
// if an items was deleted but later returned it's restored with this rule
if($item['quantity'] < 0)
{
$this->Item->undelete($item['item_id']);
}
// Inventory Count Details
$sale_remarks = 'POS '.$sale_id;
$inv_data = array(
'trans_date' => date('Y-m-d H:i:s'),
'trans_items' => $item['item_id'],
'trans_user' => $employee_id,
'trans_location' => $item['item_location'],
'trans_comment' => $sale_remarks,
'trans_inventory' => -$item['quantity']
);
$this->Inventory->insert($inv_data);
// Calculate taxes and save the tax information for the sale. Return the result for printing
if($customer_id == -1 || $customer->taxable)