[Web-erp-svn] SF.net SVN: web-erp:[5727] trunk/CounterSales.php

[<dai...@us...>]

Revision: 5727
          http://sourceforge.net/p/web-erp/reponame/5727
Author:   daintree
Date:     2012-10-24 09:15:22 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
reverse incorrect use of filter_number_format

Modified Paths:
--------------
    trunk/CounterSales.php

Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php	2012-10-23 17:46:45 UTC (rev 5726)
+++ trunk/CounterSales.php	2012-10-24 09:15:22 UTC (rev 5727)
@@ -507,7 +507,7 @@
 					prnMsg(_('Recalculated the price from the GP % entered - the GP % was') . ' ' . $OrderLine->GPPercent . '  the new GP % is ' . filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),'info');
 
 
-					$Price = filter_number_format(($OrderLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]) + filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100)));
+					$Price = ($OrderLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]) + filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100));
 				} else {
 					$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
 				}
@@ -933,7 +933,7 @@
 		prnMsg(_('There are no lines on this sale. Please enter lines to invoice first'),'error');
 		$InputError = true;
 	}
-	if (abs(filter_number_format($_POST['AmountPaid']) -(filter_number_format($_SESSION['Items'.$identifier]->total)+filter_number_format($_POST['TaxTotal'])))>=0.01) {
+	if (abs(filter_number_format($_POST['AmountPaid']) -($_SESSION['Items'.$identifier]->total+filter_number_format($_POST['TaxTotal'])))>=0.01) {
 		prnMsg(_('The amount entered as payment does not equal the amount of the invoice. Please ensure the customer has paid the correct amount and re-enter'),'error');
 		$InputError = true;
 	}