X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fsupp_trans_class.inc;h=d5f7508410f8222b35f6186ed76207ed1f7a623b;hb=e67a7d7074ceb37291846e68f8c5683bb93560ab;hp=74d95dc77b7c8ab132c62c7dc15e6f458931f88a;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index 74d95dc7..d5f75084 100644
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -17,7 +17,7 @@ include_once($path_to_root . "/taxes/tax_calc.inc");
 class supp_trans 
 {
 
-	var $grn_items; /*array of objects of class GRNDetails using the GRN No as the pointer */
+	var $grn_items; /*array of objects of class grn_item using the id as the pointer */
 	var $gl_codes; /*array of objects of class gl_codes using a counter as the pointer */
 	var $supplier_id;
 	var $supplier_name;
@@ -65,11 +65,11 @@ class supp_trans
 		return 1;
 	}
 
-	function remove_grn_from_trans(&$grn_item_id)
+	function remove_grn_from_trans($grn_item_id)
 	{
 	    unset($this->grn_items[$grn_item_id]);
 	}
-	function remove_gl_codes_from_trans(&$gl_code_counter)
+	function remove_gl_codes_from_trans($gl_code_counter)
 	{
 	     unset($this->gl_codes[$gl_code_counter]);
 	}
@@ -87,10 +87,10 @@ class supp_trans
 		$this->ov_amount = $this->ov_discount = $this->supplier_id = 0;
 		
 		$this->grn_items = array();
-		$this->gl_codes = array();		
+		$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();
@@ -107,12 +107,26 @@ class supp_trans
         	$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;
     }		
     
@@ -131,8 +145,10 @@ class supp_trans
 			 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;
     }