summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@openerp.com>2013-10-14 16:53:39 +0200
committerMartin Trigaux <mat@openerp.com>2013-10-14 16:53:39 +0200
commit3bc24a9f3b62d6c32f851960139dfa239b808529 (patch)
tree0313d48aa51f8415224186aae26bdb46046e6ff5
parent59efdc209aa7688c90c79e7f5e54f6dd0eb241a3 (diff)
[FIX] font: correct action for reloading
bzr revid: mat@openerp.com-20131014145339-p1uz9iwfyf3uhyhr
-rw-r--r--addons/base_setup/res_config.py3
-rw-r--r--addons/base_setup/res_config_view.xml2
2 files changed, 4 insertions, 1 deletions
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 @@
<div>
<div>
<field name="font" class="oe_inline"/>
- <button string="(reload fonts)" name="base.act_discover_fonts" type="object" class="oe_link"/>
+ <button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link"/>
</div>
</div>
</group>