[Web-erp-svn] SF.net SVN: web-erp:[7481] trunk

[<rc...@us...>]

Revision: 7481
          http://sourceforge.net/p/web-erp/reponame/7481
Author:   rchacon
Date:     2016-03-24 19:39:49 +0000 (Thu, 24 Mar 2016)
Log Message:
-----------
On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.

Modified Paths:
--------------
    trunk/CustomerReceipt.php
    trunk/Payments.php
    trunk/doc/Change.log

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/CustomerReceipt.php	2016-03-24 19:39:49 UTC (rev 7481)
@@ -7,7 +7,6 @@
 
 $Title = _('Receipt Entry');
 
-
 if ($_GET['Type']=='GL') {
 	$ViewTopic= 'GeneralLedger';
 	$BookMark = 'GLReceipts';
@@ -905,7 +904,7 @@
 	}
 	echo '<tr>
 			<td>', _('Functional Exchange Rate'), ':</td>
-			<td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', locale_number_format($_SESSION['ReceiptBatch']->FunctionalExRate,8), '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'),  '.</i></td>
+			<td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'),  '.</i></td>
 		</tr>';
 }
 
@@ -1100,9 +1099,9 @@
 			<td>' . _('GL Account') . ':</td>
 			<td><select tabindex="8" name="GLCode">';
 
-	$SQL = "SELECT chartmaster.accountcode, 
-					chartmaster.accountname 
-			FROM chartmaster 
+	$SQL = "SELECT chartmaster.accountcode,
+					chartmaster.accountname
+			FROM chartmaster
 				INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" .  $_SESSION['UserID'] . "' AND glaccountusers.canupd=1
 			ORDER BY chartmaster.accountcode";
 	$result=DB_query($SQL);

Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php	2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/Payments.php	2016-03-24 19:39:49 UTC (rev 7481)
@@ -16,7 +16,6 @@
 }
 
 include('includes/header.inc');
-
 include('includes/SQL_CommonFunctions.inc');
 
 if (isset($_POST['PaymentCancelled'])) {
@@ -891,7 +890,7 @@
 	}
 	echo '<tr>
 			<td>', _('Functional Exchange Rate'), ':</td>
-			<td><input class="number" maxlength="12" name="FunctionalExRate" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
+			<td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
 			<td>', $SuggestedFunctionalExRateText, '. <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
 		</tr>';
 }

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/doc/Change.log	2016-03-24 19:39:49 UTC (rev 7481)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
 24/03/16 Exson: Make the MRP report more place for material description in MRPReport.php.
 18/03/2016 Exson: Correct the currency code for transaction between bank account in GLAccountInquiry.php.
 18/03/2016 Exson: Fixed the bug that transaction between bank shows wrong original currency and amount in GLAccountInquiry.php.