[Web-erp-svn] SF.net SVN: web-erp:[7475] trunk/GLAccountInquiry.php

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

Revision: 7475
          http://sourceforge.net/p/web-erp/reponame/7475
Author:   exsonqu
Date:     2016-03-18 07:53:53 +0000 (Fri, 18 Mar 2016)
Log Message:
-----------
18/03/2016 Exson: Fixed the bug that transaction between bank shows wrong original currency and amount in GLAccountInquiry.php.

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

Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php	2016-03-09 23:02:09 UTC (rev 7474)
+++ trunk/GLAccountInquiry.php	2016-03-18 07:53:53 UTC (rev 7475)
@@ -51,7 +51,8 @@
 
 $sql = "SELECT chartmaster.accountcode, 
 			bankaccounts.accountcode AS bankact,
-			   chartmaster.accountname
+			bankaccounts.currcode,
+			chartmaster.accountname
 		FROM chartmaster LEFT JOIN bankaccounts
 		ON chartmaster.accountcode=bankaccounts.accountcode
 		INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" .  $_SESSION['UserID'] . "' AND glaccountusers.canview=1
@@ -61,6 +62,7 @@
 	if($myrow['accountcode'] == $SelectedAccount){
 		if (!is_null($myrow['bankact'])) {
 			$BankAccount = true;
+			$BankCurrency = $myrow['currcode'];
 		}
 		echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
 	} else {
@@ -295,6 +297,10 @@
 				$BankRef = $bankrow['ref'];
 				$OrgAmt = $bankrow['amount'];
 				$Currency = $bankrow['currcode'];
+			} elseif(isset($BankCurrency)){
+				$BankRef = '';
+				$OrgAmt = $myrow['amount'];
+				$Currency = $BankCurrency;
 			}
 		}