Merged changes from main trunk up to 2.2.7

[fa-stable.git] / taxes / tax_calc.inc

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 1230d8e70685cddb777ea44424387a9b4c57eb6a..3f54bd226aa65ee6871e86e30598f11f57d9ec37 100644 (file)
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -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;
                                 }