Fixed php 5.3 function name conflict.

[fa-stable.git] / gl / view / gl_payment_view.php

diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php
index 0d7c51e789cd936d96561a2f6e5020c5609df5ef..e71e3dff2105011132771afda156686aaab1392e 100644 (file)
--- a/gl/view/gl_payment_view.php
+++ b/gl/view/gl_payment_view.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 1;
-$path_to_root="../..";
+/**********************************************************************
+    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 = 'SA_BANKTRANSVIEW';
+$path_to_root = "../..";
 
 include($path_to_root . "/includes/session.inc");
 
@@ -18,7 +27,7 @@ if (isset($_GET["trans_no"]))
 }
 
 // get the pay-from bank payment info
-$result = get_bank_trans(systypes::bank_payment(), $trans_no);
+$result = get_bank_trans(ST_BANKPAYMENT, $trans_no);
 
 if (db_num_rows($result) != 1)
        display_db_error("duplicate payment bank transaction found", "");
@@ -29,7 +38,7 @@ $company_currency = get_company_currency();
 
 $show_currencies = false;
 
-if ($from_trans['bank_curr_code'] != $company_currency) 
+if ($from_trans['bank_curr_code'] != $company_currency)
 {
        $show_currencies = true;
 }
@@ -57,25 +66,25 @@ label_cells(_("Amount"), number_format2(-$from_trans['amount'], user_price_dec()
 label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Pay To"), payment_person_types::person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1");
-label_cells(_("Payment Type"), $from_trans['BankTransType'], "class='tableheader2'");
+label_cells(_("Pay To"), payment_person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1");
+label_cells(_("Payment Type"), $bank_transfer_types[$from_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
 label_cells(_("Reference"), $from_trans['ref'], "class='tableheader2'", "colspan=$colspan2");
 end_row();
-comments_display_row(systypes::bank_payment(), $trans_no);
+comments_display_row(ST_BANKPAYMENT, $trans_no);
 
 end_table(1);
 
-$voided = is_voided_display(systypes::bank_payment(), $trans_no, _("This payment has been voided."));
+$voided = is_voided_display(ST_BANKPAYMENT, $trans_no, _("This payment has been voided."));
 
-$items = get_gl_trans(systypes::bank_payment(), $trans_no);
+$items = get_gl_trans(ST_BANKPAYMENT, $trans_no);
 
 if (db_num_rows($items)==0)
 {
-       echo "<br>" . _("There are no items for this payment.");
-} 
-else 
+       display_note(_("There are no items for this payment."));
+}
+else
 {
 
        display_heading2(_("Items for this Payment"));
@@ -91,10 +100,10 @@ else
     $k = 0; //row colour counter
        $totalAmount = 0;
 
-    while ($item = db_fetch($items)) 
+    while ($item = db_fetch($items))
     {
 
-               if ($item["account"] != $from_trans["account_code"]) 
+               if ($item["account"] != $from_trans["account_code"])
                {
                alt_table_row_color($k);