Improved layout on documents etc and new empty language file.

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

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 7bbd8ef2aaed1cffe3c6d0ef763c02e8e01aa40f..893c8d9d29daae54f64af6ab9c263d1c469d1382 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     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,26 +54,19 @@ function get_bank_transactions($from, $to, $account)
 
 function print_bank_transactions()
 {
-       global $path_to_root;
+       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");
-               $filename = "BankStatement.xml";
-       }       
        else
-       {
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-               $filename = "BankStatement.pdf";
-       }
 
-       $rep = new FrontReport(_('Bank Statement'), $filename, user_pagesize());
+       $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize());
        $dec = user_price_dec();
 
        $cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520);
@@ -118,11 +110,11 @@ 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->DateCol(3, 4,     $myrow["trans_date"], true);
-                               $rep->TextCol(4, 5,     payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
+                               $rep->TextCol(4, 5,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
                                if ($myrow['amount'] > 0.0)
                                        $rep->AmountCol(5, 6, abs($myrow['amount']), $dec);
                                else