[Web-erp-svn] SF.net SVN: web-erp:[5240] trunk

[<te...@us...>]

Revision: 5240
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5240&view=rev
Author:   tehonu
Date:     2012-04-12 07:51:50 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Ricard: Code simplified on TopItems.php 

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

Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php	2012-04-12 07:43:22 UTC (rev 5239)
+++ trunk/TopItems.php	2012-04-12 07:51:50 UTC (rev 5240)
@@ -80,91 +80,33 @@
 } else {
 	// everything below here to view NumberOfTopItems items sale on selected location
 	$FromDate = FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d', -filter_number_format($_POST['NumberOfDays'])));
-	//the situation if the location and customer type selected "All"
-	if (($_POST['Location'] == 'All') and ($_POST['Customers'] == 'All')) {
-		
-		$SQL = "SELECT 	salesorderdetails.stkcode,
-						SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
-						SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
-						stockmaster.description,
-						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 >= '" . $FromDate . "' 
-				GROUP BY salesorderdetails.stkcode
-				ORDER BY " . $_POST['Sequence'] . " DESC
-				LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
-	} else { //the situation if only location type selected "All"
-		if ($_POST['Location'] == 'All') {
-			$SQL = "SELECT 	salesorderdetails.stkcode,
-						SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
-						SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
-						stockmaster.description,
-						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 >= '" . $FromDate . "'
-				GROUP BY salesorderdetails.stkcode
-				ORDER BY " . $_POST['Sequence'] . " DESC
-				LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
-		} else {
-			//the situation if the customer type selected "All"
-			if ($_POST['Customers'] == 'All') {
-				$SQL = "SELECT 	salesorderdetails.stkcode,
-							SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
-							SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
-							stockmaster.description,
-							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 >= '" . $FromDate . "'
-						GROUP BY salesorderdetails.stkcode
-						ORDER BY " . $_POST['Sequence'] . " DESC
-						LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
-			} else {
-				//the situation if the location and customer type not selected "All"
-				$SQL = "SELECT 	salesorderdetails.stkcode,
-							SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
-							SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
-							stockmaster.description,
-							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 >= '" . $FromDate . "'
-						GROUP BY salesorderdetails.stkcode
-						ORDER BY " . $_POST['Sequence'] . " DESC
-						LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
-			}
-		}
+
+	$SQL = "SELECT 	salesorderdetails.stkcode,
+					SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+					SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
+					stockmaster.description,
+					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 >= '" . $FromDate . "'";
+	
+	if ($_POST['Location'] != 'All') {
+		$SQL = $SQL . "	AND salesorders.fromstkloc = '" . $_POST['Location'] . "'";
 	}
+
+	if ($_POST['Customers'] != 'All') {
+		$SQL = $SQL . "	AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'";
+	}
+
+	$SQL = $SQL . "	GROUP BY salesorderdetails.stkcode
+					ORDER BY " . $_POST['Sequence'] . " DESC
+					LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
 	
 	$result = DB_query($SQL, $db);
 	

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-04-12 07:43:22 UTC (rev 5239)
+++ trunk/doc/Change.log	2012-04-12 07:51:50 UTC (rev 5240)
@@ -1,4 +1,5 @@
 webERP Change Log
+11/4/2012 Ricard: Code simplified on TopItems.php 
 7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.  
 5/4/2012 Exson: Fixed order delivery comments overlapped with Shipper in Packing slip of PDFOrderPageHeader_generic.inc Reported by CQZ from webERP Chinese Community QQ group 
 3/4/2012 Vitaly: Cleaned up Petty Cash module. Fixed several errors in SQL INSERT statements.

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