bench management system changes
This commit is contained in:
parent
0e51ac85e9
commit
f2788e025d
|
|
@ -9,6 +9,7 @@ class BenchManagementLine(models.Model):
|
||||||
|
|
||||||
employee_id = fields.Many2one("hr.employee", readonly=True)
|
employee_id = fields.Many2one("hr.employee", readonly=True)
|
||||||
job_id = fields.Many2one("hr.job", 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_line_ids = fields.Many2many(
|
||||||
'project.team.line',
|
'project.team.line',
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ class ProjectProject(models.Model):
|
||||||
project.can_manage_team_lines = bool(
|
project.can_manage_team_lines = bool(
|
||||||
self.env.is_superuser()
|
self.env.is_superuser()
|
||||||
or project.user_id == current_user
|
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')
|
@api.onchange('team_line_ids')
|
||||||
|
|
@ -155,7 +155,7 @@ class ProjectTeamLine(models.Model):
|
||||||
rec.can_edit_assignment = bool(
|
rec.can_edit_assignment = bool(
|
||||||
self.env.is_superuser()
|
self.env.is_superuser()
|
||||||
or (project and project.user_id == current_user)
|
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):
|
def _inverse_status(self):
|
||||||
|
|
|
||||||
|
|
@ -51,13 +51,14 @@
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<group string="Project Information">
|
<group string="Project Information">
|
||||||
<field name="project_line_ids" nolabel="1" readonly="1">
|
<field name="project_line_ids" nolabel="1" readonly="0">
|
||||||
<list create="0" delete="0" edit="0">
|
<list create="0" delete="0" editable="bottom">
|
||||||
<field name="project_id"/>
|
<field name="project_id" readonly="1"/>
|
||||||
<field name="status"/>
|
<field name="can_edit_assignment" column_invisible="1"/>
|
||||||
<field name="start_date"/>
|
<field name="status" readonly="not can_edit_assignment"/>
|
||||||
<field name="end_date"/>
|
<field name="start_date" readonly="not can_edit_assignment"/>
|
||||||
<field name="job_id" optional="hide"/>
|
<field name="end_date" readonly="not can_edit_assignment"/>
|
||||||
|
<field name="job_id" optional="hide" readonly="1"/>
|
||||||
</list>
|
</list>
|
||||||
</field>
|
</field>
|
||||||
</group>
|
</group>
|
||||||
|
|
@ -238,6 +239,7 @@
|
||||||
<field name="name">Bench Management</field>
|
<field name="name">Bench Management</field>
|
||||||
<field name="res_model">bench.management.line</field>
|
<field name="res_model">bench.management.line</field>
|
||||||
<field name="view_mode">kanban,list,form</field>
|
<field name="view_mode">kanban,list,form</field>
|
||||||
|
<field name="domain">[('company_id', 'in', allowed_company_ids)]</field>
|
||||||
<field name="search_view_id" ref="view_bench_management_search"/>
|
<field name="search_view_id" ref="view_bench_management_search"/>
|
||||||
|
|
||||||
</record>
|
</record>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue