[IMP] base_user_role: Added multicompany support from commit server-tool repo commit 840c2c1119460424230c935da24ec42f95c21122

base_user_role/models/role.py

@@ -39,7 +39,7 @@ class ResUsersRole(models.Model):
         string="Associated category",
         help="Associated group's category",
     )
-    comment = fields.Html(string="Internal Notes",)
+    comment = fields.Html(string="Internal Notes")
 
     @api.multi
     @api.depends("line_ids.user_id")
@@ -90,6 +90,9 @@ class ResUsersRoleLine(models.Model):
     date_from = fields.Date("From")
     date_to = fields.Date("To")
     is_enabled = fields.Boolean("Enabled", compute="_compute_is_enabled")
+    company_id = fields.Many2one(
+        "res.company", "Company", default=lambda self: self.env.user.company_id
+    )
 
     @api.multi
     @api.depends("date_from", "date_to")

base_user_role/models/user.py

@@ -54,6 +54,14 @@ class ResUsers(models.Model):
         self.sudo().set_groups_from_roles()
         return res
 
+    def _get_applicable_roles(self):
+        return self.role_line_ids.filtered(
+            lambda rec: rec.is_enabled
+            and (
+                not rec.company_id or rec.company_id == rec.user_id.company_id
+            )
+        )
+
     @api.multi
     def set_groups_from_roles(self, force=False):
         """Set (replace) the groups following the roles defined on users.
@@ -75,10 +83,7 @@ class ResUsers(models.Model):
             if not user.role_line_ids and not force:
                 continue
             group_ids = []
-            role_lines = user.role_line_ids.filtered(
-                lambda rec: rec.is_enabled
-            )
-            for role_line in role_lines:
+            for role_line in user._get_applicable_roles():
                 role = role_line.role_id
                 if role:
                     group_ids += role_groups[role]