X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fpo_class.inc;h=e891e6494332eefd95d7f3decf28aa0561f7c37c;hb=477c1f221df891f39e9363f7b34e6ff1eb4ad4c7;hp=30a30dea4363eef1296d92c37f7bc5e04b96da11;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index 30a30dea..e891e649 100644
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -32,11 +32,14 @@ class purch_order
 	var $tax_group_id;
 	var $tax_group_array = null; // saves db queries
 	var $tax_included; // type of prices
-	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
@@ -49,14 +52,13 @@ class purch_order
 		$this->lines_on_order = $this->order_no = $this->supplier_id = 0;
 	}
 	
-	function set_supplier($supplier_id, $supplier_name, $curr_code, $tax_group_id, $tax_included, $tax_algorithm)
+	function set_supplier($supplier_id, $supplier_name, $curr_code, $tax_group_id, $tax_included)
 	{
 		$this->supplier_id = $supplier_id;
 		$this->supplier_name = $supplier_name;
 		$this->curr_code = $curr_code;
 		$this->tax_group_id = $tax_group_id;
 		$this->tax_included = $tax_included;
-		$this->stored_algorithm = $this->tax_algorithm = $tax_algorithm;
 		$this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
 	}
 	
@@ -148,13 +150,18 @@ class purch_order
 			$prices[] = round($ln_itm->price * ($receival ? $ln_itm->receive_qty : $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, $this->tax_algorithm);
+		  $this->tax_group_id, $this->tax_included,  $this->tax_group_array);
 
     	// 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;
 	}
 
@@ -175,7 +182,7 @@ class purch_order
 
 		if (!$this->tax_included ) {
 			$taxes = get_tax_for_items($items, $prices, 0, $this->tax_group_id,
-			$this->tax_included,  $this->tax_group_array, $this->tax_algorithm);
+			$this->tax_included,  $this->tax_group_array);
 
 			foreach($taxes as $tax)
 				$total += round($tax['Value'], $dec);
@@ -244,4 +251,3 @@ class po_line_details
 	}
 }
 
-?>