X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fjournal_inquiry.php;h=b7a787a94acd132fa81db08b157313990232a089;hb=0bf933423b9645bcb57390c478d4fdaf0c895049;hp=f2aee15b2253c3d59cdb31b598511d9d2a9e2ad8;hpb=4221bf69f713a2fb0bb4c4cae6f8f4f819c3ec31;p=fa-stable.git

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index f2aee15b..b7a787a9 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -111,45 +111,7 @@ function edit_link($row)
 			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
-// joining of the bank_trans table), the fix deposit/payment amount would show up 
-// incorrectly as only the positive side of the fix.    
-$sql = "SELECT	IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
-	gl.tran_date,
-	gl.type,
-	gl.type_no,
-	refs.reference,
-	IF(gl.type = 1 OR gl.type = 2,
-	  bank_trans.amount,
-	  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
-	 LEFT JOIN ".TB_PREF."bank_trans as bank_trans ON 
-		(gl.type=bank_trans.type AND gl.type_no=bank_trans.trans_no)		
-	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";
+$sql = get_sql_for_journal_inquiry();
 
 $cols = array(
 	_("#") => array('fun'=>'journal_pos', 'align'=>'center'),