X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=9ee5ef2c3050f289c715a5dd21a46c2b32c49468;hb=fec081ddbcf4f2ceb4b325f30cfc1005e855b724;hp=20dbf267be717e2690a2e2bcf8b30b2b9c761925;hpb=0921882eb607de6fa86e19e3752f642638aa4358;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 20dbf267..9ee5ef2c 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -53,7 +53,7 @@ function getTaxTransactions($from, $to)
 		LEFT JOIN ".TB_PREF."debtors_master as debt ON dtrans.debtor_no=debt.debtor_no
 		LEFT JOIN ".TB_PREF."cust_branch as branch ON dtrans.branch_code=branch.branch_code
 		WHERE (taxrec.amount <> 0 OR taxrec.net_amount <> 0)
-			AND taxrec.trans_type <> ".ST_CUSTDELIVERY."
+			AND !ISNULL(taxrec.reg_type)
 			AND taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
 		ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
@@ -78,8 +78,8 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-	global $path_to_root, $trans_dir, $Hooks, $systypes_array;
-	
+	global $path_to_root, $Hooks, $systypes_array;
+
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$summaryOnly = $_POST['PARAM_2'];
@@ -136,7 +136,7 @@ function print_tax_report()
 			$trans['net_amount'] *= -1;
 			$trans['amount'] *= -1;
 		}
-		
+
 		if (!$summaryOnly)
 		{
 			$rep->TextCol(0, 1, $systypes_array[$trans['trans_type']]);
@@ -150,7 +150,7 @@ function print_tax_report()
 			$rep->AmountCol(5, 6, $trans['net_amount'], $dec);
 			$rep->AmountCol(6, 7, $trans['rate'], $dec);
 			$rep->AmountCol(7, 8, $trans['amount'], $dec);
-			
+
 			$rep->TextCol(9, 10, $trans['taxname']);
 
 			$rep->NewLine();
@@ -161,18 +161,18 @@ function print_tax_report()
 				$rep->NewPage();
 			}
 		}
-		if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
+		if ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_INPUT) {
 			$taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
 			$taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
 		}
-		elseif ($trans['trans_type']==ST_JOURNAL && $trans['amount']>=0) {
+		elseif ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_OUTPUT) {
 			$taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
 			$taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
 		}
 		elseif (in_array($trans['trans_type'], array(ST_BANKDEPOSIT,ST_SALESINVOICE,ST_CUSTCREDIT))) {
 			$taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
 			$taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
-		} else {
+		} elseif ($trans['reg_type'] !== NULL) {
 			$taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
 			$taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
 		}
@@ -227,4 +227,3 @@ function print_tax_report()
 	$rep->End();
 }
 
-?>
\ No newline at end of file