From 1a2c268bd9bcbd39ec84fedcca2a4fda300fb6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 10 Apr 2021 23:46:23 +0200
Subject: [PATCH] Check rule only if _check_access is set and enforce companies
 rule

issue4080
review343891009
---
 journal.xml                     | 10 +++++-----
 statement.xml                   | 10 +++++-----
 tests/test_account_statement.py |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/journal.xml b/journal.xml
index 896e41f3c5..c10030ff07 100644
--- a/journal.xml
+++ b/journal.xml
@@ -50,16 +50,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="True"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_statement_journal">
-            <field name="name">User in company</field>
+        <record model="ir.rule.group" id="rule_group_statement_journal_companies">
+            <field name="name">User in companies</field>
             <field name="model" search="[('model', '=', 'account.statement.journal')]"/>
             <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_statement_journal1">
+        <record model="ir.rule" id="rule_statement_journal_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_statement_journal"/>
+            <field name="rule_group" ref="rule_group_statement_journal_companies"/>
         </record>
 
     </data>
diff --git a/statement.xml b/statement.xml
index c2b898dc24..a3745fba9f 100644
--- a/statement.xml
+++ b/statement.xml
@@ -82,16 +82,16 @@ this repository contains the full copyright notices and license terms. -->
             sequence="10"
             id="menu_statement_form"/>
 
-        <record model="ir.rule.group" id="rule_group_statement">
-            <field name="name">User in company</field>
+        <record model="ir.rule.group" id="rule_group_statement_companies">
+            <field name="name">User in companies</field>
             <field name="model" search="[('model', '=', 'account.statement')]"/>
             <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_statement1">
+        <record model="ir.rule" id="rule_statement_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_statement"/>
+            <field name="rule_group" ref="rule_group_statement_companies"/>
         </record>
 
         <record model="ir.action.report" id="report_statement">
diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py
index 892672b215..390c1ae116 100644
--- a/tests/test_account_statement.py
+++ b/tests/test_account_statement.py
@@ -7,10 +7,10 @@ from trytond.tests.test_tryton import ModuleTestCase
 from trytond.tests.test_tryton import doctest_teardown
 from trytond.tests.test_tryton import doctest_checker
 
-from trytond.modules.company.tests import CompanyMultiValueTestMixin
+from trytond.modules.company.tests import CompanyTestMixin
 
 
-class AccountStatementTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
+class AccountStatementTestCase(CompanyTestMixin, ModuleTestCase):
     'Test AccountStatement module'
     module = 'account_statement'