[FIX] base_user_role: remove multicompany functionality

This commit is contained in:
KevinKhao
2021-01-25 22:48:44 +01:00
parent a4869c585b
commit 3354dac107
5 changed files with 2 additions and 86 deletions

View File

@@ -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__)
@@ -89,23 +88,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):

View File

@@ -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.