X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fpo_class.inc;h=47129816ac1b7501303319d38426d5b708d76b6b;hb=4568f3745a4a9e6efd6d796baccc0e9b23b81764;hp=4eb5c0b74a7873c6a4a8d876f17306be3295211a;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index 4eb5c0b7..47129816 100644
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -35,8 +35,13 @@ class purch_order
 	var $tax_algorithm;
 	var $stored_algorithm; // copy to find the change after invoice in processed
 	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)
 	
 	var $prep_amount = 0; // prepayment required
 	var $alloc; // sum of payments allocated
@@ -62,7 +67,7 @@ class purch_order
 	
 	function add_to_order($line_no, $stock_id, $qty, $item_descr, $price, $uom, $req_del_date, $qty_inv, $qty_recd)
 	{
-		if ($qty != 0 && isset($qty))
+		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);
@@ -153,8 +158,13 @@ class purch_order
     	// Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
 	    if ($this->curr_code == 'CHF') {
 			$val = $taxes['1']['Value'];
-			$taxes['1']['Value'] = (floatval((intval(round(($val*20),0)))/20));
-		} 
+			$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;
 	}
 
@@ -244,4 +254,3 @@ class po_line_details
 	}
 }
 
-?>