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

[<rc...@us...>]

Revision: 6006
          http://sourceforge.net/p/web-erp/reponame/6006
Author:   rchacon
Date:     2013-06-06 14:04:52 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
Added: Sort purchase order detail by our item code. Deleted: Duplicated suppliers_partno in printing description.

Modified Paths:
--------------
    trunk/PO_OrderDetails.php
    trunk/PO_PDFPurchOrder.php

Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php	2013-06-04 06:25:18 UTC (rev 6005)
+++ trunk/PO_OrderDetails.php	2013-06-06 14:04:52 UTC (rev 6006)
@@ -135,7 +135,8 @@
 				FROM purchorderdetails
 				LEFT JOIN stockmaster
 				ON purchorderdetails.itemcode=stockmaster.stockid
-				WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'";
+				WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'
+				ORDER BY itemcode";	/*- ADDED: Sort by our item code -*/
 
 $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
 
@@ -214,4 +215,4 @@
 echo '<br />';
 
 include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php	2013-06-04 06:25:18 UTC (rev 6005)
+++ trunk/PO_PDFPurchOrder.php	2013-06-06 14:04:52 UTC (rev 6006)
@@ -213,7 +213,8 @@
 						suppliers_partno
 				FROM purchorderdetails LEFT JOIN stockmaster
 					ON purchorderdetails.itemcode=stockmaster.stockid
-				WHERE orderno ='" . $OrderNo . "'";
+				WHERE orderno ='" . $OrderNo . "'
+				ORDER BY itemcode";	/*- ADDED: Sort by our item code -*/
 		$result = DB_query($sql, $db);
 	}
 	if ($OrderNo == 'Preview' or DB_num_rows($result) > 0) {
@@ -253,7 +254,7 @@
 			} else {
 				$DisplayLineTotal = '----';
 			}
-			$Desc = $POLine['suppliers_partno'] . " " . $POLine['itemdescription'];
+			$Desc = /*- DELETED: $POLine['suppliers_partno'] . " " . -*/ $POLine['itemdescription'];	/*- suppliers_partno is duplicated inside itemdescription -*/
 
 			$OrderTotal += ($POLine['unitprice'] * $POLine['quantityord']);