From b311eca62e703a37b1df19f391e22ff896f06cc2 Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Wed, 26 Nov 2014 08:17:43 +0100
Subject: [PATCH] Fix receiving_quantity error in receivings page

---
 application/controllers/receivings.php     | 2 +-
 application/language/en/config_lang.php    | 4 ++--
 application/libraries/Receiving_lib.php    | 3 ++-
 application/views/receivings/receiving.php | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/controllers/receivings.php b/application/controllers/receivings.php
index 43a250876..0b8b98ca4 100644
--- a/application/controllers/receivings.php
+++ b/application/controllers/receivings.php
@@ -302,7 +302,7 @@ class Receivings extends Secure_area
 		$show_stock_locations = count($data['stock_locations']) > 1;
         if ($show_stock_locations) 
         {
-        	$data['modes']['requisition'] = $this->lang->line('recvs_requisition');
+        	$data['modes']['requisition']=$this->lang->line('recvs_requisition');
 	        $data['stock_source']=$this->receiving_lib->get_stock_source();
         	$data['stock_destination']=$this->receiving_lib->get_stock_destination();
         }    
diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index 353876ad0..039998c15 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -37,8 +37,8 @@ $lang['config_stock_location'] = 'Stock location';
 $lang['config_stock_location_required'] = 'Stock location number is a required field';
 $lang['config_tax_included'] = 'Tax Included';
 $lang['config_recv_invoice_enable'] = 'Enable Orders Invoice#';
-$lang['config_recv_invoice_format'] = 'Receivings Invoice';
+$lang['config_recv_invoice_format'] = 'Receivings Invoice Format';
 $lang['config_sales_invoice_enable'] = 'Enable Sales Invoice#';
-$lang['config_sales_invoice_format'] = 'Sales Invoice';
+$lang['config_sales_invoice_format'] = 'Sales Invoice Format';
 
 ?>
\ No newline at end of file
diff --git a/application/libraries/Receiving_lib.php b/application/libraries/Receiving_lib.php
index 3cb32cd66..91ab08b84 100644
--- a/application/libraries/Receiving_lib.php
+++ b/application/libraries/Receiving_lib.php
@@ -179,7 +179,8 @@ class Receiving_lib
 			'quantity'=>$quantity,
             'discount'=>$discount,
 			'in_stock'=>$this->CI->Item_quantities->get_item_quantity($item_id, $item_location)->quantity,
-			'price'=>$price!=null ? $price: $item_info->cost_price
+			'price'=>$price!=null ? $price: $item_info->cost_price,
+			'receiving_quantity'=>$item_info->receiving_quantity
 			)
 		);
 
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php
index e77847fd4..1eec8e029 100644
--- a/application/views/receivings/receiving.php
+++ b/application/views/receivings/receiving.php
@@ -64,8 +64,8 @@ if(isset($error))
         <th style="width:11%;"><?php echo $this->lang->line('common_delete'); ?></th>
         <th style="width:30%;"><?php echo $this->lang->line('recvs_item_name'); ?></th>
         <th style="width:11%;"><?php echo $this->lang->line('recvs_cost'); ?></th>
-        <th style="width:7%;"><?php echo $this->lang->line('recvs_quantity'); ?></th>
-        <th style="width:4%;"></th>
+        <th style="width:5%;"><?php echo $this->lang->line('recvs_quantity'); ?></th>
+        <th style="width:6%;"></th>
         <th style="width:11%;"><?php echo $this->lang->line('recvs_discount'); ?></th>
         <th style="width:15%;"><?php echo $this->lang->line('recvs_total'); ?></th>
         <th style="width:11%;"><?php echo $this->lang->line('recvs_edit'); ?></th>
@@ -145,7 +145,7 @@ else
 <?php
 		    }
 ?>
-	    <td><?php echo to_currency($item['price']*$item['quantity']*$item['receiving_quantity']-$item['price']*$item['quantity']*$item['receiving_quantity']*$item['discount']/100); ?></td>
+	    <td><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['receiving_quantity']*$item['discount']/100); ?></td>
 	    <td><?php echo form_submit("edit_item", $this->lang->line('sales_edit_item'));?></td>
 	    </tr>
 	    </form>