Replaced sys_types names from table to systypes::name in reports

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

diff --git a/reporting/rep202.php b/reporting/rep202.php
index 8e20018d6c3bf1dede5275a02020e1d3caf8a9aa..3b543fcfbdc59db2b1fc88b2fd51e5c273cb4bb7 100644 (file)
--- a/reporting/rep202.php
+++ b/reporting/rep202.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;
 // ----------------------------------------------------------------
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_aged_supplier_analysis();
 
 //----------------------------------------------------------------------------------------------------
@@ -39,7 +38,7 @@ function get_invoices($supplier_id, $to)
        // Revomed allocated from sql
     $value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)";
        $due = "IF (".TB_PREF."supp_trans.type=20 OR ".TB_PREF."supp_trans.type=21,".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)";
-       $sql = "SELECT ".TB_PREF."sys_types.type_name,
+       $sql = "SELECT ".TB_PREF."supp_trans.type,
                ".TB_PREF."supp_trans.reference,
                ".TB_PREF."supp_trans.tran_date,
                $value as Balance,
@@ -49,11 +48,9 @@ function get_invoices($supplier_id, $to)
 
                FROM ".TB_PREF."suppliers,
                        ".TB_PREF."payment_terms,
-                       ".TB_PREF."supp_trans,
-                       ".TB_PREF."sys_types
+                       ".TB_PREF."supp_trans
 
-               WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type
-                       AND ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
+               WHERE ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
                        AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id
                        AND ".TB_PREF."supp_trans.supplier_id = $supplier_id
                        AND ".TB_PREF."supp_trans.tran_date <= '$todate'
@@ -70,14 +67,17 @@ function print_aged_supplier_analysis()
 {
     global $comp_path, $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $to = $_POST['PARAM_0'];
     $fromsupp = $_POST['PARAM_1'];
     $currency = $_POST['PARAM_2'];
        $summaryOnly = $_POST['PARAM_3'];
     $graphics = $_POST['PARAM_4'];
     $comments = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
+       if ($destination)
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+       else
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
        if ($graphics)
        {
                include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -122,7 +122,7 @@ function print_aged_supplier_analysis()
 
        if ($convert)
                $headers[2] = _('currency');
-    $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis.pdf", user_pagesize());
+    $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -148,11 +148,11 @@ function print_aged_supplier_analysis()
                if (!$convert && $currency != $myrow['curr_code'])
                        continue;
                $rep->fontSize += 2;
-               $rep->TextCol(0, 3,     $myrow['name']);
+               $rep->TextCol(0, 2,     $myrow['name']);
                if ($convert)
                {
                        $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to);
-                       $rep->TextCol(2, 4,     $myrow['curr_code']);
+                       $rep->TextCol(2, 3,     $myrow['curr_code']);
                }
                else
                        $rate = 1.0;
@@ -165,13 +165,13 @@ function print_aged_supplier_analysis()
                $total[2] += ($supprec["Overdue1"]-$supprec["Overdue2"]);
                $total[3] += $supprec["Overdue2"];
                $total[4] += $supprec["Balance"];
-               $str = array(number_format2(($supprec["Balance"] - $supprec["Due"]),$dec),
-                       number_format2(($supprec["Due"]-$supprec["Overdue1"]),$dec),
-                       number_format2(($supprec["Overdue1"]-$supprec["Overdue2"]) ,$dec),
-                       number_format2($supprec["Overdue2"],$dec),
-                       number_format2($supprec["Balance"],$dec));
+               $str = array($supprec["Balance"] - $supprec["Due"],
+                       $supprec["Due"]-$supprec["Overdue1"],
+                       $supprec["Overdue1"]-$supprec["Overdue2"],
+                       $supprec["Overdue2"],
+                       $supprec["Balance"]);
                for ($i = 0; $i < count($str); $i++)
-                       $rep->TextCol($i + 3, $i + 4, $str[$i]);
+                       $rep->AmountCol($i + 3, $i + 4, $str[$i], $dec);
                $rep->NewLine(1, 2);
                if (!$summaryOnly)
                {
@@ -182,18 +182,18 @@ function print_aged_supplier_analysis()
                        while ($trans=db_fetch($res))
                        {
                                $rep->NewLine(1, 2);
-                       $rep->TextCol(0, 1,     $trans['type_name'], -2);
+                       $rep->TextCol(0, 1,     systypes::name($trans['type']), -2);
                                $rep->TextCol(1, 2,     $trans['reference'], -2);
                                $rep->TextCol(2, 3,     sql2date($trans['tran_date']), -2);
                                foreach ($trans as $i => $value)
                                        $trans[$i] *= $rate;
-                               $str = array(number_format2(($trans["Balance"] - $trans["Due"]),$dec),
-                                       number_format2(($trans["Due"]-$trans["Overdue1"]),$dec),
-                                       number_format2(($trans["Overdue1"]-$trans["Overdue2"]) ,$dec),
-                                       number_format2($trans["Overdue2"],$dec),
-                                       number_format2($trans["Balance"],$dec));
+                               $str = array($trans["Balance"] - $trans["Due"],
+                                       $trans["Due"]-$trans["Overdue1"],
+                                       $trans["Overdue1"]-$trans["Overdue2"],
+                                       $trans["Overdue2"],
+                                       $trans["Balance"]);
                                for ($i = 0; $i < count($str); $i++)
-                                       $rep->TextCol($i + 3, $i + 4, $str[$i]);
+                                       $rep->AmountCol($i + 3, $i + 4, $str[$i], $dec);
                        }
                        $rep->Line($rep->row - 8);
                        $rep->NewLine(2);
@@ -209,13 +209,14 @@ function print_aged_supplier_analysis()
        $rep->fontSize -= 2;
        for ($i = 0; $i < count($total); $i++)
        {
-               $rep->TextCol($i + 3, $i + 4, number_format2($total[$i], $dec));
+               $rep->AmountCol($i + 3, $i + 4, $total[$i], $dec);
                if ($graphics && $i < count($total) - 1)
                {
                        $pg->y[$i] = abs($total[$i]);
                }
        }
        $rep->Line($rep->row  - 8);
+       $rep->NewLine();
        if ($graphics)
        {
                global $decseps, $graph_skin;