[Weberp-cvs] SF.net SVN: web-erp:[3673] trunk

[<tim...@us...>]

Revision: 3673
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3673&view=rev
Author:   tim_schofield
Date:     2010-07-26 20:38:59 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
Sql quoting corrections, bug fixes

Modified Paths:
--------------
    trunk/PDFGrn.php
    trunk/doc/Change.log.html

Modified: trunk/PDFGrn.php
===================================================================
--- trunk/PDFGrn.php	2010-07-26 20:20:43 UTC (rev 3672)
+++ trunk/PDFGrn.php	2010-07-26 20:38:59 UTC (rev 3673)
@@ -31,14 +31,14 @@
 if ($GRNNo=='Preview') {
 	$ListCount = 1; // UldisN
 } else {
-	$sql='SELECT grns.itemcode,
+	$sql="SELECT grns.itemcode,
 			grns.grnno,
 			grns.deliverydate,
 			grns.itemdescription,
 			grns.qtyrecd,
 			grns.supplierid
 		FROM grns
-		WHERE grnbatch='.$GRNNo;
+		WHERE grnbatch='".$GRNNo."'";
 	$result=DB_query($sql, $db);
 	$ListCount = DB_num_rows($result); // UldisN
 
@@ -54,27 +54,35 @@
 		$Quantity='XXXXX.XX';
 		$Supplier=str_pad('',25,'x');
 	} else {
-		$sql='SELECT orddate from purchorders WHERE orderno='.$_GET['PONo'];
+		$sql="SELECT orddate from purchorders WHERE orderno='".$_GET['PONo']."'";
 		$purchorderresult=DB_query($sql, $db);
 		$purchorderdate=DB_fetch_array($purchorderresult);
 		$myrow=DB_fetch_array($result);
-		$datesql='SELECT max(effectivefrom) FROM purchdata WHERE supplierno="'.$myrow['supplierid'].'" AND stockid="'.$myrow['itemcode'].'" AND effectivefrom<="'.$purchorderdate[0].'"';
+		$datesql="SELECT max(effectivefrom)
+					FROM purchdata
+					WHERE supplierno='".$myrow['supplierid']."'
+						AND stockid='".$myrow['itemcode']."'
+						AND effectivefrom<='".$purchorderdate[0]."'";
 		$dateresult=DB_query($datesql, $db);
 		$date=DB_fetch_row($dateresult);
 		if ($date[0]!='') {
-			$sql='SELECT unitsofmeasure.unitname,
+			$sql="SELECT unitsofmeasure.unitname,
 					suppliers_partno,
 					conversionfactor
 				FROM purchdata
 				LEFT JOIN unitsofmeasure
 					ON purchdata.suppliersuom=unitsofmeasure.unitid
-				WHERE supplierno="'.$myrow['supplierid'].'"
-					AND stockid="'.$myrow['itemcode'].'"
-					AND effectivefrom="'.$date[0].'"';
+				WHERE supplierno='".$myrow['supplierid']."'
+					AND stockid='".$myrow['itemcode']."'
+					AND effectivefrom='".$date[0]."'";
 			$purchdataresult=DB_query($sql, $db);
 			$myrow2=DB_fetch_array($purchdataresult);
 		} else {
-			$sql='SELECT units as unitname, stockid as suppliers_partno, 1 as conversionfactor FROM stockmaster WHERE stockid="'.$StockID.'"';
+			$sql="SELECT units as unitname,
+						stockid as suppliers_partno,
+						1 as conversionfactor
+						FROM stockmaster
+						WHERE stockid='".$myrow['itemcode']."'";
 			$purchdataresult=DB_query($sql, $db);
 			$myrow2=DB_fetch_array($purchdataresult);
 		}
@@ -85,9 +93,9 @@
 		$Quantity=$myrow[4];
 		$SupplierID=$myrow[5];
 		if ($myrow2['unitname']=='') {
-			$sql='SELECT units
+			$sql="SELECT units
 					FROM stockmaster
-					WHERE stockid="'.$myrow['itemcode'].'"';
+					WHERE stockid='".$myrow['itemcode']."'";
 			$uomresult=DB_query($sql, $db);
 			$uomrow=DB_fetch_array($uomresult);
 			$units=$uomrow['units'];
@@ -95,17 +103,17 @@
 		} else {
 			$units=$myrow2['unitname'];
 		}
-		$sql='SELECT units,
+		$sql="SELECT units,
 					decimalplaces
 				FROM stockmaster
-				WHERE stockid="'.$myrow['itemcode'].'"';
+				WHERE stockid='".$myrow['itemcode']."'";
 		$uomresult=DB_query($sql, $db);
 		$uomrow=DB_fetch_array($uomresult);
 		$stockunits=$uomrow['units'];
 
-		$sql='SELECT suppname
+		$sql="SELECT suppname
 				FROM suppliers
-			WHERE supplierid="'.$SupplierID.'"';
+			WHERE supplierid='".$SupplierID."'";
 		$supplierresult=DB_query($sql, $db);
 		$suppliermyrow=DB_fetch_array($supplierresult);
 		$Supplier=$suppliermyrow[0];

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-26 20:20:43 UTC (rev 3672)
+++ trunk/doc/Change.log.html	2010-07-26 20:38:59 UTC (rev 3673)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>26/07/10 Tim: PDFGrn.php - Sql quoting corrections, bug fixes</p>
 <p>26/07/10 Tim: PDFDIFOT.php - Sql quoting corrections, bug fixes and layout changes</p>
 <p>26/07/10 Tim: PDFDeliveryDifferences.php - Sql quoting corrections, bug fixes and layout changes</p>
 <p>26/07/10 Tim: PDFCustTransListing.php - Sql quoting corrections and layout changes</p>


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