X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=taxes%2Ftax_calc.inc;h=9d1ba576097fba04bc6ccac1e86fdf24a4c4b6e1;hb=e335b7bff88d068f584da89c61bbfad38632dfe9;hp=6ca9fbbfc53d4155847ce2eb62f308ce3814d920;hpb=a5bdb4cb5a7b4ed58ac02192b5cf814f99f1a6b7;p=fa-stable.git diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc index 6ca9fbbf..9d1ba576 100644 --- a/taxes/tax_calc.inc +++ b/taxes/tax_calc.inc @@ -67,7 +67,7 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_include $tax_multiplier += $taxitem["rate"]; } - return $price / (1 + ($tax_multiplier / 100)); + return round($price / (1 + ($tax_multiplier / 100)), user_price_dec()); } // // Full price (incl. VAT) for item $stock_id with line price $price, @@ -103,7 +103,7 @@ function get_full_price_for_item($stock_id, $price, $tax_group, $tax_included, $ $tax_multiplier += $taxitem["rate"]; } - return $price * (1 + ($tax_multiplier / 100)); + return round($price * (1 + ($tax_multiplier / 100)), user_price_dec()); } //--------------------------------------------------------------------------------- @@ -176,10 +176,11 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc { $index = $item_tax['tax_type_id']; if($tax_included==1) - $ret_tax_array[$index]['Value'] += $prices[$i] * $item_tax['rate'] - / ($item_tax['rate'] + 100); + $ret_tax_array[$index]['Value'] += round($prices[$i] * $item_tax['rate'] + / ($item_tax['rate'] + 100), user_price_dec()); else - $ret_tax_array[$index]['Value'] += $prices[$i] * $item_tax['rate'] / 100; + $ret_tax_array[$index]['Value'] += + round($prices[$i] * $item_tax['rate'] / 100, user_price_dec()); } } } @@ -195,10 +196,11 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc $index = $item_tax['tax_type_id']; if(isset($ret_tax_array[$index])) { if($tax_included==1) - $ret_tax_array[$index]['Value'] += $shipping_cost * $item_tax['rate'] - / ($item_tax['rate'] + 100); + $ret_tax_array[$index]['Value'] += round($shipping_cost * $item_tax['rate'] + / ($item_tax['rate'] + 100), user_price_dec()); else - $ret_tax_array[$index]['Value'] += $shipping_cost * $item_tax['rate'] / 100; + $ret_tax_array[$index]['Value'] += + round($shipping_cost * $item_tax['rate'] / 100, user_price_dec()); } } }