[Web-erp-svn] SF.net SVN: web-erp:[7900] trunk

[<tu...@us...>]

Revision: 7900
          http://sourceforge.net/p/web-erp/reponame/7900
Author:   turbopt
Date:     2018-01-03 19:35:47 +0000 (Wed, 03 Jan 2018)
Log Message:
-----------
SelectSalesOrder.php: Fix search to retain quote option and set StockLocation to the UserStockLocation to auto-load current Sales Orders.

Modified Paths:
--------------
    trunk/SelectSalesOrder.php
    trunk/doc/Change.log

Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php	2018-01-02 19:18:56 UTC (rev 7899)
+++ trunk/SelectSalesOrder.php	2018-01-03 19:35:47 UTC (rev 7900)
@@ -32,7 +32,7 @@
 if ( isset($_GET['Quotations']) ) {
 	$_POST['Quotations'] = $_GET['Quotations'];
 }
-else {
+else if ( !isset($_POST['Quotations']) ) {
 	$_POST['Quotations'] = '';
 }
 
@@ -677,7 +677,7 @@
 	}
 
 	if(!isset($_POST['StockLocation'])) {
-		$_POST['StockLocation'] = '';
+		$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
 	}
 	//Harmonize the ordervalue with SUM function since webERP allowed same items appeared several times in one sales orders. If there is no sum value, this situation not inclued.
 	//We should separate itemdue inquiry from normal inquiry.

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2018-01-02 19:18:56 UTC (rev 7899)
+++ trunk/doc/Change.log	2018-01-03 19:35:47 UTC (rev 7900)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+3/1/18:  PaulT: SelectSalesOrder.php: Fix search to retain quote option and set StockLocation to the UserStockLocation to auto-load current Sales Orders.
 2/1/18:  PaulT: SelectSalesOrder.php: Move handling for URL Quotations parameter to top of file to avoid potential page error(s). (Reported in forums by Paul Becker) Handling move reduces code within some conditional checks. This change also includes minor whitespace improvements and removes an unused global reference.
 2/1/18:  PaulT: css/default/default.css: Add text alignment in a couple of styles to match the same use in other CSS to avoid formatting issues when the default theme is used. Also, set several property names to lowercase.
 20/12/17 PaulT: FormMaker.php, ReportMaker.php, WriteForm.inc: A few more PHP 7.1 array compatibility changes.