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

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

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

Log Message:
-----------
Tim: PO_ReadInOrder.inc - Only show one line when item has more than one price set up

Modified Paths:
--------------
    trunk/doc/Change.log.html
    trunk/includes/PO_ReadInOrder.inc

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-28 11:38:41 UTC (rev 3470)
+++ trunk/doc/Change.log.html	2010-05-28 12:34:22 UTC (rev 3471)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></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>
 <P>26/05/10 Tim: Corrections to SelectCustomer.php and Customers.php</p>

Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc	2010-05-28 11:38:41 UTC (rev 3470)
+++ trunk/includes/PO_ReadInOrder.inc	2010-05-28 12:34:22 UTC (rev 3471)
@@ -154,7 +154,8 @@
 										gw,
 										cuft,
 										total_quantity,
-										total_amount
+										total_amount,
+										MAX(purchdata.effectivefrom)
 										FROM purchorderdetails
 											LEFT JOIN stockmaster
 											ON purchorderdetails.itemcode=stockmaster.stockid
@@ -162,30 +163,12 @@
 											ON purchorders.orderno=purchorderdetails.orderno
 											LEFT JOIN chartmaster
 											ON purchorderdetails.glcode=chartmaster.accountcode
-											LEFT JOIN (SELECT purchdata.supplierno,
-																purchdata.stockid,
-																purchdata.price,
-																purchdata.suppliersuom,
-																purchdata.conversionfactor,
-																purchdata.supplierdescription,
-																purchdata.leadtime,
-																purchdata.preferred,
-																purchdata.suppliers_partno,
-																MAX(purchdata.effectivefrom)
-																FROM purchdata
-																GROUP BY purchdata.supplierno, 
-																		purchdata.stockid,
-																		purchdata.suppliersuom,
-																		purchdata.conversionfactor,
-																		purchdata.supplierdescription,
-																		purchdata.leadtime,
-																		purchdata.preferred,
-																		purchdata.suppliers_partno) purchdata
+											LEFT JOIN  purchdata
 											ON purchdata.stockid=purchorderdetails.itemcode AND purchdata.supplierno=purchorders.supplierno
 										WHERE purchorderdetails.completed=0
-											AND purchorderdetails.orderno =' . $_GET['ModifyOrderNumber'] . '
+											AND purchorderdetails.orderno =" . $_GET['ModifyOrderNumber'] . '
 										ORDER BY podetailitem';
-					
+
 		  $ErrMsg =  _('The lines on the purchase order cannot be retrieved because');
 		  $DbgMsg =  _('The SQL statement that was used to retrieve the purchase order lines was');
 			  $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);


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