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

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

Revision: 3139
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3139&view=rev
Author:   tim_schofield
Date:     2009-12-04 08:23:57 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
Show the suppliers uom correctly, and have button correctly shown on screen.

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

Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php	2009-12-01 10:14:05 UTC (rev 3138)
+++ trunk/PO_Items.php	2009-12-04 08:23:57 UTC (rev 3139)
@@ -927,8 +927,13 @@
 				echo '<tr class="OddTableRows">';
 				$k=1;
 			}
-			$uomsql='SELECT conversionfactor, suppliersuom
+			$uomsql='SELECT conversionfactor, 
+							suppliersuom, 
+							unitsofmeasure.
+							unitname
 					FROM purchdata
+					LEFT JOIN unitsofmeasure
+					ON purchdata.suppliersuom=unitsofmeasure.unitid
 					WHERE supplierno="'.$_SESSION['PO'.$identifier]->SupplierID.'"
 					AND stockid="'.$POLine->StockID.'"';
 
@@ -936,7 +941,7 @@
 			if (DB_num_rows($uomresult)>0) {
 				$uomrow=DB_fetch_array($uomresult);
 				if (strlen($uomrow['suppliersuom'])>0) {
-					$uom=$uomrow['suppliersuom'];
+					$uom=$uomrow['unitname'];
 				} else {
 					$uom=$POLine->Units;
 				}
@@ -992,7 +997,7 @@
 	echo '<td><input type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name=ReqDelDate size=11
 			value="'.$_SESSION['PO'.$identifier]->deliverydate .'"></td></tr>';
 	echo '</table>';
-	echo '<input type=submit name="EnterLine" value="Enter Item">';
+	echo '<div class=centre><input type=submit name="EnterLine" value="Enter Item"></div>';
 }
 
 echo '<hr>';

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2009-12-01 10:14:05 UTC (rev 3138)
+++ trunk/doc/Change.log.html	2009-12-04 08:23:57 UTC (rev 3139)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p>
+<p>04/12/09 Tim: PO_Items.php -  Show the suppliers uom correctly, and have button correctly shown on screen.
 <p>01/12/09 Tim: StockTransferontrolled.php - Correct for batch controlled Items.
 <p>29/11/09 Phil: New Remittance Advice script
 <p>24/11/09 Tim: WWW_Users.php - Allow for case where Last visited date isn'nt set, and set it.


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