Bug 5332: Rep709, Tax Report, Multiple entries for a sinle tax line. Fixed.

[fa-stable.git] / reporting / rep709.php

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 9bfdc0a78e0844decf19774c881bb889cf0d913e..36984ff290ef43903e3c1e963ec24f59b0e84c37 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -43,7 +43,8 @@ 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
+                       gl.amount=taxrec.amount 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,6 +58,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";
+
     return db_query($sql,"No transactions were returned");
 }