Merged changes from main CVS up to 2.1.5

[fa-stable.git] / sales / customer_payments.php

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index f00a88dab6364a8a6e51674adb1531c8e4047e3f..b7b1e1da290eb17ae67ca9dce091d3b94bd807d4 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -238,11 +238,12 @@ start_form();
 
 
 
+               $comp_currency = get_company_currency();
                $cust_currency = get_customer_currency($_POST['customer_id']);
                $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
                if ($cust_currency != $bank_currency) {
-                       exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], true);
+                       exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_currency));
                }
 
                amount_row(_("Bank Charge:"), 'charge');