Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6377] trunk
|
From: <rc...@us...> - 2013-10-30 16:11:27
|
Revision: 6377
http://sourceforge.net/p/web-erp/reponame/6377
Author: rchacon
Date: 2013-10-30 16:11:22 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/Payments.php
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/CustomerReceipt.php 2013-10-30 16:11:22 UTC (rev 6377)
@@ -147,8 +147,7 @@
$SuggestedExRate = $TableExRate/$SuggestedFunctionalExRate;
}
-
-
+ $_SESSION['ReceiptBatch']->BankTransRef = $_POST['BankTransRef'];
$_SESSION['ReceiptBatch']->Narrative = $_POST['BatchNarrative'];
} elseif (isset($_GET['Delete'])) {
@@ -463,7 +462,7 @@
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
'" . $_SESSION['ReceiptBatch']->Account . "',
- '" . $_SESSION['ReceiptBatch']->Narrative . "',
+ '" . $_SESSION['ReceiptBatch']->BankTransRef . "',
'" . $_SESSION['ReceiptBatch']->ExRate . "',
'" . $_SESSION['ReceiptBatch']->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
@@ -758,7 +757,7 @@
$AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
if (isset($_POST['GLEntry'])) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('General Ledger Receipt Entry') . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Receipts Entry') . '" alt="" />' . ' ' . _('Bank Account Receipts Entry') . '</p>';
} else {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('Enter Customer Receipt') . '</p>';
echo '<div class="page_help_text">' . _('To enter a payment TO a customer (ie. to pay out a credit note), enter a negative payment amount.') . '</div>';
@@ -873,7 +872,8 @@
<td><select tabindex="6" name="ReceiptType">';
include('includes/GetPaymentMethods.php');
-/* The array ReceiptTypes is defined from the setup tab of the main menu under payment methods - the array is populated from the include file GetPaymentMethods.php */
+/* The array ReceiptTypes is defined from the setup tab of the main menu under
+payment methods - the array is populated from the include file GetPaymentMethods.php */
foreach ($ReceiptTypes as $RcptType) {
if (isset($_POST['ReceiptType']) and $_POST['ReceiptType']==$RcptType){
@@ -884,6 +884,17 @@
}
echo '</select></td>
</tr>';
+
+/* Receipt (Bank Account) info to be inserted on banktrans.ref, varchar(50). */
+if (!isset($_SESSION['ReceiptBatch']->BankTransRef)) {
+ $_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>
+ </tr>';
+
+/* Receipt (Bank Account) info to be inserted on gltrans.narrative, varchar(200). */
if (!isset($_SESSION['ReceiptBatch']->Narrative)) {
$_SESSION['ReceiptBatch']->Narrative='';
}
@@ -892,13 +903,13 @@
}
echo '<tr>
<td>' . _('Narrative') . ':</td>
- <td><input tabindex="7" type="text" name="BatchNarrative" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->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>
</tr>
<input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'] . '" />
<tr>
<td colspan="3">
<div class="centre">
- <input tabindex="8" type="submit" name="BatchInput" value="' . _('Accept') . '" />
+ <input tabindex="9" type="submit" name="BatchInput" value="' . _('Accept') . '" />
</div>
</td>
</tr>
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/Payments.php 2013-10-30 16:11:22 UTC (rev 6377)
@@ -52,8 +52,8 @@
}
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Payment Entry')
-. '" alt="" />' . ' ' . _('Payment Entry') . '
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Payments Entry')
+. '" alt="" />' . ' ' . _('Bank Account Payments Entry') . '
</p>';
echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account. <br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div>
<br />';
@@ -919,7 +919,7 @@
}
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>
+ <td colspan="2"><input type="text" name="BankTransRef" maxlength="50" size="52" value="' . stripslashes($_POST['BankTransRef'] ) . '" /> ' . _('Reference on Bank Transactions Inquiry') . '</td>
</tr>';
if (!isset($_POST['Narrative'])) { // Payment (Bank Account) info to be inserted on gltrans.narrative, varchar(200).
@@ -927,7 +927,7 @@
}
echo '<tr>
<td>' . _('Narrative') . ':</td>
- <td colspan="2"><input type="text" name="Narrative" maxlength="80" size="82" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('Narrative on GL Trans') . '</td>
+ <td colspan="2"><input type="text" name="Narrative" maxlength="200" size="52" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('Narrative on General Ledger Account Inquiry') . '</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>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/doc/Change.log 2013-10-30 16:11:22 UTC (rev 6377)
@@ -1,4 +1,5 @@
webERP Change Log
+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.
30/10/2013 Exson: Modify the the insert new stocks event to transaction.
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/includes/MainMenuLinksArray.php 2013-10-30 16:11:22 UTC (rev 6377)
@@ -327,16 +327,16 @@
$MenuItems['GL']['Transactions']['Caption'] = array( _('Bank Account Payments Entry'),
_('Bank Account Receipts Entry'),
_('Import Bank Transactions'),
- _('Journal Entry'),
_('Bank Account Payments Matching'),
- _('Bank Account Receipts Matching'));
+ _('Bank Account Receipts Matching'),
+ _('Journal Entry'));
$MenuItems['GL']['Transactions']['URL'] = array('/Payments.php?NewPayment=Yes',
'/CustomerReceipt.php?NewReceipt=Yes&Type=GL',
'/ImportBankTrans.php',
- '/GLJournal.php?NewJournal=Yes',
'/BankMatching.php?Type=Payments',
- '/BankMatching.php?Type=Receipts');
+ '/BankMatching.php?Type=Receipts',
+ '/GLJournal.php?NewJournal=Yes');
$MenuItems['GL']['Reports']['Caption'] = array( _('Trial Balance'),
_('Account Inquiry'),
|
