X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fjournal_inquiry.php;h=a7fccfb9b6c86528fd9e9b5ede424f095f1af1de;hb=136f0b545d09b06eec6431fa5dba19424e0ab05e;hp=f2aee15b2253c3d59cdb31b598511d9d2a9e2ad8;hpb=d09ac1d8c60cce3aa02730838bb06e1caf384417;p=fa-stable.git

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'),