Bug 5332: Rep709, Tax Report, Multiple entries for a sinle tax line. Fixed.

[fa-stable.git] / reporting / rep709.php

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 9ee5ef2c3050f289c715a5dd21a46c2b32c49468..36984ff290ef43903e3c1e963ec24f59b0e84c37 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -43,7 +43,8 @@ function getTaxTransactions($from, $to)
                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 
+                       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
@@ -57,7 +58,7 @@ function getTaxTransactions($from, $to)
                        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");
 }
 
@@ -78,7 +79,7 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-       global $path_to_root, $Hooks, $systypes_array;
+       global $path_to_root, $systypes_array;
 
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
@@ -103,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);
 
@@ -161,20 +162,21 @@ function print_tax_report()
                                $rep->NewPage();
                        }
                }
+               $tax_type = $trans['tax_type_id'];
                if ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_INPUT) {
-                       $taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
-                       $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
+                       $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[$trans['tax_type_id']]['taxout'] += $trans['amount'];
-                       $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
+                       $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'];
+                       $taxes[$tax_type]['taxout'] += $trans['amount'];
+                       $taxes[$tax_type]['out'] += $trans['net_amount'];
                } elseif ($trans['reg_type'] !== NULL) {
-                       $taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
-                       $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
+                       $taxes[$tax_type]['taxin'] += $trans['amount'];
+                       $taxes[$tax_type]['in'] += $trans['net_amount'];
                }
                $totalnet += $trans['net_amount'];
                $totaltax += $trans['amount'];
@@ -191,9 +193,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();
@@ -201,9 +200,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);