[Weberp-cvs] SF.net SVN: web-erp:[3336] trunk

[<tim...@us...>]

Revision: 3336
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3336&view=rev
Author:   tim_schofield
Date:     2010-02-02 15:29:47 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
Pak Ricard: BankReconciliation.php - Correction for multi currency bank accounts

Modified Paths:
--------------
    trunk/BankReconciliation.php
    trunk/doc/Change.log.html

Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php	2010-02-02 14:26:59 UTC (rev 3335)
+++ trunk/BankReconciliation.php	2010-02-02 15:29:47 UTC (rev 3336)
@@ -32,7 +32,7 @@
 		$BankAccountName = $CurrencyRow[1];
 		$CalculatedBalance = $_POST['DoExchangeDifference'];
 
-		$ExchangeDifference = ($CalculatedBalance - $_POST['BankStatmentBalance'])*$ExRate;
+		$ExchangeDifference = ($CalculatedBalance - $_POST['BankStatmentBalance'])/$ExRate;
 
 		include ('includes/SQL_CommonFunctions.inc');
 		$ExDiffTransNo = GetNextTransNo(36,$db);
@@ -155,7 +155,7 @@
 		echo  ' (' . $BankCurrCode . ' @ ' . $ExRate .')';
 	}
 	echo '</b></td>
-			<td valign=bottom class=number><b>' . number_format($Balance/$ExRate,2) . '</b></td></tr>';
+			<td valign=bottom class=number><b>' . number_format($Balance*$ExRate,2) . '</b></td></tr>';
 
 	$SQL = 'SELECT amount/exrate AS amt,
 					amountcleared,
@@ -299,7 +299,7 @@
 	}
 	//end of while loop
 	echo '<tr></tr><tr><td colspan=6>' . _('Total of all uncleared deposits') . '</td><td class=number>' . number_format($TotalUnclearedDeposits,2) . '</td></tr>';
-	$FXStatementBalance = ($Balance/$ExRate) - $TotalUnpresentedCheques -$TotalUnclearedDeposits;
+	$FXStatementBalance = ($Balance*$ExRate) - $TotalUnpresentedCheques -$TotalUnclearedDeposits;
 	echo '<tr></tr><tr><td colspan=6><b>' . _('Bank statement balance should be') . ' (' . $BankCurrCode . ')</b></td><td class=number>' . number_format($FXStatementBalance,2) . '</td></tr>';
 
 	if (isset($_POST['DoExchangeDifference'])){

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-02-02 14:26:59 UTC (rev 3335)
+++ trunk/doc/Change.log.html	2010-02-02 15:29:47 UTC (rev 3336)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>02/02/10 Pak Ricard: BankReconciliation.php - Correction for multi currency bank accounts</p>
 <p>02/02/10 Chris Franks: BOMInquiry.php - Show the labour and verhead costs for the parent item</p>
 <p>02/02/10 Harald: api_xml-rpc.php.php - Corrections to descriptions.</p>
 <p>29/01/10 Pak Ricard: PricesByCost.php - New script to view or update prices by cost</p>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.