X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_calc.inc;h=4c4b9f37c5a7ea047e6a4d908d3a3c7f5502c107;hb=fe97ad7097366fe3de8770fb5110e9c447dbc58c;hp=5d9852991038e6da43cf39ada5f7e7c5afb719c0;hpb=e927aa1b629f5fcda9a9d362c5838e343ceaaed3;p=fa-stable.git

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 5d985299..4c4b9f37 100644
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -39,17 +39,20 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_include
 	// if no exemptions or taxgroup is empty, then no included/excluded taxes
 	if ($tax_array == null)
 		return $price;
-	
-	$tax_multiplier = 0;
-
-	// loop for all taxes
 
+	// to avoid rounding errors we have to just subtract taxes from tax_included price.
+	$tax_multiplier = 0;
 	foreach ($tax_array as $taxitem) 
 	{
 		$tax_multiplier += $taxitem["rate"];
 	}
 
-	return round($price / (1 + ($tax_multiplier / 100)),  user_price_dec());
+	$tax = 0;
+	foreach ($tax_array as $taxitem)
+	{
+		$tax += round($price*$taxitem['rate']/(100+$tax_multiplier), user_price_dec());
+	}
+	return $price-$tax;
 }
 //
 //	Full price (incl. VAT) for item $stock_id with line price $price,
@@ -76,7 +79,7 @@ function get_full_price_for_item($stock_id, $price, $tax_group, $tax_included, $
 	if ($tax_array == null)
 		return $price;
 	
-	$tax_multiplier = 0;	
+	$tax_multiplier = 0;
 
 	// loop for all items
 
@@ -115,7 +118,7 @@ function get_taxes_for_item($stock_id, $tax_group_items_array)
 	foreach ($tax_group_items_array as $tax_group_item) 
 	{ 
 		
-		$skip = false;			
+		$skip = false;
 		
 		// if it's in the exemptions, skip
 		foreach ($item_tax_type_exemptions as $exemption) 
@@ -150,20 +153,25 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 	foreach($ret_tax_array as $k=>$t)
 		$ret_tax_array[$k]['Net'] = 0;
 
+	$dec = user_price_dec();
 	// loop for all items
 	for ($i = 0; $i < count($items); $i++)
 	{
 		$item_taxes = get_taxes_for_item($items[$i], $ret_tax_array);
 		if ($item_taxes != null) 
 		{
+			$tax_multiplier = 0;
+			foreach ($item_taxes as $taxitem) 
+			{
+				$tax_multiplier += $taxitem['rate'];
+			}
 			foreach ($item_taxes as $item_tax) 
 			{
 				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
-					  $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]['Net'] += $nprice;
+					if ($tax_included == 1) {
+					  $ret_tax_array[$index]['Value'] += round2($prices[$i]*$item_tax['rate']/(100+$tax_multiplier), $dec);
+					  $ret_tax_array[$index]['Net'] += round2($prices[$i]*100/(100+$tax_multiplier), $dec);
 					} else {
 					  $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / 100);
 					  $ret_tax_array[$index]['Net'] += $prices[$i];
@@ -189,14 +197,14 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 						$tax_rate += $item_tax['rate'];
 					}
 				}
-				$shipping_net = round2($shipping_cost / (1 + ($tax_rate / 100)), user_price_dec());
+				$shipping_net = round2($shipping_cost*100/(100+$tax_rate), $dec);
 			}
 			foreach ($item_taxes as $item_tax) 
 			{
 				$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*$item_tax['rate']/(100+$tax_rate), $dec);
 					    $ret_tax_array[$index]['Net'] += $shipping_net;
 					  } else {
 						$ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / 100);