From 5d90eae76e485968bd95d76e86e3273d69fa45fe 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                       | 40 +++++++++++++++++++-----------
 tests/test_purchase_requisition.py |  4 +--
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/purchase.xml b/purchase.xml
index 4d4dca475a..ee550431ad 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -232,7 +232,20 @@ this repository contains the full copyright notices and license terms.
             <field name="group" ref="group_purchase_requisition_approval"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_requisition_default">
+        <record model="ir.rule.group" id="rule_group_requisition_companies">
+            <field name="name">User in companies</field>
+            <field name="model" search="[('model', '=', 'purchase.requisition')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_requisition_companies">
+            <field
+                name="domain"
+                eval="[('company', 'in', Eval('companies', []))]"
+                pyson="1"/>
+            <field name="rule_group" ref="rule_group_requisition_companies"/>
+        </record>
+
+        <record model="ir.rule.group" id="rule_group_requisition_employees">
             <field name="name">Own requisition</field>
             <field name="model"
                 search="[('model', '=', 'purchase.requisition')]"/>
@@ -240,39 +253,38 @@ this repository contains the full copyright notices and license terms.
             <field name="default_p" eval="True"/>
             <field name="perm_read" eval="False"/>
         </record>
-         <record model="ir.rule" id="rule_requisition_default">
+         <record model="ir.rule" id="rule_requisition_employees">
             <field name="domain"
-                eval="[('employee', 'in', Eval('user', {}).get('employees', None))]"
+                eval="[('employee', 'in', Eval('employees', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_requisition_default"/>
+            <field name="rule_group" ref="rule_group_requisition_employees"/>
         </record>
         <record model="ir.rule.group-res.group"
-            id="rule_group_requisition_default_group_purchase_requisition">
-            <field name="rule_group"
-                ref="rule_group_requisition_default"/>
+            id="rule_group_requisition_employees_group_purchase_requisition">
+            <field name="rule_group" ref="rule_group_requisition_employees"/>
             <field name="group" ref="group_purchase_requisition"/>
         </record>
 
         <!-- Give access to user who could trigger requisition work-flow -->
-        <record model="ir.rule.group" id="rule_group_requisition">
+        <record model="ir.rule.group" id="rule_group_requisition_admin">
             <field name="name">Any requisition</field>
             <field name="model"
                 search="[('model', '=', 'purchase.requisition')]"/>
             <field name="global_p" eval="False"/>
         </record>
         <record model="ir.rule.group-res.group"
-            id="rule_group_requisition_group_purchase_requisition_approval">
-            <field name="rule_group" ref="rule_group_requisition"/>
+            id="rule_group_requisition_admin_group_purchase_requisition_approval">
+            <field name="rule_group" ref="rule_group_requisition_admin"/>
             <field name="group" ref="group_purchase_requisition_approval"/>
         </record>
         <record model="ir.rule.group-res.group"
-            id="rule_group_requisition_group_purchase_request">
-            <field name="rule_group" ref="rule_group_requisition"/>
+            id="rule_group_requisition_admin_group_purchase_request">
+            <field name="rule_group" ref="rule_group_requisition_admin"/>
             <field name="group" ref="purchase_request.group_purchase_request"/>
         </record>
         <record model="ir.rule.group-res.group"
-            id="rule_group_requisition_group_purchase">
-            <field name="rule_group" ref="rule_group_requisition"/>
+            id="rule_group_requisition_admin_group_purchase">
+            <field name="rule_group" ref="rule_group_requisition_admin"/>
             <field name="group" ref="purchase.group_purchase"/>
         </record>
 
diff --git a/tests/test_purchase_requisition.py b/tests/test_purchase_requisition.py
index 1a519ab6e7..afd150227c 100644
--- a/tests/test_purchase_requisition.py
+++ b/tests/test_purchase_requisition.py
@@ -9,10 +9,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 PurchaseRequisitionTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
+class PurchaseRequisitionTestCase(CompanyTestMixin, ModuleTestCase):
     'Test Purchase Requisition module'
     module = 'purchase_requisition'