From 08d8121f577ecbc554a82adaa47b3e6f6ac83d63 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 19 Jul 2024 15:41:25 +0200
Subject: [PATCH] Use 'irrulecontext' to add 'user_id' to context of ir.rule

---
 ir.py          | 25 +++++++------------------
 tryton.cfg     |  1 +
 versiondep.txt |  2 +-
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/ir.py b/ir.py
index 4054d93..0f81aec 100644
--- a/ir.py
+++ b/ir.py
@@ -3,7 +3,6 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.transaction import Transaction
 from trytond.pool import PoolMeta
 
 
@@ -14,22 +13,12 @@ class Rule(metaclass=PoolMeta):
     def _context_modelnames(cls):
         """ list of models to add 'user_id' to context
         """
-        return [
-            'cashbook.book', 'cashbook.line', 'cashbook.recon',
-            'cashbook.split']
-
-    @classmethod
-    def _get_context(cls, model_name):
-        context = super()._get_context(model_name)
-        if model_name in cls._context_modelnames():
-            context['user_id'] = Transaction().user
-        return context
-
-    @classmethod
-    def _get_cache_key(cls, model_name):
-        key = super()._get_cache_key(model_name)
-        if model_name in cls._context_modelnames():
-            key = (*key, Transaction().user)
-        return key
+        result = super(Rule, cls)._context_modelnames()
+        return result | {
+            'cashbook.book',
+            'cashbook.line',
+            'cashbook.recon',
+            'cashbook.split'
+        }
 
 # end Rule
diff --git a/tryton.cfg b/tryton.cfg
index 9867dfe..be3f103 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -5,6 +5,7 @@ depends:
     currency
     party
     company
+    irrulecontext
 xml:
     icon.xml
     group.xml
diff --git a/versiondep.txt b/versiondep.txt
index 8b13789..d501ebb 100644
--- a/versiondep.txt
+++ b/versiondep.txt
@@ -1 +1 @@
-
+irrulecontext;7.0.1;7.0.999;mds