Merge branch '14.0' into 14.0-base_user_role_edit_broken

base_user_role/models/role.py

@@ -3,8 +3,7 @@
 import datetime
 import logging
 
-from odoo import SUPERUSER_ID, _, api, fields, models
-from odoo.exceptions import ValidationError
+from odoo import SUPERUSER_ID, api, fields, models
 
 _logger = logging.getLogger(__name__)
 
@@ -34,6 +33,9 @@ class ResUsersRole(models.Model):
         help="Associated group's category",
         readonly=False,
     )
+    comment = fields.Html(
+        string="Internal Notes",
+    )
 
     @api.depends("line_ids.user_id")
     def _compute_user_ids(self):
@@ -94,23 +96,6 @@ 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.constrains("user_id", "company_id")
-    def _check_company(self):
-        for record in self:
-            if (
-                record.company_id
-                and record.company_id != record.user_id.company_id
-                and record.company_id not in record.user_id.company_ids
-            ):
-                raise ValidationError(
-                    _('User "{}" does not have access to the company "{}"').format(
-                        record.user_id.name, record.company_id.name
-                    )
-                )
 
     @api.depends("date_from", "date_to")
     def _compute_is_enabled(self):

base_user_role/models/user.py

@@ -49,10 +49,7 @@ class ResUsers(models.Model):
         return res
 
     def _get_enabled_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)
-        )
+        return self.role_line_ids.filtered(lambda rec: rec.is_enabled)
 
     def set_groups_from_roles(self, force=False):
         """Set (replace) the groups following the roles defined on users.