Voided transactions should not be presented in GL inquiry.

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index ca7f01d96fc51fb4afc60a776724d647f6e0079a..bf6a8b4f7074708cb83c291d3a56fc87579a932b 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -104,9 +104,13 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
        $to = date2sql($to_date);
 
        $sql = "SELECT ".TB_PREF."gl_trans.*, "
-               .TB_PREF."chart_master.account_name FROM ".TB_PREF."gl_trans, "
-               .TB_PREF."chart_master
-               WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
+               .TB_PREF."chart_master.account_name FROM "
+               .TB_PREF."gl_trans
+                       LEFT JOIN ".TB_PREF."voided v ON "
+                       .TB_PREF."gl_trans.type_no=v.id AND v.type=".TB_PREF."gl_trans.type,"
+                       .TB_PREF."chart_master"
+               ." WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
+               AND ISNULL(v.date_)
                AND tran_date >= '$from'
                AND tran_date <= '$to'";
        if ($trans_no > 0)