Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7212] trunk
|
From: <rc...@us...> - 2015-03-09 04:20:19
|
Revision: 7212
http://sourceforge.net/p/web-erp/reponame/7212
Author: rchacon
Date: 2015-03-09 04:20:16 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
Modified Paths:
--------------
trunk/DailyBankTransactions.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/print.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/css/xenos/default.css
trunk/doc/Change.log
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/DailyBankTransactions.php 2015-03-09 04:20:16 UTC (rev 7212)
@@ -1,24 +1,14 @@
<?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. */
+/* $Id: DailyBankTransactions.php 4556 2011-04-26 11:03:36Z daintree $*/
+/* 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 = _('Daily Bank Transactions');// Screen identificator.
+$Title = _('Daily Bank Transactions');// Screen identification.
$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.
if (!isset($_POST['Show'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- echo '<table class="selection">';
-
$SQL = "SELECT bankaccountname,
bankaccounts.accountcode,
bankaccounts.currcode
@@ -33,6 +23,16 @@
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
$AccountsResults = DB_query($SQL,$ErrMsg,$DbgMsg);
+ echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .// Icon image.
+ _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
+ _('Bank Transactions Inquiry') . '</p>';// Page title.
+
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ echo '<table class="selection">';
echo '<tr>
<td>' . _('Bank Account') . ':</td>
<td><select name="BankAccount">';
@@ -68,11 +68,11 @@
</tr>
<tr>
<td>' . _('Show Transactions') . '</td>
- <td><select name="ShowType">
- <option value="All">' . _('All') . '</option>
- <option value="Unmatched">' . _('Unmatched') . '</option>
- <option value="Matched">' . _('Matched') . '</option>
- </select></td>
+ <td><select name="ShowType">
+ <option value="All">' . _('All') . '</option>
+ <option value="Unmatched">' . _('Unmatched') . '</option>
+ <option value="Matched">' . _('Matched') . '</option>
+ </select></td>
</tr>
</table>
<br />
@@ -91,7 +91,6 @@
WHERE bankaccounts.accountcode='" . $_POST['BankAccount'] . "'";
$BankResult = DB_query($SQL,_('Could not retrieve the bank account details'));
-
$sql="SELECT banktrans.currcode,
banktrans.amount,
banktrans.amountcleared,
@@ -112,28 +111,38 @@
WHERE bankact='".$_POST['BankAccount']."'
AND transdate>='" . FormatDateForSQL($_POST['FromTransDate']) . "'
AND transdate<='" . FormatDateForSQL($_POST['ToTransDate']) . "'
- ORDER BY banktrans.transdate";
+ ORDER BY banktrans.transdate ASC, banktrans.banktransid ASC";
$result = DB_query($sql);
+
if (DB_num_rows($result)==0) {
+ echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .// Icon image.
+ _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
+ _('Bank Transactions Inquiry') . '</p>';// Page title.
prnMsg(_('There are no transactions for this account in the date range selected'), 'info');
} else {
$BankDetailRow = DB_fetch_array($BankResult);
+ echo '<div id="Report">';// Division to identify the report block.
+ echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .// Icon image.
+ _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
+ _('Account Transactions For').'<br />'.$BankDetailRow['bankaccountname'].'<br />'.
+ _('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</p>';// Page title.*/
echo '<table class="selection">
+ <thead>
<tr>
- <th colspan="10"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th>
+ <th>' . ('Date') . '</th>
+ <th class="text">' . _('Transaction type') . '</th>
+ <th class="number">' . _('Number') . '</th>
+ <th class="text">' . _('Type') . '</th>
+ <th class="text">' . _('Reference') . '</th>
+ <th class="number">' . _('Amount in').' '.$BankDetailRow['currcode'] . '</th>
+ <th class="number">' . _('Running Total').' '.$BankDetailRow['currcode'] . '</th>
+ <th class="number">' . _('Amount in').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
+ <th class="number">' . _('Running Total').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
+ <th class="number">' . _('Cleared') . '</th>
</tr>
- <tr>
- <th>' . ('Date') . '</th>
- <th>' . _('Transaction type') . '</th>
- <th>' . _('Number') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Reference') . '</th>
- <th>' . _('Amount in').' '.$BankDetailRow['currcode'] . '</th>
- <th>' . _('Running Total').' '.$BankDetailRow['currcode'] . '</th>
- <th>' . _('Amount in').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
- <th>' . _('Running Total').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
- <th>' . _('Cleared') . '</th>
- </tr>';
+ </thead><tbody>';
$AccountCurrTotal=0;
$LocalCurrTotal =0;
@@ -143,14 +152,14 @@
$AccountCurrTotal += $myrow['amount'];
$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
- if ($myrow['amount']==$myrow['amountcleared']) {
- $Matched=_('Yes');
- } else {
- $Matched=_('No');
- }
+ if ($myrow['amount']==$myrow['amountcleared']) {
+ $Matched=_('Yes');
+ } else {
+ $Matched=_('No');
+ }
echo '<tr>
- <td>' . ConvertSQLDate($myrow['transdate']) . '</td>
+ <td class="centre">' . ConvertSQLDate($myrow['transdate']) . '</td>
<td>' . _($myrow['typename']) . '</td>
<td class="number"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['typeid'] . '&TransNo=' . $myrow['transno'] . '">' . $myrow['transno'] . '</a></td>
<td>' . $myrow['banktranstype'] . '</td>
@@ -162,18 +171,25 @@
<td class="number">' . $Matched . '</td>
</tr>';
}
- echo '</table>';
+ echo '</tbody></table>';
+ echo '</div>';// div id="Report".
} //end if no bank trans in the range to show
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <br />
- <div class="centre">
- <input type="submit" name="Return" value="' . _('Select Another Date'). '" />
- </div>
- </div>
- </form>';
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <br />
+ <div class="centre noprint">'.
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/printer.png" /> ' .
+ _('Print This') . '</button>'.// "Print This" button.
+ '<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/gl.png" /> ' .
+ _('Select Another Date') . '</button>'.// "Select A Different Period" button.
+ '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/previous.png" /> ' .
+ _('Return') . '</button>'.// "Return" button.
+ '</div>
+ </form>';
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/aguapop/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -97,10 +97,16 @@
visibility: visible;
}
th.number {
+ background-color: skyblue;
+ color: white;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: skyblue;
color: white;
+ font-weight: normal;
+ text-align: left;
}
td {
font-family: Arial, Verdana, Helvetica, sans-serif;
@@ -481,12 +487,12 @@
#FooterTimeDiv{
float:right;
margin-top:15px;
-}
-#Report {
- /* Division id for reports. */}
-#Report table {
- /* Body of a report formatted with table tag. */
-}
+}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/default/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -81,10 +81,16 @@
visibility: visible;
}
th.number{
+ background-color:#B06161;
+ color:white;
+ font-weight:normal;
text-align:right;
- font-weight:normal;
+}
+th.text{
background-color:#B06161;
color:white;
+ font-weight:normal;
+ text-align:left;
}
td {
text-align:left;
@@ -457,4 +463,4 @@
.centre {
text-align:center;
/* centre class (general). */
-}
\ No newline at end of file
+}
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/fluid/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -52,11 +52,17 @@
text-align:center;
}
th.number{
- font-weight:normal;
background-color:#cccce5;
color:#330000;
+ font-weight:normal;
text-align:right;
}
+th.text{
+ background-color:#cccce5;
+ color:#330000;
+ font-weight:normal;
+ text-align:left;
+}
th.ascending {
cursor: s-resize;
}
@@ -92,6 +98,9 @@
td.number{
text-align:right;
}
+td.text{
+ text-align:left;
+}
.centre{ /* used */
margin:0 auto;
text-align:center;
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/fresh/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -71,10 +71,16 @@
text-align: center;
}
th.number {
+ background-color: #800000;
+ color: white;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: #800000;
color: white;
+ font-weight: normal;
+ text-align: left;
}
th.ascending {
cursor: s-resize;
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/gel/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -70,10 +70,16 @@
text-align: center;
}
th.number {
+ background-color: #ccc;
+ color: #330000;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: #ccc;
color: #330000;
+ font-weight: normal;
+ text-align: left;
}
th.ascending {
cursor: s-resize;
Modified: trunk/css/print.css
===================================================================
--- trunk/css/print.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/print.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -60,6 +60,11 @@
/* number class (general). */
}
+.text {
+ text-align:left;
+ /* number class (general). */
+}
+
.page_title_text {
font-weight:bold;
font-size: 207%;
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/professional/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -121,11 +121,17 @@
visibility: visible;
}
th.number {
- font-weight: normal;
background-color: #cccce5;
color: #330000;
+ font-weight: normal;
text-align: right;
}
+th.text {
+ background-color: #cccce5;
+ color: #330000;
+ font-weight: normal;
+ text-align: left;
+}
div.error {
background-color:#fddbdb;
color: red;
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/professional-rtl/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -100,12 +100,19 @@
text-align: center;
}
th.number {
- font-weight: normal;
- font-size: 10px;
background-color: #cccce5;
color: #330000;
+ font-size: 10px;
+ font-weight: normal;
text-align: right;
}
+th.text {
+ background-color: #cccce5;
+ color: #330000;
+ font-size: 10px;
+ font-weight: normal;
+ text-align: left;
+}
th.ascending {
cursor: s-resize;
}
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/silverwolf/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -70,13 +70,21 @@
vertical-align:middle;
}
th.number{
- font-weight:normal;
background-color:#cccce5;
+ color:#300;
font-size:100%;
- color:#300;
+ font-weight:normal;
text-align:right;
vertical-align:middle;
}
+th.text{
+ background-color:#cccce5;
+ color:#300;
+ font-size:100%;
+ font-weight:normal;
+ text-align:left;
+ vertical-align:middle;
+}
th.ascending {
cursor: s-resize;
}
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/wood/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -81,10 +81,16 @@
text-align: center;
}
th.number {
+ background-color: #800000;
+ color: white;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: #800000;
color: white;
+ font-weight: normal;
+ text-align: left;
}
th.ascending {
cursor: s-resize;
@@ -571,15 +577,15 @@
#FooterTimeDiv{
float:right;
margin-top:17px;
-}
-#Report {
- /* Division id for reports. */}
-#Report table {
- /* Body of a report formatted with table tag. */
-}
-.centre {
- text-align:center;
- /* centre class (general). */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
+.centre {
+ text-align:center;
+ /* centre class (general). */
+}
/* END */
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/xenos/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -75,10 +75,16 @@
border-bottom:thin solid #B3B3B3;
}
th.number {
+ background-color:#800000;
+ color:white;
+ font-weight:normal;
text-align:right;
- font-weight:normal;
+}
+th.text {
background-color:#800000;
color:white;
+ font-weight:normal;
+ text-align:left;
}
th.ascending {
cursor:s-resize;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/doc/Change.log 2015-03-09 04:20:16 UTC (rev 7212)
@@ -1,5 +1,6 @@
webERP Change Log
+09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
08/03/15 Vitaly: Fit HTML view of invoices to one screen
08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
|
