X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fpo_class.inc;h=970cce200f72a34a81aa165858084004048bf1d3;hb=71d682a4c6063256396a3d8fe15f0c534b4cf46f;hp=a7b9db37c70775b207c20fce5ac2d8996b1e1773;hpb=ad0fdc78ec8ae2b67ef1b3a6d4f3393dba242310;p=fa-stable.git

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index a7b9db37..970cce20 100644
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -24,7 +24,7 @@ class purch_order
 	var $Location;
 	var $supplier_id;
 	var $supplier_name;
-	var $orig_order_date;
+	var $tran_date;
 	var $due_date;
 	var $order_no; /*Only used for modification of existing orders otherwise only established when order committed */
 	var $lines_on_order = 0;
@@ -33,10 +33,22 @@ class purch_order
 	var $tax_group_array = null; // saves db queries
 	var $tax_included; // type of prices
 	var $terms;
-	
+	var $ex_rate;
+	var $cash_account;
+	var $dimension,
+		$dimension2;
+
 	var $reference;
+	var $tax_overrides = array();		// array of taxes manually inserted during sales invoice entry (direct invoice)
 	
-	function purch_order()
+	var $prep_amount = 0; // prepayment required
+	var $alloc; // sum of payments allocated
+	var $prepayments = array();
+
+	var $fixed_asset = false;
+	var $grn_id ;	// grn batch id used in edition only
+
+	function __construct()
 	{
 		/*Constructor function initialises a new purchase order object */
 		$this->line_items = array();
@@ -53,12 +65,12 @@ class purch_order
 		$this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
 	}
 	
-	function add_to_order($line_no, $stock_id, $qty, $item_descr, $price, $uom, $req_del_date, $qty_inv, $qty_recd)
+	function add_to_order($line_no, $stock_id, $qty, $item_descr, $price, $uom, $req_del_date, $qty_inv, $qty_recd, $qty_ordered=0, $grn_item_id=0)
 	{
 		if (isset($qty) && $qty != 0)
 		{
 			$this->line_items[$line_no] = new po_line_details($line_no, $stock_id, $item_descr, $qty, $price, $uom, 
-				$req_del_date, $qty_inv, $qty_recd);
+				$req_del_date, $qty_inv, $qty_recd, $qty_ordered, $grn_item_id);
 			$this->lines_on_order++;
 			return 1;
 		}
@@ -138,7 +150,7 @@ class purch_order
 
 		foreach ($this->line_items as $ln_itm) {
 			$items[] = $ln_itm->stock_id;
-			$prices[] = round($ln_itm->price * ($receival ? $ln_itm->receive_qty : $ln_itm->quantity),  user_price_dec());
+			$prices[] = round($ln_itm->price * $ln_itm->quantity,  user_price_dec());
 		}
 		$taxes = get_tax_for_items($items, $prices, $shipping_cost,
 		  $this->tax_group_id, $this->tax_included,  $this->tax_group_array);
@@ -148,7 +160,11 @@ class purch_order
 			$val = $taxes['1']['Value'];
 			$val1 = (floatval((intval(round(($val*20),0)))/20));
 			$taxes['1']['Value'] = $val1;
-		} 
+		}
+		foreach($this->tax_overrides as $id => $value) // add values entered manually
+		{
+			$taxes[$id]['Override'] = $value;
+		}
 		return $taxes;
 	}
 
@@ -193,18 +209,17 @@ class po_line_details
 	var $tax_type;
 	var $tax_type_name;
 
-	var $quantity;		// current/entry quantity of PO line
-	var $qty_inv;	// quantity already invoiced against this line
-	var $receive_qty;	// current/entry GRN quantity
-	var $qty_received;	// quantity already received against this line
+	var $quantity;		// this document line quantity
+	var $qty_inv;	// quantity already invoiced against this line (all PIs)
+	var $qty_received;	// quantity already received against this line (all GRNs)
+	var $qty_ordered;	// quantity on order (not used on PO entry)
 
-	var $standard_cost;
+	var $unit_cost;
 	var $descr_editable;
 
-	function po_line_details($line_no, $stock_item, $item_descr, $qty, $prc, $uom, $req_del_date, 
-		$qty_inv, $qty_recd, $grn_item_id=0)
+	function __construct($line_no, $stock_item, $item_descr, $qty, $prc, $uom, $req_del_date, 
+		$qty_inv, $qty_recd, $qty_ordered=0, $grn_item_id=0)
 	{
-
 		/* Constructor function to add a new LineDetail object with passed params */
 		$this->line_no = $line_no;
 		$this->stock_id = $stock_item;
@@ -226,16 +241,25 @@ class po_line_details
 		$this->units = $item_row["units"];
 		$this->qty_received = $qty_recd;
 		$this->qty_inv = $qty_inv;
-		$this->receive_qty = 0;	/*initialise these last two only */
-		$this->standard_cost =0;
+		$this->unit_cost =0;
 		$this->grn_item_id = $grn_item_id;
+		$this->qty_ordered = $qty_ordered;
 	}
 	
-	function taxfree_charge_price($po)
+	// Deprecated, use with care. If you need line value as it is calculated in invoice, use taxfree_charge_value below.
+ 	function taxfree_charge_price($po)
 	{
 		return get_tax_free_price_for_item($this->stock_id, $this->price, 
 		  $po->tax_group_id, $po->tax_included, $po->tax_group_array);
 	}
+
+	//
+	// GRN line tax free value.
+	//
+	function taxfree_charge_value($po)
+	{
+		return get_tax_free_price_for_item($this->stock_id, $this->quantity*$this->price,
+		  $po->tax_group_id, $po->tax_included, $po->tax_group_array);
+	}
 }
 
-?>