From 69890cf33e2464266c1d9793adc3be22705c558f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 3 Apr 2015 13:27:15 +0200
Subject: [PATCH] [FIX] account: general ledger, currency displayed twice

When printing the general ledger with "With Currency"
checked, two currencies were displayed in the colum
"Currency" when an amount was set, one time the company
currency, one time the move line currency. Only
the move line currency should be displayed.

Besides, the total of currencies amount
for each account should not display the currency symbol
at all, as the total may be composed of multiple currencies.

opw-632086
---
 addons/account/views/report_generalledger.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/views/report_generalledger.xml b/addons/account/views/report_generalledger.xml
index d873571dee3..c7a90634ac7 100644
--- a/addons/account/views/report_generalledger.xml
+++ b/addons/account/views/report_generalledger.xml
@@ -96,7 +96,7 @@
                                         <span t-esc="formatLang(sum_balance_account(childrenaccount), digits=get_digits(dp='Account'), currency_obj=res_company.currency_id)"/>
                                     </td>
                                     <td class="text-right" t-if="data['form']['amount_currency']">
-                                        <span t-esc="formatLang(sum_currency_amount_account(childrenaccount), digits=get_digits(dp='Account'), currency_obj=res_company.currency_id) if sum_currency_amount_account(childrenaccount) > 0.00 else ''"/>
+                                        <span t-esc="formatLang(sum_currency_amount_account(childrenaccount), digits=get_digits(dp='Account')) if sum_currency_amount_account(childrenaccount) > 0.00 else ''"/>
                                     </td>
                                 </tr>
                                 <tr t-foreach="lines(childrenaccount)" t-as="line">
@@ -117,7 +117,7 @@
                                         <span t-esc="formatLang(line['progress'], digits=get_digits(dp='Account'), currency_obj=res_company.currency_id)"/>
                                     </td>
                                     <td class="text-right" t-if="data['form']['amount_currency']">
-                                        <span t-esc="formatLang(line['amount_currency'], currency_obj=res_company.currency_id) if line['amount_currency'] > 0.00 else ''"/>
+                                        <span t-esc="formatLang(line['amount_currency'], digits=get_digits(dp='Account')) if line['amount_currency'] > 0.00 else ''"/>
                                         <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>
                                     </td>
                                 </tr>