Merge branch 'master' of github.com:webERP-team/webERP

BankAccountBalances.php

@@ -1,17 +1,17 @@
 <?php
+/* Shows bank accounts authorised for with balances */
 
 include('includes/session.php');
-
 $Title = _('List of bank account balances');
-/* Manual links before header.php */
 $ViewTopic = 'GeneralLedger';
-$BookMark = '';
+$BookMark = 'BankAccountBalances';
 include('includes/header.php');
 
-echo '<p class="page_title_text"><img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/bank.png" title="', _('Bank Account Balances'), '" alt="" /> ',
-		_('Bank Account Balances'), '
-	</p>
-	<table>
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+	'/images/bank.png" title="', // Icon image.
+	_('Bank Account Balances'), '" /> ', // Icon title.
+	_('Bank Account Balances'), '</p>',// Page title.
+	'<table>
 		<tr>
 			<th>', _('Bank Account'), '</th>
 			<th>', _('Account Name'), '</th>
@@ -35,23 +35,23 @@
 		$CurrBalanceSQL = "SELECT SUM(amount) AS balance FROM banktrans WHERE bankact='" . $MyBankRow['accountcode'] . "'";
 		$CurrBalanceResult = DB_query($CurrBalanceSQL);
 		$CurrBalanceRow = DB_fetch_array($CurrBalanceResult);
-	
+
 		$FuncBalanceSQL = "SELECT SUM(amount) AS balance FROM gltrans WHERE account='" . $MyBankRow['accountcode'] . "'";
 		$FuncBalanceResult = DB_query($FuncBalanceSQL);
 		$FuncBalanceRow = DB_fetch_array($FuncBalanceResult);
-	
+
 		$DecimalPlacesSQL = "SELECT decimalplaces FROM currencies WHERE currabrev='" . $MyBankRow['currcode'] . "'";
 		$DecimalPlacesResult = DB_query($DecimalPlacesSQL);
 		$DecimalPlacesRow = DB_fetch_array($DecimalPlacesResult);
-	
+
 		echo '<tr class="selection">
 				<td>', $MyBankRow['accountcode'], '</td>
 				<td>', $MyBankRow['bankaccountname'], '</td>
 				<td class="number">', locale_number_format($CurrBalanceRow['balance'], $DecimalPlacesRow['decimalplaces']), ' ', $MyBankRow['currcode'], '</td>
 				<td class="number">', locale_number_format($FuncBalanceRow['balance'], $_SESSION['CompanyRecord']['decimalplaces']), ' ', $_SESSION['CompanyRecord']['currencydefault'], '</td>
 			</tr>';
 	}
-	
+
 	echo '</table>';
 }
 include('includes/footer.php');

CounterReturns.php

@@ -1,15 +1,17 @@
 <?php
+/* This script allows credits and refunds from the default Counter Sale account for an inventory location. */
 
 include('includes/DefineCartClass.php');
 
 /* Session started in session.php for password checking and authorisation level check
 config.php is in turn included in session.php $PageSecurity now comes from session.php (and gets read in by GetConfig.php*/
 
 include('includes/session.php');
-
 $Title = _('Counter Returns');
-
+$ViewTopic = 'SalesOrders';
+$BookMark = 'CounterReturns';
 include('includes/header.php');
+
 include('includes/GetPrice.inc');
 include('includes/SQL_CommonFunctions.inc');
 include('includes/GetSalesTransGLCodes.inc');

Dashboard.php

@@ -433,11 +433,15 @@
 	$SelectedPeriod=$LastPeriodSelected;
 
 	$Sql = "SELECT bankaccounts.accountcode,
-					bankaccounts.bankaccountcode,
-					chartmaster.accountname,
-					bankaccountname
-			FROM bankaccounts INNER JOIN chartmaster
-			ON bankaccounts.accountcode = chartmaster.accountcode";
+                    bankaccounts.bankaccountcode,
+                    chartmaster.accountname,
+                    bankaccountname
+            FROM bankaccounts
+            INNER JOIN chartmaster
+            ON bankaccounts.accountcode = chartmaster.accountcode
+            INNER JOIN bankaccountusers
+            ON bankaccounts.accountcode=bankaccountusers.accountcode
+            AND userid='" . $_SESSION['UserID'] . "'"; 
 
 	$ErrMsg = _('The bank accounts set up could not be retrieved because');
 	$DbgMsg = _('The SQL used to retrieve the bank account details was') . '<br />' . $Sql;

GLAccountGraph.php

@@ -1,13 +1,12 @@
 <?php
+/* Shows a graph of GL account transactions */
 /* By Paul Becker */
 
 include ('includes/session.php');
 include ('includes/phplot/phplot.php');
 $Title = _('GL Account Graph');
-
-$ViewTopic = 'GLInquiries';
+$ViewTopic = 'GeneralLedger';
 $BookMark = 'GLAccountGraph';
-
 include ('includes/header.php');
 
 $SelectADifferentPeriod = '';
@@ -269,4 +268,4 @@
 		</div>';
 	include ('includes/footer.php');
 }
-?>
+?>

GeneratePickingList.php

@@ -1,17 +1,23 @@
 <?php
-
+/* Generate a picking list */
 
 include('includes/session.php');
+/* $Title is set in several parts of this script. */
+$ViewTopic = 'Sales';
+$BookMark = 'GeneratePickingList';
 include('includes/SQL_CommonFunctions.inc');
 
-/* Check that the config variable is set for
- * picking notes and get out if not.
- */
+/* Check that the config variable is set for picking notes and get out if not. */
 if ($_SESSION['RequirePickingNote'] == 0) {
 	$Title = _('Picking Lists Not Enabled');
 	include('includes/header.php');
+	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+		'/images/error.png" title="', // Icon image.
+		$Title, '" /> ', // Icon title.
+		$Title, '</p>';// Page title.
 	echo '<br />';
 	prnMsg(_('The system is not configured for picking lists. A configuration parameter is required where picking slips are required. Please consult your system administrator.'), 'info');
+	/*prnMsg(_('The system is configured to NOT use picking lists. In order for a picking note to occur before an order can be delivered, a configuration parameter must be activated. Please, consult your system administrator.'), 'info');*/
 	include('includes/footer.php');
 	exit;
 }
@@ -20,13 +26,16 @@
 if ((!isset($_GET['TransNo']) or $_GET['TransNo'] == '') and !isset($_POST['TransDate'])) {
 	$Title = _('Select Picking Lists');
 	include('includes/header.php');
+	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+		'/images/sales.png" title="', // Icon image.
+		_('Search'), '" /> ', // Icon title.
+		$Title, '</p>';// Page title.
 	$SQL = "SELECT locations.loccode,
 			locationname
 		FROM locations
 		INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1";
 	$Result = DB_query($SQL);
-	echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $_SESSION['Theme'] . '/images/sales.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form">
+	echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form">
 		<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
 		<table class="selection">
 		<tr>
@@ -509,4 +518,4 @@
 	$pdf->__destruct();
 	DB_Txn_Commit();
 }
-?>
+?>

PDFAck.php

@@ -1,5 +1,5 @@
 <?php
-
+/* Prints an acknowledgement */
 
 include('includes/session.php');
 include('includes/SQL_CommonFunctions.inc');
@@ -279,4 +279,4 @@
 	$pdf->OutputI($_SESSION['DatabaseName'] . '_Acknowledgement_' . date('Y-m-d') . '.pdf');
 	$pdf->__destruct();
 }
-?>
+?>

PDFShipLabel.php

@@ -1,5 +1,5 @@
 <?php
-
+/* Prints a ship label */
 
 include('includes/session.php');
 
@@ -370,4 +370,4 @@
 	echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
 	include('includes/footer.php');
 }
-?>
+?>

PickingLists.php

@@ -1,11 +1,14 @@
 <?php
-
+/* Picking List Maintenance */
 
 /* Session started in session.php for password checking and authorisation level check */
 include('includes/DefineCartClass.php');
 include('includes/DefineSerialItems.php');
+
 include('includes/session.php');
 $Title = _('Picking List Maintenance');
+$ViewTopic = '';
+$BookMark = 'PickingLists';
 
 $ARSecurity = 3;
 

SelectContract.php

@@ -1,15 +1,15 @@
 <?php
 
-
 include('includes/session.php');
 $Title = _('Select Contract');
-
 $ViewTopic= 'Contracts';
 $BookMark = 'SelectContract';
-
 include('includes/header.php');
 
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contracts') . '" alt="" />' . ' ' . _('Select A Contract') . '</p> ';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+	'/images/contract.png" title="', // Icon image.
+	_('Contracts'), '" /> ', // Icon title.
+	_('Select A Contract'), '</p>';// Page title.
 
 echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
 echo '<div>';

SelectPickingLists.php

@@ -1,12 +1,16 @@
 <?php
+/* Select a picking list */
 
 include('includes/session.php');
-$Title = _('Search Pick Lists ');
+$Title = _('Search Pick Lists');
+$ViewTopic = 'Sales';
+$BookMark = 'SelectPickingLists';
 include('includes/header.php');
 
-echo '<p class="page_title_text">
-		<img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/magnifier.png" title="', _('Pick Lists'), '" alt=""  />', ' ', _('Pick Lists'), '
-	</p>';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+	'/images/magnifier.png" title="', // Icon image.
+	_('Pick Lists'), '" /> ', // Icon title.
+	_('Pick Lists'), '</p>';// Page title.
 
 if (isset($_GET['SelectedStockItem'])) {
 	$SelectedStockItem = $_GET['SelectedStockItem'];

doc/CHANGELOG.md

@@ -15,8 +15,13 @@ For changelogs earlier than v4.14.1, please refer to [CHANGELOG_ARCHIVE.md].
 
 | Description | Type | Author | Date | Details | Ref |
 |:------------|:----:|:------:|:----:|:-------:|:---:|
-| Added the latest phpxmlrpc code version 4.3.1 - using the compatibility layer though - see https://github.com/gggeek/phpxmlrpc | Updated| Phil Daintree | 2018-04-28 | [View](https://github.com/webERP-team/webERP/pull/45/commits/756546887bac32f3ce5d2c357b7e79f7366c0391) |  |
-| Added a utility script to fix 1c allocations in AR - a GL journal will be required for the total of debtor balances changed as a result for the control account to remain in balance Z_Fix1cAllocations.php | Added| Phil Daintree | 2018-04-28 | [View](https://github.com/webERP-team/webERP/pull/45/commits/756546887bac32f3ce5d2c357b7e79f7366c0391) |  |
+| Fixed bank account and related data visible to an unauthorised user in Dashboard.php | Fixed | Paul Becker | 2018-05-02 |  | [Forum](http://www.weberp.org/forum/showthread.php?tid=8161) |
+| Fix the bug that accountgroup validation used the wrong table and field reported by Laura | Fixed | Exson Qu | 2018-04-30 | [View](https://github.com/webERP-team/webERP/commit/56b66d466e3fdd4d5d55c8e1827a3ab74d69a4b8) |  |
+| Added a utility script to fix 1c allocations in AR - a GL journal will be required for the total of debtor balances changed as a result for the control account to remain in balance Z_Fix1cAllocations.php | Added | Phil Daintree | 2018-04-28 | [View](https://github.com/webERP-team/webERP/pull/45/commits/756546887bac32f3ce5d2c357b7e79f7366c0391) |  |
+| Added the latest phpxmlrpc code version 4.3.1 - using the compatibility layer though - see https://github.com/gggeek/phpxmlrpc | Changed | Phil Daintree | 2018-04-28 | [View](https://github.com/webERP-team/webERP/pull/45/commits/756546887bac32f3ce5d2c357b7e79f7366c0391) |  |
+| Fixed failure to issue invoice for customer reference is more than 20 characters | Fixed | Xiaobotian | 2018-04-27 | [View](https://github.com/webERP-team/webERP/commit/9a7f83ac16e858ac50362cb1e90a74adbdb9f419) |  |
+| Added latest SQL update script to UpgradeDatabase.php | Changed | Deibei | 2018-04-27 | [View](https://github.com/webERP-team/webERP/commit/d02430f20e6c044131828f5e27a82471e79f1723) |  |
+| Change log updated and formatted in tabular markdown | Changed | Andrew Couling | 2018-04-27 | [View](https://github.com/webERP-team/webERP/commit/bcb543774885bad573081c7798140193665b9bd1) |  |
 | Fix the bug of wrong affected scope of bom changing in BOMs.php | Fixed | Exson Qu | 2018-04-26 | [View](http://github.com/webERP-team/webERP/commit/9e8585e91) |  |
 | Rebuild languages files | Changed | Rafael Chacon | 2018-04-24 | [View](http://github.com/webERP-team/webERP/commit/1cdd72b5f) |  |
 | Minor changes to GeneratePickingList.php | Changed | Rafael Chacon | 2018-04-24 | [View](http://github.com/webERP-team/webERP/commit/ccaf2c404) |  |

doc/Manual/ManualContracts.html

@@ -1,6 +1,6 @@
 <h1><a id="Contracts">Contract Costing</a></h1>
 
-<h2>Overview</h2>
+<h2><a id="Overview">Overview</a></h2>
 
 <p>The Contracts module allows for construction of costings for specific customer projects where a bill of materials to be taken from inventory for the contract can be defined, together with a costed list of other requirements. By entering a gross profit percentage figure a price can then be arrived at to charge the customer. The contract can then be converted to a quotation. While the contract is at the quotation stage it is possible to modify the stock components and other requirements - the quotation will be updated with the new costing on commital. The quotation can then be resubmitted to the customer.</p>
 
@@ -34,7 +34,7 @@ <h3><a id="CreateContract">Creating a New Contract</a></h3>
 
 <p>The sum of the cost of the bill of materials together with the total cost of the other requirements is shown as the total contract cost. This cost is used together with the GP % entered to work out the total contract cost. The GP% is the % of the total contract price that is profit - so 1 minus the GP% is % of the total contract price that is the cost. The calculation is therefore - contract total cost divided by (1 - the GP%).</p>
 
-<h3>Selecting A Contract</h3>
+<h3><a id="SelectContract">Selecting A Contract</a></h3>
 
 <p>From the Contracts tab of the main menu, Select Contract allows contracts for a specific customer to be selected, or contracts of a specific status. Contracts can have a status of:</p>