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

[<dai...@us...>]

Revision: 7584
          http://sourceforge.net/p/web-erp/reponame/7584
Author:   daintree
Date:     2016-08-11 09:31:30 +0000 (Thu, 11 Aug 2016)
Log Message:
-----------
Simon Kelly fix to SQL in SelectSalesOrder.php

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

Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php	2016-08-09 07:17:19 UTC (rev 7583)
+++ trunk/SelectSalesOrder.php	2016-08-11 09:31:30 UTC (rev 7584)
@@ -171,7 +171,7 @@
 							contact
 						FROM locations
 						INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" .  $_SESSION['UserID'] . "' AND locationusers.canupd=1
-						WHERE loccode = '" .$_SESSION['UserStockLocation']  . "'";
+						WHERE locations.loccode = '" .$_SESSION['UserStockLocation']  . "'";
 			$ErrMsg = _('The delivery address for the order could not be obtained from the user default stock location');
 			$DelAddResult = DB_query($sql,$ErrMsg);
 			$DelAddRow = DB_fetch_array($DelAddResult);
@@ -889,7 +889,7 @@
 				ON salesorderdetails.stkcode = stockmaster.stockid AND completed=0
 			INNER JOIN locstock
 			  ON stockmaster.stockid=locstock.stockid";
-	if (isset($_POST['StockCat']) 
+	if (isset($_POST['StockCat'])
 		AND ((trim($_POST['StockCat']) == '') OR $_POST['StockCat'] == 'All')){
 		 $WhereStockCat = '';
 	} else {

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2016-08-09 07:17:19 UTC (rev 7583)
+++ trunk/doc/Change.log	2016-08-11 09:31:30 UTC (rev 7584)
@@ -1,4 +1,6 @@
 webERP Change Log
+
+11/8/16 Simon Kelly: Fix SQL for location users in SelectSalesOrder.php
 05/08/16 RChacon: In GLAccountInquiry.php, add noprint class to clean up printer output and improve code documentation.
 05/08/16 RChacon: Fix html code in SuppInvGRNs.php.
 02/08/16 Exson: Make account inquiry shown directly when GL Code selected or inquiry result is 1 in SelectGLAccount.php.
@@ -12,12 +14,12 @@
 09/07/16 Exson: Fixed the utf8 character print incorrect of pdf file in class.pdf.php.
 08/07/16 Exson: Fixed the transaction atomicity bug by change table lock to row lock in SQL_CommonFunctions.inc.
 08/07/16 Exson: Fixed the bug that when bank account or currency changes the functional rate or exrate unchanged with suggested rate in Payments.php.
-07/07/16: Exson: Fixed the bug of wrong original amount of payments to another bank accounts in GLAccountInquiry.php and wrong transaction link in DailyBankTransactions.php and add payment transaction no in bank transaction ref to make it traceable. 
+07/07/16: Exson: Fixed the bug of wrong original amount of payments to another bank accounts in GLAccountInquiry.php and wrong transaction link in DailyBankTransactions.php and add payment transaction no in bank transaction ref to make it traceable.
 29/06/16 Exson: add identifier to avoid SESSION overwritten in CustomerReceipt.php.
 29/06/16 Exson: Fixed the wrong balance of amount in bank account currency in DailyBankTransactions.php.
 20/06/16 Exson: Fixed bom clone failure due to fields missing in CopyBom.php. Reported by shane.
 20/06/16 Exson: Fixed the bug that # is not allowed as part of stockid in SelectProduct.php.
-16/06/16 Exson: Make monthly payment term can be more than 30 days. 
+16/06/16 Exson: Make monthly payment term can be more than 30 days.
 12/06/16 TurboPT: Fix syntax error in StockClone.php
 08/06/16 Exson: add data label for SalesGraph.php.