[Web-erp-svn] SF.net SVN: web-erp:[7561] trunk/DailyBankTransactions.php

[<ex...@us...>]

Revision: 7561
          http://sourceforge.net/p/web-erp/reponame/7561
Author:   exsonqu
Date:     2016-06-29 05:35:22 +0000 (Wed, 29 Jun 2016)
Log Message:
-----------
29/06/16 Exson: Fixed bug of wrong balance in account currency and display original currency code with amount in DailyBankTransactions.php.

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

Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php	2016-06-20 06:56:54 UTC (rev 7560)
+++ trunk/DailyBankTransactions.php	2016-06-29 05:35:22 UTC (rev 7561)
@@ -152,7 +152,7 @@
 					<th class="number">' . _('Number') . '</th>
 					<th class="text">' . _('Type') . '</th>
 					<th class="text">' . _('Reference') . '</th>
-					<th class="number">' . _('Amount in org').' '.$BankDetailRow['currcode'] . '</th>
+					<th class="number">' . _('Amount in org currency') . '</th>
 					<th class="number">' . _('Balance in') . ' ' . $BankDetailRow['currcode'] . '</th>
 					<th class="number">' . _('Running Total').' '.$BankDetailRow['currcode'] . '</th>
 					<th class="number">' . _('Amount in').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
@@ -203,9 +203,8 @@
 			} else {
 				$GLNarrative = 'NA';
 			}
-			$Balance += $myrow['amount'];
-
-			$AccountCurrTotal += $myrow['amount'];
+			$Balance += $myrow['amount']/$myrow['exrate'];
+			$AccountCurrTotal += $myrow['amount']/$myrow['exrate'];
 			$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
 		
 			if ($myrow['amount']==$myrow['amountcleared']) {
@@ -220,7 +219,7 @@
 					<td class="number"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['typeid'] . '&amp;TransNo=' . $myrow['transno'] . '">' . $myrow['transno'] . '</a></td>
 					<td>' . $myrow['banktranstype'] . '</td>
 					<td>' . $myrow['ref'] . '</td>
-					<td class="number">' . locale_number_format($myrow['amount'],$BankDetailRow['decimalplaces']) . '</td>
+					<td class="number">' . locale_number_format($myrow['amount'],$BankDetailRow['decimalplaces']) . ' ' . $myrow['currcode'] . '</td>
 					<td class="number">' . locale_number_format($Balance,$BankDetailRow['decimalplaces']) . '</td>
 					<td class="number">' . locale_number_format($AccountCurrTotal,$BankDetailRow['decimalplaces']) . '</td>
 					<td class="number">' . locale_number_format($myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>