From 7cbd5244480ead4450b8e6e646ecf939399a722c Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Fri, 3 Oct 2014 12:08:49 +0200 Subject: [PATCH] [FIX] ir_translation: apply tools.ustr on the trad itself tools.ustr(None) returns u'None', res[0] can be None. --- openerp/addons/base/ir/ir_translation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py index f8eecc70856..0ff497e0274 100644 --- a/openerp/addons/base/ir/ir_translation.py +++ b/openerp/addons/base/ir/ir_translation.py @@ -336,11 +336,11 @@ class ir_translation(osv.osv): AND name=%s""", (lang or '', types, tools.ustr(name))) res = cr.fetchone() - trad = res and tools.ustr(res[0]) or u'' + trad = res and res[0] or u'' if source and not trad: return tools.ustr(source) # Remove control characters - return filter(lambda c: unicodedata.category(c) != 'Cc', trad) + return filter(lambda c: unicodedata.category(c) != 'Cc', tools.ustr(trad)) def create(self, cr, uid, vals, context=None): if context is None: