Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6368] trunk
|
From: <rc...@us...> - 2013-10-26 17:25:42
|
Revision: 6368
http://sourceforge.net/p/web-erp/reponame/6368
Author: rchacon
Date: 2013-10-26 17:25:40 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
Allows to separate register of Payment (Bank Account) info to be inserted on banktrans.ref and on gltrans.narrative. Translation adjustements.
Modified Paths:
--------------
trunk/Payments.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-10-25 03:36:42 UTC (rev 6367)
+++ trunk/Payments.php 2013-10-26 17:25:40 UTC (rev 6368)
@@ -206,7 +206,9 @@
}
-
+if (isset($_POST['BankTransRef']) AND $_POST['BankTransRef']!=''){ // Reference on Bank Transactions Inquiry
+ $_SESSION['PaymentDetail' . $identifier]->BankTransRef=$_POST['BankTransRef'];
+}
if (isset($_POST['Narrative']) AND $_POST['Narrative']!=''){
$_SESSION['PaymentDetail' . $identifier]->Narrative=$_POST['Narrative'];
}
@@ -570,7 +572,7 @@
VALUES ('" . $TransNo . "',
'" . $TransType . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "',
+ '" . $_SESSION['PaymentDetail' . $identifier]->BankTransRef . "',
'" . $_SESSION['PaymentDetail' . $identifier]->ExRate . "',
'" . $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
@@ -597,7 +599,7 @@
VALUES ('" . $TransNo . "',
'" . $TransType . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "',
+ '" . $_SESSION['PaymentDetail' . $identifier]->BankTransRef . "',
'" . $_SESSION['PaymentDetail' . $identifier]->ExRate . "',
'" . $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
@@ -907,19 +909,25 @@
if (!isset($_POST['ChequeNum'])) {
$_POST['ChequeNum']='';
}
-
echo '<tr>
<td>' . _('Cheque Number') . ':</td>
<td><input type="text" name="ChequeNum" maxlength="8" size="10" value="' . $_POST['ChequeNum'] . '" /> ' . _('(if using pre-printed stationery)') . '</td>
</tr>';
-if (!isset($_POST['Narrative'])) {
+if (!isset($_POST['BankTransRef'])) { // Payment (Bank Account) info to be inserted on banktrans.ref, varchar(50).
+ $_POST['BankTransRef']='';
+}
+echo '<tr>
+ <td>' . _('Reference') . ':</td>
+ <td colspan="2"><input type="text" name="BankTransRef" maxlength="50" size="52" value="' . stripslashes($_POST['BankTransRef'] ) . '" /> ' . _('Reference on Bank Transactions Inquiry (Max. length 50 characters)') . '</td>
+ </tr>';
+
+if (!isset($_POST['Narrative'])) { // Payment (Bank Account) info to be inserted on gltrans.narrative, varchar(200).
$_POST['Narrative']='';
}
-
echo '<tr>
- <td>' . _('Reference / Narrative') . ':</td>
- <td colspan="2"><input type="text" name="Narrative" maxlength="80" size="82" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('(Max. length 80 characters)') . '</td>
+ <td>' . _('Narrative') . ':</td>
+ <td colspan="2"><input type="text" name="Narrative" maxlength="80" size="82" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('Narrative on GL Trans') . '</td>
</tr>
<td><input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'].'" /></td>
<td colspan="3"><div class="centre"><input type="submit" name="UpdateHeader" value="' . _('Update'). '" /></div></td>
@@ -1035,7 +1043,7 @@
<td><input type="text" name="Cheque" maxlength="12" size="12" /></td>
</tr>';
- if (isset($_POST['GLNarrative'])) {
+ if (isset($_POST['GLNarrative'])) { // General Ledger Payment (Different than Bank Account) info to be inserted on gltrans.narrative, varchar(200).
echo '<tr>
<td>' . _('GL Narrative') . ':</td>
<td><input type="text" name="GLNarrative" maxlength="50" size="52" value="' . stripslashes($_POST['GLNarrative']) . '" /></td>
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 2013-10-25 03:36:42 UTC (rev 6367)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-10-26 17:25:40 UTC (rev 6368)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-10-22 09:03-0600\n"
+"PO-Revision-Date: 2013-10-26 11:04-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1689,7 +1689,7 @@
#: CustomerReceipt.php:769 DailyBankTransactions.php:37 Payments.php:774
#: PDFChequeListing.php:46 TaxAuthorities.php:151 TaxAuthorities.php:318
msgid "Bank Account"
-msgstr "Cuenta Bancaria"
+msgstr "Cuenta bancaria"
#: BankMatching.php:127 ShopParameters.php:298 ShopParameters.php:302
msgid "Show"
@@ -1843,7 +1843,7 @@
#: includes/PDFGLJournalHeader.inc:22 ../webSHOP/CreditCardPayFlowPro.php:276
#: ../webSHOP/CreditCardPayPalPro.php:338
msgid "Amount"
-msgstr "Importe"
+msgstr "Monto"
#: BankMatching.php:280 BankReconciliation.php:217 BankReconciliation.php:294
#: PDFOrdersInvoiced.php:361 PDFOrderStatus.php:332
@@ -5787,7 +5787,7 @@
#: includes/PDFTransPageHeaderPortrait.inc:212
#: includes/PO_PDFOrderPageHeader.inc:71
msgid "All amounts stated in"
-msgstr "Todos los precios se muestran en"
+msgstr "Todos los montos en"
#: Contracts.php:840 SelectContract.php:31 SelectContract.php:41
#: SuppContractChgs.php:132
@@ -6105,7 +6105,7 @@
#: CounterReturns.php:197 CounterSales.php:227
msgid "all amounts in"
-msgstr "todas las cantidades en"
+msgstr "todos los montos en"
#: CounterReturns.php:204 CounterSales.php:234
msgid "Item description has been used in search"
@@ -8992,7 +8992,7 @@
#: GLAccountReport.php:269 Payments.php:935 StockAdjustments.php:477
#: SuppTransGLAnalysis.php:168
msgid "Select Tag"
-msgstr "Seleccionar Centro de Costo"
+msgstr "Seleccione centro de costo"
#: CustomerReceipt.php:1051 GLBudgets.php:52 Payments.php:1017
msgid "No General ledger accounts have been set up yet"
@@ -13430,7 +13430,7 @@
#: GLBudgets.php:40 GLJournal.php:296 Payments.php:1011
msgid "Select GL Account"
-msgstr "Seleccionar cuenta contable"
+msgstr "Seleccione cuenta contable"
#: GLBudgets.php:52
msgid "budgets cannot be allocated until the GL accounts are set up"
@@ -13835,7 +13835,7 @@
#: GLTagProfit_Loss.php:97
msgid "Select tag"
-msgstr "Seleccionar Centro de Costo"
+msgstr "Seleccione centro de costo"
#: GLTagProfit_Loss.php:128
msgid "Show Statement of Income and Expenditure"
@@ -18125,7 +18125,7 @@
#: Payments.php:807
msgid "Currency of Payment"
-msgstr "Moneda del Pago"
+msgstr "Moneda de pago"
#: Payments.php:815
msgid ""
@@ -18184,7 +18184,7 @@
#: Payments.php:959 Payments.php:964
msgid "Enter GL Account Manually"
-msgstr "Introduzca Manualmente la Cuenta Contable"
+msgstr "Introduzca manualmente la cuenta contable"
#: Payments.php:960 Payments.php:965
#, fuzzy
@@ -18198,7 +18198,7 @@
#: Payments.php:970
msgid "Select GL Group"
-msgstr "Seleccionar un Grupo de Cuentas Contables"
+msgstr "Seleccione grupo contable"
#: Payments.php:981
msgid "No General ledger account groups have been set up yet"
@@ -30981,9 +30981,8 @@
msgstr "Las cantidad debe ser numérica"
#: SuppContractChgs.php:165
-#, fuzzy
msgid "Non zero amount"
-msgstr "Importe Neto"
+msgstr "Monto no nulo"
#: SuppContractChgs.php:172
#, fuzzy
@@ -31231,9 +31230,8 @@
msgstr "Seleccionar de la lista"
#: SuppFixedAssetChgs.php:154 SuppTransGLAnalysis.php:220
-#, fuzzy
msgid "The amount must be numeric and cannot be zero"
-msgstr "La cantidad no puede ser cero"
+msgstr "El monto debe ser numérico y no puede ser cero"
#: SuppFixedAssetChgs.php:160
msgid "Enter Fixed Asset"
@@ -44074,7 +44072,7 @@
#: includes/PDFCustTransListingPageHeader.inc:53
#: includes/PDFSuppTransListingPageHeader.inc:53
msgid "Total Amount"
-msgstr "Monto Total"
+msgstr "Monto total"
#: includes/PDFDebtorBalsPageHeader.inc:17
msgid "Customer Balances For Customers between"
@@ -47710,6 +47708,8 @@
#: ../webSHOP/Checkout.php:607
msgid "Please deposit the amount due (in full) to our bank account."
msgstr ""
+"Por favor deposite el monto adeudado (en su totalidad) en nuestra cuenta "
+"bancaria."
#: ../webSHOP/Checkout.php:610
msgid ""
|
