From 819514309b4ea28172e2f65d0e52899e453fcf60 Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Fri, 14 Jun 2019 15:13:23 +0000
Subject: [PATCH] [FIX] account: make tax report compatible with new
 multicompany implementation

[IMP] account: make all tax report lines accessible in every company

The former implementation, with a record rule, did not support the new multicompany implementation. Furthermore, making the tax reports accessible by every company whatever their contries is more consistent with the way other accounting reports work.

closes odoo/odoo#34154

Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
---
 addons/account/security/account_security.xml      |  7 -------
 addons/account/views/account_tax_report_views.xml | 13 +++++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index fa998f922ea..34f80bf9c68 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -131,13 +131,6 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
-    <record id="tax_report_comp_rule" model="ir.rule">
-        <field name="name">Tax report multi-company</field>
-        <field name="model_id" ref="model_account_tax_report_line"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">[('country_id','=',user.company_id.country_id.id)]</field>
-    </record>
-
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
         <field name="model_id" ref="model_account_invoice"/>
diff --git a/addons/account/views/account_tax_report_views.xml b/addons/account/views/account_tax_report_views.xml
index 1860df8cc08..05e0ce00dac 100644
--- a/addons/account/views/account_tax_report_views.xml
+++ b/addons/account/views/account_tax_report_views.xml
@@ -60,6 +60,18 @@
             </field>
         </record>
 
+        <record id="account_tax_report_line_search" model="ir.ui.view">
+            <field name="name">account.tax.report.line.search</field>
+            <field name="model">account.tax.report.line</field>
+            <field name="arch" type="xml">
+                <search>
+                    <group expand="0" string="Group By">
+                        <filter string="Country" name="groupby_country" context="{'group_by': 'country_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_configure_tax_report" model="ir.actions.act_window">
             <field name="name">Configure Tax Report</field>
             <field name="type">ir.actions.act_window</field>
@@ -67,6 +79,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="account_tax_report_line_tree"/>
+            <field name="context">{'search_default_groupby_country': True}</field>
         </record>