Fixed maximum nam length.

[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 293b59a725b11ff69f6a1816b0aef186e83b6cbf..21e5e5fbb32d3846593f9f8de5615c6b578052ca 100644 (file)
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -40,6 +40,7 @@ class supp_trans
        var $ov_discount;
        var $ov_gst;
        var $gl_codes_counter=0;
+       var $credit = 0;
 
        function supp_trans($trans_type)
        {
@@ -164,12 +165,12 @@ class supp_trans
                foreach ($this->grn_items as $ln_itm)
                        $total += round($ln_itm->this_quantity_inv * $ln_itm->chg_price, user_price_dec());
 
-               return $total;
-
                foreach ($this->gl_codes as $gl_line)
-               {
-                       $total += $gl_line->amount;
+               {   //////// 2010-10-10 Joe Hunt
+                       if (!is_tax_account($gl_line->gl_code) || $this->tax_included)
+                               $total += $gl_line->amount;
                }
+               return $total;
        }
 } /* end of class defintion */