X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fpo_class.inc;h=c9ec00df2f32362d5ca993b480c1e699026266f4;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=c9ab5b0785570bb935c906e3976cd9c2d966535d;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index c9ab5b07..c9ec00df 100644
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -32,6 +32,8 @@ 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 $reference;
@@ -43,13 +45,14 @@ 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)
+	function set_supplier($supplier_id, $supplier_name, $curr_code, $tax_group_id, $tax_included, $tax_algorithm)
 	{
 		$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);
 	}
 	
@@ -124,8 +127,12 @@ class purch_order
 		}
 		return 0;
 	}
-
-	function get_taxes($shipping_cost=null)
+	
+	//
+	//	Returns taxes for PO/GRN.
+	//	$receival=true in purchase receive context.
+	//
+	function get_taxes($shipping_cost=null, $receival=false)
 	{
 		$items = array();
 		$prices = array();
@@ -134,16 +141,15 @@ class purch_order
 
 		foreach ($this->line_items as $ln_itm) {
 			$items[] = $ln_itm->stock_id;
-			$prices[] = round($ln_itm->quantity * $ln_itm->price,  user_price_dec());
+			$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_group_id, $this->tax_included,  $this->tax_group_array, $this->tax_algorithm);
 
     	// Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
 	    if ($this->curr_code == 'CHF') {
 			$val = $taxes['1']['Value'];
-			$val1 = (floatval((intval(round(($val*20),0)))/20));
-			$taxes['1']['Value'] = $val1;
+			$taxes['1']['Value'] = (floatval((intval(round(($val*20),0)))/20));
 		} 
 		return $taxes;
 	}
@@ -165,7 +171,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_included,  $this->tax_group_array, $this->tax_algorithm);
 
 			foreach($taxes as $tax)
 				$total += round($tax['Value'], $dec);
@@ -226,6 +232,12 @@ class po_line_details
 		$this->standard_cost =0;
 		$this->grn_item_id = $grn_item_id;
 	}
+	
+	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);
+	}
 }
 
 ?>