X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=bd807a6973fcd7b8ff915da694587a72a09b0925;hb=616b34b5bd751e1fb8e2c0d394430128c7cb285f;hp=9bfdc0a78e0844decf19774c881bb889cf0d913e;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 9bfdc0a7..bd807a69 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");
 }
 
@@ -131,7 +133,8 @@ function print_tax_report()
 
 	while ($trans=db_fetch($transactions))
 	{
-		if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE,ST_JOURNAL))) {
+		if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE)) ||
+			($trans['trans_type'] == ST_JOURNAL && $trans['reg_type'] == TR_INPUT)) {
 			$trans['net_amount'] *= -1;
 			$trans['amount'] *= -1;
 		}