X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_calc.inc;h=7d124d7dbf5a0712d4b18095a8fbdc824674a958;hb=88231b75937436aedadf2a751893e887307aa419;hp=1209d62133eca1f355f073e7f2a464b95b999aaa;hpb=86e4d1627183fb4d97fe145a5dd33b43b03284ee;p=fa-stable.git

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 1209d621..7d124d7d 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)
 {
@@ -41,15 +40,15 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_include
 	if ($tax_array == null)
 		return $price;
 	
-	$tax_multiplier = 0;	
+	$tax_multiplier = 0;
 
-	// loop for all items
+	// loop for all taxes
 
 	foreach ($tax_array as $taxitem) 
 	{
-			$tax_multiplier += $taxitem["rate"];
+		$tax_multiplier += $taxitem["rate"];
 	}
-	
+
 	return round($price / (1 + ($tax_multiplier / 100)),  user_price_dec());
 }
 //
@@ -155,48 +154,55 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 	for ($i = 0; $i < count($items); $i++)
 	{
 		$item_taxes = get_taxes_for_item($items[$i], $ret_tax_array);
-
 		if ($item_taxes != null) 
 		{
 			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) {// 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;
+					} 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 / (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));
-				  } 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) {
+					$index = $item_tax['tax_type_id'];
+					$rate = isset($ret_tax_array[$index]['rate']) ? $item_tax['rate'] : 0; // use customer tax group on shipment 
+					  if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
+						$ret_tax_array[$index]['Value'] += ($shipping_net * $rate / 100);
+				        $ret_tax_array[$index]['Net'] += $shipping_net;
+					  } else {
+						$ret_tax_array[$index]['Value'] += ($shipping_cost * $rate / 100);
+				        $ret_tax_array[$index]['Net'] += $shipping_cost;
+					  }
 				}
 			}
 		}
@@ -207,16 +213,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