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

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

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

Log Message:
-----------
CustomerAllocations.php - Show the right balance, and the allocate link where needed

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

Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php	2010-05-28 15:24:11 UTC (rev 3472)
+++ trunk/CustomerAllocations.php	2010-05-28 17:22:31 UTC (rev 3473)
@@ -544,9 +544,9 @@
 				$balance = 0;
 				$curDebtor = $myrow['debtorno'];
 
-				$balSQL= "SELECT ovamount+ovgst+ovfreight+ovdiscount as total
+				$balSQL= "SELECT ovamount+ovgst+ovfreight+ovdiscount-alloc as total
 					FROM debtortrans
-					WHERE debtortrans.settled=0 AND
+					WHERE type=12 AND
 					debtorno='" . $myrow['debtorno'] . "'
 					ORDER BY ovamount";
 				$balResult = DB_query($balSQL,$db);
@@ -559,7 +559,7 @@
 			}
 			$curTrans ++;
 
-			if ( isset($balance) and $balance < -0.01 )
+			if ( isset($balance) and abs($balance) < -0.01 )
 			{
 				$allocate = '&nbsp;';
 			}

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-28 15:24:11 UTC (rev 3472)
+++ trunk/doc/Change.log.html	2010-05-28 17:22:31 UTC (rev 3473)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></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>
 <P>27/05/10 Tim: GLProfit_Loss.php - Correction to show profit and loss reports for other languages</p>


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