mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-20 11:52:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove invoice / sale format enable option

Browse Source 
Add giftcards -> person_id foreign key constraint
Fix tax calculation for non taxable customers
Improve giftcard person autocompletion
This commit is contained in:
jekkos-t520
2014-12-16 08:49:49 +01:00
parent b546883d2a
commit 07a32a0deb
9 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/libraries/Sale_lib.php
View File

@@ -80,8 +80,7 @@ class Sale_lib
function clear_invoice_number_enabled()
{
$enable = $this->CI->config->config['sales_invoice_enable'];
$this->set_invoice_number_enabled($enable);
$this->set_invoice_number_enabled(FALSE);
}
function get_email_receipt()
@@ -537,15 +536,15 @@ class Sale_lib
return to_currency_no_money($subtotal);
}
function get_item_total_tax_exclusive($quantity, $price, $discount_percentage)
function get_item_total_tax_exclusive($item_id, $quantity, $price, $discount_percentage)
{
$tax_info = $this->CI->Item_taxes->get_info($item['item_id']);
$tax_info = $this->CI->Item_taxes->get_info($item_id);
$item_price = $this->get_item_total($quantity, $price, $discount_percentage);
// only additive tax here
foreach($tax_info as $tax)
{
$tax_percentage = $tax_info[0]['percent'];
$item_price =- $this->get_item_tax($quantity, $price, $discount_percentage, $tax_percentage);
$item_price -= $this->get_item_tax($quantity, $price, $discount_percentage, $tax_percentage);
}
return $item_price;
@@ -585,13 +584,13 @@ class Sale_lib
}
else
{
if ($CI->config->config['tax_included'])
if ($this->CI->config->config['tax_included'])
{
$subtotal += $this->get_item_total($item['quantity'], $item['price'], $item['discount']);
}
else
{
$subtotal += $this->get_item_total_tax_exclusive($item['quantity'], $item['price'], $item['discount']);
$subtotal += $this->get_item_total_tax_exclusive($item['item_id'], $item['quantity'], $item['price'], $item['discount']);
}
}
}