From 04b081ab378f1bd926ad41e736afe9551ea58a8e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 3 Aug 2016 13:21:40 +0200 Subject: [PATCH] [FIX] tools: do not display False as the currency The field symbol is not required on a res.currency (it should and will be changed in master). In case it is not set, do not display the currency in the rapport. Fixes #11346 --- openerp/report/report_sxw.py | 2 +- openerp/tools/misc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/report/report_sxw.py b/openerp/report/report_sxw.py index 5ccb8f74185..f111566dcb4 100644 --- a/openerp/report/report_sxw.py +++ b/openerp/report/report_sxw.py @@ -223,7 +223,7 @@ class rml_parse(object): return date.strftime(date_format.encode('utf-8')) res = self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary) - if currency_obj: + if currency_obj and currency_obj.symbol: if currency_obj.position == 'after': res = u'%s\N{NO-BREAK SPACE}%s' % (res, currency_obj.symbol) elif currency_obj and currency_obj.position == 'before': diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 7f11ad82222..c47ed00302d 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -1168,7 +1168,7 @@ def formatLang(env, value, digits=None, grouping=True, monetary=False, dp=False, res = lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary) - if currency_obj: + if currency_obj and currency_obj.symbol: if currency_obj.position == 'after': res = '%s %s' % (res, currency_obj.symbol) elif currency_obj and currency_obj.position == 'before':