Changed Journal Inquiries so it shows the Bank Deposit/Payment amount instead of...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c7fd6dfd8a23bdd9180ed16260734286a90b388d..b5cd728b03fab0d095576ff6478e5b1d484ea798 100644 (file)
--- 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 9f551e0185df694965605ac14826b970e4c84ac0..ecde86f46844382829f3e185a0778ff67944868b 100644 (file)
--- 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";