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>
diff --git a/addons/l10n_ca/__manifest__.py b/addons/l10n_ca/__manifest__.py
index 1158b62f709..28892d09a76 100644
--- a/addons/l10n_ca/__manifest__.py
+++ b/addons/l10n_ca/__manifest__.py
@@ -38,7 +38,6 @@ position.
         'base_iban',
         'base_vat',
         'l10n_multilang',
-        'report',
     ],
     'data': [
         'data/account_chart_template_data.xml',
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 105c8ab7841..d4a0dc8907d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1592,7 +1592,7 @@ class ReportController(http.Controller):
         try:
             barcode = request.env['ir.actions.report'].barcode(type, value, width=width, height=height, humanreadable=humanreadable)
         except (ValueError, AttributeError):
-            raise exceptions.HTTPException(description='Cannot convert into barcode.')
+            raise werkzeug.exceptions.HTTPException(description='Cannot convert into barcode.')
 
         return request.make_response(barcode, headers=[('Content-Type', 'image/png')])
 
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index 8540ac2db76..e939b23bf86 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -298,6 +298,8 @@
         <t t-if="not o and doc">
             <t t-set="o" t-value="doc"/>
         </t>
+        <h2 t-esc="o"/>
+
         <t t-if="o and 'company_id' in o">
             <t t-set="company" t-value="o.company_id.sudo()"/>
         </t>
@@ -358,4 +360,36 @@
         </t>
     </template>
 
+    <!-- Customize the company form view by adding paperformat field as well as demo reports -->
+    <!-- Demo reports definition -->
+    <template id="preview_internalreport">
+        <t t-call="web.html_container">
+            <t t-call="web.internal_layout">
+                <div class="page">
+                    <p>This is a sample of an internal report.</p>
+                </div>
+            </t>
+        </t>
+    </template>
+    <template id="preview_externalreport">
+        <t t-call="web.html_container">
+            <t t-call="web.external_layout">
+                <div class="page">
+                    <p>This is a sample of an external report.</p>
+                </div>
+            </t>
+        </t>
+    </template>
+    <report id="action_report_internalpreview"
+        model="res.company"
+        name="web.preview_internalreport"
+        file="web.preview_internalreport"
+        string="Preview Internal Report"
+        report_type="qweb-pdf"/>
+    <report id="action_report_externalpreview"
+        model="res.company"
+        name="web.preview_externalreport"
+        file="web.preview_externalreport"
+        string="Preview External Report"
+        report_type="qweb-pdf"/>
 </odoo>
diff --git a/odoo/addons/base/res/report_paperformat_views.xml b/odoo/addons/base/res/report_paperformat_views.xml
index 2339d00e97f..94f5e94b247 100644
--- a/odoo/addons/base/res/report_paperformat_views.xml
+++ b/odoo/addons/base/res/report_paperformat_views.xml
@@ -69,38 +69,5 @@
             sequence="3"
             groups="base.group_no_one"
             />
-
-        <!-- Customize the company form view by adding paperformat field as well as demo reports -->
-        <!-- Demo reports definition -->
-        <template id="preview_internalreport">
-            <t t-call="web.html_container">
-                <t t-call="web.internal_layout">
-                    <div class="page">
-                        <p>This is a sample of an internal report.</p>
-                    </div>
-                </t>
-            </t>
-        </template>
-        <template id="preview_externalreport">
-            <t t-call="web.html_container">
-                <t t-call="web.external_layout">
-                    <div class="page">
-                        <p>This is a sample of an external report.</p>
-                    </div>
-                </t>
-            </t>
-        </template>
-        <report id="action_report_internalpreview"
-            model="res.company"
-            name="base.preview_internalreport"
-            file="base.preview_internalreport"
-            string="Preview Internal Report"
-            report_type="qweb-pdf"/>
-        <report id="action_report_externalpreview"
-            model="res.company"
-            name="base.preview_externalreport"
-            file="base.preview_externalreport"
-            string="Preview External Report"
-            report_type="qweb-pdf"/>
     </data>
 </odoo>
diff --git a/odoo/addons/base/res/res_company_view.xml b/odoo/addons/base/res/res_company_view.xml
index 317e0cf73ae..ef1f334e22d 100644
--- a/odoo/addons/base/res/res_company_view.xml
+++ b/odoo/addons/base/res/res_company_view.xml
@@ -152,7 +152,7 @@
                             <button type="object" name="set_report_template" context="{'report_template': 'clean'}">
                                 <img src="/base/static/img/preview_clean.png" class="img img-responsive img-thumbnail" alt="Preview Clean Template"/>
                             </button>
-                            <a href="/base/static/src/pdf/preview_clean.pdf" target="_blank">preview</a>
+                            <a href="/base/static/pdf/preview_clean.pdf" target="_blank">preview</a>
                         </div><div class="col-xs-3 text-center">
                             <button type="object" name="set_report_template" context="{'report_template': 'standard'}">
                                 <img src="/base/static/img/preview_standard.png" class="img img-responsive img-thumbnail" alt="Preview Minimalist Template"/>