Merging version 2.1 RC to main trunk.

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

diff --git a/reporting/rep202.php b/reporting/rep202.php
index ad720eccbbdd42fa2a754bbe6c15e7c6047ec679..fbb803dbf08f5f468bb82cae7ed8829895144f32 100644 (file)
--- a/reporting/rep202.php
+++ b/reporting/rep202.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
@@ -7,16 +16,15 @@ $page_security = 2;
 // date_:      2005-05-19
 // Title:      Ages Supplier Analysis
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "gl/includes/gl_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_aged_supplier_analysis();
 
 //----------------------------------------------------------------------------------------------------
@@ -61,17 +69,20 @@ 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");
+               include_once($path_to_root . "/reporting/includes/class.graphic.inc");
                $pg = new graph();
        }
 
@@ -113,7 +124,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);
@@ -139,11 +150,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;
@@ -156,13 +167,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)
                {
@@ -178,13 +189,13 @@ function print_aged_supplier_analysis()
                                $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);
@@ -200,13 +211,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;
@@ -218,7 +230,7 @@ function print_aged_supplier_analysis()
                $pg->type      = $graphics;
                $pg->skin      = $graph_skin;
                $pg->built_in  = false;
-               $pg->fontfile  = $path_to_root . "reporting/fonts/Vera.ttf";
+               $pg->fontfile  = $path_to_root . "/reporting/fonts/Vera.ttf";
                $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
                $filename = $comp_path.'/'.user_company(). "/pdf_files/test.png";
                $pg->display($filename, true);