diff options
| author | Laurent Smet <las@openerp.com> | 2017-05-09 12:58:27 +0200 |
|---|---|---|
| committer | Laurent Smet <las@openerp.com> | 2017-05-16 15:37:15 +0200 |
| commit | d5fa3232fe6cfdc931fda7132b408f9baa86c57a (patch) | |
| tree | 2dbc3213153a6a9f6a509de9c2dea785bdca6e16 /addons/base_setup | |
| parent | 0a523a16cd21eec7e6fc713e8d1e6901da89250b (diff) | |
[FIX] base, report: fix some issues due to removed 'report' module.
fix related to task: https://www.odoo.com/web#id=31625&view_type=form&model=project.task&action=333&active_id=967&menu_id=4720
The 'report' module no longer exists but a dependency was still there in l10n_ca.
- fix dependency in l10n_ca
- fix broken company layout
- move layout templates from base to web
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/models/res_config.py | 2 | ||||
| -rw-r--r-- | addons/base_setup/views/res_config_views.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/base_setup/models/res_config.py b/addons/base_setup/models/res_config.py index 52e4c79d8bb..c1a0076957c 100644 --- a/addons/base_setup/models/res_config.py +++ b/addons/base_setup/models/res_config.py @@ -94,7 +94,7 @@ class BaseConfigSettings(models.TransientModel): 'res_id': template_id.id, } - @api.model + @api.multi def edit_external_header(self): return self._prepare_report_view_action('web.external_layout_' + self.external_report_layout) diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml index 9d0f4ae597f..6d4f9277de1 100644 --- a/addons/base_setup/views/res_config_views.xml +++ b/addons/base_setup/views/res_config_views.xml @@ -43,7 +43,7 @@ <div class="mt16"> <button name="change_report_template" string="Change Document Template" type="object" class="oe_link" icon="fa-arrow-right"/> <button name="edit_external_header" string="Edit Header" type="object" class="oe_link" groups="base.group_no_one"/> - <button name="%(base.action_report_externalpreview)d" string="Preview Document" type="action" class="oe_link" groups="base.group_no_one"/> + <button name="%(web.action_report_externalpreview)d" string="Preview Document" type="action" class="oe_link" groups="base.group_no_one"/> </div> </div> </div> |