diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst
index cf1a8f08..9f04d5e8 100644
--- a/account_financial_report/README.rst
+++ b/account_financial_report/README.rst
@@ -97,6 +97,7 @@ Contributors
 * Akim Juillerat <akim.juillerat@camptocamp.com>
 * Alexis de Lattre <alexis@via.ecp.fr>
 * Mihai Fekete <feketemihai@gmail.com>
+* Miquel Raïch <miquel.raich@eficent.com>
 
 Much of the work in this module was done at a sprint in Sorrento, Italy in
 April 2016.
diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py
index cf1dfe4b..5ddf2a5c 100644
--- a/account_financial_report/__manifest__.py
+++ b/account_financial_report/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'Account Financial Reports',
-    'version': '11.0.2.3.1',
+    'version': '11.0.2.4.0',
     'category': 'Reporting',
     'summary': 'OCA Financial Reports',
     'author': 'Camptocamp SA,'
diff --git a/account_financial_report/readme/CONTRIBUTORS.rst b/account_financial_report/readme/CONTRIBUTORS.rst
index 4604fe42..10431f9e 100644
--- a/account_financial_report/readme/CONTRIBUTORS.rst
+++ b/account_financial_report/readme/CONTRIBUTORS.rst
@@ -14,6 +14,7 @@
 * Akim Juillerat <akim.juillerat@camptocamp.com>
 * Alexis de Lattre <alexis@via.ecp.fr>
 * Mihai Fekete <feketemihai@gmail.com>
+* Miquel Raïch <miquel.raich@eficent.com>
 
 Much of the work in this module was done at a sprint in Sorrento, Italy in
 April 2016.
diff --git a/account_financial_report/report/abstract_report_xlsx.py b/account_financial_report/report/abstract_report_xlsx.py
index 4fe4933c..5d53b3fb 100644
--- a/account_financial_report/report/abstract_report_xlsx.py
+++ b/account_financial_report/report/abstract_report_xlsx.py
@@ -41,7 +41,7 @@ class AbstractReportXslx(models.AbstractModel):
 
         self._define_formats(workbook)
 
-        report_name = self._get_report_name()
+        report_name = self._get_report_name(objects)
         report_footer = self._get_report_footer()
         filters = self._get_report_filters(report)
         self.columns = self._get_report_columns(report)
@@ -349,7 +349,7 @@ class AbstractReportXslx(models.AbstractModel):
         """
         raise NotImplementedError()
 
-    def _get_report_name(self):
+    def _get_report_name(self, objects):
         """
             Allow to define the report name.
             Report name will be used as sheet name and as report title.
diff --git a/account_financial_report/report/aged_partner_balance_xlsx.py b/account_financial_report/report/aged_partner_balance_xlsx.py
index fee5540e..31362c2a 100644
--- a/account_financial_report/report/aged_partner_balance_xlsx.py
+++ b/account_financial_report/report/aged_partner_balance_xlsx.py
@@ -10,8 +10,10 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
     _name = 'report.a_f_r.report_aged_partner_balance_xlsx'
     _inherit = 'report.account_financial_report.abstract_report_xlsx'
 
-    def _get_report_name(self):
-        return _('Aged Partner Balance')
+    def _get_report_name(self, objects):
+        report = objects
+        return _('Aged Partner Balance - %s - %s') % (
+            report.company_id.name, report.company_id.currency_id.name)
 
     def _get_report_columns(self, report):
         if not report.show_move_line_details:
diff --git a/account_financial_report/report/general_ledger_xlsx.py b/account_financial_report/report/general_ledger_xlsx.py
index d5a20d42..f722d154 100644
--- a/account_financial_report/report/general_ledger_xlsx.py
+++ b/account_financial_report/report/general_ledger_xlsx.py
@@ -11,8 +11,10 @@ class GeneralLedgerXslx(models.AbstractModel):
     _name = 'report.a_f_r.report_general_ledger_xlsx'
     _inherit = 'report.account_financial_report.abstract_report_xlsx'
 
-    def _get_report_name(self):
-        return _('General Ledger')
+    def _get_report_name(self, objects):
+        report = objects
+        return _('General Ledger - %s - %s') % (
+            report.company_id.name, report.company_id.currency_id.name)
 
     def _get_report_columns(self, report):
         res = {
diff --git a/account_financial_report/report/journal_ledger_xlsx.py b/account_financial_report/report/journal_ledger_xlsx.py
index 26d1e1f6..e9a7351e 100644
--- a/account_financial_report/report/journal_ledger_xlsx.py
+++ b/account_financial_report/report/journal_ledger_xlsx.py
@@ -10,8 +10,10 @@ class JournalLedgerXslx(models.AbstractModel):
     _name = 'report.a_f_r.report_journal_ledger_xlsx'
     _inherit = 'report.account_financial_report.abstract_report_xlsx'
 
-    def _get_report_name(self):
-        return _('Journal Ledger')
+    def _get_report_name(self, objects):
+        report = objects
+        return _('Journal Ledger - %s - %s') % (
+            report.company_id.name, report.company_id.currency_id.name)
 
     def _get_report_columns(self, report):
         columns = [
diff --git a/account_financial_report/report/open_items_xlsx.py b/account_financial_report/report/open_items_xlsx.py
index cbe663fa..4a82a27b 100644
--- a/account_financial_report/report/open_items_xlsx.py
+++ b/account_financial_report/report/open_items_xlsx.py
@@ -9,8 +9,10 @@ class OpenItemsXslx(models.AbstractModel):
     _name = 'report.a_f_r.report_open_items_xlsx'
     _inherit = 'report.account_financial_report.abstract_report_xlsx'
 
-    def _get_report_name(self):
-        return _('Open Items')
+    def _get_report_name(self, objects):
+        report = objects
+        return _('Open Items - %s - %s') % (
+            report.company_id.name, report.company_id.currency_id.name)
 
     def _get_report_columns(self, report):
         res = {
diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml
index 53b01be7..ef00fe00 100644
--- a/account_financial_report/report/templates/aged_partner_balance.xml
+++ b/account_financial_report/report/templates/aged_partner_balance.xml
@@ -14,12 +14,13 @@
     <template id="report_aged_partner_balance_base">
         <!-- Saved flag fields into variables, used to define columns display -->
         <t t-set="show_move_line_details" t-value="o.show_move_line_details"/>
-
         <!-- Defines global variables used by internal layout -->
-        <t t-set="title">Aged Partner Balance</t>
+        <t t-set="title">Aged Partner Balance - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
         <t t-set="company_name" t-value="o.company_id.name"/>
-
-        <div class="page">
+        <div class="page data_table">
+            <div class="row">
+                <h4 class="mt0" t-esc="title or 'Odoo Report'"/>
+            </div>
             <!-- Display filters -->
             <t t-call="account_financial_report.report_aged_partner_balance_filters"/>
 
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index be1004c3..2656e016 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -17,13 +17,14 @@
         <t t-set="show_cost_center" t-value="o.show_cost_center"/>
         <t t-set="foreign_currency" t-value="o.foreign_currency"/>
         <!-- Defines global variables used by internal layout -->
-        <t t-set="title">General Ledger</t>
+        <t t-set="title">General Ledger - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
         <t t-set="company_name" t-value="o.company_id.name"/>
-
-        <div class="page">
+        <div class="page data_table">
+            <div class="row">
+                <h4 class="mt0" t-esc="title or 'Odoo Report'"/>
+            </div>
             <!-- Display filters -->
             <t t-call="account_financial_report.report_general_ledger_filters"/>
-
             <t t-foreach="o.account_ids" t-as="account">
                 <div class="page_break">
                     <!-- Display account header -->
diff --git a/account_financial_report/report/templates/journal_ledger.xml b/account_financial_report/report/templates/journal_ledger.xml
index 8c895074..c321a6d4 100644
--- a/account_financial_report/report/templates/journal_ledger.xml
+++ b/account_financial_report/report/templates/journal_ledger.xml
@@ -12,12 +12,14 @@
     </template>
 
     <template id="report_journal_ledger_base">
-        <t t-set="title">Journal Ledger</t>
-        <t t-set="company_name" t-value="o.company_id.name"/>
         <t t-set="display_currency" t-value="o.foreign_currency"/>
         <t t-set="display_account_name" t-value="o.with_account_name"/>
-    
-        <div class="page">
+        <t t-set="title">Journal Ledger - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
+        <t t-set="company_name" t-value="o.company_id.name"/>
+        <div class="page data_table">
+            <div class="row">
+                <h4 class="mt0" t-esc="title or 'Odoo Report'"/>
+            </div>
             <t t-if="o.group_option == 'none'">
                 <div class="page_break">
                     <t t-call="account_financial_report.report_journal_all"/>
diff --git a/account_financial_report/report/templates/layouts.xml b/account_financial_report/report/templates/layouts.xml
index 704c7aad..630d7dee 100644
--- a/account_financial_report/report/templates/layouts.xml
+++ b/account_financial_report/report/templates/layouts.xml
@@ -2,16 +2,6 @@
 <odoo>
 
     <template id="account_financial_report.internal_layout">
-        <div class="header">
-            <div class="row">
-                <div class="col-xs-6">
-                    <span t-esc="title"/>
-                </div>
-                <div class="col-xs-6 text-right">
-                    <span t-esc="company_name"/>
-                </div>
-            </div>
-        </div>
         <div class="article">
             <link href="/account_financial_report/static/src/css/report.css" rel="stylesheet"/>
           <t t-raw="0" />
diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml
index be5c7d49..5f1c0269 100644
--- a/account_financial_report/report/templates/open_items.xml
+++ b/account_financial_report/report/templates/open_items.xml
@@ -14,13 +14,13 @@
     <template id="account_financial_report.report_open_items_base">
         <!-- Saved flag fields into variables, used to define columns display -->
         <t t-set="foreign_currency" t-value="o.foreign_currency"/>
-
-
         <!-- Defines global variables used by internal layout -->
-        <t t-set="title">Open Items</t>
+        <t t-set="title">Open Items - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
         <t t-set="company_name" t-value="o.company_id.name"/>
-
-        <div class="page">
+        <div class="page data_table">
+            <div class="row">
+                <h4 class="mt0" t-esc="title or 'Odoo Report'"/>
+            </div>
             <!-- Display filters -->
             <t t-call="account_financial_report.report_open_items_filters"/>
 
diff --git a/account_financial_report/report/templates/trial_balance.xml b/account_financial_report/report/templates/trial_balance.xml
index bb00109f..c2cdf593 100644
--- a/account_financial_report/report/templates/trial_balance.xml
+++ b/account_financial_report/report/templates/trial_balance.xml
@@ -15,93 +15,95 @@
         <!-- Saved flag fields into variables, used to define columns display -->
         <t t-set="show_partner_details" t-value="o.show_partner_details"/>
         <t t-set="foreign_currency" t-value="o.foreign_currency"/>
-            <!-- Defines global variables used by internal layout -->
-            <t t-set="title">Trial Balance</t>
-            <t t-set="company_name" t-value="o.company_id.name"/>
-            <t t-set="res_company" t-value="o.company_id"/>
+        <!-- Defines global variables used by internal layout -->
+        <t t-set="title">Trial Balance - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
+        <t t-set="company_name" t-value="o.company_id.name"/>
+        <t t-set="res_company" t-value="o.company_id"/>
+        <div class="page data_table">
+            <div class="row">
+                <h4 class="mt0" t-esc="title or 'Odoo Report'"/>
+            </div>
+            <!-- Display filters -->
+            <t t-call="account_financial_report.report_trial_balance_filters"/>
+            <div class="act_as_table list_table" style="margin-top: 10px;"/>
 
-            <div class="page">
-                <!-- Display filters -->
-                <t t-call="account_financial_report.report_trial_balance_filters"/>
-                <div class="act_as_table list_table" style="margin-top: 10px;"/>
+            <!-- Display account lines -->
+            <t t-if="not show_partner_details">
+                <div class="act_as_table data_table" style="width: 100%;">
+                    <!-- Display account header -->
+                    <t t-call="account_financial_report.report_trial_balance_lines_header"/>
 
-                <!-- Display account lines -->
-                <t t-if="not show_partner_details">
-                    <div class="act_as_table data_table" style="width: 100%;">
-                        <!-- Display account header -->
-                        <t t-call="account_financial_report.report_trial_balance_lines_header"/>
-                        
-                        <!-- Display each lines -->
-                        <t t-foreach="o.account_ids.filtered(lambda a: not a.hide_line)" t-as="line">
-                            <t t-set="type" t-value='"account_type"'/>                                                                    
-                            <!-- Adapt -->
-                            <t t-set="style" t-value="'font-size:8px;'"/>
-                            <t t-set="padding" t-value="line.level * 4"/>
-                            <t t-if="o.hide_account_at_0">
-                                <t t-set="style" t-value="'font-size: 14px;'"/>
-                            </t>
-                            <t t-if="o.hierarchy_on != 'none'">
-                                <t t-set="style" t-value="'font-size: ' + str(14 - line.level) + 'px; margin-left: ' + str(line.level * 4) + 'px;'"/>
-                            </t>
-                            <t t-if="line.account_group_id">
-                                <t t-set="style" t-value="style + 'font-weight: bold; color: blue;'"/>
-                            </t>              
-                            
-                            <!-- Display account lines -->
-                            <t t-call="account_financial_report.report_trial_balance_line"/>
-                            <!-- Adapt style -->
+                    <!-- Display each lines -->
+                    <t t-foreach="o.account_ids.filtered(lambda a: not a.hide_line)" t-as="line">
+                        <t t-set="type" t-value='"account_type"'/>
+                        <!-- Adapt -->
+                        <t t-set="style" t-value="'font-size:8px;'"/>
+                        <t t-set="padding" t-value="line.level * 4"/>
+                        <t t-if="o.hide_account_at_0">
+                            <t t-set="style" t-value="'font-size: 14px;'"/>
+                        </t>
+                        <t t-if="o.hierarchy_on != 'none'">
+                            <t t-set="style" t-value="'font-size: ' + str(14 - line.level) + 'px; margin-left: ' + str(line.level * 4) + 'px;'"/>
+                        </t>
+                        <t t-if="line.account_group_id">
+                            <t t-set="style" t-value="style + 'font-weight: bold; color: blue;'"/>
                         </t>
-                    </div>
-                </t>
 
-                <!-- Display partner lines -->
-                <t t-if="show_partner_details">
-                    <t t-set="padding" t-value="0"/>
-                    <t t-foreach="o.account_ids" t-as="account">
-                        <div class="page_break">
-                            <t t-set="style" t-value="'font-size:8px;'"/>
-                            <t t-set="padding" t-value="account.level * 4"/>
-                            <t t-set="style" t-value="'font-size: ' + str(14 - account.level) + 'px; margin-left: ' + str(account.level * 4) + 'px;'"/>
-                            
-                            <!-- Display account header -->
-                            <div class="act_as_table list_table" style="margin-top: 10px;"/>
-                            <div class="act_as_caption account_title"
-                                 style="width: 100%;">
-                                <t t-set="res_model" t-value="'account.account'"/>
-                                <span>
-                                    <a t-att-data-active-id="account.account_id.id"
-                                       t-att-data-res-model="res_model"
-                                       class="o_account_financial_reports_web_action"
-                                       t-att-style="style">
-                                        <t t-raw="account.code"/> - <t t-raw="account.name"/></a>
-                                </span>
-                            </div>
+                        <!-- Display account lines -->
+                        <t t-call="account_financial_report.report_trial_balance_line"/>
+                        <!-- Adapt style -->
+                    </t>
+                </div>
+            </t>
 
-                            <div class="act_as_table data_table"
-                                 style="width: 100%;">
-                                <!-- Display account/partner header -->
-                                <t t-call="account_financial_report.report_trial_balance_lines_header"/>
+            <!-- Display partner lines -->
+            <t t-if="show_partner_details">
+                <t t-set="padding" t-value="0"/>
+                <t t-foreach="o.account_ids" t-as="account">
+                    <div class="page_break">
+                        <t t-set="style" t-value="'font-size:8px;'"/>
+                        <t t-set="padding" t-value="account.level * 4"/>
+                        <t t-set="style" t-value="'font-size: ' + str(14 - account.level) + 'px; margin-left: ' + str(account.level * 4) + 'px;'"/>
 
-                                <!-- Adapt style -->
-                                <t t-set="padding" t-value="padding+4"/>
-                                
-                                <!-- Display each partners -->
-                                <t t-foreach="account.partner_ids" t-as="line">
-                                    <t t-set="type" t-value='"partner_type"'/>
-                                    <!-- Display partner line -->
-                                    <t t-call="account_financial_report.report_trial_balance_line"/>
-                                </t>
-                                <t t-set="padding" t-value="padding-4"/>
-                            </div>
+                        <!-- Display account header -->
+                        <div class="act_as_table list_table" style="margin-top: 10px;"/>
+                        <div class="act_as_caption account_title"
+                             style="width: 100%;">
+                            <t t-set="res_model" t-value="'account.account'"/>
+                            <span>
+                                <a t-att-data-active-id="account.account_id.id"
+                                   t-att-data-res-model="res_model"
+                                   class="o_account_financial_reports_web_action"
+                                   t-att-style="style">
+                                    <t t-raw="account.code"/> - <t t-raw="account.name"/></a>
+                            </span>
+                        </div>
+
+                        <div class="act_as_table data_table"
+                             style="width: 100%;">
+                            <!-- Display account/partner header -->
+                            <t t-call="account_financial_report.report_trial_balance_lines_header"/>
+
+                            <!-- Adapt style -->
+                            <t t-set="padding" t-value="padding+4"/>
 
-                            <!-- Display account footer -->
-                            <t t-set="type" t-value='"account_type"'/>                                                                    
-                            <t t-call="account_financial_report.report_trial_balance_account_footer"/>                           
-                            
+                            <!-- Display each partners -->
+                            <t t-foreach="account.partner_ids" t-as="line">
+                                <t t-set="type" t-value='"partner_type"'/>
+                                <!-- Display partner line -->
+                                <t t-call="account_financial_report.report_trial_balance_line"/>
+                            </t>
+                            <t t-set="padding" t-value="padding-4"/>
                         </div>
-                    </t>
+
+                        <!-- Display account footer -->
+                        <t t-set="type" t-value='"account_type"'/>
+                        <t t-call="account_financial_report.report_trial_balance_account_footer"/>
+
+                    </div>
                 </t>
-            </div>
+            </t>
+        </div>
     </template>
     <template id="account_financial_report.report_trial_balance_filters">
         <div class="act_as_table data_table" style="width: 100%;">
diff --git a/account_financial_report/report/templates/vat_report.xml b/account_financial_report/report/templates/vat_report.xml
index f1c1c150..2291e3f3 100644
--- a/account_financial_report/report/templates/vat_report.xml
+++ b/account_financial_report/report/templates/vat_report.xml
@@ -12,15 +12,15 @@
     </template>
 
     <template id="account_financial_report.report_vat_report_base">
+        <t t-set="title">VAT Report - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
+        <t t-set="company_name" t-value="o.company_id.name"/>
         <div class="page data_table">
-            <t t-set="title">VAT Report</t>
             <div class="row">
                 <h4 class="mt0" t-esc="title or 'Odoo Report'"/>
             </div>
             <!-- Display filters -->
             <t t-call="account_financial_report.report_vat_report_filters"/>
             <div class="page_break"/>
-
             <div class="act_as_table data_table" style="width: 100%;">
                 <!-- Display table headers for lines -->
                 <div class="act_as_thead">
diff --git a/account_financial_report/report/trial_balance_xlsx.py b/account_financial_report/report/trial_balance_xlsx.py
index 57bf27c6..647e8491 100644
--- a/account_financial_report/report/trial_balance_xlsx.py
+++ b/account_financial_report/report/trial_balance_xlsx.py
@@ -10,8 +10,10 @@ class TrialBalanceXslx(models.AbstractModel):
     _name = 'report.a_f_r.report_trial_balance_xlsx'
     _inherit = 'report.account_financial_report.abstract_report_xlsx'
 
-    def _get_report_name(self):
-        return _('Trial Balance')
+    def _get_report_name(self, objects):
+        report = objects
+        return _('Trial Balance - %s - %s') % (
+            report.company_id.name, report.company_id.currency_id.name)
 
     def _get_report_columns(self, report):
         if not report.show_partner_details:
diff --git a/account_financial_report/report/vat_report_xlsx.py b/account_financial_report/report/vat_report_xlsx.py
index 1418057c..3d69ffeb 100644
--- a/account_financial_report/report/vat_report_xlsx.py
+++ b/account_financial_report/report/vat_report_xlsx.py
@@ -8,8 +8,10 @@ class VATReportXslx(models.AbstractModel):
     _name = 'report.a_f_r.report_vat_report_xlsx'
     _inherit = 'report.account_financial_report.abstract_report_xlsx'
 
-    def _get_report_name(self):
-        return _('VAT Report')
+    def _get_report_name(self, objects):
+        report = objects
+        return _('VAT Report - %s - %s') % (
+            report.company_id.name, report.company_id.currency_id.name)
 
     def _get_report_columns(self, report):
         return {
diff --git a/account_financial_report/tests/test_vat_report.py b/account_financial_report/tests/test_vat_report.py
index 08648cdb..a2b6e570 100644
--- a/account_financial_report/tests/test_vat_report.py
+++ b/account_financial_report/tests/test_vat_report.py
@@ -48,22 +48,27 @@ class TestVATReport(common.TransactionCase):
 
     def setUp(self):
         super(TestVATReport, self).setUp()
-        self.date_from = time.strftime('%Y-%m-01'),
-        self.date_to = time.strftime('%Y-%m-28'),
+        self.date_from = time.strftime('%Y-%m-01')
+        self.date_to = time.strftime('%Y-%m-28')
+        self.company = self.env.ref('base.main_company')
         self.receivable_account = self.env['account.account'].search([
+            ('company_id', '=', self.company.id),
             ('user_type_id.name', '=', 'Receivable')
             ], limit=1)
         self.income_account = self.env['account.account'].search([
+            ('company_id', '=', self.company.id),
             ('user_type_id.name', '=', 'Income')
             ], limit=1)
         self.tax_account = self.env['account.account'].search([
+            ('company_id', '=', self.company.id),
             ('user_type_id',
              '=',
              self.env.ref(
-                 'account.data_account_type_non_current_liabilities').id
-             )], limit=1)
-        self.bank_journal = self.env['account.journal'].search(
-            [('type', '=', 'bank')], limit=1)
+                 'account.data_account_type_non_current_liabilities').id)
+            ], limit=1)
+        self.bank_journal = self.env['account.journal'].search([
+            ('type', '=', 'bank'), ('company_id', '=', self.company.id)
+            ], limit=1)
         self.tax_tag_01 = self.env['account.account.tag'].create({
             'name': 'Tag 01',
             'applicability': 'taxes'
@@ -90,6 +95,7 @@ class TestVATReport(common.TransactionCase):
             'amount_type': 'percent',
             'type_tax_use': 'sale',
             'account_id': self.tax_account.id,
+            'company_id': self.company.id,
             'refund_account_id': self.tax_account.id,
             'tax_group_id': self.tax_group_10.id,
             'tag_ids': [(6, 0, [self.tax_tag_01.id, self.tax_tag_02.id])]
@@ -102,6 +108,7 @@ class TestVATReport(common.TransactionCase):
             'type_tax_use': 'sale',
             'tax_exigibility': 'on_payment',
             'account_id': self.tax_account.id,
+            'company_id': self.company.id,
             'refund_account_id': self.tax_account.id,
             'cash_basis_account': self.tax_account.id,
             'tax_group_id': self.tax_group_20.id,
@@ -111,6 +118,7 @@ class TestVATReport(common.TransactionCase):
         invoice = self.env['account.invoice'].create({
             'partner_id': self.env.ref('base.res_partner_2').id,
             'account_id': self.receivable_account.id,
+            'company_id': self.company.id,
             'date_invoice': time.strftime('%Y-%m-03'),
             'type': 'out_invoice',
         })
@@ -130,6 +138,7 @@ class TestVATReport(common.TransactionCase):
         self.cbinvoice = self.env['account.invoice'].create({
             'partner_id': self.env.ref('base.res_partner_2').id,
             'account_id': self.receivable_account.id,
+            'company_id': self.company.id,
             'date_invoice': time.strftime('%Y-%m-05'),
             'type': 'out_invoice',
         })
@@ -147,13 +156,12 @@ class TestVATReport(common.TransactionCase):
         self.cbinvoice.action_invoice_open()
 
     def _get_report_lines(self):
-        company = self.env.ref('base.main_company')
         self.cbinvoice.pay_and_reconcile(
             self.bank_journal.id, 300, time.strftime('%Y-%m-10'))
         vat_report = self.env['report_vat_report'].create({
             'date_from': self.date_from,
             'date_to': self.date_to,
-            'company_id': company.id,
+            'company_id': self.company.id,
             'based_on': 'taxtags',
             'tax_detail': True,
             })
@@ -238,11 +246,10 @@ class TestVATReport(common.TransactionCase):
         self.assertEqual(lines['tax_group_20'].tax, 50)
 
     def test_get_report_html(self):
-        company = self.env.ref('base.main_company')
         vat_report = self.env['report_vat_report'].create({
             'date_from': self.date_from,
             'date_to': self.date_to,
-            'company_id': company.id,
+            'company_id': self.company.id,
             'tax_detail': True,
             })
         vat_report.compute_data_for_report()
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py
index 97d68691..c192c24b 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report/wizard/aged_partner_balance_wizard.py
@@ -17,6 +17,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
     company_id = fields.Many2one(
         comodel_name='res.company',
         default=lambda self: self.env.user.company_id,
+        required=True,
         string='Company'
     )
     date_at = fields.Date(required=True,
@@ -38,11 +39,22 @@ class AgedPartnerBalanceWizard(models.TransientModel):
     )
     show_move_line_details = fields.Boolean()
 
+    @api.onchange('company_id')
+    def onchange_company_id(self):
+        """Handle company change."""
+        if self.company_id and self.partner_ids:
+            self.partner_ids = self.partner_ids.filtered(
+                lambda p: p.company_id == self.company_id or
+                not p.company_id)
+        if self.company_id and self.account_ids:
+            self.account_ids = self.account_ids.filtered(
+                lambda a: a.company_id == self.company_id)
+
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         if self.receivable_accounts_only or self.payable_accounts_only:
-            domain = []
+            domain = [('company_id', '=', self.company_id.id)]
             if self.receivable_accounts_only and self.payable_accounts_only:
                 domain += [('internal_type', 'in', ('receivable', 'payable'))]
             elif self.receivable_accounts_only:
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
index a2e3196c..0b8c5863 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
+++ b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
@@ -21,15 +21,21 @@
                 </group>
                 <group name="partner_filter" col="1">
                     <label for="partner_ids"/>
-                    <field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
+                    <field name="partner_ids" nolabel="1"
+                           widget="many2many_tags"
+                           options="{'no_create': True}"
+                           domain="['|',('company_id','=',company_id), ('company_id','=',False)]"/>
                 </group>
                 <group name="account_filter" col="4">
                     <label for="account_ids" colspan="4"/>
                     <field name="receivable_accounts_only"/>
                     <field name="payable_accounts_only"/>
-                    <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
+                    <field name="account_ids" nolabel="1"
+                           widget="many2many_tags"
+                           options="{'no_create': True}"
+                           domain="[('company_id','=',company_id)]"
+                           colspan="4"/>
                 </group>
-                <field name="account_ids" nolabel="1" options="{'no_create': True}"/>
                 <footer>
                     <button name="button_export_html" string="View"
                             type="object" default_focus="1" class="oe_highlight"/>
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index 0057ad87..85396d6a 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -7,9 +7,10 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 from odoo.tools.safe_eval import safe_eval
 from odoo.tools import pycompat
+from odoo.exceptions import ValidationError
 
 
 class GeneralLedgerReportWizard(models.TransientModel):
@@ -21,6 +22,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
     company_id = fields.Many2one(
         comodel_name='res.company',
         default=lambda self: self.env.user.company_id,
+        required=True,
         string='Company'
     )
     date_range_id = fields.Many2one(
@@ -98,6 +100,19 @@ class GeneralLedgerReportWizard(models.TransientModel):
                 ('company_id', '=', self.company_id.id)
             ])
         self.not_only_one_unaffected_earnings_account = count != 1
+        if self.company_id and self.date_range_id.company_id and \
+                self.date_range_id.company_id != self.company_id:
+            self.date_range_id = False
+        if self.company_id and self.partner_ids:
+            self.partner_ids = self.partner_ids.filtered(
+                lambda p: p.company_id == self.company_id or
+                not p.company_id)
+        if self.company_id and self.account_ids:
+            self.account_ids = self.account_ids.filtered(
+                lambda a: a.company_id == self.company_id)
+        if self.company_id and self.cost_center_ids:
+            self.cost_center_ids = self.cost_center_ids.filtered(
+                lambda c: c.company_id == self.company_id)
 
     @api.onchange('date_range_id')
     def onchange_date_range_id(self):
@@ -105,11 +120,21 @@ class GeneralLedgerReportWizard(models.TransientModel):
         self.date_from = self.date_range_id.date_start
         self.date_to = self.date_range_id.date_end
 
+    @api.multi
+    @api.constrains('company_id', 'date_range_id')
+    def _check_company_id_date_range_id(self):
+        for rec in self.sudo():
+            if rec.company_id and rec.date_range_id.company_id and\
+                    rec.company_id != rec.date_range_id.company_id:
+                raise ValidationError(
+                    _('The Company in the General Ledger Report Wizard and in '
+                      'Date Range must be the same.'))
+
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         if self.receivable_accounts_only or self.payable_accounts_only:
-            domain = []
+            domain = [('company_id', '=', self.company_id.id)]
             if self.receivable_accounts_only and self.payable_accounts_only:
                 domain += [('internal_type', 'in', ('receivable', 'payable'))]
             elif self.receivable_accounts_only:
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index d56d7c13..225eaac2 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -13,7 +13,8 @@
                 <div attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', True)]}">
                     <group name="filters">
                         <group name="date_range">
-                            <field name="date_range_id" domain="['|',('company_id','=',company_id), ('company_id','=',False)]"/>
+                            <field name="date_range_id"
+                                   domain="['|',('company_id','=',company_id), ('company_id','=',False)]"/>
                             <field name="date_from"/>
                             <field name="date_to"/>
                             <field name="fy_start_date" invisible="1"/>
@@ -32,13 +33,23 @@
                                 <field name="receivable_accounts_only"/>
                                 <field name="payable_accounts_only"/>
                             </group>
-                            <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
+                            <field name="account_ids"
+                                   nolabel="1"
+                                   widget="many2many_tags"
+                                   options="{'no_create': True}"
+                                   domain="[('company_id','=',company_id)]"/>
                         </page>
                         <page string="Filter partners">
-                            <field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
+                            <field name="partner_ids" nolabel="1"
+                                   widget="many2many_tags"
+                                   domain="['|',('company_id','=',company_id), ('company_id','=',False)]"
+                                   options="{'no_create': True}"/>
                         </page>
                         <page string="Filter cost centers" groups="analytic.group_analytic_accounting">
-                            <field name="cost_center_ids" nolabel="1" options="{'no_create': True}" groups="analytic.group_analytic_accounting"/>
+                            <field name="cost_center_ids" nolabel="1"
+                                   options="{'no_create': True}"
+                                   domain="[('company_id','=',company_id)]"
+                                   groups="analytic.group_analytic_accounting"/>
                         </page>
                         <page string="Filter analytic tags">
                             <field name="analytic_tag_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py
index 60f5b7d3..804a8efe 100644
--- a/account_financial_report/wizard/open_items_wizard.py
+++ b/account_financial_report/wizard/open_items_wizard.py
@@ -17,6 +17,7 @@ class OpenItemsReportWizard(models.TransientModel):
     company_id = fields.Many2one(
         comodel_name='res.company',
         default=lambda self: self.env.user.company_id,
+        required=True,
         string='Company'
     )
     date_at = fields.Date(required=True,
@@ -51,11 +52,22 @@ class OpenItemsReportWizard(models.TransientModel):
              'will display initial and final balance in that currency.'
     )
 
+    @api.onchange('company_id')
+    def onchange_company_id(self):
+        """Handle company change."""
+        if self.company_id and self.partner_ids:
+            self.partner_ids = self.partner_ids.filtered(
+                lambda p: p.company_id == self.company_id or
+                not p.company_id)
+        if self.company_id and self.account_ids:
+            self.account_ids = self.account_ids.filtered(
+                lambda a: a.company_id == self.company_id)
+
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         if self.receivable_accounts_only or self.payable_accounts_only:
-            domain = []
+            domain = [('company_id', '=', self.company_id.id)]
             if self.receivable_accounts_only and self.payable_accounts_only:
                 domain += [('internal_type', 'in', ('receivable', 'payable'))]
             elif self.receivable_accounts_only:
diff --git a/account_financial_report/wizard/open_items_wizard_view.xml b/account_financial_report/wizard/open_items_wizard_view.xml
index 3a6122bf..1366799b 100644
--- a/account_financial_report/wizard/open_items_wizard_view.xml
+++ b/account_financial_report/wizard/open_items_wizard_view.xml
@@ -22,13 +22,21 @@
                 </group>
                 <group name="partner_filter" col="1">
                     <label for="partner_ids"/>
-                    <field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
+                    <field name="partner_ids"
+                           nolabel="1"
+                           domain="['|',('company_id','=',company_id), ('company_id','=',False)]"
+                           widget="many2many_tags"
+                           options="{'no_create': True}"/>
                 </group>
                 <group name="account_filter" col="4">
-                    <label for="account_ids" colspan="4"/>
                     <field name="receivable_accounts_only"/>
                     <field name="payable_accounts_only"/>
-                    <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
+                    <field name="account_ids"
+                           nolabel="1"
+                           widget="many2many_tags"
+                           domain="[('company_id','=',company_id)]"
+                           options="{'no_create': True}"
+                           colspan="4"/>
                 </group>
                 <footer>
                     <button name="button_export_html" string="View"
diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py
index 1b79eb0a..cd8cabe6 100644
--- a/account_financial_report/wizard/trial_balance_wizard.py
+++ b/account_financial_report/wizard/trial_balance_wizard.py
@@ -7,7 +7,7 @@
 from odoo import api, fields, models, _
 from odoo.tools.safe_eval import safe_eval
 from odoo.tools import pycompat
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
 
 
 class TrialBalanceReportWizard(models.TransientModel):
@@ -19,6 +19,7 @@ class TrialBalanceReportWizard(models.TransientModel):
     company_id = fields.Many2one(
         comodel_name='res.company',
         default=lambda self: self.env.user.company_id,
+        required=True,
         string='Company'
     )
     date_range_id = fields.Many2one(
@@ -107,6 +108,16 @@ class TrialBalanceReportWizard(models.TransientModel):
                 ('company_id', '=', self.company_id.id)
             ])
         self.not_only_one_unaffected_earnings_account = count != 1
+        if self.company_id and self.date_range_id.company_id and \
+                self.date_range_id.company_id != self.company_id:
+            self.date_range_id = False
+        if self.company_id and self.partner_ids:
+            self.partner_ids = self.partner_ids.filtered(
+                lambda p: p.company_id == self.company_id or
+                not p.company_id)
+        if self.company_id and self.account_ids:
+            self.account_ids = self.account_ids.filtered(
+                lambda a: a.company_id == self.company_id)
 
     @api.onchange('date_range_id')
     def onchange_date_range_id(self):
@@ -114,11 +125,21 @@ class TrialBalanceReportWizard(models.TransientModel):
         self.date_from = self.date_range_id.date_start
         self.date_to = self.date_range_id.date_end
 
+    @api.multi
+    @api.constrains('company_id', 'date_range_id')
+    def _check_company_id_date_range_id(self):
+        for rec in self.sudo():
+            if rec.company_id and rec.date_range_id.company_id and\
+                    rec.company_id != rec.date_range_id.company_id:
+                raise ValidationError(
+                    _('The Company in the Trial Balance Report Wizard and in '
+                      'Date Range must be the same.'))
+
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         if self.receivable_accounts_only or self.payable_accounts_only:
-            domain = []
+            domain = [('company_id', '=', self.company_id.id)]
             if self.receivable_accounts_only and self.payable_accounts_only:
                 domain += [('internal_type', 'in', ('receivable', 'payable'))]
             elif self.receivable_accounts_only:
diff --git a/account_financial_report/wizard/trial_balance_wizard_view.xml b/account_financial_report/wizard/trial_balance_wizard_view.xml
index 540cf0b7..efc763ad 100644
--- a/account_financial_report/wizard/trial_balance_wizard_view.xml
+++ b/account_financial_report/wizard/trial_balance_wizard_view.xml
@@ -30,17 +30,31 @@
                     </group>
                     <group name="partner_filter" attrs="{'invisible':[('show_partner_details','!=',True)]}" col="1">
                         <label for="partner_ids"/>
-                        <field name="partner_ids" nolabel="1"  widget="many2many_tags" options="{'no_create': True}"/>
+                        <field name="partner_ids"
+                               nolabel="1"
+                               domain="['|',('company_id','=',company_id), ('company_id','=',False)]"
+                               widget="many2many_tags"
+                               options="{'no_create': True}"/>
                     </group>
                     <label for="journal_ids"/>
-                    <field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
+                    <field name="journal_ids"
+                           widget="many2many_tags"
+                           domain="[('company_id','=',company_id)]"
+                           nolabel="1"
+                           options="{'no_create': True}"
+                    />
                     <group attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
                     <div/>
                     <group name="account_filter" col="4">
                         <label for="account_ids" colspan="4"/>
                         <field name="receivable_accounts_only"/>
                         <field name="payable_accounts_only"/>
-                        <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
+                        <field name="account_ids"
+                               nolabel="1"
+                               widget="many2many_tags"
+                               domain="[('company_id','=',company_id)]"
+                               options="{'no_create': True}"
+                               colspan="4"/>
                     </group>
                 </div>
                 <div attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', False)]}">
diff --git a/account_financial_report/wizard/vat_report_wizard.py b/account_financial_report/wizard/vat_report_wizard.py
index d64eb97c..0878bba4 100644
--- a/account_financial_report/wizard/vat_report_wizard.py
+++ b/account_financial_report/wizard/vat_report_wizard.py
@@ -1,9 +1,10 @@
 # Copyright  2018 Forest and Biomass Romania
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 from odoo.tools.safe_eval import safe_eval
 from odoo.tools import pycompat
+from odoo.exceptions import ValidationError
 
 
 class VATReportWizard(models.TransientModel):
@@ -12,6 +13,7 @@ class VATReportWizard(models.TransientModel):
     company_id = fields.Many2one(
         comodel_name='res.company',
         default=lambda self: self.env.user.company_id,
+        required=True,
         string='Company'
     )
     date_range_id = fields.Many2one(
@@ -27,12 +29,28 @@ class VATReportWizard(models.TransientModel):
                                 default='taxtags')
     tax_detail = fields.Boolean('Detail Taxes')
 
+    @api.onchange('company_id')
+    def onchange_company_id(self):
+        if self.company_id and self.date_range_id.company_id and \
+                self.date_range_id.company_id != self.company_id:
+            self.date_range_id = False
+
     @api.onchange('date_range_id')
     def onchange_date_range_id(self):
         """Handle date range change."""
         self.date_from = self.date_range_id.date_start
         self.date_to = self.date_range_id.date_end
 
+    @api.multi
+    @api.constrains('company_id', 'date_range_id')
+    def _check_company_id_date_range_id(self):
+        for rec in self.sudo():
+            if rec.company_id and rec.date_range_id.company_id and\
+                    rec.company_id != rec.date_range_id.company_id:
+                raise ValidationError(
+                    _('The Company in the Vat Report Wizard and in '
+                      'Date Range must be the same.'))
+
     @api.multi
     def button_export_html(self):
         self.ensure_one()