X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_calc.inc;h=3f54bd226aa65ee6871e86e30598f11f57d9ec37;hb=181cd75a7b027c398cc382974bc9f97cba8c48b3;hp=1209d62133eca1f355f073e7f2a464b95b999aaa;hpb=95303d7b5280820af76ddbd8908b120813f1e763;p=fa-stable.git

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 1209d621..3f54bd22 100644
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -50,7 +50,7 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_include
 			$tax_multiplier += $taxitem["rate"];
 	}
 	
-	return round($price / (1 + ($tax_multiplier / 100)),  user_price_dec());
+	return round($price / (1 + ($tax_multiplier / 100)),  2*user_price_dec());
 }
 //
 //	Full price (incl. VAT) for item $stock_id with line price $price,
@@ -86,7 +86,7 @@ function get_full_price_for_item($stock_id, $price, $tax_group, $tax_included, $
 			$tax_multiplier += $taxitem["rate"];
 	}
 	
-	return round($price * (1 + ($tax_multiplier / 100)),  user_price_dec());
+	return round($price * (1 + ($tax_multiplier / 100)),  2*user_price_dec());
 }
 
 //---------------------------------------------------------------------------------
@@ -162,13 +162,10 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 			{
 				$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));
+				  $nprice = get_tax_free_price_for_item($items[$i], $prices[$i], $tax_group, $tax_included);
+				  $ret_tax_array[$index]['Value'] += ($nprice * $item_tax['rate'] / 100);
+				  $ret_tax_array[$index]['Net'] += $nprice;
 				} 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];
 				}
@@ -182,18 +179,26 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 		$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 / (1 + ($tax_rate / 100)), user_price_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));
+					$ret_tax_array[$index]['Value'] += ($shipping_net * $item_tax['rate'] / 100);
+				    $ret_tax_array[$index]['Net'] += $shipping_net;
 				  } 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;
 				 }
@@ -207,16 +212,4 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 	return $ret_tax_array;
 }
 
-function is_tax_account($account_code)
-{
-	$sql= "SELECT id FROM ".TB_PREF."tax_types WHERE 
-		sales_gl_code='$account_code' OR purchasing_gl_code='$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