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

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

Revision: 6379
          http://sourceforge.net/p/web-erp/reponame/6379
Author:   rchacon
Date:     2013-11-01 21:56:30 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
Allow translate the name of the currency on CustomerReceipt.php and Payments.php.

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

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2013-10-30 18:10:51 UTC (rev 6378)
+++ trunk/CustomerReceipt.php	2013-11-01 21:56:30 UTC (rev 6379)
@@ -813,11 +813,12 @@
 	prnMsg(_('No currencies are defined yet') . '. ' . _('Receipts cannot be entered until a currency is defined'),'warn');
 
 } else {
+	include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name.
 	while ($myrow=DB_fetch_array($result)){
 		if ($_SESSION['ReceiptBatch']->Currency==$myrow['currabrev']){
-			echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+			echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
 		} else {
-			echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+			echo '<option value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
 		}
 	}
 	echo '</select></td>

Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php	2013-10-30 18:10:51 UTC (rev 6378)
+++ trunk/Payments.php	2013-11-01 21:56:30 UTC (rev 6379)
@@ -164,7 +164,7 @@
 
 if (isset($_POST['Currency']) AND $_POST['Currency']!=''){
 	/* Payment currency is the currency that is being paid */
-	$_SESSION['PaymentDetail' . $identifier]->Currency=$_POST['Currency']; //payment currency
+	$_SESSION['PaymentDetail' . $identifier]->Currency=$_POST['Currency']; // Payment currency
 
 
 	if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']){
@@ -803,7 +803,7 @@
 
 echo '<tr>
 		<td>' . _('Date Paid') . ':</td>
-		<td><input type="text" name="DatePaid" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" required="required" maxlength="10" size="11" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '" /></td>
+		<td><input type="text" name="DatePaid" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" required="required" maxlength="10" size="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '" /></td>
 	</tr>';
 
 
@@ -819,11 +819,12 @@
 			</tr>';
 		prnMsg( _('No currencies are defined yet. Payments cannot be entered until a currency is defined'),'error');
 	} else {
+		include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name.
 		while ($myrow=DB_fetch_array($result)){
 			if ($_SESSION['PaymentDetail' . $identifier]->Currency==$myrow['currabrev']){
-				echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+				echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
 			} else {
-				echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+				echo '<option value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
 			}
 		}
 		echo '</select></td>

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-10-30 18:10:51 UTC (rev 6378)
+++ trunk/doc/Change.log	2013-11-01 21:56:30 UTC (rev 6379)
@@ -1,4 +1,5 @@
 webERP Change Log
+30/10/2013 rchacon: Allow translate the name of the currency on CustomerReceipt.php and Payments.php.
 30/10/2013 rchacon: Allow insert different data on banktrans.ref and gltrans.narrative for the bank account on CustomerReceipt.php. Match the page_title_text with the MainMenuLinksArray option for Bank Account Payments Entry and Bank Account Receipts Entry. Regroup the General Ledger Transactions menu.
 30/10/2013 Exson: Add required attribute for Z_MakeNewCompany.php to avoid file void error and make it more user friendly.
 30/10/2013: Exson modify the locstock table change the bin to NULL to avoid stick sql standard constraint failed for those items without bin.