From: Joe Hunt Date: Thu, 14 May 2009 14:03:13 +0000 (+0000) Subject: Added user_id to Journal Inquiry X-Git-Tag: v2.4.2~19^2~1380 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=9d84771d49fecca5aedca33670309830602f670b;p=fa-stable.git Added user_id to Journal Inquiry --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ca18a811..e09af045 100644 --- 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 bf75a473..15361bd2 100644 --- 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') );