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

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

Revision: 3472
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3472&view=rev
Author:   tim_schofield
Date:     2010-05-28 15:24:11 +0000 (Fri, 28 May 2010)

Log Message:
-----------
GoodsReceived.php - Correctly show the suppliers Units of measure

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

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2010-05-28 12:34:22 UTC (rev 3471)
+++ trunk/GoodsReceived.php	2010-05-28 15:24:11 UTC (rev 3472)
@@ -111,16 +111,21 @@
 		$DisplayLineTotal = number_format($LineTotal,2);
 		$DisplayPrice = number_format($LnItm->Price,2);
 
-		$uomsql='SELECT conversionfactor, suppliersuom
+		$uomsql='SELECT unitsofmeasure.unitname,
+					conversionfactor,
+					suppliersuom,
+					max(effectivefrom)
 				FROM purchdata
+				LEFT JOIN unitsofmeasure
+				ON purchdata.suppliersuom=unitsofmeasure.unitid
 				WHERE supplierno="'.$_SESSION['PO']->SupplierID.'"
 				AND stockid="'.$LnItm->StockID.'"';
 
 		$uomresult=DB_query($uomsql, $db);
 		if (DB_num_rows($uomresult)>0) {
 			$uomrow=DB_fetch_array($uomresult);
-			if (strlen($uomrow['suppliersuom'])>0) {
-				$uom=$uomrow['suppliersuom'];
+			if (strlen($uomrow['unitname'])>0) {
+				$uom=$uomrow['unitname'];
 			} else {
 				$uom=$LnItm->Units;
 			}

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-28 12:34:22 UTC (rev 3471)
+++ trunk/doc/Change.log.html	2010-05-28 15:24:11 UTC (rev 3472)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<P>27/05/10 Tim: GoodsReceived.php - Correctly show the suppliers Units of measure</p>
 <P>27/05/10 Tim: PO_ReadInOrder.inc - Only show one line when item has more than one price set up</p>
 <P>27/05/10 Tim: GLProfit_Loss.php - Correction to show profit and loss reports for other languages</p>
 <P>26/05/10 Tim: Corrections to Suppliers.php and new fields for suppliers table</p>


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