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

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

Revision: 3649
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3649&view=rev
Author:   tim_schofield
Date:     2010-07-20 11:36:56 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
Show value in functional currency, and show decimal places correctly

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

Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php	2010-07-20 11:19:57 UTC (rev 3648)
+++ trunk/TopItems.php	2010-07-20 11:36:56 UTC (rev 3649)
@@ -66,11 +66,15 @@
 						SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
 						SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
 						stockmaster.description,
-						stockmaster.units
-				FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster
+						stockmaster.units,
+						currencies.rate,
+						debtorsmaster.currcode,
+						stockmaster.decimalplaces
+				FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
 				WHERE 	salesorderdetails.orderno = salesorders.orderno
 						AND salesorderdetails.stkcode = stockmaster.stockid
 						AND salesorders.debtorno = debtorsmaster.debtorno
+						AND debtorsmaster.currcode = currencies.currabrev
 						AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
 				GROUP BY salesorderdetails.stkcode
 				ORDER BY " . $_POST["order"] . " DESC
@@ -82,11 +86,15 @@
 						SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
 						SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
 						stockmaster.description,
-						stockmaster.units
-				FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster
+						stockmaster.units,
+						currencies.rate,
+						debtorsmaster.currcode,
+						stockmaster.decimalplaces
+				FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
 				WHERE 	salesorderdetails.orderno = salesorders.orderno
 						AND salesorderdetails.stkcode = stockmaster.stockid
 						AND salesorders.debtorno = debtorsmaster.debtorno
+						AND debtorsmaster.currcode = currencies.currabrev
 						AND debtorsmaster.typeid = '" . $_POST["Customers"] . "'
 						AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
 				GROUP BY salesorderdetails.stkcode
@@ -100,11 +108,15 @@
 						SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
 						SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
 						stockmaster.description,
-						stockmaster.units
-					FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster
+						stockmaster.units,
+						currencies.rate,
+						debtorsmaster.currcode,
+						stockmaster.decimalplaces
+					FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
 					WHERE 	salesorderdetails.orderno = salesorders.orderno
 						AND salesorderdetails.stkcode = stockmaster.stockid
 						AND salesorders.debtorno = debtorsmaster.debtorno
+						AND debtorsmaster.currcode = currencies.currabrev
 						AND salesorders.fromstkloc = '" . $_POST["Location"] . "'
 						AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
 					GROUP BY salesorderdetails.stkcode
@@ -117,11 +129,15 @@
 						SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
 						SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
 						stockmaster.description,
-						stockmaster.units
-					FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster
+						stockmaster.units,
+						currencies.rate,
+						debtorsmaster.currcode,
+						stockmaster.decimalplaces
+					FROM 	salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
 					WHERE 	salesorderdetails.orderno = salesorders.orderno
 						AND salesorderdetails.stkcode = stockmaster.stockid
 						AND salesorders.debtorno = debtorsmaster.debtorno
+						AND debtorsmaster.currcode = currencies.currabrev
 						AND salesorders.fromstkloc = '" . $_POST["Location"] . "'
 						AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
 						AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
@@ -165,7 +181,6 @@
 			echo '<tr class="OddTableRows">';
 			$k = 1;
 		}
-		$val = number_format($myrow['2'], 2);
 		printf('<td class="number">%s</td>
 						<td>%s</font></td>
 						<td>%s</td>
@@ -175,8 +190,8 @@
 						<td class="number">%s</td>
 						</tr>', $i, $myrow['0'], $myrow['3'], $myrow['1'], //total invoice here
 		$myrow['4'], //unit
-		$val, //value sales here
-		$ohRow[0] //on hand
+		number_format($myrow['2']/$myrow['5'],2), //value sales here
+		number_format($ohRow[0], $myrow['7']) //on hand
 		);
 		$i+= 1;
 	}

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-20 11:19:57 UTC (rev 3648)
+++ trunk/doc/Change.log.html	2010-07-20 11:36:56 UTC (rev 3649)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>20/07/10 Tim: TopItems.php - Show value in functional currency, and show decimal places correctly</p>
 <p>20/07/10 Tim: Daily Transactions listings - Show reports correctly even in mysql strict mode</p>
 <p>19/07/10 Tim: FixedassetTransfer.php - Layout changes and sql quoting, use javascript to change location</p>
 <p>19/07/10 Tim: FixedassetLocations.php - Layout changes and sql quoting, proper checks for deletion of location</p>


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