X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_calc.inc;h=4c4b9f37c5a7ea047e6a4d908d3a3c7f5502c107;hb=87ac1ff401682a1ccbbbf01ece7afe8ff518d3fe;hp=7107cdca7a75c8f6732e533231faeda6c84cc92e;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 7107cdca..4c4b9f37 100644
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -18,7 +18,6 @@ include_once($path_to_root . "/taxes/db/item_tax_types_db.inc");
 // returns the price of a given item minus any included taxes
 // for item $stock_id with line price $price,
 // with applicable tax rates $tax_group_array or group id $tax_group
-//
 
 function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_included, $tax_group_array=null)
 {
@@ -40,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 items
 
+	// 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"];
+		$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,
@@ -77,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
 
@@ -116,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) 
@@ -151,72 +153,70 @@ 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) 
 			{
-				$index = $item_tax['tax_type_id'];
-				if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
-				  //$ret_tax_array[$index]['Value'] += round($prices[$i] * $item_tax['rate'] 
-				  //	/ ($item_tax['rate'] + 100),  user_price_dec());
-				  $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / ($item_tax['rate'] + 100));
-				  $ret_tax_array[$index]['Net'] += ($prices[$i] * 100 / ($item_tax['rate'] + 100));
-				} else {
-				  //$ret_tax_array[$index]['Value'] += 
-				  //	round($prices[$i] * $item_tax['rate'] / 100,  user_price_dec());
-				  $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / 100);
-				  $ret_tax_array[$index]['Net'] += $prices[$i];
+				if ($item_tax['rate'] !== null) {
+					$index = $item_tax['tax_type_id'];
+					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];
+					}
 				}
 			}
 		}
 	}
-	
+
 	// add the shipping taxes, only if non-zero, and only if tax group taxes shipping
 	if ($shipping_cost != 0) 
 	{
 		$item_taxes = get_shipping_tax_as_array();
 		if ($item_taxes != null) 
 		{
+			if ($tax_included == 1)
+			{
+				$tax_rate = 0;
+				foreach ($item_taxes as $item_tax)
+				{
+					$index = $item_tax['tax_type_id'];
+					if(isset($ret_tax_array[$index])) {
+						$tax_rate += $item_tax['rate'];
+					}
+				}
+				$shipping_net = round2($shipping_cost*100/(100+$tax_rate), $dec);
+			}
 			foreach ($item_taxes as $item_tax) 
 			{
 				$index = $item_tax['tax_type_id'];
-				if(isset($ret_tax_array[$index])) {
-				  if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
-					//$ret_tax_array[$index]['Value'] += round($shipping_cost * $item_tax['rate'] 
-					//  / ($item_tax['rate'] + 100),  user_price_dec());
-					$ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / ($item_tax['rate'] + 100));
-				    $ret_tax_array[$index]['Net'] += ($shipping_cost * 100 / ($item_tax['rate'] + 100));
-				  } else {
-					//$ret_tax_array[$index]['Value'] += 
-					//  round($shipping_cost * $item_tax['rate'] / 100,  user_price_dec());
-					$ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / 100);
-				    $ret_tax_array[$index]['Net'] += $shipping_cost;
-				 }
+				if ($item_tax['rate'] !== null && $ret_tax_array[$index]['rate'] !== null) {
+					  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);
+					    $ret_tax_array[$index]['Net'] += $shipping_cost;
+					  }
 				}
 			}
 		}
 	}
-	
 	//print_r($ret_tax_array);
 
 	return $ret_tax_array;
 }
 
-function is_tax_account($account_code)
-{
-	$sql= "SELECT id FROM ".TB_PREF."tax_types WHERE 
-		sales_gl_code=".db_escape($account_code)." OR purchasing_gl_code=".db_escape($account_code);
-	$result = db_query($sql, "checking account is tax account");
-	if (db_num_rows($result) > 0) {
-		$acct = db_fetch($result);
-		return $acct['id'];
-	} else
-		return false;
-}
-
 ?>
\ No newline at end of file