From 136f0b545d09b06eec6431fa5dba19424e0ab05e Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 23 Dec 2009 23:03:41 +0000
Subject: [PATCH 1/1]  Restoring journal entry sql to previous without join
 with bank_trans due to error in joins. Tom Hallman works on it until 2.2.3

---
 CHANGELOG.txt                  |  3 +++
 gl/inquiry/journal_inquiry.php | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 96bd8fa9..da648a26 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -29,6 +29,9 @@ $ /reporting/rep109.php
   /reporting/rep111.php
   /reporting/includes/doctext.inc
   /reporting/includes/doctext2.inc
+# Restoring journal entry sql to previous without join with bank_trans
+  due to error in joins. Tom Hallman works on it until 2.2.3
+$ /gl/inquiry/journal_inquiry.php  
 ! Replaced all deprecated functions so FA runs in php >= 5.3.0 as well.
 $ /admin/db/maintenance_db.inc
   /gl/gl_bank.php
diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index f2aee15b..a7fccfb9 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -110,7 +110,7 @@ function edit_link($row)
 			sprintf($editors[$row["type"]], $row["type_no"], $row["type"]),
 			ICON_EDIT) : '';
 }
-
+/*
 // Tom Hallman 11 Nov 2009
 // IF(gl.type = 1... statement is for deposits/payments that may not actually result
 // in a deposit, such as when a fix is made.  Without that statement (and the
@@ -150,6 +150,38 @@ if (!check_value('AlsoClosed')) {
 	$sql .= " AND gl_seq=0";
 }
 $sql .= " GROUP BY gl.type, gl.type_no";
+*/
+
+$sql = "SELECT	IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
+ 	gl.tran_date,
+ 	gl.type,
+ 	gl.type_no,
+ 	refs.reference,
+ 	SUM(IF(gl.amount>0, gl.amount,0)) as amount,
+ 	com.memo_,
+ 	IF(ISNULL(u.user_id),'',u.user_id) as user_id
+ 	FROM ".TB_PREF."gl_trans as gl
+ 	 LEFT JOIN ".TB_PREF."audit_trail as a ON
+ 		(gl.type=a.type AND gl.type_no=a.trans_no)
+ 	 LEFT JOIN ".TB_PREF."comments as com ON
+ 		(gl.type=com.type AND gl.type_no=com.id)
+ 	 LEFT JOIN ".TB_PREF."refs as refs ON
+ 		(gl.type=refs.type AND gl.type_no=refs.id)
+ 	 LEFT JOIN ".TB_PREF."users as u ON
+ 		a.user=u.id
+ 	WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
+ 	AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
+ 	AND gl.amount!=0";
+if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
+ 	$sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
+}
+if (get_post('filterType') != -1) {
+ 	$sql .= " AND gl.type=".get_post('filterType');
+}
+if (!check_value('AlsoClosed')) {
+ 	$sql .= " AND gl_seq=0";
+}
+$sql .= " GROUP BY gl.type, gl.type_no";
 
 $cols = array(
 	_("#") => array('fun'=>'journal_pos', 'align'=>'center'), 
-- 
2.30.2