From 5e42f5c1aa614df643c761e32673d1a5f191b051 Mon Sep 17 00:00:00 2001
From: "tom.vermeeren" <tom.vermeeren@dynapps.be>
Date: Tue, 6 May 2025 13:21:59 +0200
Subject: [PATCH] [FIX] base_user_role_company: Roles are filtered so none
 which exceed date_to are used

---
 base_user_role_company/models/user.py         |  2 +-
 base_user_role_company/tests/__init__.py      |  1 +
 .../tests/test_use_only_enabled_roles.py      | 62 +++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 base_user_role_company/tests/test_use_only_enabled_roles.py

diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
index f050be474..bd12bc22c 100644
--- a/base_user_role_company/models/user.py
+++ b/base_user_role_company/models/user.py
@@ -27,7 +27,7 @@ def _get_enabled_roles(self):
                 company_ids = self.env.context.get("active_company_ids")
             else:
                 company_ids = self.company_id.ids
-            for role_line in self.role_line_ids:
+            for role_line in res:
                 if not role_line.company_id:
                     active_roles |= role_line
                 elif role_line.company_id.id in company_ids:
diff --git a/base_user_role_company/tests/__init__.py b/base_user_role_company/tests/__init__.py
index cd7f7833f..7ddf192b2 100644
--- a/base_user_role_company/tests/__init__.py
+++ b/base_user_role_company/tests/__init__.py
@@ -1 +1,2 @@
 from . import test_role_per_company
+from . import test_use_only_enabled_roles
diff --git a/base_user_role_company/tests/test_use_only_enabled_roles.py b/base_user_role_company/tests/test_use_only_enabled_roles.py
new file mode 100644
index 000000000..4b95e455a
--- /dev/null
+++ b/base_user_role_company/tests/test_use_only_enabled_roles.py
@@ -0,0 +1,62 @@
+# Copyright 2021 Open Source Integrators
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+from datetime import timedelta
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class TestUserRoleCompany(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.company1 = cls.env.ref("base.main_company")
+        # GROUPS for roles
+        cls.groupA = cls.env.ref("base.group_user")
+        cls.groupB = cls.env.ref("base.group_system")
+        # ROLES
+        cls.Role = cls.env["res.users.role"]
+        cls.roleA = cls.Role.create({"name": "Role internal user"})
+        cls.roleA.implied_ids |= cls.groupA
+        cls.roleB = cls.Role.create({"name": "Role system user"})
+        # USER with roles
+        cls.roleB.implied_ids |= cls.groupB
+        cls.User = cls.env["res.users"]
+        user_vals = {
+            "name": "Role test user",
+            "login": "role_test_user",
+            "company_ids": [(fields.Command.set([cls.company1.id]))],
+            "role_line_ids": [
+                (fields.Command.create({"role_id": cls.roleA.id})),
+                (
+                    fields.Command.create(
+                        {
+                            "role_id": cls.roleB.id,
+                            "date_to": fields.Date.today() + timedelta(days=1),
+                        }
+                    )
+                ),
+            ],
+        }
+        cls.test_user = cls.User.create(user_vals)
+
+    def test_110_enabled_role_is_used(self):
+        # User should be in group A and B because date_to is in the future
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
+        expected = self.groupA | self.groupB
+        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)
+
+    def test_120_disabled_role_is_not_used(self):
+        # User should not be in group B because date_to is in the past
+        self.test_user.role_line_ids.filtered(
+            lambda x: x.role_id == self.roleB
+        ).date_to = fields.Date.today() - timedelta(days=1)
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
+        expected = self.groupA
+        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)