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

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

Revision: 3474
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3474&view=rev
Author:   tim_schofield
Date:     2010-05-28 18:22:16 +0000 (Fri, 28 May 2010)

Log Message:
-----------
PurchData.php - Show the uom name, not the number

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

Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php	2010-05-28 17:22:31 UTC (rev 3473)
+++ trunk/PurchData.php	2010-05-28 18:22:16 UTC (rev 3474)
@@ -136,13 +136,15 @@
 					purchdata.price,
 					suppliers.currcode,
 					purchdata.effectivefrom,
-					purchdata.suppliersuom,
+					unitsofmeasure.unitname,
 					purchdata.supplierdescription,
 					purchdata.leadtime,
 					purchdata.suppliers_partno,
 					purchdata.preferred
 			FROM purchdata INNER JOIN suppliers
 				ON purchdata.supplierno=suppliers.supplierid
+			LEFT JOIN unitsofmeasure
+				ON purchdata.suppliersuom=unitsofmeasure.unitid
 			WHERE purchdata.stockid = '" . $StockID . "'
 			ORDER BY purchdata.effectivefrom DESC";
     $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
@@ -188,7 +190,7 @@
 			<td>%s</td>
 			<td><a href='%s?%s&StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s'>" . _('Edit') . "</a></td>
 			<td><a href='%s?%s&StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s' onclick=\"return confirm('" . _('Are you sure you wish to delete this suppliers price?') . "');\">" . _('Delete') . "</a></td>
-			</tr>", $myrow['suppname'], number_format($myrow['price'], 3), $myrow['currcode'], ConvertSQLDate($myrow['effectivefrom']), $myrow['suppliersuom'], $myrow['leadtime'], $DisplayPreferred, $_SERVER['PHP_SELF'], SID, $StockID, $myrow['supplierno'], $myrow['effectivefrom'], $_SERVER['PHP_SELF'], SID, $StockID, $myrow['supplierno'], $myrow['effectivefrom']);
+			</tr>", $myrow['suppname'], number_format($myrow['price'], 3), $myrow['currcode'], ConvertSQLDate($myrow['effectivefrom']), $myrow['unitname'], $myrow['leadtime'], $DisplayPreferred, $_SERVER['PHP_SELF'], SID, $StockID, $myrow['supplierno'], $myrow['effectivefrom'], $_SERVER['PHP_SELF'], SID, $StockID, $myrow['supplierno'], $myrow['effectivefrom']);
         } //end of while loop
         echo '</table><br/>';
         if ($CountPreferreds > 1) {

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-28 17:22:31 UTC (rev 3473)
+++ trunk/doc/Change.log.html	2010-05-28 18:22:16 UTC (rev 3474)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<P>27/05/10 Tim: PurchData.php - Show the uom name, not the number</p>
 <P>27/05/10 Tim: CustomerAllocations.php - Show the right balance, and the allocate link where needed</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>


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