From: Quentin (OpenERP) <qdp-launchpad@openerp.com>
Date: Fri, 2 Dec 2011 11:07:16 +0000 (+0100)
Subject: [IMP] account: display the currency in name_get of journal also for journals in compa... 
X-Git-Tag: 6.1.0-rc1-addons~847^2~4
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=e1e585aee35c774aef4b3132105a7fdef1c27c63;p=odoo%2Fodoo.git

[IMP] account: display the currency in name_get of journal also for journals in company currency

bzr revid: qdp-launchpad@openerp.com-20111202110716-yt4nc2v3p07zdmkl
---

diff --git a/addons/account/account.py b/addons/account/account.py
index c8895fa..e18b20f 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -789,9 +789,11 @@ class account_journal(osv.osv):
         result = self.browse(cr, user, ids, context=context)
         res = []
         for rs in result:
-            name = rs.name
             if rs.currency:
-                name = "%s (%s)" % (rs.name, rs.currency.name)
+                currency = rs.currency
+            else:
+                currency = rs.company_id.currency_id
+            name = "%s (%s)" % (rs.name, currency.name)
             res += [(rs.id, name)]
         return res