From 1267e92117c69e8dcbc72e5d3860f9101592063e Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Thu, 12 Feb 2015 10:47:09 +0100
Subject: [PATCH] Fix sale and receiving return (incorrect receipt numbers were
 generated) Fix item form width in receivings

---
 application/controllers/receivings.php     | 4 ++--
 application/controllers/sales.php          | 2 +-
 application/views/receivings/receiving.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/receivings.php b/application/controllers/receivings.php
index 05341d20b..27431ac65 100644
--- a/application/controllers/receivings.php
+++ b/application/controllers/receivings.php
@@ -285,8 +285,9 @@ class Receivings extends Secure_area
 		$emp_info=$this->Employee->get_info($receiving_info['employee_id']);
 		$data['payment_type']=$receiving_info['payment_type'];
 		$data['invoice_number']=$this->receiving_lib->get_invoice_number();
+		$data['receiving_id']='RECV '.$receiving_id;
 		$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
-		$data['barcode']=$this->barcode_lib->generate_barcode($receiving_id,$barcode_config);
+		$data['barcode']=$this->barcode_lib->generate_barcode($data['receiving_id'],$barcode_config);
 		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
 
 		if($supplier_id!=-1)
@@ -294,7 +295,6 @@ class Receivings extends Secure_area
 			$supplier_info=$this->Supplier->get_info($supplier_id);
 			$data['supplier']=$supplier_info->first_name.' '.$supplier_info->last_name;
 		}
-		$data['receiving_id']='RECV '.$receiving_id;
 		$this->load->view("receivings/receipt",$data);
 		$this->receiving_lib->clear_all();
 		$this->_remove_duplicate_cookies();
diff --git a/application/controllers/sales.php b/application/controllers/sales.php
index dbab47e67..838a958e4 100644
--- a/application/controllers/sales.php
+++ b/application/controllers/sales.php
@@ -325,7 +325,7 @@ class Sales extends Secure_area
 		}
 		$data['sale_id']='POS '.$sale_id;
 		$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
-		$data['barcode']=$this->barcode_lib->generate_barcode($sale_id,$barcode_config);
+		$data['barcode']=$this->barcode_lib->generate_barcode($data['sale_id'],$barcode_config);
 		$this->load->view("sales/receipt",$data);
 		$this->sale_lib->clear_all();
 		$this->_remove_duplicate_cookies();
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php
index 380e3759d..3d1ebcc84 100644
--- a/application/views/receivings/receiving.php
+++ b/application/views/receivings/receiving.php
@@ -48,7 +48,7 @@ if(isset($error))
 	</label>
 <?php echo form_input(array('name'=>'item','id'=>'item','size'=>'40'));?>
 <div id="new_item_button_register" >
-		<?php echo anchor("items/view/-1/width:360",
+		<?php echo anchor("items/view/-1/width:400",
 		"<div class='small_button'><span>".$this->lang->line('sales_new_item')."</span></div>",
 		array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item')));
 		?>