From e6ba4e5f35ef1b09c2b2ffbb3b37fce6a2a79c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 11 May 2017 11:07:52 +0200 Subject: [PATCH] [FIX] base, report: fixes various bugs introduced when 'refactoring' reports Commit https://github.com/odoo/odoo/commit/e80238042c9d93d492ea8b06b0041aced0d81dcd refactored and removed report module. However it broke among other the feature allowing to customize reports. This commit fixes first bugs preventing the 'choose template' box to appear. Feature is still broken though. --- addons/base_setup/models/res_config.py | 7 ++++--- odoo/addons/base/ir/ir_actions_report.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/base_setup/models/res_config.py b/addons/base_setup/models/res_config.py index 4ad4a2549b8..52e4c79d8bb 100644 --- a/addons/base_setup/models/res_config.py +++ b/addons/base_setup/models/res_config.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models + +from odoo import api, fields, models, _ class BaseConfigSettings(models.TransientModel): @@ -97,10 +98,10 @@ class BaseConfigSettings(models.TransientModel): def edit_external_header(self): return self._prepare_report_view_action('web.external_layout_' + self.external_report_layout) - @api.model + @api.multi def change_report_template(self): self.ensure_one() - template = self.env.ref('report.view_company_report_form', False) + template = self.env.ref('base.view_company_report_form') return { 'name': _('Choose Your Document Layout'), 'type': 'ir.actions.act_window', diff --git a/odoo/addons/base/ir/ir_actions_report.py b/odoo/addons/base/ir/ir_actions_report.py index 21777901528..05fe96e99f3 100644 --- a/odoo/addons/base/ir/ir_actions_report.py +++ b/odoo/addons/base/ir/ir_actions_report.py @@ -676,7 +676,7 @@ class IrActionsReport(models.Model): :param report_name: Name of the template to generate an action for """ if (self.env.uid == SUPERUSER_ID) and ((not self.env.user.company_id.external_report_layout) or (not self.env.user.company_id.logo)) and config: - template = self.env.ref('report.view_company_report_form', False) + template = self.env.ref('base.view_company_report_form') return { 'name': _('Choose Your Document Layout'), 'type': 'ir.actions.act_window',