Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7331] trunk
|
From: <rc...@us...> - 2015-08-02 16:54:28
|
Revision: 7331
http://sourceforge.net/p/web-erp/reponame/7331
Author: rchacon
Date: 2015-08-02 16:54:25 +0000 (Sun, 02 Aug 2015)
Log Message:
-----------
In CustomerReceipt.php, move currency tags near currency ratesand other minor changes.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2015-08-02 14:56:38 UTC (rev 7330)
+++ trunk/CustomerReceipt.php 2015-08-02 16:54:25 UTC (rev 7331)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$ */
+/* Entry of both customer receipts against accounts receivable and also general ledger or nominal receipts */
include('includes/DefineReceiptClass.php');
include('includes/session.inc');
@@ -869,38 +869,36 @@
if (!isset($_SESSION['ReceiptBatch']->FunctionalExRate)){
$_SESSION['ReceiptBatch']->FunctionalExRate=1;
}
-if ($_SESSION['ReceiptBatch']->AccountCurrency!=$_SESSION['ReceiptBatch']->Currency AND isset($_SESSION['ReceiptBatch']->AccountCurrency)){
- if (isset($SuggestedExRate)){
- $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,8) . '</b>';
- } else {
- $SuggestedExRateText ='';
- }
- if ($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)){
+if($_SESSION['ReceiptBatch']->AccountCurrency != $_SESSION['ReceiptBatch']->Currency AND isset($_SESSION['ReceiptBatch']->AccountCurrency)) {
+ if($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)) {
$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
- }elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)){//the user has changed the currency, then we should revise suggested rate
+ } elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)) {//the user has changed the currency, then we should revise suggested rate
$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
}
+
+ if(isset($SuggestedExRate)) {
+ $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['ReceiptBatch']->Currency . '</b>';
+ } else {
+ $SuggestedExRateText = '<b>1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</b>';
+ }
echo '<tr>
- <td>' . _('Receipt Exchange Rate') . ':</td>
- <td><input class="number" maxlength="12" name="ExRate" required="required" size="14" tabindex="4" type="text" value="' . locale_number_format($_SESSION['ReceiptBatch']->ExRate,8) . '" /></td>
- <td>' . $SuggestedExRateText . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the receipt') . '. 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</i></td>
+ <td>', _('Receipt Exchange Rate'), ':</td>
+ <td><input class="number" maxlength="12" name="ExRate" required="required" size="14" tabindex="4" type="text" value="', locale_number_format($_SESSION['ReceiptBatch']->ExRate,8), '" /> ', $SuggestedExRateText, ' <i>', _('The exchange rate between the currency of the bank account currency and the currency of the receipt'), '.</i></td>
</tr>';
}
-if ($_SESSION['ReceiptBatch']->AccountCurrency!=$_SESSION['CompanyRecord']['currencydefault']
- AND isset($_SESSION['ReceiptBatch']->AccountCurrency)){
- if (isset($SuggestedFunctionalExRate)){
- $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedFunctionalExRate,8) . '</b>';
+if($_SESSION['ReceiptBatch']->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['ReceiptBatch']->AccountCurrency)) {
+ if($_SESSION['ReceiptBatch']->FunctionalExRate==1 AND isset($SuggestedFunctionalExRate)) {
+ $_SESSION['ReceiptBatch']->FunctionalExRate = $SuggestedFunctionalExRate;
+ }
+ if(isset($SuggestedFunctionalExRate)) {
+ $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</b>';
} else {
- $SuggestedFunctionalExRateText ='';
+ $SuggestedFunctionalExRateText = '<b>1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</b>';
}
- if ($_SESSION['ReceiptBatch']->FunctionalExRate==1 AND isset($SuggestedFunctionalExRate)){
- $_SESSION['ReceiptBatch']->FunctionalExRate = $SuggestedFunctionalExRate;
- }
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) . '" /></td>
- <td>' . ' ' . $SuggestedFunctionalExRateText . ' <i>' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '. 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</i></td>
+ <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>
</tr>';
}
@@ -927,8 +925,8 @@
$_SESSION['ReceiptBatch']->BankTransRef='';
}
echo '<tr>
- <td>' . _('Reference') . ':</td>
- <td><input tabindex="7" type="text" name="BankTransRef" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->BankTransRef . '" /> ' . _('Reference on Bank Transactions Inquiry') . '</td>
+ <td>', _('Reference'), ':</td>
+ <td><input maxlength="50" name="BankTransRef" size="52" tabindex="7" type="text" value="', $_SESSION['ReceiptBatch']->BankTransRef,'" /> <i>', _('Reference on Bank Transactions Inquiry'), '.</i></td>
</tr>';
/* Receipt (Bank Account) info to be inserted on gltrans.narrative, varchar(200). */
@@ -939,14 +937,14 @@
$_POST['Currency'] = $_SESSION['CompanyRecord']['currencydefault'];
}
echo '<tr>
- <td>' . _('Narrative') . ':</td>
- <td><input tabindex="8" type="text" name="BatchNarrative" maxlength="200" size="52" value="' . $_SESSION['ReceiptBatch']->Narrative . '" /> ' . _('Narrative on General Ledger Account Inquiry') . '</td>
+ <td>', _('Narrative'), ':</td>
+ <td><input maxlength="200" name="BatchNarrative" size="52" tabindex="8" type="text" value="', $_SESSION['ReceiptBatch']->Narrative, '" /> <i>', _('Narrative on General Ledger Account Inquiry'), '.</i></td>
</tr>
- <input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'] . '" />
+ <input name="PreviousCurrency" type="hidden" value="', $_POST['Currency'], '" />
<tr>
<td colspan="3">
<div class="centre">
- <input tabindex="9" type="submit" name="BatchInput" value="' . _('Accept') . '" />
+ <input name="BatchInput" tabindex="9" type="submit" value="', _('Accept'), '" />
</div>
</td>
</tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-02 14:56:38 UTC (rev 7330)
+++ trunk/doc/Change.log 2015-08-02 16:54:25 UTC (rev 7331)
@@ -1,5 +1,6 @@
webERP Change Log
+02/08/15 RChacon: In CustomerReceipt.php, move currency tags near currency ratesand other minor changes.
27/07/15 RChacon: In Payments.php, move currency tags near currency rates.
20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-08-02 14:56:38 UTC (rev 7330)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-08-02 16:54:25 UTC (rev 7331)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-08-02 08:50-0600\n"
+"PO-Revision-Date: 2015-08-02 10:39-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -9750,7 +9750,7 @@
#: CustomerReceipt.php:931 Payments.php:930
msgid "Reference on Bank Transactions Inquiry"
-msgstr "Referencia en la consulta de transacciones bancarias "
+msgstr "Referencia en la consulta de transacciones bancarias"
#: CustomerReceipt.php:943 Payments.php:938
msgid "Narrative on General Ledger Account Inquiry"
@@ -19911,7 +19911,7 @@
#: PcTabs.php:118
msgid " already exists"
-msgstr " already exists"
+msgstr " ya existe"
#: PcTabs.php:166
msgid "The Tab record could not be deleted because"
|
