X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fsupp_trans_class.inc;h=0870f07487eb39496a43c05608772dd16821acce;hb=9502b1b3fc30a8b12c647f7e024e8b8da6a50af6;hp=d6e06714b2f670bf0a8e203e1ba48a348182713b;hpb=d34add5e762a470a52fade37173b4491462ee22a;p=fa-stable.git

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index d6e06714..0870f074 100644
--- 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
 */
 
@@ -8,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;
@@ -18,7 +27,7 @@ class supp_trans
 	var $tax_description;
 	var $tax_group_id;
 	
-	var $is_invoice;
+	var $trans_type;	// invoice or credit
 
 	var $Comments;
 	var $tran_date;
@@ -31,8 +40,9 @@ class supp_trans
 	var $ov_gst;
 	var $gl_codes_counter=0;
 
-	function supp_trans()
+	function supp_trans($trans_type)
 	{
+		$this->trans_type = $trans_type;
 		/*Constructor function initialises a new Supplier Transaction object */
 		$this->grn_items = array();
 		$this->gl_codes = array();
@@ -40,11 +50,11 @@ class supp_trans
 
 	function add_grn_to_trans($grn_item_id, $po_detail_item, $item_code, $item_description, 
 		$qty_recd, $prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price, 
-		$Complete, $std_cost_unit, $gl_code)
+		$std_cost_unit, $gl_code)
 	{
 		$this->grn_items[$grn_item_id] = new grn_item($grn_item_id, $po_detail_item, 
 			$item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, 
-			$order_price, $chg_price, $Complete, $std_cost_unit, $gl_code);
+			$order_price, $chg_price, $std_cost_unit, $gl_code);
 		return 1;
 	}
 
@@ -56,11 +66,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]);
 	}
@@ -78,10 +88,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();
@@ -98,12 +108,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;
     }		
     
@@ -122,8 +146,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;
     }
 
@@ -144,12 +170,11 @@ all the info to do the necessary entries without looking up ie additional querie
 	var $this_quantity_inv;
 	var $order_price;
 	var $chg_price;
-	var $Complete;
 	var $std_cost_unit;
 	var $gl_code;
 
 	function grn_item ($id, $po_detail_item, $item_code, $item_description, $qty_recd, 
-		$prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price, $Complete, 
+		$prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price,
 		$std_cost_unit, $gl_code)
 	{
 
@@ -162,21 +187,22 @@ all the info to do the necessary entries without looking up ie additional querie
 		$this->this_quantity_inv = $this_quantity_inv;
 		$this->order_price =$order_price;
 		$this->chg_price = $chg_price;
-		$this->Complete = $Complete;
 		$this->std_cost_unit = $std_cost_unit;
 		$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);
 	}
 }