Fixed error creating customer credit note: Undefined index: sales_gl_code. @notrinos.

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

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 27b1ccfadeca21a750a35021d06aede635a18ee7..3ef685aef1cda24d34d4ea9c5f58d34c3cd0edb1 100644 (file)
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -33,8 +33,6 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_include
        else
                $ret_tax_array = get_tax_group_items_as_array($tax_group);
        
-       //print_r($ret_tax_array);
-
        $tax_array = get_taxes_for_item($stock_id, $ret_tax_array);
 
        // if no exemptions or taxgroup is empty, then no included/excluded taxes
@@ -149,9 +147,9 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                $tax_algorithm = get_company_pref('tax_algorithm');
        // first create and set an array with all the tax types of the tax group
        if($tax_items_array!=null)
-         $ret_tax_array = $tax_items_array;
+               $ret_tax_array = $tax_items_array;
        else
-         $ret_tax_array = get_tax_group_items_as_array($tax_group);
+               $ret_tax_array = get_tax_group_items_as_array($tax_group);
 
        $dec = user_price_dec();
 
@@ -162,8 +160,8 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                        $fully_exempt = false;
                $ret_tax_array[$k]['Net'] = 0;
        }
-
-       $ret_tax_array['exempt'] = array('Value'=>0, 'Net'=>0, 'rate' => null, 'tax_type_id' => '');
+       
+       $ret_tax_array['exempt'] = array('Value'=>0, 'Net'=>0, 'rate' => null, 'tax_type_id' => '', 'sales_gl_code' => '');
        $dec = user_price_dec();
        // loop for all items
        for ($i = 0; $i < count($items); $i++)
@@ -186,11 +184,11 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                                if ($item_tax['rate'] !== null) {
                                        $index = $item_tax['tax_type_id'];
                                        if ($tax_included == 1) {
-                                         $ret_tax_array[$index]['Value'] += round2($prices[$i]*$item_tax['rate']/(100+$tax_multiplier), $dec);
-                                         $ret_tax_array[$index]['Net'] += round2($prices[$i]*100/(100+$tax_multiplier), $dec);
+                                               $ret_tax_array[$index]['Value'] += round2($prices[$i]*$item_tax['rate']/(100+$tax_multiplier), $dec);
+                                               $ret_tax_array[$index]['Net'] += round2($prices[$i]*100/(100+$tax_multiplier), $dec);
                                        } else {
-                                         $ret_tax_array[$index]['Value'] += round2($prices[$i] * $item_tax['rate'] / 100, $dec);
-                                         $ret_tax_array[$index]['Net'] += $prices[$i];
+                                               $ret_tax_array[$index]['Value'] += round2($prices[$i] * $item_tax['rate'] / 100, $dec);
+                                               $ret_tax_array[$index]['Net'] += $prices[$i];
                                        }
                                }
                        }
@@ -218,13 +216,13 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                        {
                                $index = $item_tax['tax_type_id'];
                                if ($item_tax['rate'] !== null && $ret_tax_array[$index]['rate'] !== null) {
-                                         if($tax_included==1) {
-                                           $ret_tax_array[$index]['Value'] += round2($shipping_cost*$item_tax['rate']/(100+$tax_rate), $dec);
-                                           $ret_tax_array[$index]['Net'] += $shipping_net;
-                                         } else {
+                                       if($tax_included==1) {
+                                               $ret_tax_array[$index]['Value'] += round2($shipping_cost*$item_tax['rate']/(100+$tax_rate), $dec);
+                                               $ret_tax_array[$index]['Net'] += $shipping_net;
+                                       } else {
                                                $ret_tax_array[$index]['Value'] += round2($shipping_cost * $item_tax['rate'] / 100, $dec);
-                                           $ret_tax_array[$index]['Net'] += $shipping_cost;
-                                         }
+                                               $ret_tax_array[$index]['Net'] += $shipping_cost;
+                                       }
                                }
                        }
                }
@@ -240,4 +238,3 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
        return $ret_tax_array;
 }
 
-?>
\ No newline at end of file