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

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 7d124d7d..5d985299 100644
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -193,21 +193,19 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 			}
 			foreach ($item_taxes as $item_tax) 
 			{
-				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 
+				$index = $item_tax['tax_type_id'];
+				if ($item_tax['rate'] !== null && $ret_tax_array[$index]['rate'] !== null) {
 					  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;
+						$ret_tax_array[$index]['Value'] += ($shipping_net * $item_tax['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;
+						$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;