X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fsupp_trans_class.inc;h=130354d7142516a28303246d7f4e9cf7fd2da9da;hb=46c5f7a65a7659a44ae8254c63152074363d3987;hp=98bd4fcdc88f10868b74141fd6b216791cca9952;hpb=35f482e2a9246960de37e5f1d975c734e08951e6;p=fa-stable.git

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index 98bd4fcd..130354d7 100644
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -17,17 +17,17 @@ 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;
-	var $terms_description;
 	var $terms;
 	
 	var $tax_description;
 	var $tax_group_id;
+	var $tax_included;
 	
-	var $is_invoice;
+	var $trans_type;	// invoice or credit
 
 	var $Comments;
 	var $tran_date;
@@ -39,9 +39,11 @@ class supp_trans
 	var $ov_discount;
 	var $ov_gst;
 	var $gl_codes_counter=0;
+	var $credit = 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();
@@ -49,11 +51,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, $this->tax_included);
 		return 1;
 	}
 
@@ -65,11 +67,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,7 +89,7 @@ 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, $gl_codes=true)
@@ -104,14 +106,15 @@ class supp_trans
         foreach ($this->grn_items as $ln_itm) 
         {
         	$items[] = $ln_itm->item_code;
-        	$prices[] =round( ($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)),
+        	$prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->chg_price),
 			 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);
+        	$tax_group_id = $this->tax_group_id;
+        $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id, 
+        	$this->tax_included);
 
 ///////////////// Joe Hunt 2009.08.18
 
@@ -129,8 +132,10 @@ class supp_trans
 ////////////////		
         return $taxes;
     }		
-    
-    function get_total_charged($tax_group_id=null)
+	//
+	//	Returns total invoice amount without taxes.
+	//
+    function get_total_taxfree($tax_group_id=null)
     {
     	$total = 0;
     	
@@ -152,6 +157,20 @@ class supp_trans
    		return $total;
     }
 
+	function get_items_total()
+	{
+		$total = 0;
+
+		foreach ($this->grn_items as $ln_itm)
+			$total += round($ln_itm->this_quantity_inv * $ln_itm->chg_price, user_price_dec());
+
+		foreach ($this->gl_codes as $gl_line)
+		{   //////// 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 */
 
 class grn_item 
@@ -169,13 +188,13 @@ 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;
+	var $tax_included;
 
 	function 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)
+		$prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price,
+		$std_cost_unit, $gl_code, $tax_included)
 	{
 
 		$this->id = $id;
@@ -187,15 +206,15 @@ 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;
+		$this->tax_included = $tax_included;
 	}
 	
 	function full_charge_price($tax_group_id, $tax_group=null)
 	{
 		return get_full_price_for_item($this->item_code, 
-		  $this->chg_price, $tax_group_id, 0, $tax_group);
+		  $this->chg_price, $tax_group_id, $this->tax_included, $tax_group);
 	}
 	
 	function taxfree_charge_price($tax_group_id, $tax_group=null)
@@ -203,7 +222,7 @@ all the info to do the necessary entries without looking up ie additional querie
 //		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);
+		  $tax_group_id, $this->tax_included, $tax_group);
 	}
 }