Bug 5332: Rep709, Tax Report, Multiple entries for a sinle tax line. Fixed.
[fa-stable.git] / reporting / rep709.php
index 6f0139a1ff769f94b0bee02f5bbd34c5a3091515..36984ff290ef43903e3c1e963ec24f59b0e84c37 100644 (file)
@@ -1,95 +1,70 @@
 <?php
-
-$page_security = 2;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_TAXREP';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
 // date_:      2005-05-19
 // Title:      Tax Report
 // ----------------------------------------------------------------
-$path_to_root="../";
-
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "gl/includes/gl_db.inc");
+$path_to_root="..";
 
-//----------------------------------------------------------------------------------------------------
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/gl/includes/gl_db.inc");
 
-print_tax_report();
+//------------------------------------------------------------------
 
-function getTax($tno, $tpe)
-{
-       //      GROUP BY debtor_trans_type, debtor_trans_no";
-       $sql = "SELECT SUM(amount) AS Amount, MAX(included_in_price) AS Included FROM ".TB_PREF."debtor_trans_tax_details
-               WHERE debtor_trans_no=$tno
-                       AND debtor_trans_type=$tpe
-                       AND amount <> 0";
 
-    $result = db_query($sql,"No transactions were returned");
-    return db_fetch($result);
-}
-
-function getCustTransactions($from, $to)
-{
-       $fromdate = date2sql($from);
-       $todate = date2sql($to);
-
-       $netamount = "IF(".TB_PREF."debtor_trans.type=11,-(ov_amount+ov_freight+ov_discount),ov_amount+ov_freight+ov_discount)*".TB_PREF."debtor_trans.rate";
-
-       $sql = "SELECT ".TB_PREF."debtor_trans.reference,
-                       ".TB_PREF."debtor_trans.trans_no,
-                       ".TB_PREF."debtor_trans.type,
-                       ".TB_PREF."debtor_trans.rate,
-                       ".TB_PREF."sys_types.type_name,
-                       ".TB_PREF."debtor_trans.tran_date,
-                       ".TB_PREF."debtor_trans.debtor_no,
-                       ".TB_PREF."debtors_master.name,
-                       ".TB_PREF."debtors_master.curr_code,
-                       ".TB_PREF."debtor_trans.branch_code,
-                       ".TB_PREF."debtor_trans.order_,
-                       $netamount AS NetAmount
-               FROM ".TB_PREF."debtor_trans
-               INNER JOIN ".TB_PREF."debtors_master ON ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no
-               INNER JOIN ".TB_PREF."sys_types ON ".TB_PREF."debtor_trans.type=".TB_PREF."sys_types.type_id
-               WHERE ".TB_PREF."debtor_trans.tran_date >= '$fromdate'
-                       AND ".TB_PREF."debtor_trans.tran_date <= '$todate'
-                       AND (".TB_PREF."debtor_trans.type=10 OR ".TB_PREF."debtor_trans.type=11)
-               ORDER BY ".TB_PREF."debtor_trans.tran_date";
-
-    return db_query($sql,"No transactions were returned");
-}
+print_tax_report();
 
-function getSuppTransactions($from, $to)
+function getTaxTransactions($from, $to)
 {
        $fromdate = date2sql($from);
        $todate = date2sql($to);
 
-       $sql = "SELECT ".TB_PREF."supp_trans.supp_reference,
-                       ".TB_PREF."supp_trans.type,
-                       ".TB_PREF."sys_types.type_name,
-                       ".TB_PREF."supp_trans.tran_date,
-                       ".TB_PREF."supp_trans.supplier_id,
-                       ".TB_PREF."supp_trans.rate,
-                       ".TB_PREF."suppliers.supp_name,
-                       ".TB_PREF."suppliers.curr_code,
-                       ".TB_PREF."supp_trans.rate,
-                       (ov_amount+ov_discount)*rate AS NetAmount,
-                       ov_gst*rate AS Tax
-               FROM ".TB_PREF."supp_trans
-               INNER JOIN ".TB_PREF."suppliers ON ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id
-               INNER JOIN ".TB_PREF."sys_types ON ".TB_PREF."supp_trans.type=".TB_PREF."sys_types.type_id
-               WHERE ".TB_PREF."supp_trans.tran_date >= '$fromdate'
-                       AND ".TB_PREF."supp_trans.tran_date <= '$todate'
-                       AND (".TB_PREF."supp_trans.type=20 OR ".TB_PREF."supp_trans.type=21)
-               ORDER BY ".TB_PREF."supp_trans.tran_date";
+       $sql = "SELECT tt.name as taxname, taxrec.*, taxrec.amount*ex_rate AS amount,
+                   taxrec.net_amount*ex_rate AS net_amount,
+                               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
+               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.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
 
     return db_query($sql,"No transactions were returned");
 }
 
 function getTaxTypes()
 {
-       $sql = "SELECT id FROM ".TB_PREF."tax_types ORDER BY id";
+       $sql = "SELECT * FROM ".TB_PREF."tax_types ORDER BY id";
     return db_query($sql,"No transactions were returned");
 }
 
@@ -100,360 +75,158 @@ function getTaxInfo($id)
     return db_fetch($result);
 }
 
-function getCustInvTax($taxtype, $from, $to)
-{
-       $fromdate = date2sql($from);
-       $todate = date2sql($to);
-       $amount = "IF(".TB_PREF."debtor_trans_tax_details.debtor_trans_type=11,-amount,amount)*".TB_PREF."debtor_trans.rate";
-       $mamount = "IF(".TB_PREF."debtor_trans_tax_details.included_in_price=0, 0, $amount)";
-       $netamount = "IF(".TB_PREF."debtor_trans.type=11,-quantity,quantity)*unit_price*".TB_PREF."debtor_trans.rate-$mamount";
-
-       $sql = "SELECT SUM($netamount),
-               SUM($amount)
-               FROM ".TB_PREF."debtor_trans_details, ".TB_PREF."debtor_trans_tax_details, ".TB_PREF."debtor_trans
-                               WHERE ".TB_PREF."debtor_trans.type>=10
-                                       AND ".TB_PREF."debtor_trans.type<=11
-                                       AND ".TB_PREF."debtor_trans_details.debtor_trans_no=".TB_PREF."debtor_trans.trans_no
-                                       AND ".TB_PREF."debtor_trans_details.debtor_trans_type=".TB_PREF."debtor_trans.type
-                                       AND ".TB_PREF."debtor_trans.trans_no=".TB_PREF."debtor_trans_tax_details.debtor_trans_no
-                                       AND ".TB_PREF."debtor_trans.type=".TB_PREF."debtor_trans_tax_details.debtor_trans_type
-                                       AND ".TB_PREF."debtor_trans_tax_details.amount <> 0
-                                       AND ".TB_PREF."debtor_trans_tax_details.tax_type_id=$taxtype
-                                       AND ".TB_PREF."debtor_trans.tran_date >= '$fromdate'
-                                       AND ".TB_PREF."debtor_trans.tran_date <= '$todate'";
-
-    $result = db_query($sql,"No transactions were returned");
-    return db_fetch_row($result);
-}
-
-function getSuppInvTax($taxtype, $from, $to)
-{
-       $fromdate = date2sql($from);
-       $todate = date2sql($to);
-       $sql = "SELECT SUM(unit_price * quantity * ".TB_PREF."supp_trans.rate), SUM(amount*".TB_PREF."supp_trans.rate)
-               FROM ".TB_PREF."supp_invoice_items, ".TB_PREF."supp_invoice_tax_items, ".TB_PREF."supp_trans
-                               WHERE ".TB_PREF."supp_trans.type>=20
-                                       AND ".TB_PREF."supp_trans.type<=21
-                                       AND ".TB_PREF."supp_trans.trans_no=".TB_PREF."supp_invoice_tax_items.supp_trans_no
-                                       AND ".TB_PREF."supp_trans.type=".TB_PREF."supp_invoice_tax_items.supp_trans_type
-                                       AND ".TB_PREF."supp_invoice_items.supp_trans_no=".TB_PREF."supp_trans.trans_no
-                                       AND ".TB_PREF."supp_invoice_items.supp_trans_type=".TB_PREF."supp_trans.type
-                                       AND ".TB_PREF."supp_invoice_tax_items.tax_type_id=$taxtype
-                                       AND ".TB_PREF."supp_invoice_tax_items.amount <> 0
-                                       AND ".TB_PREF."supp_trans.tran_date >= '$fromdate'
-                                       AND ".TB_PREF."supp_trans.tran_date <= '$todate'";
-
-    $result = db_query($sql,"No transactions were returned");
-    return db_fetch_row($result);
-}
-
 //----------------------------------------------------------------------------------------------------
 
 function print_tax_report()
 {
-       global $path_to_root;
-
-       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
                $summary = _('Detailed Report');
 
-
        $res = getTaxTypes();
 
-       $taxes = array();
-       $i = 0;
+       $taxes[0] = array('in'=>0, 'out'=>0, 'taxin'=>0, 'taxout'=>0);
        while ($tax=db_fetch($res))
-               $taxes[$i++] = $tax['id'];
-       $idcounter = count($taxes);
+               $taxes[$tax['id']] = array('in'=>0, 'out'=>0, 'taxin'=>0, 'taxout'=>0);
 
-       $totalinvout = array(0,0,0,0,0,0,0,0,0,0);
-       $totaltaxout = array(0,0,0,0,0,0,0,0,0,0);
-       $totalinvin = array(0,0,0,0,0,0,0,0,0,0);
-       $totaltaxin = array(0,0,0,0,0,0,0,0,0,0);
+       $params =   array(      0 => $comments,
+                                               1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
+                                               2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
 
-       if (!$summaryOnly)
-       {
-               $cols = array(0, 80, 130, 190, 290, 370, 435, 500, 565);
-
-               $headers = array(_('Trans Type'), _('#'), _('Date'), _('Name'), _('Branch Name'),
-                       _('Net'), _('Tax'));
-
-               $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right');
+       $cols = array(0, 80, 130, 180, 270, 350, 400, 430, 480, 485, 520);
 
-               $params =   array(      0 => $comments,
-                                                       1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
-                                                       2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
+       $headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
+               _('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);
-               $rep->Header();
+       $rep->Font();
+       $rep->Info($params, $cols, $headers, $aligns);
+       if (!$summaryOnly)
+       {
+               $rep->NewPage();
        }
+       
        $totalnet = 0.0;
        $totaltax = 0.0;
-
-       $transactions = getCustTransactions($from, $to);
+       $transactions = getTaxTransactions($from, $to);
 
        while ($trans=db_fetch($transactions))
        {
-               $tx = getTax($trans['trans_no'], $trans['type']);
-               if ($tx === false)
-                       $tax_amt = 0;
-               else
-               {
-                       $tx['Amount'] *= $trans['rate'];
-                       if ($trans['type'] == 11)
-                               $tx['Amount'] *= -1;
-                       if ($tx['Included'] > 0)
-                               $trans['NetAmount'] -= $tx['Amount'];
-                       $tax_amt = $tx['Amount'];
+               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(1, 2,     $trans['reference']);
-                       $rep->TextCol(2, 3,     sql2date($trans['tran_date']));
+                       $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']);
-                       if ($trans["branch_code"] > 0)
-                               $rep->TextCol(4, 5,     get_branch_name($trans["branch_code"]));
+                       $rep->TextCol(4, 5,     $trans['br_name']);
 
-                       $rep->TextCol(5, 6,     number_format2($trans['NetAmount'], $dec));
-                       $rep->TextCol(6, 7,     number_format2($tax_amt, $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();
                        }
                }
-               $totalnet += $trans['NetAmount'];
-               $totaltax += $tax_amt;
-
-       }
-       if (!$summaryOnly)
-       {
-               $rep->NewLine();
-
-               if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
-               {
-                       $rep->Line($rep->row - 2);
-                       $rep->Header();
+               $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'];
                }
-               $rep->Line($rep->row + $rep->lineHeight);
-               $rep->TextCol(3, 5,     _('Total Outputs'));
-               $rep->TextCol(5, 6,     number_format2($totalnet, $dec));
-               $rep->TextCol(6, 7,     number_format2($totaltax, $dec));
-               $rep->Line($rep->row - 5);
-               $rep->Header();
-       }
-       $totalinnet = 0.0;
-       $totalintax = 0.0;
-
-       $transactions = getSuppTransactions($from, $to);
-
-       while ($trans=db_fetch($transactions))
-       {
-               if (!$summaryOnly)
-               {
-                       $rep->TextCol(0, 1,     $trans['type_name']);
-                       $rep->TextCol(1, 2,     $trans['supp_reference']);
-                       $rep->TextCol(2, 3,     sql2date($trans['tran_date']));
-                       $rep->TextCol(3, 5,     $trans['supp_name']);
-                       $rep->TextCol(5, 6,     number_format2($trans['NetAmount'], $dec));
-                       $rep->TextCol(6, 7,     number_format2($trans['Tax'], $dec));
-
-                       $rep->NewLine();
-                       if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
-                       {
-                               $rep->Line($rep->row - 2);
-                               $rep->Header();
-                       }
+               elseif ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_OUTPUT) {
+                       $taxes[$tax_type]['taxout'] += $trans['amount'];
+                       $taxes[$tax_type]['out'] += $trans['net_amount'];
                }
-               $totalinnet += $trans['NetAmount'];
-               $totalintax += $trans['Tax'];
-
-       }
-       if (!$summaryOnly)
-       {
-               $rep->NewLine();
-
-               if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
-               {
-                       $rep->Line($rep->row - 2);
-                       $rep->Header();
+               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'];
                }
-               $rep->Line($rep->row + $rep->lineHeight);
-               $rep->TextCol(3, 5,     _('Total Inputs'));
-               $rep->TextCol(5, 6,     number_format2($totalinnet, $dec));
-               $rep->TextCol(6, 7,     number_format2($totalintax, $dec));
-               $rep->Line($rep->row - 5);
+               $totalnet += $trans['net_amount'];
+               $totaltax += $trans['amount'];
        }
-       $cols2 = array(0, 100, 200,     300, 400, 500, 600);
+       
+       // 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'), '', '');
+       $headers2 = array(_('Tax Rate'), _('Outputs'), _('Output Tax'), _('Inputs'), _('Input Tax'), _('Net Tax'));
 
        $aligns2 = array('left', 'right', 'right', 'right',     'right', 'right', 'right');
 
-       $invamount = 0.0;
-       for ($i = 0; $i < $idcounter; $i++)
-       {
-               $amt = getCustInvTax($taxes[$i], $from, $to);
-               $totalinvout[$i] += $amt[0];
-               $totaltaxout[$i] += $amt[1];
-               $invamount += $amt[0];
-       }
-       if ($totalnet != $invamount)
-       {
-               $totalinvout[$idcounter] = ($totalnet - $invamount);
-               $totaltaxout[$idcounter] = 0.0;
-       }
-       $invamount2 = 0.0;
-       for ($i = 0; $i < $idcounter; $i++)
-       {
-               $amt = getSuppInvTax($taxes[$i], $from, $to);
-               $totalinvin[$i] += $amt[0];
-               $totaltaxin[$i] += $amt[1];
-               $invamount2 += $amt[0];
-       }
-       if ($totalinnet != $invamount2)
-       {
-               $totalinvin[$idcounter] = ($totalinnet - $invamount2);
-               $totaltaxin[$idcounter] = 0.0;
-       }
-       if ($totalnet != $invamount || $totalinnet != $invamount2)
-               $idcounter++;
-       for ($i = 0; $i < count($cols2); $i++)
-       {
-               $rep->cols[$i] = $rep->leftMargin + $cols2[$i];
-               $rep->headers[$i] = $headers2[$i];
-               $rep->aligns[$i] = $aligns2[$i];
-       }
-       $rep->Header();
-       //$counter = count($totalinvout);
-       //$counter = max($counter, $idcounter);
+       $rep->Info($params, $cols2, $headers2, $aligns2);
 
-       $trow = $rep->row;
-       $i = 0;
-       for ($j = 0; $j < $idcounter; $j++)
+       $rep->headers = $headers2;
+       $rep->aligns = $aligns2;
+       $rep->NewPage();
+
+       $taxtotal = 0;
+       foreach( $taxes as $id=>$sum)
        {
-               if (isset($taxes[$j]) && $taxes[$j] > 0)
+               if ($id)
                {
-                       $tx = getTaxInfo($taxes[$j]);
-                       $str = $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%";
+                       $tx = getTaxInfo($id);
+                       $rep->TextCol(0, 1, $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%");
+               } else {
+                       $rep->TextCol(0, 1, _('Exempt'));
                }
-               else
-                       $str = _('No tax specified');
-               $rep->TextCol($i, $i + 1, $str);
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $rep->TextCol($i, $i + 1, number_format2($totalinvout[$j], $dec));
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $rep->TextCol($i, $i + 1,number_format2($totaltaxout[$j], $dec));
+               $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();
        }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $rep->TextCol($i, $i + 1, number_format2($totalinvin[$j], $dec));
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $rep->TextCol($i, $i + 1, number_format2($totaltaxin[$j], $dec));
-               $rep->NewLine();
-       }
-       $rep->Line($rep->row - 4);
 
-       $rep->row -= 16;
-       $rep->TextCol(0, 5, _("General Ledger"));
-       $rep->Line($rep->row - 6);
+       $rep->Font('bold');
+       $rep->NewLine();
+       $rep->Line($rep->row + $rep->lineHeight);
+       $rep->TextCol(3, 5,     _("Total payable or refund"));
+       $rep->AmountCol(5, 6, $taxtotal, $dec);
+       $rep->Line($rep->row - 5);
+       $rep->Font();
+       $rep->NewLine();
 
-       $rep->row -= 22;
+       hook_tax_report_done();
 
-       $trow = $rep->row;
-
-       $idcounter = count($taxes);
-       $i = 0;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $str = $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%";
-               $rep->TextCol($i, $i + 1, $str);
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $acc = get_gl_account($tx['sales_gl_code']);
-               $rep->TextCol($i, $i + 1, $acc['account_code']." ".$acc['account_name']);
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $amount = get_gl_trans_from_to($from, $to, $tx['sales_gl_code']);
-               $rep->TextCol($i, $i + 1,number_format2(-$amount, $dec));
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $acc = get_gl_account($tx['purchasing_gl_code']);
-               $rep->TextCol($i, $i + 1, $acc['account_code']." ".$acc['account_name']);
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $amount = get_gl_trans_from_to($from, $to, $tx['purchasing_gl_code']);
-               $rep->TextCol($i, $i + 1,number_format2($amount, $dec));
-               $rep->NewLine();
-       }
-       $rep->Line($rep->row - 4);
-
-       $locale = $path_to_root . "lang/" . $_SESSION['language']->code . "/locale.inc";
-       if (file_exists($locale))
-       {
-               $taxinclude = true;
-               include($locale);
-               /*
-               if (function_exists("TaxFunction"))
-                       TaxFunction();
-               */
-       }
        $rep->End();
 }
 
-?>
\ No newline at end of file