Merged changes from main trunk 2.2.1-2.2.2

[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 596114c915ae22265788a34b8dbbf984f9f800b1..98bd4fcdc88f10868b74141fd6b216791cca9952 100644 (file)
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.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>.
+***********************************************************************/
 /* Definition of the Supplier Transactions class to hold all the information for an accounts payable invoice or credit note
 */
 
@@ -81,7 +90,7 @@ class supp_trans
                $this->gl_codes = array();              
        }
        
-    function get_taxes($tax_group_id=null, $shipping_cost=0)
+    function get_taxes($tax_group_id=null, $shipping_cost=0, $gl_codes=true)
     {
        $items = array();
        $prices = array();
@@ -95,14 +104,29 @@ class supp_trans
         foreach ($this->grn_items as $ln_itm) 
         {
                $items[] = $ln_itm->item_code;
-               $prices[] = ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group));
+               $prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)),
+                        user_price_dec());
         }
-        
+
         if ($tax_group_id == null)
                $tax_group_id = $this->tax_group_id;            
         
         $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id);
-        
+
+///////////////// Joe Hunt 2009.08.18
+
+               if ($gl_codes)
+               {
+                       foreach ($this->gl_codes as $gl_code)
+                       {
+                               $index = is_tax_account($gl_code->gl_code);
+                               if ($index !== false)
+                               {
+                                       $taxes[$index]['Value'] += $gl_code->amount;
+                               }       
+                       }
+               }       
+////////////////               
         return $taxes;
     }          
     
@@ -117,11 +141,14 @@ class supp_trans
                        $tax_group = null;      
        
                foreach ($this->grn_items as $ln_itm)
-               $total += ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group));
+               $total += round(($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)),
+                        user_price_dec());
 
                foreach ($this->gl_codes as $gl_line)
-                       $total += $gl_line->amount;
-                       
+               {       //////// 2009-08-18 Joe Hunt
+                       if (!is_tax_account($gl_line->gl_code))
+                               $total += $gl_line->amount;
+               }       
                return $total;
     }
 
@@ -165,16 +192,18 @@ all the info to do the necessary entries without looking up ie additional querie
                $this->gl_code = $gl_code;
        }
        
-       function full_charge_price()
+       function full_charge_price($tax_group_id, $tax_group=null)
        {
-               return $this->chg_price;
+               return get_full_price_for_item($this->item_code, 
+                 $this->chg_price, $tax_group_id, 0, $tax_group);
        }
        
        function taxfree_charge_price($tax_group_id, $tax_group=null)
        {
-               if ($tax_group_id==null)
-                       return $this->chg_price;
-               return get_tax_free_price_for_item($this->item_code, $this->chg_price, $tax_group_id, $tax_group);
+//             if ($tax_group_id==null)
+//                     return $this->chg_price;
+               return get_tax_free_price_for_item($this->item_code, $this->chg_price, 
+                 $tax_group_id, 0, $tax_group);
        }
 }