diff --git a/addons/base_setup/models/res_config.py b/addons/base_setup/models/res_config.py
index 4ad4a2549b8ec9e2da1a4e273783c8759f80c7b5..52e4c79d8bbbd2b2550f0d03ab82cd09f3a215f4 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 21777901528110178fe25c62a103ed85f408fe55..05fe96e99f320bf788f6c410eed0647ac9e28e98 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',