Merged changes form main trunk since 2.1RC

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

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index a9bf26e624ba5d6913c48596b26950ab329e0914..397c5f501f3d7eae3c0eef49de6fd847d9240663 100644 (file)
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -1,5 +1,14 @@
 <?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");
@@ -164,7 +173,10 @@ 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++)
        {
@@ -175,14 +187,17 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                        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
+                               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]['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];
+                               }
                        }
                }
        }
@@ -197,14 +212,17 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                        {
                                $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
+                                 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]['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;
+                                }
                                }
                        }
                }