Merge branch 'pawan_branch' into 'development'

Pawan branch

See merge request prakash.jain/cor-odoo!121
This commit is contained in:
pawan.sharma 2021-02-18 06:40:20 -08:00
commit 6c9635b6cb
2 changed files with 3 additions and 0 deletions

View File

@ -15,6 +15,7 @@ class ProjectConsultantHrs(models.Model):
_order = 'employee_id, end_date desc'
project_id = fields.Many2one('project.project', string="Project", required=True)
user_id = fields.Many2one('res.user', related='project_id.user_id')
employee_id = fields.Many2one('hr.employee', string="Consultant", required=True)
start_date = fields.Date('Start Date', required=True)
end_date = fields.Date('End Date', required=True)

View File

@ -8,6 +8,7 @@
<form string="Consultant Allocation" create="false" edit="false" delete="false">
<group>
<field name="project_id"/>
<field name="user_id"/>
<field name="employee_id"/>
<field name="start_date"/>
<field name="end_date"/>
@ -26,6 +27,7 @@
<field name="arch" type="xml">
<tree string="Consultant Allocation" create="false" edit="false" delete="false">
<field name="project_id"/>
<field name="user_id"/>
<field name="employee_id"/>
<field name="start_date"/>
<field name="end_date"/>