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

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

Revision: 7147
          http://sourceforge.net/p/web-erp/reponame/7147
Author:   daintree
Date:     2015-02-11 07:12:39 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations

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

Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php	2015-02-10 05:02:22 UTC (rev 7146)
+++ trunk/BOMIndented.php	2015-02-11 07:12:39 UTC (rev 7147)
@@ -108,11 +108,12 @@
 						 bom.effectiveafter,
 						 bom.effectiveto,
 						 bom.quantity
-				 FROM bom, passbom
-				 INNER JOIN locationusers ON locationusers.loccode=loccode AND locationusers.userid='" .  $_SESSION['UserID'] . "' AND locationusers.canview=1
-				 WHERE bom.parent = passbom.part
-                 AND bom.effectiveafter <= '" . date('Y-m-d') . "'
-                 AND bom.effectiveto > '" . date('Y-m-d') . "'";
+				FROM bom
+                 INNER JOIN passbom ON bom.parent = passbom.part
+				 INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" .  $_SESSION['UserID'] . "' AND locationusers.canview=1
+				WHERE bom.effectiveafter <= '" . date('Y-m-d') . "'
+				AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+				AND bom.effectiveto > '" . date('Y-m-d') . "'";
 			$result = DB_query($sql);
 
 			$sql = "DROP TABLE IF EXISTS passbom2";

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-02-10 05:02:22 UTC (rev 7146)
+++ trunk/doc/Change.log	2015-02-11 07:12:39 UTC (rev 7147)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+11/2/15 Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations
 10/2/15 Phil: New script StockCategorySalesInquiry.php - shows category sales by item for a selected custom date range
 10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote.
 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif.