Merged last changes from stable.

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

diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 88b9a2f23e415e0ebb0d7e068be7ce46eb47ac4b..21dfcc3234c4cd674889bb688925b0e70e0dcd4f 100644 (file)
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -38,7 +38,7 @@ $company_currency = get_company_currency();
 
 $show_currencies = false;
 
-if ($to_trans['bank_curr_code'] != $company_currency)
+if ($to_trans['bank_curr_code'] != $to_trans['settle_curr'])
 {
        $show_currencies = true;
 }
@@ -52,13 +52,13 @@ start_table(TABLESTYLE, "width=80%");
 
 if ($show_currencies)
 {
-       $colspan1 = 5;
-       $colspan2 = 8;
+       $colspan1 = 1;
+       $colspan2 = 7;
 }
 else
 {
        $colspan1 = 3;
-       $colspan2 = 6;
+       $colspan2 = 5;
 }
 start_row();
 label_cells(_("To Bank Account"), $to_trans['bank_account_name'], "class='tableheader2'");
@@ -68,7 +68,12 @@ label_cells(_("Amount"), number_format2($to_trans['amount'], user_price_dec()),
 label_cells(_("Date"), sql2date($to_trans['trans_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("From"), get_counterparty_name(ST_BANKDEPOSIT, $trans_no), "class='tableheader2'", "colspan=$colspan1");
+label_cells(_("From"), get_counterparty_name(BT_BANKDEPOSIT, $to_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1");
+if ($show_currencies)
+{
+       label_cells(_("Settle currency"), $to_trans['settle_curr'], "class='tableheader2'");
+       label_cells(_("Settled amount"),  number_format2($to_trans['settled_amount'], user_price_dec()), "class='tableheader2'");
+}
 label_cells(_("Deposit Type"), $bank_transfer_types[$to_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
@@ -91,7 +96,7 @@ else
 
        display_heading2(_("Items for this Deposit"));
        if ($show_currencies)
-               display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
+               display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
 
     start_table(TABLESTYLE, "width=80%");
     $dim = get_company_pref('use_dimension');
@@ -133,7 +138,7 @@ else
 
        end_table(1);
 
-       display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['amount']);
+       display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['settled_amount']);
 }
 
 end_page(true, false, false, ST_BANKDEPOSIT, $trans_no);