Tax Report: not taxable sales printed in separate summary line.

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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index b9cd1171272cbf905579c3589375c230b4fef819..5c12ac9dd32d4e1a3709588303660f3b36473463 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -53,11 +53,10 @@ function getTaxTransactions($from, $to)
                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 taxrec.trans_type <> ".ST_CUSTDELIVERY."
+                       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";
-//display_error($sql);
     return db_query($sql,"No transactions were returned");
 }
 
@@ -103,7 +102,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 +160,21 @@ function print_tax_report()
                                $rep->NewPage();
                        }
                }
-               if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
-                       $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['amount']>=0) {
-                       $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
-                       $taxes[$trans['tax_type_id']]['out'] += $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[$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[$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'];
@@ -201,9 +201,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);