mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-24 02:46:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix receiving_quantity error in receivings page

Browse Source
This commit is contained in:
jekkos-t520
2014-11-26 08:17:43 +01:00
parent 99a804c1ac
commit b311eca62e
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/receivings.php
View File

@@ -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();
}

4
application/language/en/config_lang.php
View File

@@ -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';
?>

3
application/libraries/Receiving_lib.php
View File

@@ -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
)
);

6
application/views/receivings/receiving.php
View File

@@ -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>