Added dimension edition on purchase invoice entry.

[fa-stable.git] / purchasing / includes / supp_trans_class.inc

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index 547d833e3012f0031f8b394649019cdfe9e36667..99fe1934f7fcf65a183362c7e97fc4be72a53963 100644 (file)
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -48,6 +48,9 @@ class supp_trans
        var $currency;
        var $tax_overrides = array();           // array of taxes manually inserted during sales invoice entry
 
+       var $dimension,
+               $dimension2;
+
        function supp_trans($trans_type, $trans_no=0)
        {
                $this->trans_type = $trans_type;
@@ -144,23 +147,27 @@ class supp_trans
         $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id, 
                $this->tax_included, null, $this->tax_algorithm);
 
-               if ($gl_codes)
+               if (isset($this->tax_overrides))
+                       foreach($this->tax_overrides as $id => $value) // add values entered manually
+                       {
+                               $taxes[$id]['Override'] = $value;
+                       }
+
+               // Taxes included in gl_codes table have exact value, but count to overrides as well.
+               // Therefore when we want to now taxes only for items (gl_codes==false),
+               // we have to subtract gl_taxes from override values.
+               foreach ($this->gl_codes as $gl_code)
                {
-                       foreach ($this->gl_codes as $gl_code)
+                       $index = is_tax_account($gl_code->gl_code);
+                       if ($index !== false)
                        {
-                               $index = is_tax_account($gl_code->gl_code);
-                               if ($index !== false)
-                               {
+                               if ($gl_codes)
                                        $taxes[$index]['Value'] += $gl_code->amount;
-                               }
+                               elseif (isset($this->tax_overrides))
+                                       $taxes[$index]['Override'] -= $gl_code->amount;
                        }
                }
 
-               if(isset($this->tax_overrides))
-                       foreach($this->tax_overrides as $id => $value) // add values entered manually
-                       {
-                               $taxes[$id]['Override'] = $value;
-                       }
         return $taxes;
     }
        //
@@ -283,4 +290,3 @@ class gl_codes
        }
 }
 
-?>