|
From: <dai...@us...> - 2015-02-21 04:04:29
|
Revision: 7164
http://sourceforge.net/p/web-erp/reponame/7164
Author: daintree
Date: 2015-02-21 04:04:27 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/BOMIndented.php
trunk/PrintCustTransPortrait.php
trunk/WorkOrderEntry.php
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2015-02-21 00:30:18 UTC (rev 7163)
+++ trunk/BOMIndented.php 2015-02-21 04:04:27 UTC (rev 7164)
@@ -108,11 +108,12 @@
bom.effectiveafter,
bom.effectiveto,
bom.quantity
- FROM bom
+ 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.effectiveto > '" . date('Y-m-d') . "'";
+ 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/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2015-02-21 00:30:18 UTC (rev 7163)
+++ trunk/PrintCustTransPortrait.php 2015-02-21 04:04:27 UTC (rev 7164)
@@ -465,7 +465,7 @@
$pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']);
$FontSize =8;
- $LeftOvers=explode("\r\n",$myrow['invtext']);
+ $LeftOvers=explode("\r\n",DB_escape_string($myrow['invtext']));
for ($i=0;$i<sizeOf($LeftOvers);$i++) {
$pdf->addText($Left_Margin, $YPos-8-($i*8), $FontSize, $LeftOvers[$i]);
}
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2015-02-21 00:30:18 UTC (rev 7163)
+++ trunk/WorkOrderEntry.php 2015-02-21 04:04:27 UTC (rev 7164)
@@ -22,13 +22,13 @@
if (isset($_GET['ReqDate'])){
$ReqDate = $_GET['ReqDate'];
} else {
- $ReqDate=Date('Y-m-d');
+ $ReqDate=Date($_SESSION['DefaultDateFormat']);
}
if (isset($_GET['StartDate'])){
$StartDate = $_GET['StartDate'];
} else {
- $StartDate=Date('Y-m-d');
+ $StartDate=Date($_SESSION['DefaultDateFormat']);
}
if (isset($_GET['loccode'])){
|