Fixed problem with multiply zero values in selector options.

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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index f20e48e0692c23a0d2e7f5f35d73f3d216d4841d..d944960c87b16e97d4c9be84ecedd9adec0563e7 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -45,8 +45,8 @@ function getTaxTransactions($from, $to)
                        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 taxrec.trans_type != 13
+               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";
@@ -107,7 +107,7 @@ function print_tax_report()
        $rep->Info($params, $cols, $headers, $aligns);
        if (!$summaryOnly)
        {
-               $rep->Header();
+               $rep->NewPage();
        }
        
        $totalnet = 0.0;
@@ -116,7 +116,7 @@ function print_tax_report()
 
        while ($trans=db_fetch($transactions))
        {
-               if (in_array($trans['trans_type'], array(11,20))) {
+               if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE))) {
                        $trans['net_amount'] *= -1;
                        $trans['amount'] *= -1;
                }
@@ -140,10 +140,14 @@ function print_tax_report()
                        if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                        {
                                $rep->Line($rep->row - 2);
-                               $rep->Header();
+                               $rep->NewPage();
                        }
                }
-               if (in_array($trans['trans_type'], array(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 {
@@ -166,7 +170,7 @@ function print_tax_report()
 
        $rep->headers = $headers2;
        $rep->aligns = $aligns2;
-       $rep->Header();
+       $rep->NewPage();
 
        $taxtotal = 0;
        foreach( $taxes as $id=>$sum)