Changes to committed tax report routines.

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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 238bd3094974479a539ae480f5d0cd7c567a3a6f..d651b36f625ab5e19d8e214e3a93b95b1ef8629c 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -33,7 +33,10 @@ function getTaxTransactions($from, $to)
        $fromdate = date2sql($from);
        $todate = date2sql($to);
 
-       $sql = "SELECT taxrec.*,
+       $sql = "SELECT taxrec.*, IF(ISNULL(dtrans.rate),IF(ISNULL(strans.rate), taxrec.amount, taxrec.amount*strans.rate), 
+                               taxrec.amount*dtrans.rate) AS amount,
+                   IF(ISNULL(dtrans.rate),IF(ISNULL(strans.rate), taxrec.net_amount,taxrec.net_amount*strans.rate),
+                   taxrec.net_amount*dtrans.rate) AS net_amount,
                                stype.type_name,
                                if(supp.supp_name is null, debt.name, supp.supp_name) as name,
                                branch.br_name
@@ -144,12 +147,12 @@ function print_tax_report()
                                $rep->Header();
                        }
                }
-               if ($trans['amount'] > 0) {
-                       $taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
-                       $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
+               if ($trans['net_amount'] > 0) {
+                       $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
+                       $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
                } else {
-                       $taxes[$trans['tax_type_id']]['taxout'] -= $trans['amount'];
-                       $taxes[$trans['tax_type_id']]['out'] -= $trans['net_amount'];
+                       $taxes[$trans['tax_type_id']]['taxin'] -= $trans['amount'];
+                       $taxes[$trans['tax_type_id']]['in'] -= $trans['net_amount'];
                }
                
                $totalnet += $trans['net_amount'];
@@ -180,8 +183,8 @@ function print_tax_report()
                $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['taxin']-$sum['taxout'], $dec));
-               $taxtotal += $sum['taxin']-$sum['taxout'];
+               $rep->TextCol(5, 6, number_format2($sum['taxout']-$sum['taxin'], $dec));
+               $taxtotal += $sum['taxout']-$sum['taxin'];
                $rep->NewLine();
        }