From 30c3f13ab72bfbafa18e124149b1dd6171875516 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 3 Dec 2013 16:41:16 +0100 Subject: [PATCH] [FIX] font: better default and don't trigger onchange if no font selected bzr revid: mat@openerp.com-20131203154116-mzqfvu02r8kx2xt3 --- openerp/addons/base/res/res_company.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index 0f6d4bed133..07464d2db4d 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -189,6 +189,9 @@ class res_company(osv.osv): default_para = re.sub('fontName.?=.?".*"', 'fontName="%s"'% font,header) return re.sub('("%s"\g<3>'% font,default_para) + + if not font: + return True fontname = self.pool.get('res.font').browse(cr, uid, font, context=context).name return {'value':{ 'rml_header': _change_header(rml_header,fontname), @@ -294,12 +297,12 @@ class res_company(osv.osv): def _get_font(self, cr, uid, ids): font_obj = self.pool.get('res.font') - res = font_obj.search(cr, uid, [('name', '=', 'Helvetica')], limit=1) + res = font_obj.search(cr, uid, [('family', '=', 'Helvetica'), ('mode', '=', 'normal')], limit=1) if res: return res[0] font_obj.init_scan(cr, uid) - res = font_obj.search(cr, uid, [('name', '=', 'Helvetica')], limit=1) + res = font_obj.search(cr, uid, [('family', '=', 'Helvetica'), ('mode', '=', 'normal')], limit=1) return res and res[0] or False _header = """