diff options
| author | Christophe Matthieu <chm@odoo.com> | 2018-07-26 09:55:01 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@odoo.com> | 2018-08-13 17:09:28 +0200 |
| commit | 61eef73b52c078daaae37f8d57e93830a2e53410 (patch) | |
| tree | 8b144174691de487a584bf8ac449fb55d3ad12ab /addons/base_setup | |
| parent | 149eb38b07cace0ec2118d214c56995402008efc (diff) | |
[IMP] base, *: use a many2one for the company report layout
Before this rev. one could set the report layout on the company using a
hardcoded list (background, clean, standard, etc.). Other modules (typically
accounting modules) could add options in this list. The used template was built
on the layout key.
Now, the layout is a many2one field to a newly created model `report.layout`,
which is linked to a view with the layout architecture.
This gives more control to customize reports and create a new layout (without
creating a python module that extend the layout selection).
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/models/res_config_settings.py | 8 | ||||
| -rw-r--r-- | addons/base_setup/views/res_config_settings_views.xml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py index 3e548b015e2..de5037a2245 100644 --- a/addons/base_setup/models/res_config_settings.py +++ b/addons/base_setup/models/res_config_settings.py @@ -39,8 +39,8 @@ class ResConfigSettings(models.TransientModel): group_multi_currency = fields.Boolean(string='Multi-Currencies', implied_group='base.group_multi_currency', help="Allows to work in a multi currency environment") - paperformat_id = fields.Many2one(related="company_id.paperformat_id", string='Paper Format') - external_report_layout = fields.Selection(related="company_id.external_report_layout") + paperformat_id = fields.Many2one(related="company_id.paperformat_id", string='Paper format') + external_report_layout_id = fields.Many2one(related="company_id.external_report_layout_id") show_effect = fields.Boolean(string="Show Effect", config_parameter='base_setup.show_effect') @api.model @@ -87,9 +87,9 @@ class ResConfigSettings(models.TransientModel): @api.multi def edit_external_header(self): - if not self.external_report_layout: + if not self.external_report_layout_id: return False - return self._prepare_report_view_action('web.external_layout_' + self.external_report_layout) + return self._prepare_report_view_action(self.external_report_layout_id.key) @api.multi def change_report_template(self): diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml index 58c4a0162a4..bebdaf16f64 100644 --- a/addons/base_setup/views/res_config_settings_views.xml +++ b/addons/base_setup/views/res_config_settings_views.xml @@ -35,8 +35,8 @@ </div> <div class="content-group"> <div class="mt16" groups="base.group_no_one"> - <label for="external_report_layout" string="Template" class="col-3 col-lg-3 o_light_label"/> - <field name="external_report_layout" class="oe_inline"/> + <label for="external_report_layout_id" string="Template" class="col-3 col-lg-3 o_light_label"/> + <field name="external_report_layout_id" class="oe_inline"/> </div> <div class="mt16"> <button name="change_report_template" string="Change Document Template" type="object" class="oe_link" icon="fa-arrow-right"/> |