|
From: <dai...@us...> - 2015-02-21 23:23:56
|
Revision: 7166
http://sourceforge.net/p/web-erp/reponame/7166
Author: daintree
Date: 2015-02-21 23:23:54 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
Fix errors my machines config snags - unsynced versions
Modified Paths:
--------------
trunk/BOMIndented.php
trunk/WorkOrderEntry.php
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2015-02-21 14:47:59 UTC (rev 7165)
+++ trunk/BOMIndented.php 2015-02-21 23:23:54 UTC (rev 7166)
@@ -112,7 +112,6 @@
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);
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2015-02-21 14:47:59 UTC (rev 7165)
+++ trunk/WorkOrderEntry.php 2015-02-21 23:23:54 UTC (rev 7166)
@@ -22,13 +22,13 @@
if (isset($_GET['ReqDate'])){
$ReqDate = $_GET['ReqDate'];
} else {
- $ReqDate=Date($_SESSION['DefaultDateFormat']);
+ $ReqDate=Date('Y-m-d');
}
if (isset($_GET['StartDate'])){
$StartDate = $_GET['StartDate'];
} else {
- $StartDate=Date($_SESSION['DefaultDateFormat']);
+ $StartDate=Date('Y-m-d');
}
if (isset($_GET['loccode'])){
|