[Web-erp-svn] SF.net SVN: web-erp:[6139] trunk/GLAccountInquiry.php

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

Revision: 6139
          http://sourceforge.net/p/web-erp/reponame/6139
Author:   tehonu
Date:     2013-07-24 03:03:47 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
Simplify query

Modified Paths:
--------------
    trunk/GLAccountInquiry.php

Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php	2013-07-22 17:46:59 UTC (rev 6138)
+++ trunk/GLAccountInquiry.php	2013-07-24 03:03:47 UTC (rev 6139)
@@ -130,47 +130,30 @@
 	$FirstPeriodSelected = min($SelectedPeriod);
 	$LastPeriodSelected = max($SelectedPeriod);
 
-	if ($_POST['tag']==0) {
- 		$sql= "SELECT type,
-					typename,
-					gltrans.typeno,
-					trandate,
-					narrative,
-					amount,
-					periodno,
-					gltrans.tag,
-					tagdescription
-				FROM gltrans INNER JOIN systypes
-				ON systypes.typeid=gltrans.type
-				LEFT JOIN tags
-				ON gltrans.tag = tags.tagref
-				WHERE gltrans.account = '" . $SelectedAccount . "'
-				AND posted=1
-				AND periodno>='" . $FirstPeriodSelected . "'
-				AND periodno<='" . $LastPeriodSelected . "'
-				ORDER BY periodno, gltrans.trandate, counterindex";
+	$sql= "SELECT counterindex,
+				type,
+				typename,
+				gltrans.typeno,
+				trandate,
+				narrative,
+				amount,
+				periodno,
+				gltrans.tag,
+				tagdescription
+			FROM gltrans INNER JOIN systypes
+			ON systypes.typeid=gltrans.type
+			LEFT JOIN tags
+			ON gltrans.tag = tags.tagref
+			WHERE gltrans.account = '" . $SelectedAccount . "'
+			AND posted=1
+			AND periodno>='" . $FirstPeriodSelected . "'
+			AND periodno<='" . $LastPeriodSelected . "'";
 
-	} else {
- 		$sql= "SELECT type,
-					typename,
-					gltrans.typeno,
-					trandate,
-					narrative,
-					amount,
-					periodno,
-					gltrans.tag,
-					tagdescription
-				FROM gltrans INNER JOIN systypes
-				ON systypes.typeid=gltrans.type
-				LEFT JOIN tags
-				ON gltrans.tag = tags.tagref
-				WHERE gltrans.account = '" . $SelectedAccount . "'
-				AND posted=1
-				AND periodno>= '" . $FirstPeriodSelected . "'
-				AND periodno<= '" . $LastPeriodSelected . "'
-				AND tag='" . $_POST['tag'] . "'
-				ORDER BY periodno, gltrans.trandate, counterindex";
+	if ($_POST['tag']!=0) {
+ 		$sql = $sql . " AND tag='" . $_POST['tag'] . "'";
 	}
+			
+	$sql = $sql . " ORDER BY periodno, gltrans.trandate, counterindex";
 
 	$namesql = "SELECT accountname FROM chartmaster WHERE accountcode='" . $SelectedAccount . "'";
 	$nameresult = DB_query($namesql, $db);