Merging changes form main trunk 2.2.5-2.2.6

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

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 04092b75e47d8a46d4ed5cd517613c4e0a5a197b..66b9aaf14df026ba3c45c52131daac28e109d57a 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -24,7 +24,7 @@ if ($use_popup_windows)
 if ($use_date_picker)
        $js .= get_js_date_picker();
 
-page(_("Journal Inquiry"), false, false, "", $js);
+page(_($help_context = "Journal Inquiry"), false, false, "", $js);
 
 //-----------------------------------------------------------------------------------
 // Ajax updates
@@ -45,13 +45,15 @@ start_row();
 ref_cells(_("Reference:"), 'Ref', '',null, _('Enter reference fragment or leave empty'));
 
 journal_types_list_cells(_("Type:"), "filterType");
-date_cells(_("From:"), 'FromDate', '', null, 0, 0, -1);
+date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
 date_cells(_("To:"), 'ToDate');
 
 check_cells( _("Show closed:"), 'AlsoClosed', null);
 
 submit_cells('Search', _("Search"), '', '', 'default');
-
+end_row();
+start_row();
+ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty'));
 end_row();
 end_table();
 
@@ -111,36 +113,7 @@ function edit_link($row)
                        ICON_EDIT) : '';
 }
 
-$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,
-       com.memo_,
-       IF(ISNULL(u.user_id),'',u.user_id) as 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)
-        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";
-if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
-       $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
-}      
-if (get_post('filterType') != -1) {
-       $sql .= " AND gl.type=".get_post('filterType');
-}      
-if (!check_value('AlsoClosed')) {
-       $sql .= " AND gl_seq=0";
-}
-$sql .= " GROUP BY gl.type, gl.type_no";
+$sql = get_sql_for_journal_inquiry();
 
 $cols = array(
        _("#") => array('fun'=>'journal_pos', 'align'=>'center'),