X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=f24512d6a734ee9d453656c23edb5c6db4e2067f;hb=b54fdb00859af85c72742d32ebc628ef52b81cec;hp=0cd1f519328aa01b7d26a5481c6a56e96c8bd8f9;hpb=ce77ace4ce3b96189e38a4e99712fe119b01fb51;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 0cd1f519..f24512d6 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_TAXREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -35,7 +35,6 @@ function getTaxTransactions($from, $to)
 
 	$sql = "SELECT taxrec.*, taxrec.amount*ex_rate AS amount,
 	            taxrec.net_amount*ex_rate AS net_amount,
-				stype.type_name,
 				IF(ISNULL(supp.supp_name), debt.name, supp.supp_name) as name,
 				branch.br_name
 		FROM ".TB_PREF."trans_tax_details taxrec
@@ -45,11 +44,9 @@ function getTaxTransactions($from, $to)
 		LEFT JOIN ".TB_PREF."debtor_trans dtrans
 			ON taxrec.trans_no=dtrans.trans_no AND taxrec.trans_type=dtrans.type
 		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,
-		".TB_PREF."sys_types stype
-		WHERE taxrec.trans_type=stype.type_id
-			AND (taxrec.amount != 0 OR taxrec.net_amount != 0)
-			AND taxrec.trans_type != 13
+		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 taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
 		ORDER BY taxrec.tran_date";
@@ -74,14 +71,18 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-	global $path_to_root, $trans_dir;
+	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'];
 
-	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	$dec = user_price_dec();
 
@@ -101,7 +102,7 @@ function print_tax_report()
 						1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
 						2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
 
-	$cols = array(0, 80, 130, 180, 290, 370, 455, 505, 555);
+	$cols = array(0, 100, 130, 180, 290, 370, 420, 470, 520);
 
 	$headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
 		_('Net'), _('Rate'), _('Tax'));
@@ -110,7 +111,7 @@ function print_tax_report()
 	$rep->Info($params, $cols, $headers, $aligns);
 	if (!$summaryOnly)
 	{
-		$rep->Header();
+		$rep->NewPage();
 	}
 	
 	$totalnet = 0.0;
@@ -119,14 +120,16 @@ function print_tax_report()
 
 	while ($trans=db_fetch($transactions))
 	{
-		if (in_array($trans['trans_type'], array(11,20,1))) {
+		if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE))) {
 			$trans['net_amount'] *= -1;
 			$trans['amount'] *= -1;
 		}
 		
 		if (!$summaryOnly)
 		{
-			$rep->TextCol(0, 1,	$trans['type_name']);
+			$rep->TextCol(0, 1, $systypes_array[$trans['trans_type']]);
+			if ($trans['memo'] == '')
+				$trans['memo'] = get_reference($trans['trans_type'], $trans['trans_no']);
 			$rep->TextCol(1, 2,	$trans['memo']);
 			$rep->DateCol(2, 3,	$trans['tran_date'], true);
 			$rep->TextCol(3, 4,	$trans['name']);
@@ -141,10 +144,14 @@ function print_tax_report()
 			if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
 			{
 				$rep->Line($rep->row - 2);
-				$rep->Header();
+				$rep->NewPage();
 			}
 		}
-		if (in_array($trans['trans_type'], array(0,2,10,11))) {
+		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'];
+		}
+		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 {
@@ -162,12 +169,14 @@ function print_tax_report()
 
 	$aligns2 = array('left', 'right', 'right', 'right',	'right', 'right', 'right');
 
-	for ($i = 0; $i < count($cols2); $i++)
-		$rep->cols[$i] = $rep->leftMargin + $cols2[$i];
+	$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->Header();
+	$rep->NewPage();
 
 	$taxtotal = 0;
 	foreach( $taxes as $id=>$sum)