Added user_id to Journal Inquiry

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ca18a811cd67933018489a949dac7d5d766340a6..e09af0455cbd46ae2019fe01d6e83a1e64e21f20 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,9 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+14-May-2009 Joe Hunt
++ Added user_id to Journal Inquiry
+$ /gl/inquiry/journal_inquiry.php
 
 13-May-2009 Janusz Dobrowolski
 # Excluding closed transactions from edition/voiding.

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index bf75a4732a3cca0ebc08ce1218a02a6e43c39e63..15361bd2be26b16cd528e14fbc8b1a6f6b86863a 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -117,14 +117,17 @@ $sql = "SELECT    a.gl_seq,
                                gl.type_no,
                                refs.reference,
                                SUM(IF(gl.amount>0, gl.amount,0)) as amount,"
-                               ."com.memo_"
+                               ."com.memo_,"
+                               ."u.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)
+                       (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 AND !ISNULL(a.gl_seq)";
@@ -149,6 +152,7 @@ $cols = array(
        _("Reference"), 
        _("Amount") => array('type'=>'amount'),
        _("Memo"),
+       _("User"),
        _("View") => array('insert'=>true, 'fun'=>'gl_link'),
        array('insert'=>true, 'fun'=>'edit_link')
 );