X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fsupp_trans_class.inc;h=96959ecd282e93382d1e3f30c8e004521094e46b;hb=807baf36cadbb2452b15c2321bbcacdbc09a8951;hp=a185895c7f8cf41f69c7f674629a6e23a7bf813e;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index a185895c..96959ecd 100644
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -43,12 +43,13 @@ class supp_trans
 	var $ov_gst;
 	var $gl_codes_counter=0;
 	var $credit = 0;
-	var $tax_algorithm;
-	var $stored_algorithm;
 	var $currency;
 	var $tax_overrides = array();		// array of taxes manually inserted during sales invoice entry
 
-	function supp_trans($trans_type, $trans_no=0)
+	var $dimension,
+		$dimension2;
+
+	function __construct($trans_type, $trans_no=0)
 	{
 		$this->trans_type = $trans_type;
 		/*Constructor function initialises a new Supplier Transaction object */
@@ -65,7 +66,7 @@ class supp_trans
 			read_supp_invoice($trans_no, $trans_type, $this);
 			if ($trans_type == ST_SUPPCREDIT)
 			{
-				$this->src_docs = find_src_invoices($trans_no);
+                $this->src_docs = find_src_invoices($this);
 			}
 			read_supplier_details_to_trans($this, $this->supplier_id);
 		}
@@ -73,7 +74,7 @@ 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, 
-		$std_cost_unit, $gl_code)
+		$std_cost_unit=null, $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, 
@@ -142,7 +143,7 @@ class supp_trans
         if ($tax_group_id == null)
         	$tax_group_id = $this->tax_group_id;
         $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id, 
-        	$this->tax_included, null, $this->tax_algorithm);
+        	$this->tax_included);
 
 		if (isset($this->tax_overrides))
 			foreach($this->tax_overrides as $id => $value) // add values entered manually
@@ -229,7 +230,7 @@ all the info to do the necessary entries without looking up ie additional querie
 	var $gl_code;
 	var $tax_included;
 
-	function grn_item ($id, $po_detail_item, $item_code, $item_description, $qty_recd, 
+	function __construct($id, $po_detail_item, $item_code, $item_description, $qty_recd, 
 		$prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price,
 		$std_cost_unit, $gl_code, $tax_included)
 	{
@@ -273,7 +274,7 @@ class gl_codes
 	var $amount;
 	var $memo_;
 
-	function gl_codes ($Counter, $gl_code, $gl_act_name, $gl_dim, $gl_dim2, $amount, $memo_)
+	function __construct($Counter, $gl_code, $gl_act_name, $gl_dim, $gl_dim2, $amount, $memo_)
 	{
 
 	/* Constructor function to add a new gl_codes object with passed params */
@@ -287,4 +288,3 @@ class gl_codes
 	}
 }
 
-?>