Merged changes form main trunk since 2.1RC

[fa-stable.git] / sales / includes / ui / sales_credit_ui.inc

diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index dba384df59a9661e9275d80fa41eb8da459c21d8..e9bb8ebe259dade19f5d2d190d2254403a5058a2 100644 (file)
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -91,11 +91,9 @@ function display_credit_header(&$order)
        {
                table_section(2);
                
-           div_start('currency');
                label_row(_("Customer Currency:"), $order->customer_currency);
                exchange_rate_display($order->customer_currency, get_company_currency(),
                        $_POST['OrderDate']);
-           div_end();
        }
        table_section(3);
 
@@ -126,7 +124,7 @@ function display_credit_header(&$order)
                        && (get_base_sales_type()>0)) {
                                $change_prices = 1;
                }
-               $Ajax->activate('currency');
+               $Ajax->activate('_ex_rate');
        }
        // 2008-11-12 Joe Hunt added dimensions
        $dim = get_company_pref('use_dimension');