From: Janusz Dobrowolski Date: Fri, 19 Aug 2011 08:22:11 +0000 (+0200) Subject: Fixed additional rounding errors posting when tax included invoice is saved. X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=839ce4ed7f899a21956499712842f5db2465a536;p=textcart.git Fixed additional rounding errors posting when tax included invoice is saved. --- diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc index 5d98529..ea6b805 100644 --- a/taxes/tax_calc.inc +++ b/taxes/tax_calc.inc @@ -160,9 +160,9 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc { if ($item_tax['rate'] !== null) { $index = $item_tax['tax_type_id']; - if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings + if ($tax_included == 1) { $nprice = get_tax_free_price_for_item($items[$i], $prices[$i], $tax_group, $tax_included, null, $item_tax['tax_type_id']); - $ret_tax_array[$index]['Value'] += $nprice*$item_tax['rate']/100; + $ret_tax_array[$index]['Value'] += round2($prices[$i] - $nprice, $dec); $ret_tax_array[$index]['Net'] += $nprice; } else { $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / 100); @@ -195,8 +195,8 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc { $index = $item_tax['tax_type_id']; if ($item_tax['rate'] !== null && $ret_tax_array[$index]['rate'] !== null) { - if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings - $ret_tax_array[$index]['Value'] += ($shipping_net * $item_tax['rate'] / 100); + if($tax_included==1) { + $ret_tax_array[$index]['Value'] += round2($shipping_cost - $shipping_net, $dec); $ret_tax_array[$index]['Net'] += $shipping_net; } else { $ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / 100);