X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=d944960c87b16e97d4c9be84ecedd9adec0563e7;hb=b37623cf1de2cfce6825744557d76475f002321f;hp=1a5663eef9fa901f1eaecaafdf88ea68a04fe022;hpb=c674982ebc83a5077b3091eaf104eba74557f87f;p=fa-stable.git diff --git a/reporting/rep709.php b/reporting/rep709.php index 1a5663ee..d944960c 100644 --- a/reporting/rep709.php +++ b/reporting/rep709.php @@ -1,15 +1,15 @@ . + See the License here . ***********************************************************************/ -$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,19 +71,18 @@ function getTaxInfo($id) function print_tax_report() { - global $path_to_root, $trans_dir; + global $path_to_root, $trans_dir, $Hooks, $systypes_array; - - include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - - $rep = new FrontReport(_('Tax Report'), "TaxReport.pdf", user_pagesize()); - $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $summaryOnly = $_POST['PARAM_2']; $comments = $_POST['PARAM_3']; + + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + $dec = user_price_dec(); + $rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize()); if ($summaryOnly == 1) $summary = _('Summary Only'); else @@ -102,7 +98,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')); @@ -111,7 +107,7 @@ function print_tax_report() $rep->Info($params, $cols, $headers, $aligns); if (!$summaryOnly) { - $rep->Header(); + $rep->NewPage(); } $totalnet = 0.0; @@ -120,39 +116,44 @@ 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->TextCol(2, 3, sql2date($trans['tran_date'])); + $rep->DateCol(2, 3, $trans['tran_date'], true); $rep->TextCol(3, 4, $trans['name']); $rep->TextCol(4, 5, $trans['br_name']); - $rep->TextCol(5, 6, number_format2($trans['net_amount'], $dec)); - $rep->TextCol(6, 7, number_format2($trans['rate'], $dec)); - $rep->TextCol(7, 8, number_format2($trans['amount'], $dec)); + $rep->AmountCol(5, 6, $trans['net_amount'], $dec); + $rep->AmountCol(6, 7, $trans['rate'], $dec); + $rep->AmountCol(7, 8, $trans['amount'], $dec); $rep->NewLine(); 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 { - $taxes[$trans['tax_type_id']]['taxin'] -= $trans['amount']; - $taxes[$trans['tax_type_id']]['in'] -= $trans['net_amount']; + $taxes[$trans['tax_type_id']]['taxin'] += $trans['amount']; + $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount']; } - $totalnet += $trans['net_amount']; $totaltax += $trans['amount']; } @@ -169,7 +170,7 @@ function print_tax_report() $rep->headers = $headers2; $rep->aligns = $aligns2; - $rep->Header(); + $rep->NewPage(); $taxtotal = 0; foreach( $taxes as $id=>$sum) @@ -177,12 +178,12 @@ function print_tax_report() $tx = getTaxInfo($id); $rep->TextCol(0, 1, $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%"); - $rep->TextCol(1, 2, number_format2($sum['out'], $dec)); - $rep->TextCol(2, 3,number_format2($sum['taxout'], $dec)); - $rep->TextCol(3, 4, number_format2($sum['in'], $dec)); - $rep->TextCol(4, 5,number_format2($sum['taxin'], $dec)); - $rep->TextCol(5, 6, number_format2($sum['taxout']-$sum['taxin'], $dec)); - $taxtotal += $sum['taxout']-$sum['taxin']; + $rep->AmountCol(1, 2, $sum['out'], $dec); + $rep->AmountCol(2, 3, $sum['taxout'], $dec); + $rep->AmountCol(3, 4, $sum['in'], $dec); + $rep->AmountCol(4, 5, $sum['taxin'], $dec); + $rep->AmountCol(5, 6, $sum['taxout']+$sum['taxin'], $dec); + $taxtotal += $sum['taxout']+$sum['taxin']; $rep->NewLine(); } @@ -190,20 +191,14 @@ function print_tax_report() $rep->NewLine(); $rep->Line($rep->row + $rep->lineHeight); $rep->TextCol(3, 5, _("Total payable or refund")); - $rep->TextCol(5, 6, number_format2($taxtotal, $dec)); + $rep->AmountCol(5, 6, $taxtotal, $dec); $rep->Line($rep->row - 5); $rep->Font(); $rep->NewLine(); - $locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc"; - if (file_exists($locale)) + if (method_exists($Hooks, 'TaxFunction')) { - $taxinclude = true; - include($locale); - -// if (function_exists("TaxFunction")) -// TaxFunction(); - + $Hooks->TaxFunction(); } $rep->End();