Added confirmation js dialogs for deleting and restoring backup file.

[fa-stable.git] / gl / inquiry / journal_inquiry.php

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 119c34be951718a577a24c35fc80d5ec35a97a0d..6cfd3cccd20deb2fd484357651e895ca1c2b0340 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 
-$page_security = 8;
+$page_security = 'SA_GLANALYTIC';
 $path_to_root="../..";
 
 include($path_to_root . "/includes/db_pager.inc");
@@ -105,7 +105,7 @@ function edit_link($row)
 {
        global $editors;
 
-       return isset($editors[$row["type"]]) && !is_closed_trans($row["type"]], $row["type_no"]) ? 
+       return isset($editors[$row["type"]]) && !is_closed_trans($row["type"], $row["type_no"]) ? 
                pager_link(_("Edit"), 
                        sprintf($editors[$row["type"]], $row["type_no"], $row["type"]),
                        ICON_EDIT) : '';
@@ -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')
 );