From dd2cbe92b5f0502c5b8f50bce7ff71dbb84d789b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 3 Oct 2013 15:50:18 +0200 Subject: [PATCH] [FIX] report: default font set as helvetica bzr revid: mat@openerp.com-20131003135018-2jr68cfbffda53m3 --- openerp/addons/base/res/res_company.py | 2 +- openerp/report/render/rml2pdf/customfonts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index feb6f70bcfd..929aba877b3 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -395,7 +395,7 @@ class res_company(osv.osv): 'rml_header2': _header2, 'rml_header3': _header3, 'logo':_get_logo, - 'font':'DejaVuSans' + 'font':'Helvetica', } _constraints = [ diff --git a/openerp/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py index 6f3c833d7d0..f4db37b264c 100644 --- a/openerp/report/render/rml2pdf/customfonts.py +++ b/openerp/report/render/rml2pdf/customfonts.py @@ -104,7 +104,7 @@ def RegisterCustomFonts(): """ global CustomTTFonts all_system_fonts = all_sysfonts_list() - if len(all_system_fonts) > _fonts_cache['total_system_fonts']: + if len(all_system_fonts) != _fonts_cache['total_system_fonts']: font_modes, last_family, registered_font_list, _fonts_cache['registered_fonts'] = {}, "", [], list(BasePDFFonts) #Prepares a list of registered fonts. Remove such fonts those don't have cmap for Unicode.