X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fsupp_trans_class.inc;h=74d95dc77b7c8ab132c62c7dc15e6f458931f88a;hb=6425de92749015d0e7ab29b5fd071a9d70cbb7d5;hp=596114c915ae22265788a34b8dbbf984f9f800b1;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index 596114c9..74d95dc7 100644
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 /* Definition of the Supplier Transactions class to hold all the information for an accounts payable invoice or credit note
 */
 
@@ -95,7 +104,8 @@ class supp_trans
         foreach ($this->grn_items as $ln_itm) 
         {
         	$items[] = $ln_itm->item_code;
-        	$prices[] = ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group));
+        	$prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)),
+			 user_price_dec());
         }
         
         if ($tax_group_id == null)
@@ -117,7 +127,8 @@ class supp_trans
 			$tax_group = null;    	
     	
 		foreach ($this->grn_items as $ln_itm)
-    		$total += ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group));
+    		$total += round(($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)),
+			 user_price_dec());
 
    		foreach ($this->gl_codes as $gl_line)
    			$total += $gl_line->amount;
@@ -165,16 +176,18 @@ all the info to do the necessary entries without looking up ie additional querie
 		$this->gl_code = $gl_code;
 	}
 	
-	function full_charge_price()
+	function full_charge_price($tax_group_id, $tax_group=null)
 	{
-		return $this->chg_price;
+		return get_full_price_for_item($this->item_code, 
+		  $this->chg_price, $tax_group_id, 0, $tax_group);
 	}
 	
 	function taxfree_charge_price($tax_group_id, $tax_group=null)
 	{
-		if ($tax_group_id==null)
-			return $this->chg_price;
-		return get_tax_free_price_for_item($this->item_code, $this->chg_price, $tax_group_id, $tax_group);
+//		if ($tax_group_id==null)
+//			return $this->chg_price;
+		return get_tax_free_price_for_item($this->item_code, $this->chg_price, 
+		  $tax_group_id, 0, $tax_group);
 	}
 }