From 8a1f5660a0cf5e9c5ed4e9f877b843522eed46a5 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:24 +0200
Subject: [PATCH] Check rule only if _check_access is set and enforce companies
 rule

issue4080
review343891009
---
 sale.xml                 | 10 +++++-----
 tests/test_sale_extra.py |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sale.xml b/sale.xml
index 0b2db36bc3..97efa16335 100644
--- a/sale.xml
+++ b/sale.xml
@@ -55,16 +55,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="act_extra_relate"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_extra">
-            <field name="name">User in company</field>
+        <record model="ir.rule.group" id="rule_group_extra_companies">
+            <field name="name">User in companies</field>
             <field name="model" search="[('model', '=', 'sale.extra')]"/>
             <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_extra1">
+        <record model="ir.rule" id="rule_extra_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_extra"/>
+            <field name="rule_group" ref="rule_group_extra_companies"/>
         </record>
 
         <record model="ir.model.access" id="access_extra">
diff --git a/tests/test_sale_extra.py b/tests/test_sale_extra.py
index 907186d5f9..4a8908fc26 100644
--- a/tests/test_sale_extra.py
+++ b/tests/test_sale_extra.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 SaleExtraTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
+class SaleExtraTestCase(CompanyTestMixin, ModuleTestCase):
     'Test Sale Extra module'
     module = 'sale_extra'