X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep709.php;h=20dbf267be717e2690a2e2bcf8b30b2b9c761925;hb=168c5beaa04a25f31face788f8030c5d08f8e998;hp=dbe25e5bd59e82f1472f06b0c566ee4e9f055baf;hpb=2868af36843011d5f96da63e0ddeea05039a7bf5;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index dbe25e5b..20dbf267 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -35,11 +35,16 @@ function getTaxTransactions($from, $to)
 
 	$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,
+				IF(taxrec.trans_type=".ST_BANKPAYMENT." OR taxrec.trans_type=".ST_BANKDEPOSIT.", 
+					IF(gl.person_type_id<>".PT_MISC.", gl.memo_, gl.person_id), 
+					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."gl_trans gl 
+			ON taxrec.trans_type=gl.type AND taxrec.trans_no=gl.type_no AND 
+			(tt.purchasing_gl_code=gl.account OR tt.sales_gl_code=gl.account)
 		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
@@ -79,16 +84,18 @@ function print_tax_report()
 	$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
@@ -109,6 +116,9 @@ function print_tax_report()
 	$headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
 		_('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)
@@ -122,7 +132,7 @@ 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;
 		}
@@ -152,8 +162,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'];
@@ -168,6 +182,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'));