Changed Tag types in reports_classes to be the same as defined in types.inc. Suitable...

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

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 75206499531941b0cbe7acba0e460898d3c6b185..893c8d9d29daae54f64af6ab9c263d1c469d1382 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -1,15 +1,15 @@
 <?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;
+$page_security = 'SA_BANKREP';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_bank_transactions();
 
 //----------------------------------------------------------------------------------------------------
@@ -55,17 +54,19 @@ function get_bank_transactions($from, $to, $account)
 
 function print_bank_transactions()
 {
-       global $path_to_root;
-
-       include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
-       $rep = new FrontReport(_('Bank Statement'), "BankStatement.pdf", user_pagesize());
+       global $path_to_root, $systypes_array;
 
        $acc = $_POST['PARAM_0'];
        $from = $_POST['PARAM_1'];
        $to = $_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");
 
+       $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize());
        $dec = user_price_dec();
 
        $cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520);
@@ -97,9 +98,9 @@ function print_bank_transactions()
                $rep->TextCol(0, 3,     $act);
                $rep->TextCol(3, 5, _('Opening Balance'));
                if ($prev_balance > 0.0)
-                       $rep->TextCol(5, 6,     number_format2(abs($prev_balance), $dec));
+                       $rep->AmountCol(5, 6, abs($prev_balance), $dec);
                else
-                       $rep->TextCol(6, 7,     number_format2(abs($prev_balance), $dec));
+                       $rep->AmountCol(6, 7, abs($prev_balance), $dec);
                $rep->Font();
                $total = $prev_balance;
                $rep->NewLine(2);
@@ -109,16 +110,16 @@ function print_bank_transactions()
                        {
                                $total += $myrow['amount'];
 
-                               $rep->TextCol(0, 1,     systypes::name($myrow["type"]));
+                               $rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
                                $rep->TextCol(1, 2,     $myrow['trans_no']);
                                $rep->TextCol(2, 3,     $myrow['ref']);
-                               $rep->TextCol(3, 4,     sql2date($myrow["trans_date"]));
-                               $rep->TextCol(4, 5,     payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
+                               $rep->DateCol(3, 4,     $myrow["trans_date"], true);
+                               $rep->TextCol(4, 5,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
                                if ($myrow['amount'] > 0.0)
-                                       $rep->TextCol(5, 6,     number_format2(abs($myrow['amount']), $dec));
+                                       $rep->AmountCol(5, 6, abs($myrow['amount']), $dec);
                                else
-                                       $rep->TextCol(6, 7,     number_format2(abs($myrow['amount']), $dec));
-                               $rep->TextCol(7, 8,     number_format2($total, $dec));
+                                       $rep->AmountCol(6, 7, abs($myrow['amount']), $dec);
+                               $rep->AmountCol(7, 8, $total, $dec);
                                $rep->NewLine();
                                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                                {
@@ -131,9 +132,9 @@ function print_bank_transactions()
                $rep->Font('bold');
                $rep->TextCol(3, 5,     _("Ending Balance"));
                if ($total > 0.0)
-                       $rep->TextCol(5, 6,     number_format2(abs($total), $dec));
+                       $rep->AmountCol(5, 6, abs($total), $dec);
                else
-                       $rep->TextCol(6, 7,     number_format2(abs($total), $dec));
+                       $rep->AmountCol(6, 7, abs($total), $dec);
                $rep->Font();
                $rep->Line($rep->row - $rep->lineHeight + 4);
                $rep->NewLine(2, 1);