From cc9adeef47a3d8bc30e56e0aa050e31943733da5 Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Thu, 23 Oct 2014 21:13:36 +0200
Subject: [PATCH] Set supplier_info to default value (fix warning with empty
 supplier)

Conflicts:

	application/controllers/receivings.php
---
 application/controllers/receivings.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/controllers/receivings.php b/application/controllers/receivings.php
index 9d1c53d19..8bd096234 100644
--- a/application/controllers/receivings.php
+++ b/application/controllers/receivings.php
@@ -186,11 +186,11 @@ class Receivings extends Secure_area
 			$data['amount_change'] = to_currency($data['amount_tendered'] - round($data['total'], 2));
 		}
 		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
-
+		$suppl_info	='';
 		if($supplier_id!=-1)
 		{
 			$suppl_info=$this->Supplier->get_info($supplier_id);
-			$data['supplier']=$suppl_info->first_name.' '.$suppl_info->last_name;
+			$data['supplier']=$suppl_info->company_name;  //   first_name.' '.$suppl_info->last_name;
 		}
 		$invoice_number=$this->_substitute_invoice_number($suppl_info);
 		if ($this->Receiving->invoice_number_exists($invoice_number))
@@ -319,13 +319,13 @@ class Receivings extends Secure_area
 		);
 		
 		$supplier_id=$this->receiving_lib->get_supplier();
-		$info='';
+		$suppl_info='';
 		if($supplier_id!=-1)
 		{
-			$info=$this->Supplier->get_info($supplier_id);
-			$data['supplier']=$info->first_name.' '.$info->last_name;
+			$suppl_info=$this->Supplier->get_info($supplier_id);
+			$data['supplier']=$suppl_info->company_name;  // first_name.' '.$info->last_name;
 		}
-		$data['invoice_number']=$this->_substitute_invoice_number($info);
+		$data['invoice_number']=$this->_substitute_invoice_number($suppl_info);
 		
 		$this->load->view("receivings/receiving",$data);
 		$this->_remove_duplicate_cookies();