Merged changes from main CVS up to 2.1.5

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

diff --git a/reporting/rep501.php b/reporting/rep501.php
index 09d6203f1e93e5342ca65394a5994824b860c6c0..b697925f1f87654b8c6d232db434d91a46085a97 100644 (file)
--- a/reporting/rep501.php
+++ b/reporting/rep501.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_dimension_summary();
 
 function getTransactions($from, $to)
@@ -71,13 +70,15 @@ function print_dimension_summary()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $fromdim = $_POST['PARAM_0'];
     $todim = $_POST['PARAM_1'];
     $showbal = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-    
+       $destination = $_POST['PARAM_4'];
+       if ($destination)
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+       else
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        $cols = array(0, 50, 210, 250, 320, 395, 465,   515);
 
@@ -88,7 +89,7 @@ function print_dimension_summary()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Dimension'), 'from' => $fromdim, 'to' => $todim));
 
-    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary.pdf", user_pagesize());
+    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -100,8 +101,8 @@ function print_dimension_summary()
                $rep->TextCol(0, 1, $trans['reference']);
                $rep->TextCol(1, 2, $trans['name']);
                $rep->TextCol(2, 3, $trans['type_']);
-               $rep->TextCol(3, 4, $trans['date_']);
-               $rep->TextCol(4, 5, $trans['due_date']);
+               $rep->DateCol(3, 4, $trans['date_'], true);
+               $rep->DateCol(4, 5, $trans['due_date'], true);
                if ($trans['closed'])
                        $str = _('Yes');
                else
@@ -110,7 +111,7 @@ function print_dimension_summary()
                if ($showbal)
                {
                        $balance = getYTD($trans['id']);
-                       $rep->TextCol(6, 7, number_format2($balance, 0));
+                       $rep->AmountCol(6, 7, $balance, 0);
                }       
                $rep->NewLine(1, 2);
        }