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

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

Revision: 3681
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3681&view=rev
Author:   tim_schofield
Date:     2010-08-02 09:53:33 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
Show currencies correctly when transaction is in different currency to bank currency

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

Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php	2010-07-30 11:37:22 UTC (rev 3680)
+++ trunk/DailyBankTransactions.php	2010-08-02 09:53:33 UTC (rev 3681)
@@ -55,7 +55,7 @@
 	echo '<br><div class="centre"><input type="submit" name="Show" value="' . _('Show transactions'). '"></div>';
 	echo '</form>';
 } else {
-	$sql="SELECT *,
+	$sql="SELECT banktrans.*,
 				bankaccounts.bankaccountname,
 				systypes.typename,
 				systypes.typeid
@@ -88,8 +88,8 @@
 		echo '<td>'.$myrow['ref'].'</td>';
 		echo '<td class=number>'.number_format($myrow['amount'],2).'</td>';
 		echo '<td class=number>'.number_format($myrow['amount'],2).'</td>';
-		echo '<td class=number>'.number_format($myrow['amount']/$myrow['functionalexrate'],2).'</td>';
-		echo '<td class=number>'.number_format($myrow['amount']/$myrow['functionalexrate'],2).'</td>';
+		echo '<td class=number>'.number_format($myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'],2).'</td>';
+		echo '<td class=number>'.number_format($myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'],2).'</td>';
 		echo '</tr>';
 		$AccountCurrTotal = $myrow['amount'];
 		$LocalCurrTotal = $myrow['amount']/$myrow['functionalexrate'];

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-30 11:37:22 UTC (rev 3680)
+++ trunk/doc/Change.log.html	2010-08-02 09:53:33 UTC (rev 3681)
@@ -1,5 +1,7 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>02/08/10 Tim: DailyBankTransactions.php - Show currencies correctly when transaction is in different currency to bank currency</p>
+<p>30/07/10 Tim: Payments.php - Syntax error in sql statement</p>
 <p>28/07/10 Simon Peter Otandeka: Change locatransfers table so that recd quantity on bulk stock transfers is a double field not integer</p>
 <p>28/07/10 Tim: class.pdf.php - Ensure ellipse() method has compatible declaration with ancestor class</p>
 <p>28/07/10 Tim: class.pdf.php - Ensure line() method has compatible declaration with ancestor class</p>


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