From 3a9dd755b7f911f1ba5bec0412ffff5304c9cdb7 Mon Sep 17 00:00:00 2001
From: Raimon Esteve <raimonesteve@gmail.com>
Date: Fri, 25 Mar 2022 13:25:05 +0100
Subject: [PATCH] Check rule only if _check_access is set and enforce companies
 rule

issue4080
---
 issue3932.diff | 6 +++---
 issue8479.diff | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/issue3932.diff b/issue3932.diff
index 92c8bed..7a28624 100644
--- a/issue3932.diff
+++ b/issue3932.diff
@@ -14,7 +14,7 @@ diff -r d5e2bdf73e16 account.xml
 +        </record>
 +        <record model="ir.rule" id="rule_account_journal_period">
 +            <field name="domain"
-+                eval="[('period.company', '=', Eval('user', {}).get('company', None))]"
++                eval="[('period.company', 'in', Eval('companies', []))]"
 +                pyson="1"/>
 +            <field name="rule_group" ref="rule_group_account_journal_period"/>
 +        </record>
@@ -40,7 +40,7 @@ diff -r d5e2bdf73e16 move.xml
 +        </record>
 +        <record model="ir.rule" id="rule_account_move1">
 +            <field name="domain"
-+                eval="[('company', '=', Eval('user', {}).get('company', None))]"
++                eval="[('company', 'in', Eval('companies', []))]"
 +                pyson="1"/>
 +            <field name="rule_group" ref="rule_group_account_move"/>
 +        </record>
@@ -52,7 +52,7 @@ diff -r d5e2bdf73e16 move.xml
 +        </record>
 +        <record model="ir.rule" id="rule_account_move_line1">
 +            <field name="domain"
-+                eval="[('move.company', '=', Eval('user', {}).get('company', None))]"
++                eval="[('move.company', 'in', Eval('companies', []))]"
 +                pyson="1"/>
 +            <field name="rule_group" ref="rule_group_account_move_line"/>
 +        </record>
diff --git a/issue8479.diff b/issue8479.diff
index 2a25e39..3f0b8ff 100644
--- a/issue8479.diff
+++ b/issue8479.diff
@@ -13,7 +13,7 @@ diff -r 80d34e8f57a0 trytond/trytond/modules/account_invoice/invoice.xml
 +        </record>
 +        <record model="ir.rule" id="rule_invoice_payment_method1">
 +            <field name="domain"
-+                eval="[('company', '=', Eval('user', {}).get('company', None))]"
++                eval="[('company', 'in', Eval('companies', []))]"
 +                pyson="1"/>
 +            <field name="rule_group" ref="rule_group_invoice_payment_method"/>
 +        </record>