X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_calc.inc;h=acc8f0f0633d468aadd47b528f3ad2262b717bd9;hb=813a5c558638f7937da410b969a7935dd0de7342;hp=146beac41aeb89cde91867eb425e4b777a40ba06;hpb=146f7f65af4a1212c74d5105b1a572104526e852;p=fa-stable.git

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 146beac4..acc8f0f0 100644
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -7,8 +7,8 @@ include_once($path_to_root . "/taxes/db/item_tax_types_db.inc");
 //---------------------------------------------------------------------------------
 
 // returns the tax cost for a given item
-
-/*function get_tax_value_for_item($stock_id, $price, $tax_group)
+/*
+function get_tax_value_for_item($stock_id, $price, $tax_group)
 {
 	// if price is zero, then can't be taxed
 	if ($price == 0)
@@ -28,18 +28,23 @@ include_once($path_to_root . "/taxes/db/item_tax_types_db.inc");
 	}
 	
 	return $price * ($tax_multiplier / 100);	
-}*/
-
+}
+*/
 //---------------------------------------------------------------------------------
 
 // 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_group_array=null)
+function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_included, $tax_group_array=null)
 {
 	// if price is zero, then can't be taxed !
 	if ($price == 0)
 		return 0;
 
+	if ($tax_included==0) return $price;
+	
 	// if array already read, then make a copy and use that
 	if ($tax_group_array)
 		$ret_tax_array = $tax_group_array;
@@ -59,16 +64,49 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_group_a
 
 	foreach ($tax_array as $taxitem) 
 	{
-		if ($taxitem["included_in_price"])
 			$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,
+//	with tax rates $tax_group_array or applicable group $tax_group
+//
+function get_full_price_for_item($stock_id, $price, $tax_group, $tax_included, $tax_group_array=null)
+{
+	// if price is zero, then can't be taxed !
+	if ($price == 0)
+		return 0;
 
-//---------------------------------------------------------------------------------
+	if ($tax_included==1) return $price;
+
+	// if array already read, then make a copy and use that
+	if ($tax_group_array)
+		$ret_tax_array = $tax_group_array;
+	else
+		$ret_tax_array = get_tax_group_items_as_array($tax_group);
+	
+	//print_r($ret_tax_array);
+
+	$tax_array = get_taxes_for_item($stock_id, $ret_tax_array);
+	// 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
 
+	foreach ($tax_array as $taxitem) 
+	{
+			$tax_multiplier += $taxitem["rate"];
+	}
+	
+	return round($price * (1 + ($tax_multiplier / 100)),  user_price_dec());
+}
 
+//---------------------------------------------------------------------------------
 // return an array of (tax_type_id, tax_type_name, sales_gl_code, purchasing_gl_code, rate)
 
 function get_taxes_for_item($stock_id, $tax_group_items_array)
@@ -116,15 +154,16 @@ function get_taxes_for_item($stock_id, $tax_group_items_array)
 	
 	return $ret_tax_array;
 }
-
 //-----------------------------------------------------------------------------------
-
 // return an array of (tax_type_id, tax_type_name, sales_gl_code, purchasing_gl_code, rate, included_in_price, Value) 
 
-function get_tax_for_items($items, $prices, $shipping_cost, $tax_group)
+function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_included=null, $tax_items_array=null)
 {
 	// first create and set an array with all the tax types of the tax group
-	$ret_tax_array = get_tax_group_items_as_array($tax_group);
+	if($tax_items_array!=null)
+	  $ret_tax_array = $tax_items_array;
+	else
+	  $ret_tax_array = get_tax_group_items_as_array($tax_group);
 	
 	// loop for all items
 	for ($i = 0; $i < count($items); $i++)
@@ -136,7 +175,14 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group)
 			foreach ($item_taxes as $item_tax) 
 			{
 				$index = $item_tax['tax_type_id'];
-				$ret_tax_array[$index]['Value'] += $prices[$i] * $item_tax['rate'] / 100;
+				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));
+				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);
 			}
 		}
 	}
@@ -150,9 +196,16 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group)
 			foreach ($item_taxes as $item_tax) 
 			{
 				$index = $item_tax['tax_type_id'];
-				if(!isset($ret_tax_array[$index]))
-				    $ret_tax_array[$index] = $item_tax;
-				$ret_tax_array[$index]['Value'] += $shipping_cost * $item_tax['rate'] / 100;
+				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));
+				  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);
+				}
 			}
 		}
 	}