From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 7 Dec 2010 08:01:27 +0000 (+0000)
Subject: Voided transactions should not be presented in GL inquiry.
X-Git-Tag: v2.4.2~19^2~432
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=22d4e8e58bc6fa1c8dd1b091f582eab0ab175d0d;p=fa-stable.git

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 ca7f01d9..bf6a8b4f 100644
--- 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)