Merged changes from main branch up to 2.1.3.

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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 1a5663eef9fa901f1eaecaafdf88ea68a04fe022..0cd1f519328aa01b7d26a5481c6a56e96c8bd8f9 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
@@ -76,17 +76,16 @@ function print_tax_report()
 {
        global $path_to_root, $trans_dir;
        
-       
-       include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
-       $rep = new FrontReport(_('Tax Report'), "TaxReport.pdf", user_pagesize());
-
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
        $summaryOnly = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
+
+       include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+
        $dec = user_price_dec();
 
+       $rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize());
        if ($summaryOnly == 1)
                $summary = _('Summary Only');
        else
@@ -129,13 +128,13 @@ function print_tax_report()
                {
                        $rep->TextCol(0, 1,     $trans['type_name']);
                        $rep->TextCol(1, 2,     $trans['memo']);
-                       $rep->TextCol(2, 3,     sql2date($trans['tran_date']));
+                       $rep->DateCol(2, 3,     $trans['tran_date'], true);
                        $rep->TextCol(3, 4,     $trans['name']);
                        $rep->TextCol(4, 5,     $trans['br_name']);
 
-                       $rep->TextCol(5, 6,     number_format2($trans['net_amount'], $dec));
-                       $rep->TextCol(6, 7,     number_format2($trans['rate'], $dec));
-                       $rep->TextCol(7, 8,     number_format2($trans['amount'], $dec));
+                       $rep->AmountCol(5, 6, $trans['net_amount'], $dec);
+                       $rep->AmountCol(6, 7, $trans['rate'], $dec);
+                       $rep->AmountCol(7, 8, $trans['amount'], $dec);
 
                        $rep->NewLine();
 
@@ -149,10 +148,9 @@ function print_tax_report()
                        $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[$trans['tax_type_id']]['taxin'] += $trans['amount'];
+                       $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
                }
-               
                $totalnet += $trans['net_amount'];
                $totaltax += $trans['amount'];
        }
@@ -177,12 +175,12 @@ function print_tax_report()
                $tx = getTaxInfo($id);
                
                $rep->TextCol(0, 1, $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%");
-               $rep->TextCol(1, 2, number_format2($sum['out'], $dec));
-               $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['taxout']-$sum['taxin'], $dec));
-               $taxtotal += $sum['taxout']-$sum['taxin'];
+               $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();
        }
 
@@ -190,20 +188,14 @@ function print_tax_report()
        $rep->NewLine();
        $rep->Line($rep->row + $rep->lineHeight);
        $rep->TextCol(3, 5,     _("Total payable or refund"));
-       $rep->TextCol(5, 6,     number_format2($taxtotal, $dec));
+       $rep->AmountCol(5, 6, $taxtotal, $dec);
        $rep->Line($rep->row - 5);
        $rep->Font();
        $rep->NewLine();
 
-       $locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc";
-       if (file_exists($locale))
+       if (method_exists($Hooks, 'TaxFunction'))
        {
-               $taxinclude = true;
-               include($locale);
-               
-//             if (function_exists("TaxFunction"))
-//                     TaxFunction();
-               
+               $Hooks->TaxFunction();
        }
 
        $rep->End();