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

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index acc8f0f0..7d124d7d 100644
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -1,41 +1,23 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/taxes/db/tax_groups_db.inc");
 include_once($path_to_root . "/taxes/db/tax_types_db.inc");
 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)
-{
-	// if price is zero, then can't be taxed
-	if ($price == 0)
-		return 0;
-		
-	$ret_tax_array = get_tax_group_items_as_array($tax_group);			
-		
-	$tax_array = get_taxes_for_item($stock_id, $ret_tax_array);
-	if ($tax_array == null)
-		return 0;
-	
-	$tax_multiplier = 0;	
-
-	// loop for all items
-	foreach ($tax_array as $taxitem) {
-		$tax_multiplier += $taxitem["rate"];
-	}
-	
-	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_included, $tax_group_array=null)
 {
@@ -58,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());
 }
 //
@@ -164,47 +146,63 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 	  $ret_tax_array = $tax_items_array;
 	else
 	  $ret_tax_array = get_tax_group_items_as_array($tax_group);
-	
+
+	foreach($ret_tax_array as $k=>$t)
+		$ret_tax_array[$k]['Net'] = 0;
+
 	// 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) 
 		{
 			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));
-				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);
+				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));
-				  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);
+				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;
+					  }
 				}
 			}
 		}
@@ -215,5 +213,4 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 	return $ret_tax_array;
 }
 
-
 ?>
\ No newline at end of file