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

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

Revision: 4669
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4669&view=rev
Author:   daintree
Date:     2011-08-28 01:08:59 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/BOMListing.php
    trunk/WorkOrderEntry.php
    trunk/includes/ConnectDB_mysqli.inc

Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php	2011-08-26 21:06:27 UTC (rev 4668)
+++ trunk/BOMListing.php	2011-08-28 01:08:59 UTC (rev 4669)
@@ -19,24 +19,21 @@
 
       /*Now figure out the bills to report for the part range under review */
 	$SQL = "SELECT bom.parent,
-			bom.component,
-			stockmaster.description as compdescription,
-			stockmaster.decimalplaces,
-			bom.quantity,
-			bom.loccode,
-			bom.workcentreadded,
-			bom.effectiveto AS eff_to,
-			bom.effectiveafter AS eff_frm
-		FROM
-			stockmaster,
-			bom
-		WHERE stockmaster.stockid=bom.component
-		AND bom.parent >= '" . $_POST['FromCriteria'] . "'
-		AND bom.parent <= '" . $_POST['ToCriteria'] . "'
-		AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()
-		ORDER BY
-			bom.parent,
-			bom.component";
+				bom.component,
+				stockmaster.description as compdescription,
+				stockmaster.decimalplaces,
+				bom.quantity,
+				bom.loccode,
+				bom.workcentreadded,
+				bom.effectiveto AS eff_to,
+				bom.effectiveafter AS eff_frm
+			FROM stockmaster INNER JOIN bom
+			ON stockmaster.stockid=bom.component
+			WHERE bom.parent >= '" . $_POST['FromCriteria'] . "'
+			AND bom.parent <= '" . $_POST['ToCriteria'] . "'
+			AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()
+			ORDER BY bom.parent,
+					bom.component";
 
 	$BOMResult = DB_query($SQL,$db,'','',false,false); //dont do error trapping inside DB_query
 

Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php	2011-08-26 21:06:27 UTC (rev 4668)
+++ trunk/WorkOrderEntry.php	2011-08-28 01:08:59 UTC (rev 4669)
@@ -393,7 +393,7 @@
 	}
 }
 
-echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '" name="form">';
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '" name="form1">';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 echo '<br /><table class="selection">';
@@ -456,7 +456,7 @@
 echo '<input type=hidden name="WO" value=' .$_POST['WO'] . '>';
 echo '<tr><td class="label">' . _('Work Order Reference') . ':</td><td>' . $_POST['WO'] . '</td></tr>';
 echo '<tr><td class="label">' . _('Factory Location') .':</td>
-	<td><select name="StockLocation">';
+	<td><select name="StockLocation" onChange="ReloadForm(form1.submit)">';
 $LocResult = DB_query("SELECT loccode,locationname FROM locations",$db);
 while ($LocRow = DB_fetch_array($LocResult)){
 	if ($_POST['StockLocation']==$LocRow['loccode']){
@@ -471,7 +471,7 @@
 }
 
 echo '<tr><td class="label">' . _('Start Date') . ':</td><td><input type="text" name="StartDate" size=12 maxlength=12 value="' . $_POST['StartDate'] .
-			'" class="date" alt="'.$_SESSION['DefaultDateFormat'].'"></td></tr>';
+			'" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" /></td></tr>';
 
 if (!isset($_POST['RequiredBy'])){
 	$_POST['RequiredBy'] = Date($_SESSION['DefaultDateFormat']);

Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc	2011-08-26 21:06:27 UTC (rev 4668)
+++ trunk/includes/ConnectDB_mysqli.inc	2011-08-28 01:08:59 UTC (rev 4669)
@@ -87,7 +87,7 @@
 		}
 		prnMsg($ErrorMessage.'<br />' . DB_error_msg($Conn),'error', _('Database Error'));
 		if ($debug==1){
-			prnMsg($DebugMessage. "<br />$SQL<br />",'error',_('Database SQL Failure'));
+			prnMsg($DebugMessage. '<br />' . $SQL . '<br />','error',_('Database SQL Failure'));
 		}
 		if ($Transaction){
 			$SQL = 'rollback';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.