Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7092] trunk
|
From: <rc...@us...> - 2015-01-22 14:17:13
|
Revision: 7092
http://sourceforge.net/p/web-erp/reponame/7092
Author: rchacon
Date: 2015-01-22 14:17:10 +0000 (Thu, 22 Jan 2015)
Log Message:
-----------
Standardise bank.png, add code comments, complete parameters for calling manual.
Modified Paths:
--------------
trunk/BankAccountUsers.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/DailyBankTransactions.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/BankAccountUsers.php
===================================================================
--- trunk/BankAccountUsers.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankAccountUsers.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,12 +1,18 @@
<?php
+/* $Id: BankAccountUsers.php 6946 2014-10-27 07:30:11Z daintree $*/
+/* This script maintains table bankaccountusers (Authorized users to work with a bank account in webERP). */
include('includes/session.inc');
-$Title = _('Maintenance Of Bank Account Authorised Users');
+$Title = _('Bank Account Users');;// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+/* To do this section in the manual.
+$BookMark = 'BankAccountUsers';// Anchor's id in the manual's html document.*/
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Account Authorised Users') . '" /> ' .// Icon title.
+ _('Maintenance Of Bank Account Authorised Users') . '</p>';// Page title.
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Account Authorised Users')
- . '" alt="" />' . ' ' . $Title . '</p>';
-
if (isset($_POST['SelectedUser'])){
$SelectedUser = mb_strtoupper($_POST['SelectedUser']);
} elseif (isset($_GET['SelectedUser'])){
@@ -137,7 +143,7 @@
$result = DB_query($SQLName);
$myrow = DB_fetch_array($result);
$SelectedBankName = $myrow['bankaccountname'];
-
+
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Authorised users for') . ' ' .$SelectedBankName . ' ' . _('bank account') .'</a></div>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
@@ -229,4 +235,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankAccounts.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,15 +1,17 @@
<?php
-
/* $Id$*/
+/* This script defines the general ledger code for bank accounts and specifies that bank transactions be created for these accounts for the purposes of reconciliation. */
include('includes/session.inc');
-
-$Title = _('Bank Accounts Maintenance');
-$ViewTopic= 'GeneralLedger';
-$BookMark = 'BankAccounts';
+$Title = _('Bank Accounts');// Screen identificator.
+$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'BankAccounts';// Anchor's id in the manual's html document.
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank') . '" /> ' .// Icon title.
+ _('Bank Accounts Maintenance') . '</p>';// Page title.
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to Currency Default or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />';
if (isset($_GET['SelectedBankAccount'])) {
@@ -432,4 +434,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankMatching.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,13 +1,11 @@
<?php
-
/* $Id$*/
+/* This script allows payments and receipts to be matched off against bank statements. */
include('includes/session.inc');
-$Title = _('Bank Account Matching');
-
-$ViewTopic = 'GeneralLedger';
-$BookMark = 'BankMatching';
-
+$Title = _('Bank Matching');// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'BankMatching';// Filename's id in ManualContents.php's TOC.
include('includes/header.inc');
if ((isset($_GET['Type']) AND $_GET['Type']=='Receipts')
@@ -15,18 +13,20 @@
$Type = 'Receipts';
$TypeName =_('Receipts');
- echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . '
- </p>';
+ echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Matching') . '" /> ' .// Icon title.
+ _('Bank Account Matching - Receipts') . '</p>';// Page title.
} elseif ((isset($_GET['Type']) AND $_GET['Type']=='Payments')
OR (isset($_POST['Type']) AND $_POST['Type']=='Payments')) {
$Type = 'Payments';
$TypeName =_('Payments');
- echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . '
- </p>';
+ echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Matching') . '" /> ' .// Icon title.
+ _('Bank Account Matching - Payments') . '</p>';// Page title.
} else {
@@ -353,4 +353,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankReconciliation.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,20 +1,20 @@
<?php
-
/* $Id$*/
+/* This script displays the bank reconciliation for a selected bank account. */
-include ('includes/session.inc');
-
-$Title = _('Bank Reconciliation');
-
-$ViewTopic= 'GeneralLedger';
-$BookMark = 'BankAccounts';
-
+include('includes/session.inc');
+$Title = _('Bank Reconciliation');;// Screen identificator.
+$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'BankAccounts';// Anchor's id in the manual's html document.
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Reconciliation') . '" /> ' .// Icon title.
+ _('Bank Reconciliation') . '</p>';// Page title.
if (isset($_GET['Account'])) {
$_POST['BankAccount']=$_GET['Account'];
@@ -99,8 +99,8 @@
echo '<table class="selection">';
-$SQL = "SELECT bankaccounts.accountcode,
- bankaccounts.bankaccountname
+$SQL = "SELECT bankaccounts.accountcode,
+ bankaccounts.bankaccountname
FROM bankaccounts, bankaccountusers
WHERE bankaccounts.accountcode=bankaccountusers.accountcode
AND bankaccountusers.userid = '" . $_SESSION['UserID'] ."'
@@ -403,4 +403,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/DailyBankTransactions.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,15 +1,17 @@
<?php
/* $Id: DailyBankTransactions.php 4556 2011-04-26 11:03:36Z daintree $ */
+/* This script allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen. */
-include ('includes/session.inc');
-$Title = _('Bank Transactions Inquiry');
-$ViewTopic= 'GeneralLedger';
-$BookMark = 'DailyBankTransactions';
-
+include('includes/session.inc');
+$Title = _('Daily Bank Transactions');// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'DailyBankTransactions';// Anchor's id in the manual's html document.
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
+ _('Bank Transactions Inquiry') . '</p>';// Page title.
-echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/money_add.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p>';
-
if (!isset($_POST['Show'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
echo '<div>';
@@ -21,7 +23,7 @@
bankaccounts.accountcode,
bankaccounts.currcode
FROM bankaccounts,
- chartmaster,
+ chartmaster,
bankaccountusers
WHERE bankaccounts.accountcode=chartmaster.accountcode
AND bankaccounts.accountcode=bankaccountusers.accountcode
@@ -140,7 +142,7 @@
$AccountCurrTotal += $myrow['amount'];
$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
-
+
if ($myrow['amount']==$myrow['amountcleared']) {
$Matched=_('Yes');
} else {
@@ -174,4 +176,4 @@
</form>';
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2015-01-22 14:17:10 UTC (rev 7092)
@@ -183,4 +183,9 @@
ALTER TABLE `suppliercontacts`
ADD CONSTRAINT `suppliercontacts_ibfk_1` FOREIGN KEY (`supplierid`) REFERENCES `suppliers` (`supplierid`);
+
+-- Add a description for the script:
+UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php';
+
+
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
