X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=46aae6ba1a0a7ffb5adf3208394f8fed415488fa;hb=b0c4c9777f9574e9c2805fddc2a12576d75d94ce;hp=f5b9dd072f0ff5d9ec86b0a20915358fcdf6961b;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index f5b9dd07..46aae6ba 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
@@ -112,8 +117,8 @@ function print_tax_report()
 		_('Net'), _('Rate'), _('Tax'), '', _('Name'));
 	$aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right', 'right','left');
     if ($orientation == 'L')
-    	$rep->recalculate_cols($cols);
-	
+    	recalculate_cols($cols);
+
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
 	if (!$summaryOnly)
@@ -178,7 +183,7 @@ function print_tax_report()
 	// Summary
 	$cols2 = array(0, 100, 180,	260, 340, 420, 500);
     if ($orientation == 'L')
-    	$rep->recalculate_cols($cols2);
+    	recalculate_cols($cols2);
 
 	$headers2 = array(_('Tax Rate'), _('Outputs'), _('Output Tax'),	_('Inputs'), _('Input Tax'), _('Net Tax'));
 
@@ -222,4 +227,3 @@ function print_tax_report()
 	$rep->End();
 }
 
-?>
\ No newline at end of file