Merged changes from stable branch up to 2.3.12

[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 6b05b6d6aa915b840d9a4a050e605177db114271..681373c2c9577d3924bc6319b0f598a12c877854 100644 (file)
--- a/gl/view/gl_payment_view.php
+++ b/gl/view/gl_payment_view.php
@@ -46,7 +46,7 @@ if ($from_trans['bank_curr_code'] != $company_currency)
 display_heading(_("GL Payment") . " #$trans_no");
 
 echo "<br>";
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width=80%");
 
 if ($show_currencies)
 {
@@ -62,11 +62,11 @@ start_row();
 label_cells(_("From Bank Account"), $from_trans['bank_account_name'], "class='tableheader2'");
 if ($show_currencies)
        label_cells(_("Currency"), $from_trans['bank_curr_code'], "class='tableheader2'");
-label_cells(_("Amount"), number_format2($from_trans['amount'], user_price_dec()), "class='tableheader2'", "align=right");
+label_cells(_("Amount"), number_format2(-$from_trans['amount'], user_price_dec()), "class='tableheader2'", "align=right");
 label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Pay To"), payment_person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1");
+label_cells(_("Pay To"), get_counterparty_name(ST_BANKPAYMENT, $trans_no), "class='tableheader2'", "colspan=$colspan1");
 label_cells(_("Payment Type"), $bank_transfer_types[$from_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
@@ -92,7 +92,7 @@ else
                display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
 
     echo "<br>";
-    start_table("$table_style width=80%");
+    start_table(TABLESTYLE, "width=80%");
     $dim = get_company_pref('use_dimension');
     if ($dim == 2)
         $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2",