Fixed taxes display for multiply tax types included in price.

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

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 9d1ba576097fba04bc6ccac1e86fdf24a4c4b6e1..08efec416550deb9376b788efce1f3171dcd157a 100644 (file)
--- 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,7 +146,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++)
        {
@@ -174,33 +159,52 @@ 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)
-                                 $ret_tax_array[$index]['Value'] += round($prices[$i] * $item_tax['rate'] 
-                                       / ($item_tax['rate'] + 100),  user_price_dec());
-                               else
-                                 $ret_tax_array[$index]['Value'] += 
-                                       round($prices[$i] * $item_tax['rate'] / 100,  user_price_dec());
+                               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)
-                                       $ret_tax_array[$index]['Value'] += round($shipping_cost * $item_tax['rate'] 
-                                         / ($item_tax['rate'] + 100),  user_price_dec());
-                                 else
-                                       $ret_tax_array[$index]['Value'] += 
-                                         round($shipping_cost * $item_tax['rate'] / 100,  user_price_dec());
+                               if ($item_tax['rate'] != null) {
+                                       $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'] += ($shipping_net * $item_tax['rate'] / 100);
+                                           $ret_tax_array[$index]['Net'] += $shipping_net;
+                                         } else {
+                                               $ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / 100);
+                                           $ret_tax_array[$index]['Net'] += $shipping_cost;
+                                        }
+                                       }
                                }
                        }
                }
@@ -211,5 +215,4 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
        return $ret_tax_array;
 }
 
-
 ?>
\ No newline at end of file