X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=9a4b2a5259a0e88ff6a32ce85e27042617be27a7;hb=25379bdc9f10bda4aae4b37f04d16eb1bbe7e4f6;hp=c424dad05b5dc48933b141d1c1ffb93ef4e0ef93;hpb=6a4d8e6c1e92ff1b8fc5abb3fae76fb1c1968550;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index c424dad0..9a4b2a52 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 gl.amount<>0 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
@@ -48,11 +53,11 @@ function getTaxTransactions($from, $to)
 		LEFT JOIN ".TB_PREF."debtors_master as debt ON dtrans.debtor_no=debt.debtor_no
 		LEFT JOIN ".TB_PREF."cust_branch as branch ON dtrans.branch_code=branch.branch_code
 		WHERE (taxrec.amount <> 0 OR taxrec.net_amount <> 0)
-			AND taxrec.trans_type <> ".ST_CUSTDELIVERY."
+			AND !ISNULL(taxrec.reg_type)
 			AND taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
 		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");
 }
 
@@ -73,7 +78,7 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-	global $path_to_root, $trans_dir, $Hooks, $systypes_array;
+	global $path_to_root, $systypes_array;
 
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
@@ -98,7 +103,7 @@ function print_tax_report()
 
 	$res = getTaxTypes();
 
-	$taxes = array();
+	$taxes[0] = array('in'=>0, 'out'=>0, 'taxin'=>0, 'taxout'=>0);
 	while ($tax=db_fetch($res))
 		$taxes[$tax['id']] = array('in'=>0, 'out'=>0, 'taxin'=>0, 'taxout'=>0);
 
@@ -113,7 +118,7 @@ function print_tax_report()
 	$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)
@@ -156,20 +161,21 @@ function print_tax_report()
 				$rep->NewPage();
 			}
 		}
-		if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
-			$taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
-			$taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
+		$tax_type = $trans['tax_type_id'];
+		if ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_INPUT) {
+			$taxes[$tax_type]['taxin'] += $trans['amount'];
+			$taxes[$tax_type]['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 ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_OUTPUT) {
+			$taxes[$tax_type]['taxout'] += $trans['amount'];
+			$taxes[$tax_type]['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'];
-			$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[$tax_type]['taxout'] += $trans['amount'];
+			$taxes[$tax_type]['out'] += $trans['net_amount'];
+		} elseif ($trans['reg_type'] !== NULL) {
+			$taxes[$tax_type]['taxin'] += $trans['amount'];
+			$taxes[$tax_type]['in'] += $trans['net_amount'];
 		}
 		$totalnet += $trans['net_amount'];
 		$totaltax += $trans['amount'];
@@ -186,9 +192,6 @@ function print_tax_report()
 
 	$rep->Info($params, $cols2, $headers2, $aligns2);
 
-	//for ($i = 0; $i < count($cols2); $i++)
-	//	$rep->cols[$i] = $rep->leftMargin + $cols2[$i];
-
 	$rep->headers = $headers2;
 	$rep->aligns = $aligns2;
 	$rep->NewPage();
@@ -196,9 +199,13 @@ function print_tax_report()
 	$taxtotal = 0;
 	foreach( $taxes as $id=>$sum)
 	{
-		$tx = getTaxInfo($id);
-		
-		$rep->TextCol(0, 1, $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%");
+		if ($id)
+		{
+			$tx = getTaxInfo($id);
+			$rep->TextCol(0, 1, $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%");
+		} else {
+			$rep->TextCol(0, 1, _('Exempt'));
+		}
 		$rep->AmountCol(1, 2, $sum['out'], $dec);
 		$rep->AmountCol(2, 3, $sum['taxout'], $dec);
 		$rep->AmountCol(3, 4, $sum['in'], $dec);
@@ -222,4 +229,3 @@ function print_tax_report()
 	$rep->End();
 }
 
-?>
\ No newline at end of file