From c49e8846790aa013e6b7cd9e65e8fbb464d487e4 Mon Sep 17 00:00:00 2001 From: "Dharmraj Zala (OpenERP Trainee)" Date: Tue, 17 Sep 2013 11:24:50 +0530 Subject: [PATCH] [IMP] miscellaneous improvements bzr revid: dizzy.zala@gmail.com-20130917055450-1mbdt8u0up6ucw0h --- addons/base_setup/res_config.py | 4 +--- addons/base_setup/res_config_view.xml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index c445b25d6e5..59be9cc4e3d 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -28,9 +28,7 @@ class base_config_settings(osv.osv_memory): _inherit = 'res.config.settings' def _get_font(self, cr, uid, context=None): - if not customfonts.supported_fonts: - customfonts.RegisterCustomFonts() - return sorted(customfonts.supported_fonts) + return sorted(customfonts.RegisterCustomFonts()) _columns = { 'module_multi_company': fields.boolean('Manage multiple companies', diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index e9be52c66d8..8004d444ed9 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -91,7 +91,7 @@ -