Fixed journal view and journal inquiry (regression).

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 78bff3a9c953d3e41676f21871aef5b954c4d751..c4fff50c1c77418a2241ce62b610c074d70460a6 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -178,8 +178,8 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 
 function get_gl_trans($type, $trans_id)
 {
-       $sql = "SELECT gl.*, cm.account_name, IF(ISNULL(refs.reference), '', refs.reference) AS reference, user.real_name, 
-                       IFNULL(st.tran_date, IFNULL(dt.tran_date, IFNULL(bt.trans_date, IFNULL(grn.delivery_date, gl.tran_date)))) as doc_date,
+       $sql = "SELECT gl.*, cm.account_name, IFNULL(refs.reference, '') AS reference, user.real_name, 
+                       COALESCE(st.tran_date, dt.tran_date, bt.trans_date, grn.delivery_date, gl.tran_date) as doc_date,
                        IF(ISNULL(st.supp_reference), '', st.supp_reference) AS supp_reference
        FROM ".TB_PREF."gl_trans as gl
                LEFT JOIN ".TB_PREF."chart_master as cm ON gl.account = cm.account_code
@@ -622,7 +622,7 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
        if ($dimension != null)
                $sql .= " AND dim.dimension = ".db_escape($dimension);
 
-       $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl_seq, gl.type, gl.type_no";
+       $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
 
        return $sql;
 }

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 999ae232cd23145de5073d23a85e266e862f1d80..3dc740de66ea6cce0deaede1937a38588ad3f13a 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -48,15 +48,14 @@ journal_types_list_cells(_("Type:"), "filterType");
 date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
 date_cells(_("To:"), 'ToDate');
 
-submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 start_row();
 ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty'));
 users_list_cells(_("User:"), 'userid', null, false);
 if (get_company_pref('use_dimension') && isset($_POST['dimension'])) // display dimension only, when started in dimension mode
        dimensions_list_cells(_('Dimension:'), 'dimension', null, true, null, true);
-users_list_cells(_("User:"), 'userid', null, false);
 check_cells( _("Show closed:"), 'AlsoClosed', null);
+submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 end_table();
 

diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php
index 7e37d0a6e188ccf404e3d6419e02628ed7641c13..38ba7f265885c9b291f13f7b7631572dbea35ea9 100644 (file)
--- a/gl/view/gl_trans_view.php
+++ b/gl/view/gl_trans_view.php
@@ -29,7 +29,7 @@ if (!isset($_GET['type_id']) || !isset($_GET['trans_no']))
 
 function display_gl_heading($myrow)
 {
-       global $systypes_array, $type_shortcuts;
+       global $systypes_array;
 
        $trans_name = $systypes_array[$_GET['type_id']];
        $journal = $_GET['type_id'] == ST_JOURNAL;
@@ -50,7 +50,7 @@ function display_gl_heading($myrow)
     table_header($th); 
     start_row();       
     label_cell("$trans_name #" . $_GET['trans_no']);
-    label_cell($type_shortcuts[$myrow['type']].' '.$myrow["reference"], "align='center'");
+    label_cell($myrow["reference"], "align='center'");
        if($myrow['supp_reference'])
        {
        label_cell($myrow["supp_reference"], "align='center'");