X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=f24512d6a734ee9d453656c23edb5c6db4e2067f;hb=ee7f610a0669b4dd4a85d19c1969573a82ee1826;hp=f20e48e0692c23a0d2e7f5f35d73f3d216d4841d;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index f20e48e0..f24512d6 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -45,8 +45,8 @@ function getTaxTransactions($from, $to)
 			ON taxrec.trans_no=dtrans.trans_no AND taxrec.trans_type=dtrans.type
 		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 != 13
+		WHERE (taxrec.amount <> 0 OR taxrec.net_amount <> 0)
+			AND taxrec.trans_type <> ".ST_CUSTDELIVERY."
 			AND taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
 		ORDER BY taxrec.tran_date";
@@ -77,8 +77,12 @@ function print_tax_report()
 	$to = $_POST['PARAM_1'];
 	$summaryOnly = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
+	$destination = $_POST['PARAM_4'];
 
-	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	$dec = user_price_dec();
 
@@ -107,7 +111,7 @@ function print_tax_report()
 	$rep->Info($params, $cols, $headers, $aligns);
 	if (!$summaryOnly)
 	{
-		$rep->Header();
+		$rep->NewPage();
 	}
 	
 	$totalnet = 0.0;
@@ -116,7 +120,7 @@ function print_tax_report()
 
 	while ($trans=db_fetch($transactions))
 	{
-		if (in_array($trans['trans_type'], array(11,20))) {
+		if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE))) {
 			$trans['net_amount'] *= -1;
 			$trans['amount'] *= -1;
 		}
@@ -140,10 +144,14 @@ function print_tax_report()
 			if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
 			{
 				$rep->Line($rep->row - 2);
-				$rep->Header();
+				$rep->NewPage();
 			}
 		}
-		if (in_array($trans['trans_type'], array(2,10,11))) {
+		if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
+			$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 {
@@ -161,12 +169,14 @@ function print_tax_report()
 
 	$aligns2 = array('left', 'right', 'right', 'right',	'right', 'right', 'right');
 
-	for ($i = 0; $i < count($cols2); $i++)
-		$rep->cols[$i] = $rep->leftMargin + $cols2[$i];
+	$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->Header();
+	$rep->NewPage();
 
 	$taxtotal = 0;
 	foreach( $taxes as $id=>$sum)