diff --git a/addons_extensions/bench_management_system/models/bench_management.py b/addons_extensions/bench_management_system/models/bench_management.py index a59e545de..c488b4f7c 100644 --- a/addons_extensions/bench_management_system/models/bench_management.py +++ b/addons_extensions/bench_management_system/models/bench_management.py @@ -9,6 +9,7 @@ class BenchManagementLine(models.Model): employee_id = fields.Many2one("hr.employee", readonly=True) job_id = fields.Many2one("hr.job", readonly=True) + company_id = fields.Many2one("res.company", related="employee_id.company_id") project_line_ids = fields.Many2many( 'project.team.line', diff --git a/addons_extensions/bench_management_system/models/project.py b/addons_extensions/bench_management_system/models/project.py index 1bce4c1e4..994ec50bc 100644 --- a/addons_extensions/bench_management_system/models/project.py +++ b/addons_extensions/bench_management_system/models/project.py @@ -21,7 +21,7 @@ class ProjectProject(models.Model): project.can_manage_team_lines = bool( self.env.is_superuser() or project.user_id == current_user - or ('project_lead' in project._fields and project.project_lead == current_user) + or ('project_lead' in project._fields and project.project_lead == current_user) or (current_user.has_group("project.group_project_manager")) ) @api.onchange('team_line_ids') @@ -155,7 +155,7 @@ class ProjectTeamLine(models.Model): rec.can_edit_assignment = bool( self.env.is_superuser() or (project and project.user_id == current_user) - or (project and 'project_lead' in project._fields and project.project_lead == current_user) + or (project and 'project_lead' in project._fields and project.project_lead == current_user) or (current_user.has_group("project.group_project_manager")) ) def _inverse_status(self): diff --git a/addons_extensions/bench_management_system/views/bench_management_view.xml b/addons_extensions/bench_management_system/views/bench_management_view.xml index 38f8ee441..606632e12 100644 --- a/addons_extensions/bench_management_system/views/bench_management_view.xml +++ b/addons_extensions/bench_management_system/views/bench_management_view.xml @@ -51,13 +51,14 @@ - - - - - - - + + + + + + + + @@ -238,6 +239,7 @@ Bench Management bench.management.line kanban,list,form + [('company_id', 'in', allowed_company_ids)]