From d4446984d08050d184aaefb6a5832f6ffdf6eb22 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
---
 purchase.xml                             | 11 ++++++-----
 tests/test_purchase_request_quotation.py |  5 ++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/purchase.xml b/purchase.xml
index bab096ca34..2262ed8a20 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -131,18 +131,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="purchase_request.group_purchase_request"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_request_quotation">
-            <field name="name">User in company</field>
+        <record model="ir.rule.group" id="rule_group_request_quotation_companies">
+            <field name="name">User in companies</field>
             <field name="model"
                 search="[('model', '=', 'purchase.request.quotation')]"/>
             <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_request_quotation">
+        <record model="ir.rule" id="rule_request_quotation_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_request_quotation"/>
+            <field name="rule_group" ref="rule_group_request_quotation_companies"/>
         </record>
+
         <record model="ir.model.access" id="access_request_quotation">
             <field name="model"
                 search="[('model', '=', 'purchase.request.quotation')]"/>
diff --git a/tests/test_purchase_request_quotation.py b/tests/test_purchase_request_quotation.py
index f1c8c7baf2..d67cd3e047 100644
--- a/tests/test_purchase_request_quotation.py
+++ b/tests/test_purchase_request_quotation.py
@@ -10,11 +10,10 @@ from trytond.tests.test_tryton import suite as test_suite
 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 PurchaseRequestForQuotationTestCase(
-        CompanyMultiValueTestMixin, ModuleTestCase):
+class PurchaseRequestForQuotationTestCase(CompanyTestMixin, ModuleTestCase):
     'Test Purchase Request For Quotation module'
     module = 'purchase_request_quotation'