Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7709] trunk
|
From: <rc...@us...> - 2016-12-20 15:57:13
|
Revision: 7709
http://sourceforge.net/p/web-erp/reponame/7709
Author: rchacon
Date: 2016-12-20 15:57:10 +0000 (Tue, 20 Dec 2016)
Log Message:
-----------
Standardise to "Print" button.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/BOMs.php
trunk/CustWhereAlloc.php
trunk/DailyBankTransactions.php
trunk/GLAccountUsers.php
trunk/GLBalanceSheet.php
trunk/GLProfit_Loss.php
trunk/GLTrialBalance.php
trunk/SuppWhereAlloc.php
trunk/UserGLAccounts.php
trunk/doc/Change.log
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/AnalysisHorizontalIncome.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -512,10 +512,10 @@
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
'<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
'<input type="hidden" name="FromPeriod" value="', $_POST['FromPeriod'], '" />',
- '<input type="hidden" name="ToPeriod" value="', $_POST['ToPeriod'], '" />', // Form buttons:
- '<div class="centre noprint">',
+ '<input type="hidden" name="ToPeriod" value="', $_POST['ToPeriod'], '" />',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/AnalysisHorizontalPosition.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -352,10 +352,10 @@
echo '<br />',
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
'<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
- '<input type="hidden" name="BalancePeriodEnd" value="', $_POST['BalancePeriodEnd'], '" />', // Form buttons:
- '<div class="centre noprint">',
+ '<input type="hidden" name="BalancePeriodEnd" value="', $_POST['BalancePeriodEnd'], '" />',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/BOMs.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -914,10 +914,9 @@
<br />
<div class="centre noprint">
<input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
- <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/printer.png" /> ' .
- _('Print This') . '</button>
- </div>
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '</div>
</div>
</form>';
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/CustWhereAlloc.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -194,11 +194,9 @@
echo '</form>';
if(isset($Printer)) {
echo '<div class="centre noprint">
- <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/printer.png" /> ' .
- _('Print This') . '
- </button>
- </div>';// "Print This" button.
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '</div>';// "Print This" button.
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/DailyBankTransactions.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -246,10 +246,9 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<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.
+ <div class="centre noprint">', // Form buttons:
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" 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.
Modified: trunk/GLAccountUsers.php
===================================================================
--- trunk/GLAccountUsers.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLAccountUsers.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -242,10 +242,10 @@
</tr>
</table>';
DB_free_result($Result);
- echo '<br>', // Form buttons:
- '<div class="centre noprint">',
+ echo '<br>',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button formaction="GLAccountUsers.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different GL account'), '</button>'; // "Select A Different GL account" button.
}
@@ -255,4 +255,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLBalanceSheet.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -711,9 +711,9 @@
echo '</table>';
echo '</div>';// div id="Report".
echo '<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.
+ <div class="centre noprint">', // Form buttons:
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Balance Date') . '</button>'.// "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLProfit_Loss.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -1307,10 +1307,10 @@
/* echo '</tbody>';// See comment at the begin of the table.*/
echo '</table>';
echo '</div>';// div id="Report".
- echo '<br />', // Form buttons:
- '<div class="centre noprint">',
+ echo '<br />',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
@@ -1320,4 +1320,4 @@
echo '</div>';// div class=?
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLTrialBalance.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -731,9 +731,9 @@
echo '</table><br />';
- echo '<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.
+ echo '<div class="centre noprint">', // Form buttons:
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Period') . '</button>'.// "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
Modified: trunk/SuppWhereAlloc.php
===================================================================
--- trunk/SuppWhereAlloc.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/SuppWhereAlloc.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -2,130 +2,130 @@
/* $Id: SuppWhereAlloc.php 7449 2016-01-14 10:08:51Z exsonqu $*/
/* Suppliers Where allocated */
-include('includes/session.inc');
-$Title = _('Supplier How Paid Inquiry');
-$ViewTopic = 'APInquiries';
+include('includes/session.inc');
+$Title = _('Supplier How Paid Inquiry');
+$ViewTopic = 'APInquiries';
$BookMark = 'WhereAllocated';
include('includes/header.inc');
-
-if(isset($_GET['TransNo']) AND isset($_GET['TransType'])) {
- $_POST['TransNo'] = (int)$_GET['TransNo'];
- $_POST['TransType'] = (int)$_GET['TransType'];
- $_POST['ShowResults'] = true;
-}
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
+
+if(isset($_GET['TransNo']) AND isset($_GET['TransType'])) {
+ $_POST['TransNo'] = (int)$_GET['TransNo'];
+ $_POST['TransType'] = (int)$_GET['TransType'];
+ $_POST['ShowResults'] = true;
+}
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<p class="page_title_text noprint"><img alt="" src="'. $RootPath. '/css/'. $Theme.
'/images/money_add.png" title="',// Icon image.
_('Supplier Where Allocated'), '" /> ',// Icon title.
$Title. '</p>',// Page title.
- '<table class="selection noprint">
- <tr>
- <td>' . _('Type') . ':</td>
- <td><select tabindex="1" name="TransType"> ';
-
-if(!isset($_POST['TransType'])) {
- $_POST['TransType']='20';
-}
-if($_POST['TransType']==20) {
- echo '<option selected="selected" value="20">' . _('Purchase Invoice') . '</option>
- <option value="22">' . _('Payment') . '</option>
- <option value="21">' . _('Debit Note') . '</option>';
-} elseif($_POST['TransType'] == 22) {
- echo '<option selected="selected" value="22">' . _('Payment') . '</option>
- <option value="20">' . _('Purchase Invoice') . '</option>
- <option value="21">' . _('Debit Note') . '</option>';
-} elseif($_POST['TransType'] == 21) {
- echo '<option selected="selected" value="21">' . _('Debit Note') . '</option>
- <option value="20">' . _('Purchase Invoice') . '</option>
- <option value="22">' . _('Payment') . '</option>';
-}
-
-echo '</select></td>';
-
-if(!isset($_POST['TransNo'])) {$_POST['TransNo']='';}
-echo '<td>' . _('Transaction Number').':</td>
- <td><input tabindex="2" type="text" class="number" name="TransNo" required="required" maxlength="20" size="20" value="'. $_POST['TransNo'] . '" /></td>
- </tr>
- </table>
- <br />
- <div class="centre noprint">
- <input tabindex="3" type="submit" name="ShowResults" value="' . _('Show How Allocated') . '" />
- </div>';
-
-if(isset($_POST['ShowResults']) AND $_POST['TransNo']=='') {
- echo '<br />';
- prnMsg(_('The transaction number to be queried must be entered first'),'warn');
-}
-
-if(isset($_POST['ShowResults']) AND $_POST['TransNo']!='') {
-
-/*First off get the DebtorTransID of the transaction (invoice normally) selected */
- $sql = "SELECT supptrans.id,
- ovamount+ovgst AS totamt,
- currencies.decimalplaces AS currdecimalplaces,
- suppliers.currcode
- FROM supptrans INNER JOIN suppliers
- ON supptrans.supplierno=suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE type='" . $_POST['TransType'] . "'
- AND transno = '" . $_POST['TransNo']."'";
-
- if($_SESSION['SalesmanLogin'] != '') {
- $sql .= " AND supptrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
- }
- $result = DB_query($sql);
-
- if(DB_num_rows($result) > 0) {
- $myrow = DB_fetch_array($result);
- $AllocToID = $myrow['id'];
- $CurrCode = $myrow['currcode'];
- $CurrDecimalPlaces = $myrow['currdecimalplaces'];
- $sql = "SELECT type,
- transno,
- trandate,
- supptrans.supplierno,
- suppreference,
- supptrans.rate,
- ovamount+ovgst as totalamt,
- suppallocs.amt
- FROM supptrans
- INNER JOIN suppallocs ";
- if($_POST['TransType']==22 OR $_POST['TransType'] == 21) {
-
- $TitleInfo = ($_POST['TransType'] == 22)?_('Payment'):_('Debit Note');
- $sql .= "ON supptrans.id = suppallocs.transid_allocto
- WHERE suppallocs.transid_allocfrom = '" . $AllocToID . "'";
- } else {
- $TitleInfo = _('invoice');
- $sql .= "ON supptrans.id = suppallocs.transid_allocfrom
- WHERE suppallocs.transid_allocto = '" . $AllocToID . "'";
- }
- $sql .= " ORDER BY transno ";
-
- $ErrMsg = _('The customer transactions for the selected criteria could not be retrieved because');
- $TransResult = DB_query($sql, $ErrMsg);
-
- if(DB_num_rows($TransResult)==0) {
-
- if($myrow['totamt']>0 AND ($_POST['TransType']==22 OR $_POST['TransType'] == 21)) {
- prnMsg(_('This transaction was a receipt of funds and there can be no allocations of receipts or credits to a receipt. This inquiry is meant to be used to see how a payment which is entered as a negative receipt is settled against credit notes or receipts'),'info');
- } else {
- prnMsg(_('There are no allocations made against this transaction'),'info');
- }
- } else {
+ '<table class="selection noprint">
+ <tr>
+ <td>' . _('Type') . ':</td>
+ <td><select tabindex="1" name="TransType"> ';
+
+if(!isset($_POST['TransType'])) {
+ $_POST['TransType']='20';
+}
+if($_POST['TransType']==20) {
+ echo '<option selected="selected" value="20">' . _('Purchase Invoice') . '</option>
+ <option value="22">' . _('Payment') . '</option>
+ <option value="21">' . _('Debit Note') . '</option>';
+} elseif($_POST['TransType'] == 22) {
+ echo '<option selected="selected" value="22">' . _('Payment') . '</option>
+ <option value="20">' . _('Purchase Invoice') . '</option>
+ <option value="21">' . _('Debit Note') . '</option>';
+} elseif($_POST['TransType'] == 21) {
+ echo '<option selected="selected" value="21">' . _('Debit Note') . '</option>
+ <option value="20">' . _('Purchase Invoice') . '</option>
+ <option value="22">' . _('Payment') . '</option>';
+}
+
+echo '</select></td>';
+
+if(!isset($_POST['TransNo'])) {$_POST['TransNo']='';}
+echo '<td>' . _('Transaction Number').':</td>
+ <td><input tabindex="2" type="text" class="number" name="TransNo" required="required" maxlength="20" size="20" value="'. $_POST['TransNo'] . '" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre noprint">
+ <input tabindex="3" type="submit" name="ShowResults" value="' . _('Show How Allocated') . '" />
+ </div>';
+
+if(isset($_POST['ShowResults']) AND $_POST['TransNo']=='') {
+ echo '<br />';
+ prnMsg(_('The transaction number to be queried must be entered first'),'warn');
+}
+
+if(isset($_POST['ShowResults']) AND $_POST['TransNo']!='') {
+
+/*First off get the DebtorTransID of the transaction (invoice normally) selected */
+ $sql = "SELECT supptrans.id,
+ ovamount+ovgst AS totamt,
+ currencies.decimalplaces AS currdecimalplaces,
+ suppliers.currcode
+ FROM supptrans INNER JOIN suppliers
+ ON supptrans.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE type='" . $_POST['TransType'] . "'
+ AND transno = '" . $_POST['TransNo']."'";
+
+ if($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND supptrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+ $result = DB_query($sql);
+
+ if(DB_num_rows($result) > 0) {
+ $myrow = DB_fetch_array($result);
+ $AllocToID = $myrow['id'];
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ $sql = "SELECT type,
+ transno,
+ trandate,
+ supptrans.supplierno,
+ suppreference,
+ supptrans.rate,
+ ovamount+ovgst as totalamt,
+ suppallocs.amt
+ FROM supptrans
+ INNER JOIN suppallocs ";
+ if($_POST['TransType']==22 OR $_POST['TransType'] == 21) {
+
+ $TitleInfo = ($_POST['TransType'] == 22)?_('Payment'):_('Debit Note');
+ $sql .= "ON supptrans.id = suppallocs.transid_allocto
+ WHERE suppallocs.transid_allocfrom = '" . $AllocToID . "'";
+ } else {
+ $TitleInfo = _('invoice');
+ $sql .= "ON supptrans.id = suppallocs.transid_allocfrom
+ WHERE suppallocs.transid_allocto = '" . $AllocToID . "'";
+ }
+ $sql .= " ORDER BY transno ";
+
+ $ErrMsg = _('The customer transactions for the selected criteria could not be retrieved because');
+ $TransResult = DB_query($sql, $ErrMsg);
+
+ if(DB_num_rows($TransResult)==0) {
+
+ if($myrow['totamt']>0 AND ($_POST['TransType']==22 OR $_POST['TransType'] == 21)) {
+ prnMsg(_('This transaction was a receipt of funds and there can be no allocations of receipts or credits to a receipt. This inquiry is meant to be used to see how a payment which is entered as a negative receipt is settled against credit notes or receipts'),'info');
+ } else {
+ prnMsg(_('There are no allocations made against this transaction'),'info');
+ }
+ } else {
$Printer = true;
echo '<br />
<div id="Report">
<table class="selection">
<thead>
<tr>
- <th class="centre" colspan="7">
- <b>' . _('Allocations made against') . ' ' . $TitleInfo . ' ' . _('number') . ' ' . $_POST['TransNo'] . '<br />' . _('Transaction Total').': '. locale_number_format($myrow['totamt'],$CurrDecimalPlaces) . ' ' . $CurrCode . '</b>
- </th>
+ <th class="centre" colspan="7">
+ <b>' . _('Allocations made against') . ' ' . $TitleInfo . ' ' . _('number') . ' ' . $_POST['TransNo'] . '<br />' . _('Transaction Total').': '. locale_number_format($myrow['totamt'],$CurrDecimalPlaces) . ' ' . $CurrCode . '</b>
+ </th>
</tr>';
$TableHeader = '<tr>
@@ -139,64 +139,62 @@
</tr>';
echo $TableHeader,
'</thead>
- <tbody>';
-
- $RowCounter = 1;
- $k = 0; //row colour counter
- $AllocsTotal = 0;
-
- while($myrow=DB_fetch_array($TransResult)) {
- if($k==1) {
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
-
- if($myrow['type']==21) {
- $TransType = _('Debit Note');
- } elseif($myrow['type'] == 20) {
- $TransType = _('Purchase Invoice');
- } else {
- $TransType = _('Payment');
+ <tbody>';
+
+ $RowCounter = 1;
+ $k = 0; //row colour counter
+ $AllocsTotal = 0;
+
+ while($myrow=DB_fetch_array($TransResult)) {
+ if($k==1) {
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
}
+
+ if($myrow['type']==21) {
+ $TransType = _('Debit Note');
+ } elseif($myrow['type'] == 20) {
+ $TransType = _('Purchase Invoice');
+ } else {
+ $TransType = _('Payment');
+ }
echo ' <td class="centre">', ConvertSQLDate($myrow['trandate']), '</td>
<td class="text">' . $TransType . '</td>
<td class="number">' . $myrow['transno'] . '</td>
<td class="text">' . $myrow['suppreference'] . '</td>
<td class="number">' . $myrow['rate'] . '</td>
- <td class="number">' . locale_number_format($myrow['totalamt'], $CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format($myrow['amt'], $CurrDecimalPlaces) . '</td>
- </tr>';
-
- $RowCounter++;
- if($RowCounter == 22) {
- $RowCounter=1;
- echo $TableHeader;
- }
- //end of page full new headings if
- $AllocsTotal += $myrow['amt'];
- }
- //end of while loop
- echo '<tr>
- <td class="number" colspan="6">' . _('Total allocated') . '</td>
- <td class="number">' . locale_number_format($AllocsTotal, $CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['totalamt'], $CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['amt'], $CurrDecimalPlaces) . '</td>
+ </tr>';
+
+ $RowCounter++;
+ if($RowCounter == 22) {
+ $RowCounter=1;
+ echo $TableHeader;
+ }
+ //end of page full new headings if
+ $AllocsTotal += $myrow['amt'];
+ }
+ //end of while loop
+ echo '<tr>
+ <td class="number" colspan="6">' . _('Total allocated') . '</td>
+ <td class="number">' . locale_number_format($AllocsTotal, $CurrDecimalPlaces) . '</td>
</tr>
</tbody></table>
- </div>';
- } // end if there are allocations against the transaction
- } //got the ID of the transaction to find allocations for
-}
-echo '</div>';
-echo '</form>';
-if(isset($Printer)) {
- echo '<div class="centre noprint">
- <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/printer.png" /> ' .
- _('Print This') . '
- </button>
- </div>';// "Print This" button.
-}
-include('includes/footer.inc');
-?>
\ No newline at end of file
+ </div>';
+ } // end if there are allocations against the transaction
+ } //got the ID of the transaction to find allocations for
+}
+echo '</div>';
+echo '</form>';
+if(isset($Printer)) {
+ echo '<div class="centre noprint">
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '</div>';
+}
+include('includes/footer.inc');
+?>
Modified: trunk/UserGLAccounts.php
===================================================================
--- trunk/UserGLAccounts.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/UserGLAccounts.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -248,10 +248,10 @@
</tr>
</table>';
DB_free_result($Result);
- echo '<br>', // Form buttons:
- '<div class="centre noprint">',
+ echo '<br>',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button formaction="UserGLAccounts.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/user.png" /> ', _('Select A Different User'), '</button>'; // "Select A Different User" button.
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/doc/Change.log 2016-12-20 15:57:10 UTC (rev 7709)
@@ -1,5 +1,6 @@
webERP Change Log
+20/12/16 RChacon: Standardise to "Print" button.
20/12/16 RChacon: Add a report of purchases to suppliers for the range of selected dates.
11/12/16 PaulT: Dashboard.php: Correct table closure. When there are no outstanding orders, causes footer artifact.
08/12/16 Exson: Fixed the variable error in stock take pdf header in includes/PDFStockCheckPageHeader.inc. And fixed undefined noise in Payments.php. Reported by shane.
|
