X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=e52f293395c08b265a20e203b0eb4cce09a88daa;hb=f9de0ce30a9bf6940fba0126f6cc51cab0692061;hp=4baf0105841b9e4e4b91416a7c8446ab4258f03e;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 4baf0105..e52f2933 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -71,14 +71,18 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-	global $path_to_root, $trans_dir, $Hooks, $systypes_array;
+	global $path_to_root, $trans_dir, $systypes_array;
 	
 	$from = $_POST['PARAM_0'];
 	$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;
@@ -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(ST_BANKDEPOSIT,ST_SALESINVOICE,ST_CUSTCREDIT))) {
+		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)
@@ -192,10 +202,7 @@ function print_tax_report()
 	$rep->Font();
 	$rep->NewLine();
 
-	if (method_exists($Hooks, 'TaxFunction'))
-	{
-		$Hooks->TaxFunction();
-	}
+	hook_tax_report_done();
 
 	$rep->End();
 }