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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 1e781f25..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
@@ -74,7 +79,7 @@ function getTaxInfo($id)
 function print_tax_report()
 {
 	global $path_to_root, $trans_dir, $Hooks, $systypes_array;
-	
+
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$summaryOnly = $_POST['PARAM_2'];
@@ -131,7 +136,7 @@ function print_tax_report()
 			$trans['net_amount'] *= -1;
 			$trans['amount'] *= -1;
 		}
-		
+
 		if (!$summaryOnly)
 		{
 			$rep->TextCol(0, 1, $systypes_array[$trans['trans_type']]);
@@ -145,7 +150,7 @@ function print_tax_report()
 			$rep->AmountCol(5, 6, $trans['net_amount'], $dec);
 			$rep->AmountCol(6, 7, $trans['rate'], $dec);
 			$rep->AmountCol(7, 8, $trans['amount'], $dec);
-			
+
 			$rep->TextCol(9, 10, $trans['taxname']);
 
 			$rep->NewLine();
@@ -222,4 +227,3 @@ function print_tax_report()
 	$rep->End();
 }
 
-?>
\ No newline at end of file