X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=36984ff290ef43903e3c1e963ec24f59b0e84c37;hb=14e0807fc87e0096af43f414f98764a6f8c8a4a8;hp=213d90a749f0cb2f7aada2c1643ed5be73b9d0db;hpb=ed453e5a0c01ad53a49625e94846a4c2e1456a28;p=fa-stable.git diff --git a/reporting/rep709.php b/reporting/rep709.php index 213d90a7..36984ff2 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 @@ -33,27 +33,32 @@ function getTaxTransactions($from, $to) $fromdate = date2sql($from); $todate = date2sql($to); - $sql = "SELECT taxrec.*, taxrec.amount*ex_rate AS amount, + $sql = "SELECT tt.name as taxname, 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, + 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 + gl.amount=taxrec.amount 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 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 !ISNULL(taxrec.reg_type) AND taxrec.tran_date >= '$fromdate' AND taxrec.tran_date <= '$todate' - ORDER BY taxrec.tran_date"; -//display_error($sql); + ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate"; + return db_query($sql,"No transactions were returned"); } @@ -74,19 +79,24 @@ function getTaxInfo($id) function print_tax_report() { - global $path_to_root, $trans_dir; - - - include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - - $rep = new FrontReport(_('Tax Report'), "TaxReport.pdf", user_pagesize()); + global $path_to_root, $systypes_array; $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $summaryOnly = $_POST['PARAM_2']; $comments = $_POST['PARAM_3']; + $orientation = $_POST['PARAM_4']; + $destination = $_POST['PARAM_5']; + + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); + $rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize(), 9, $orientation); if ($summaryOnly == 1) $summary = _('Summary Only'); else @@ -94,7 +104,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); @@ -102,16 +112,19 @@ 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, 80, 130, 180, 270, 350, 400, 430, 480, 485, 520); $headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'), - _('Net'), _('Rate'), _('Tax')); - $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right'); + _('Net'), _('Rate'), _('Tax'), '', _('Name')); + $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) { - $rep->Header(); + $rep->NewPage(); } $totalnet = 0.0; @@ -120,37 +133,50 @@ 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,ST_JOURNAL))) { $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->TextCol(9, 10, $trans['taxname']); $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))) { - $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']; + $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['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[$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']; @@ -158,29 +184,34 @@ function print_tax_report() // Summary $cols2 = array(0, 100, 180, 260, 340, 420, 500); + if ($orientation == 'L') + recalculate_cols($cols2); $headers2 = array(_('Tax Rate'), _('Outputs'), _('Output Tax'), _('Inputs'), _('Input Tax'), _('Net Tax')); $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); $rep->headers = $headers2; $rep->aligns = $aligns2; - $rep->Header(); + $rep->NewPage(); $taxtotal = 0; foreach( $taxes as $id=>$sum) { - $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)); + 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); + $rep->AmountCol(4, 5, $sum['taxin'], $dec); + $rep->AmountCol(5, 6, $sum['taxout']+$sum['taxin'], $dec); $taxtotal += $sum['taxout']+$sum['taxin']; $rep->NewLine(); } @@ -189,23 +220,13 @@ 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)) - { - $taxinclude = true; - include($locale); - -// if (function_exists("TaxFunction")) -// TaxFunction(); - - } + hook_tax_report_done(); $rep->End(); } -?> \ No newline at end of file