Merged all main trunk bugfixes up to release 2.0.5

[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..520de94d252d2aa6c743a5bda2ce501a3a823ff5 100644 (file)
--- a/gl/view/gl_payment_view.php
+++ b/gl/view/gl_payment_view.php
@@ -29,7 +29,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;
 }
@@ -58,7 +58,7 @@ 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(_("Payment Type"),bank_account_types::transfer_type($from_trans['account_type']), "class='tableheader2'");
 end_row();
 start_row();
 label_cells(_("Reference"), $from_trans['ref'], "class='tableheader2'", "colspan=$colspan2");
@@ -73,9 +73,9 @@ $items = get_gl_trans(systypes::bank_payment(), $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 +91,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);