projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
8dcc7aa
)
[IMP] account: display the currency in name_get of journal also for journals in compa...
author
Quentin (OpenERP)
<qdp-launchpad@openerp.com>
Fri, 2 Dec 2011 11:07:16 +0000
(12:07 +0100)
committer
Quentin (OpenERP)
<qdp-launchpad@openerp.com>
Fri, 2 Dec 2011 11:07:16 +0000
(12:07 +0100)
bzr revid: qdp-launchpad@openerp.com-
20111202110716
-yt4nc2v3p07zdmkl
addons/account/account.py
patch
|
blob
|
history
diff --git
a/addons/account/account.py
b/addons/account/account.py
index
c8895fa
..
e18b20f
100644
(file)
--- 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