From 44b5404fe7231c94dabeaa149bd343a32992ecd8 Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Thu, 27 Nov 2014 08:48:15 +0100
Subject: [PATCH] Fix missing invoice number in sales receipt

---
 application/controllers/reports.php | 2 +-
 application/controllers/sales.php   | 2 +-
 application/libraries/Sale_lib.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/reports.php b/application/controllers/reports.php
index d3c5e37b2..572176478 100644
--- a/application/controllers/reports.php
+++ b/application/controllers/reports.php
@@ -820,7 +820,7 @@ class Reports extends Secure_area
 		
 		foreach($report_data['summary'] as $key=>$row)
 		{
-			$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('class' => 'thickbox')), $row['sale_date'], $row['items_purchased'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),/*to_currency($row['profit']),*/ $row['payment_type'], $row['comment']);
+			$summary_data[] = array(anchor('sales/edit/'.$row['sale_id'], 'POS '.$row['sale_id'], array('class' => 'thickbox')), $row['sale_date'], $row['items_purchased'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),/*to_currency($row['profit']),*/ $row['payment_type'], $row['comment']);
 				
 			foreach($report_data['details'][$key] as $drow)
 			{
diff --git a/application/controllers/sales.php b/application/controllers/sales.php
index 414efafa6..fc9fdde9d 100644
--- a/application/controllers/sales.php
+++ b/application/controllers/sales.php
@@ -306,7 +306,7 @@ class Sales extends Secure_area
 		$customer_id=$this->sale_lib->get_customer();
 		$emp_info=$this->Employee->get_info($sale_info['employee_id']);
 		$data['payment_type']=$sale_info['payment_type'];
-		$data['invoice_number']=$this->sale_lib->get_invoice_number();
+		$data['invoice_number']=$sale_info['invoice_number'];
 		$data['amount_change']=to_currency($this->sale_lib->get_amount_due() * -1);
 		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
 
diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index 3d7e8263f..d2458ed95 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -413,7 +413,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,$row->invoice_number);
+			$this->add_item($row->item_id,$row->quantity_purchased,$row->item_location,$row->discount_percent,$row->item_unit_price,$row->description,$row->serialnumber);
 		}
 		foreach($this->CI->Sale->get_sale_payments($sale_id)->result() as $row)
 		{