From 081465f30442afc4f008a1c7038bef320466a730 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 12 Nov 2009 10:29:43 +0000 Subject: [PATCH] Changed Journal Inquiries so it shows the Bank Deposit/Payment amount instead of sum of positive transaction. --- CHANGELOG.txt | 5 +++++ gl/inquiry/journal_inquiry.php | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c7fd6dfd..b5cd728b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,11 @@ Legend: ! -> Note $ -> Affected files +12-Nov-2009 Tom Hallman/Joe Hunt +! Changed Journal Inquiries so it shows the Bank Deposit/Payment amount + instead of sum of positive transaction. +$ /gl/inquiry/journal_inquiry.php + 10-Nov-2009 Janusz Dobrowolski # Fixed value for SA_SUPPBULKREP access area. $ /includes/access_levels.inc diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php index 9f551e01..ecde86f4 100644 --- a/gl/inquiry/journal_inquiry.php +++ b/gl/inquiry/journal_inquiry.php @@ -111,12 +111,19 @@ 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, - SUM(IF(gl.amount>0, gl.amount,0)) as amount, + 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 @@ -128,6 +135,8 @@ $sql = "SELECT IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq, (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"; -- 2.30.2