From 81e03814e88c198f1bd04c36bb29085f4a9810db Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 14 Oct 2013 11:40:25 +0200 Subject: [PATCH 1/5] [IMP] base_setup: adapt fonts to many2one instead of list bzr revid: mat@openerp.com-20131014094025-05989gbpdghu2rwt --- addons/base_setup/res_config.py | 7 ++----- addons/base_setup/res_config_view.xml | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index bbb54e4538a..ea640a74859 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -26,9 +26,6 @@ from openerp.report.render.rml2pdf import customfonts class base_config_settings(osv.osv_memory): _name = 'base.config.settings' _inherit = 'res.config.settings' - - def _get_font(self, cr, uid, context=None): - return sorted(customfonts.RegisterCustomFonts()) _columns = { 'module_multi_company': fields.boolean('Manage multiple companies', @@ -44,11 +41,11 @@ class base_config_settings(osv.osv_memory): 'module_base_import': fields.boolean("Allow users to import data from CSV files"), 'module_google_drive': fields.boolean('Attach Google documents to any record', help="""This installs the module google_docs."""), - 'font': fields.selection(_get_font, "Select Font", help="Set your favorite font into company header"), + 'font': fields.many2one('res.font', string="Report Font", help="Set the font into the report header, it will be used for every RML report of the user company"), } _defaults= { - 'font': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.font or 'Helvetica', + 'font': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.font.id, } def open_company(self, cr, uid, ids, context=None): diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index e0434480a37..a235d98bdde 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -95,6 +95,7 @@
+
From b94140f6c9455e2f67bff644b294a30837a7f814 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 14 Oct 2013 12:15:03 +0200 Subject: [PATCH 2/5] [IMP] better labels bzr revid: mat@openerp.com-20131014101503-lfge6qnfioepu22x --- addons/base_setup/res_config.py | 2 +- addons/base_setup/res_config_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 82475be55d9..556b358506e 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -41,7 +41,7 @@ class base_config_settings(osv.osv_memory): 'module_base_import': fields.boolean("Allow users to import data from CSV files"), 'module_google_drive': fields.boolean('Attach Google documents to any record', help="""This installs the module google_docs."""), - 'font': fields.many2one('res.font', string="Report Font", help="Set the font into the report header, it will be used for every RML report of the user company"), + 'font': fields.many2one('res.font', string="Report Font", help="Set the font into the report header, it will be used as default font in the RML reports of the user company"), } _defaults= { diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index a235d98bdde..6a2c226f467 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -95,7 +95,7 @@
-
From 59efdc209aa7688c90c79e7f5e54f6dd0eb241a3 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 14 Oct 2013 12:33:08 +0200 Subject: [PATCH 3/5] [FIX] base_setup: correctly handle new font value bzr revid: mat@openerp.com-20131014103308-jynnbs2cy0nsehhn --- addons/base_setup/res_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 556b358506e..fd28a5fc8ca 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -71,7 +71,8 @@ class base_config_settings(osv.osv_memory): wizard = self.browse(cr, uid, ids)[0] if wizard.font: user = self.pool.get('res.users').browse(cr, uid, uid, context) - user.company_id.write({'font':wizard.font,'rml_header': self._change_header(user.company_id.rml_header,wizard.font), 'rml_header2': self._change_header(user.company_id.rml_header2,wizard.font), 'rml_header3': self._change_header(user.company_id.rml_header3,wizard.font)}) + font_name = wizard.font.name + user.company_id.write({'font': wizard.font.id,'rml_header': self._change_header(user.company_id.rml_header,font_name), 'rml_header2': self._change_header(user.company_id.rml_header2, font_name), 'rml_header3': self._change_header(user.company_id.rml_header3, font_name)}) return {} # Preferences wizard for Sales & CRM. From 3bc24a9f3b62d6c32f851960139dfa239b808529 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 14 Oct 2013 16:53:39 +0200 Subject: [PATCH 4/5] [FIX] font: correct action for reloading bzr revid: mat@openerp.com-20131014145339-p1uz9iwfyf3uhyhr --- addons/base_setup/res_config.py | 3 +++ addons/base_setup/res_config_view.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index fd28a5fc8ca..06c57f2df5a 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -75,6 +75,9 @@ class base_config_settings(osv.osv_memory): user.company_id.write({'font': wizard.font.id,'rml_header': self._change_header(user.company_id.rml_header,font_name), 'rml_header2': self._change_header(user.company_id.rml_header2, font_name), 'rml_header3': self._change_header(user.company_id.rml_header3, font_name)}) return {} + def act_discover_fonts(self, cr, uid, ids, context=None): + return self.pool.get("res.font").discover_fonts(cr, uid, ids, context) + # Preferences wizard for Sales & CRM. # It is defined here because it is inherited independently in modules sale, crm, # plugin_outlook and plugin_thunderbird. diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 6a2c226f467..34a59444fd2 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -95,7 +95,7 @@
-
From 554093ae8677fc1bc9664057654028e92f83e4d9 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 14 Oct 2013 17:07:24 +0200 Subject: [PATCH 5/5] [IMP] base_setup: better view for fonts bzr revid: mat@openerp.com-20131014150724-820j9wcduapbzrpz --- addons/base_setup/res_config_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 34a59444fd2..fab2f48e8ab 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -90,8 +90,8 @@ - -