Show Journal Entries from 2.1 as closed in Journal Inquiries.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e43ae66cb9f6c998afea52cbb86c2320cbbc2db5..3ffa4c2d390d8dcf7f979675677a3ce2e32883a5 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -21,7 +21,9 @@ $ -> Affected files
 
 06-Oct-2009 Tom Hallman
 # moved commit_transaction and added a default use_transaction param in write_journal_entries
-$ /gl/include/db/gl_db_trans.inc
+$ /gl/includes/db/gl_db_trans.inc
+# Show Journal Entries from 2.1 as closed in Journal Inquiries.
+$ /gl/inquiry/journal_inquiry.php
 
 03-Oct-2009 Joe Hunt
 # Bad conversion of timestamp value in report audit trail.

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 1c1405137dee9df5e0c806d08c9adc65cbc5fbf5..04092b75e47d8a46d4ed5cd517613c4e0a5a197b 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -55,8 +55,6 @@ submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 end_table();
 
-end_form();
-
 function journal_pos($row)
 {
        return $row['gl_seq'] ? $row['gl_seq'] : '-';
@@ -113,37 +111,35 @@ function edit_link($row)
                        ICON_EDIT) : '';
 }
 
-$sql = "SELECT a.gl_seq,
-                               gl.tran_date,
-                               gl.type,
-                               gl.type_no,
-                               refs.reference,
-                               SUM(IF(gl.amount>0, gl.amount,0)) as amount,"
-                               ."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)"
-               ." LEFT JOIN ". TB_PREF."users as u ON 
-                       a.user=u.id
-               WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
+$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 AND !ISNULL(a.gl_seq)";
-
+       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 a.gl_seq=0";
+       $sql .= " AND gl_seq=0";
 }
-
 $sql .= " GROUP BY gl.type, gl.type_no";
 
 $cols = array(
@@ -166,7 +162,6 @@ if (!check_value('AlsoClosed')) {
 $table =& new_db_pager('journal_tbl', $sql, $cols);
 
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);