X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=1ffa5f089fe129e9514e6c553df8280ef4c8d1a9;hb=1571869d54be48452fdbe08f25130972ff0a7b5a;hp=e52f293395c08b265a20e203b0eb4cce09a88daa;hpb=0fd1eb74bd51889ce48a6ab5369e66a86cbe7da2;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index e52f2933..1ffa5f08 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -33,11 +33,13 @@ function getTaxTransactions($from, $to)
 	$fromdate = date2sql($from);
 	$todate = date2sql($to);
 
-	$sql = "SELECT taxrec.*, taxrec.amount*ex_rate AS amount,
+	$sql = "SELECT tt.name as taxname, taxrec.*, taxrec.amount*ex_rate AS amount,
 	            taxrec.net_amount*ex_rate AS net_amount,
 				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."tax_types tt
+			ON taxrec.tax_type_id=tt.id
 		LEFT JOIN ".TB_PREF."supp_trans strans
 			ON taxrec.trans_no=strans.trans_no AND taxrec.trans_type=strans.type
 		LEFT JOIN ".TB_PREF."suppliers as supp ON strans.supplier_id=supp.supplier_id
@@ -49,7 +51,7 @@ function getTaxTransactions($from, $to)
 			AND taxrec.trans_type <> ".ST_CUSTDELIVERY."
 			AND taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
-		ORDER BY taxrec.tran_date";
+		ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
 //display_error($sql);
     return db_query($sql,"No transactions were returned");
 }
@@ -71,22 +73,24 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-	global $path_to_root, $trans_dir, $systypes_array;
-	
+	global $path_to_root, $trans_dir, $Hooks, $systypes_array;
+
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$summaryOnly = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
-	$destination = $_POST['PARAM_4'];
+	$orientation = $_POST['PARAM_4'];
+	$destination = $_POST['PARAM_5'];
 
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
-	$rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize());
+	$rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize(), 9, $orientation);
 	if ($summaryOnly == 1)
 		$summary = _('Summary Only');
 	else
@@ -102,11 +106,14 @@ function print_tax_report()
 						1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
 						2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
 
-	$cols = array(0, 100, 130, 180, 290, 370, 420, 470, 520);
+	$cols = array(0, 80, 130, 180, 270, 350, 400, 430, 480, 485, 520);
 
 	$headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
-		_('Net'), _('Rate'), _('Tax'));
-	$aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+		_('Net'), _('Rate'), _('Tax'), '', _('Name'));
+	$aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right', 'right','left');
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
+
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
 	if (!$summaryOnly)
@@ -120,11 +127,11 @@ function print_tax_report()
 
 	while ($trans=db_fetch($transactions))
 	{
-		if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE))) {
+		if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE,ST_JOURNAL))) {
 			$trans['net_amount'] *= -1;
 			$trans['amount'] *= -1;
 		}
-		
+
 		if (!$summaryOnly)
 		{
 			$rep->TextCol(0, 1, $systypes_array[$trans['trans_type']]);
@@ -139,6 +146,8 @@ function print_tax_report()
 			$rep->AmountCol(6, 7, $trans['rate'], $dec);
 			$rep->AmountCol(7, 8, $trans['amount'], $dec);
 
+			$rep->TextCol(9, 10, $trans['taxname']);
+
 			$rep->NewLine();
 
 			if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
@@ -148,8 +157,12 @@ function print_tax_report()
 			}
 		}
 		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'];
+			$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) {
+			$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'];
@@ -164,6 +177,8 @@ function print_tax_report()
 	
 	// Summary
 	$cols2 = array(0, 100, 180,	260, 340, 420, 500);
+    if ($orientation == 'L')
+    	recalculate_cols($cols2);
 
 	$headers2 = array(_('Tax Rate'), _('Outputs'), _('Output Tax'),	_('Inputs'), _('Input Tax'), _('Net Tax'));