X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=0cd1f519328aa01b7d26a5481c6a56e96c8bd8f9;hb=2383d33373d6ddec06906658a0ed6398077c1147;hp=d651b36f625ab5e19d8e214e3a93b95b1ef8629c;hpb=f086902be249cff3848f86b2601f138857c5d016;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index d651b36f..0cd1f519 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
@@ -33,12 +33,10 @@ function getTaxTransactions($from, $to)
 	$fromdate = date2sql($from);
 	$todate = date2sql($to);
 
-	$sql = "SELECT taxrec.*, IF(ISNULL(dtrans.rate),IF(ISNULL(strans.rate), taxrec.amount, taxrec.amount*strans.rate), 
-				taxrec.amount*dtrans.rate) AS amount,
-	            IF(ISNULL(dtrans.rate),IF(ISNULL(strans.rate), taxrec.net_amount,taxrec.net_amount*strans.rate),
-	            taxrec.net_amount*dtrans.rate) AS net_amount,
+	$sql = "SELECT taxrec.*, taxrec.amount*ex_rate AS amount,
+	            taxrec.net_amount*ex_rate AS net_amount,
 				stype.type_name,
-				if(supp.supp_name is null, debt.name, supp.supp_name) as name,
+				IF(ISNULL(supp.supp_name), debt.name, supp.supp_name) as name,
 				branch.br_name
 		FROM ".TB_PREF."trans_tax_details taxrec
 		LEFT JOIN ".TB_PREF."supp_trans strans
@@ -50,6 +48,7 @@ function getTaxTransactions($from, $to)
 		LEFT JOIN ".TB_PREF."cust_branch as branch ON dtrans.branch_code=branch.branch_code,
 		".TB_PREF."sys_types stype
 		WHERE taxrec.trans_type=stype.type_id
+			AND (taxrec.amount != 0 OR taxrec.net_amount != 0)
 			AND taxrec.trans_type != 13
 			AND taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
@@ -77,17 +76,16 @@ function print_tax_report()
 {
 	global $path_to_root, $trans_dir;
 	
-	
-	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
-	$rep = new FrontReport(_('Tax Report'), "TaxReport.pdf", user_pagesize());
-
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$summaryOnly = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
+
+	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+
 	$dec = user_price_dec();
 
+	$rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize());
 	if ($summaryOnly == 1)
 		$summary = _('Summary Only');
 	else
@@ -99,20 +97,19 @@ function print_tax_report()
 	while ($tax=db_fetch($res))
 		$taxes[$tax['id']] = array('in'=>0, 'out'=>0, 'taxin'=>0, 'taxout'=>0);
 
-	if (!$summaryOnly)
-	{
-		$cols = array(0, 80, 130, 180, 290, 370, 455, 505, 555);
-
-		$headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
-			_('Net'), _('Rate'), _('Tax'));
-		$aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+	$params =   array( 	0 => $comments,
+						1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
+						2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
 
-		$params =   array( 	0 => $comments,
-							1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
-							2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
+	$cols = array(0, 80, 130, 180, 290, 370, 455, 505, 555);
 
-		$rep->Font();
-		$rep->Info($params, $cols, $headers, $aligns);
+	$headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
+		_('Net'), _('Rate'), _('Tax'));
+	$aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+	$rep->Font();
+	$rep->Info($params, $cols, $headers, $aligns);
+	if (!$summaryOnly)
+	{
 		$rep->Header();
 	}
 	
@@ -131,13 +128,13 @@ function print_tax_report()
 		{
 			$rep->TextCol(0, 1,	$trans['type_name']);
 			$rep->TextCol(1, 2,	$trans['memo']);
-			$rep->TextCol(2, 3,	sql2date($trans['tran_date']));
+			$rep->DateCol(2, 3,	$trans['tran_date'], true);
 			$rep->TextCol(3, 4,	$trans['name']);
 			$rep->TextCol(4, 5,	$trans['br_name']);
 
-			$rep->TextCol(5, 6,	number_format2($trans['net_amount'], $dec));
-			$rep->TextCol(6, 7,	number_format2($trans['rate'], $dec));
-			$rep->TextCol(7, 8,	number_format2($trans['amount'], $dec));
+			$rep->AmountCol(5, 6, $trans['net_amount'], $dec);
+			$rep->AmountCol(6, 7, $trans['rate'], $dec);
+			$rep->AmountCol(7, 8, $trans['amount'], $dec);
 
 			$rep->NewLine();
 
@@ -147,14 +144,13 @@ function print_tax_report()
 				$rep->Header();
 			}
 		}
-		if ($trans['net_amount'] > 0) {
+		if (in_array($trans['trans_type'], array(0,2,10,11))) {
 			$taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
 			$taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
 		} else {
-			$taxes[$trans['tax_type_id']]['taxin'] -= $trans['amount'];
-			$taxes[$trans['tax_type_id']]['in'] -= $trans['net_amount'];
+			$taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
+			$taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
 		}
-		
 		$totalnet += $trans['net_amount'];
 		$totaltax += $trans['amount'];
 	}
@@ -179,12 +175,12 @@ function print_tax_report()
 		$tx = getTaxInfo($id);
 		
 		$rep->TextCol(0, 1, $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%");
-		$rep->TextCol(1, 2, number_format2($sum['out'], $dec));
-		$rep->TextCol(2, 3,number_format2($sum['taxout'], $dec));
-		$rep->TextCol(3, 4, number_format2($sum['in'], $dec));
-		$rep->TextCol(4, 5,number_format2($sum['taxin'], $dec)); 
-		$rep->TextCol(5, 6, number_format2($sum['taxout']-$sum['taxin'], $dec));
-		$taxtotal += $sum['taxout']-$sum['taxin'];
+		$rep->AmountCol(1, 2, $sum['out'], $dec);
+		$rep->AmountCol(2, 3, $sum['taxout'], $dec);
+		$rep->AmountCol(3, 4, $sum['in'], $dec);
+		$rep->AmountCol(4, 5, $sum['taxin'], $dec); 
+		$rep->AmountCol(5, 6, $sum['taxout']+$sum['taxin'], $dec);
+		$taxtotal += $sum['taxout']+$sum['taxin'];
 		$rep->NewLine();
 	}
 
@@ -192,20 +188,14 @@ function print_tax_report()
 	$rep->NewLine();
 	$rep->Line($rep->row + $rep->lineHeight);
 	$rep->TextCol(3, 5,	_("Total payable or refund"));
-	$rep->TextCol(5, 6,	number_format2($taxtotal, $dec));
+	$rep->AmountCol(5, 6, $taxtotal, $dec);
 	$rep->Line($rep->row - 5);
 	$rep->Font();
 	$rep->NewLine();
 
-	$locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc";
-	if (file_exists($locale))
+	if (method_exists($Hooks, 'TaxFunction'))
 	{
-		$taxinclude = true;
-		include($locale);
-		
-//		if (function_exists("TaxFunction"))
-//			TaxFunction();
-		
+		$Hooks->TaxFunction();
 	}
 
 	$rep->End();