From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 10 Jul 2015 13:22:28 +0000 (+0200)
Subject: [0003240] Tax Report: duplicated lines were listed for edited transactions.
X-Git-Tag: 2.3-final~44^2
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=acb313fc11ab4aa40e48b46c1534d09114638f6c

[0003240] Tax Report: duplicated lines were listed for edited transactions.
---

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 20dbf267..d4421eeb 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -43,7 +43,7 @@ function getTaxTransactions($from, $to)
 		LEFT JOIN ".TB_PREF."tax_types tt
 			ON taxrec.tax_type_id=tt.id
 		LEFT JOIN ".TB_PREF."gl_trans gl 
-			ON taxrec.trans_type=gl.type AND taxrec.trans_no=gl.type_no AND 
+			ON taxrec.trans_type=gl.type AND taxrec.trans_no=gl.type_no AND gl.amount<>0 AND
 			(tt.purchasing_gl_code=gl.account OR tt.sales_gl_code=gl.account)
 		LEFT JOIN ".TB_PREF."supp_trans strans
 			ON taxrec.trans_no=strans.trans_no AND taxrec.trans_type=strans.type
@@ -57,7 +57,7 @@ function getTaxTransactions($from, $to)
 			AND taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
 		ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
-//display_error($sql);
+
     return db_query($sql,"No transactions were returned");
 }