X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=36984ff290ef43903e3c1e963ec24f59b0e84c37;hb=14e0807fc87e0096af43f414f98764a6f8c8a4a8;hp=5c12ac9dd32d4e1a3709588303660f3b36473463;hpb=31b570aaeb5b66a9511552facc454ff77a99642b;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 5c12ac9d..36984ff2 100644
--- 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");
 }
 
@@ -77,7 +79,7 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-	global $path_to_root, $Hooks, $systypes_array;
+	global $path_to_root, $systypes_array;
 
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
@@ -191,9 +193,6 @@ function print_tax_report()
 
 	$rep->Info($params, $cols2, $headers2, $aligns2);
 
-	//for ($i = 0; $i < count($cols2); $i++)
-	//	$rep->cols[$i] = $rep->leftMargin + $cols2[$i];
-
 	$rep->headers = $headers2;
 	$rep->aligns = $aligns2;
 	$rep->NewPage();