mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-08 00:49:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show deleted items in Receiving receipt (#904)

Browse Source
This commit is contained in:
FrancescoUK
2016-10-17 08:32:03 +01:00
parent 20a6c6ec0a
commit 2d8bd2d307
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/libraries/Receiving_lib.php
View File

@@ -153,13 +153,13 @@ class Receiving_lib
$this->CI->session->unset_userdata('recv_stock_destination');
}
public function add_item($item_id, $quantity = 1, $item_location = NULL, $discount = 0, $price = NULL, $description = NULL, $serialnumber = NULL, $receiving_quantity = NULL)
public function add_item($item_id, $quantity = 1, $item_location = NULL, $discount = 0, $price = NULL, $description = NULL, $serialnumber = NULL, $receiving_quantity = NULL, $include_deleted = FALSE)
{
//make sure item exists in database.
if(!$this->CI->Item->exists($item_id))
if(!$this->CI->Item->exists($item_id, $include_deleted))
{
//try to get item id given an item_number
$item_id = $this->CI->Item->get_item_id($item_id);
$item_id = $this->CI->Item->get_item_id($item_id, $include_deleted);
if(!$item_id)
{
@@ -296,7 +296,7 @@ class Receiving_lib
public function return_entire_receiving($receipt_receiving_id)
{
//RECV #
$pieces = explode(' ',$receipt_receiving_id);
$pieces = explode(' ', $receipt_receiving_id);
if(preg_match("/(RECV|KIT)/", $pieces[0]))
{
$receiving_id = $pieces[1];
@@ -312,8 +312,9 @@ class Receiving_lib
foreach($this->CI->Receiving->get_receiving_items($receiving_id)->result() as $row)
{
$this->add_item($row->item_id, -$row->quantity_purchased, $row->item_location, $row->discount_percent, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity);
$this->add_item($row->item_id, -$row->quantity_purchased, $row->item_location, $row->discount_percent, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity, TRUE);
}
$this->set_supplier($this->CI->Receiving->get_supplier($receiving_id)->person_id);
}
@@ -336,8 +337,9 @@ class Receiving_lib
foreach($this->CI->Receiving->get_receiving_items($receiving_id)->result() as $row)
{
$this->add_item($row->item_id, $row->quantity_purchased, $row->item_location, $row->discount_percent, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity);
$this->add_item($row->item_id, $row->quantity_purchased, $row->item_location, $row->discount_percent, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity, TRUE);
}
$this->set_supplier($this->CI->Receiving->get_supplier($receiving_id)->person_id);
//$this->set_reference($this->CI->Receiving->get_info($receiving_id)->row()->reference);
}

4
application/libraries/Sale_lib.php
View File

@@ -273,7 +273,7 @@ class Sale_lib
public function add_item($item_id, $quantity = 1, $item_location, $discount = 0, $price = NULL, $description = NULL, $serialnumber = NULL, $include_deleted = FALSE)
{
//make sure item exists
if($this->_validate_item($item_id, $include_deleted) === FALSE)
if($this->_validate_item($item_id, $include_deleted) == FALSE)
{
return FALSE;
}
@@ -485,7 +485,7 @@ class Sale_lib
foreach($this->CI->Sale->get_sale_items($sale_id)->result() as $row)
{
$this->add_item($row->item_id, -$row->quantity_purchased, $row->item_location, $row->discount_percent, $row->item_unit_price, $row->description, $row->serialnumber, TRUE);
}
$this->set_customer($this->CI->Sale->get_customer($sale_id)->person_id);
}