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

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

Revision: 3150
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3150&view=rev
Author:   tim_schofield
Date:     2009-12-11 10:23:18 +0000 (Fri, 11 Dec 2009)

Log Message:
-----------
Print the correct suppliers unit of measure.

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

Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php	2009-12-11 10:01:53 UTC (rev 3149)
+++ trunk/PO_PDFPurchOrder.php	2009-12-11 10:23:18 UTC (rev 3150)
@@ -157,11 +157,13 @@
 	   			deliverydate,
 				itemdescription,
 				unitprice,
-				units,
+				unitname as units,
 				quantityord,
 				decimalplaces
 			FROM purchorderdetails LEFT JOIN stockmaster
 				ON purchorderdetails.itemcode=stockmaster.stockid
+			LEFT JOIN unitsofmeasure
+				ON purchorderdetails.uom=unitsofmeasure.unitid
 			WHERE orderno =" . $OrderNo;
 	   $result=DB_query($sql,$db);
 

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2009-12-11 10:01:53 UTC (rev 3149)
+++ trunk/doc/Change.log.html	2009-12-11 10:23:18 UTC (rev 3150)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p>
+<p>11/12/09 Tim: PO_PDFPurchOrder.php -  Print the correct suppliers unit of measure.
 <p>11/12/09 Tim: SelectProducts.php -  Ensure that preferred supplier is shown first, and provide a direct link to purchase ordering.
 <p>11/12/09 Pak Ricard: Selectproduct.php - Add ORDER BY to show the supplier info in effective date order.
 <p>09/12/09 Tim: Correctly align numbers in tables.


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