Merge branch 'duplicate_resource' into 'master'
Duplicate resource See merge request prakash.jain/cor-odoo!270
This commit is contained in:
commit
82b5c5b549
|
@ -78,20 +78,22 @@ class Project(models.Model):
|
|||
is_check = fields.Boolean()
|
||||
|
||||
###### Added Create and write method for add default resource(31 Oct 2022)
|
||||
"""@api.model
|
||||
@api.model
|
||||
def create(self, vals):
|
||||
value = super(Project, self).create(vals)
|
||||
value.onchange_add_allowed_internal_users()
|
||||
value.add_allowed_internal_users()
|
||||
return value
|
||||
|
||||
def write(self, vals):
|
||||
res = super(Project, self).write(vals)
|
||||
self.onchange_add_allowed_internal_users()
|
||||
return res"""
|
||||
if 'allowed_internal_user_ids' in vals:
|
||||
self.add_allowed_internal_users()
|
||||
return res
|
||||
#############
|
||||
|
||||
@api.onchange('allowed_internal_user_ids')
|
||||
def onchange_add_allowed_internal_users(self):
|
||||
#@api.onchange('allowed_internal_user_ids', 'pricing_type')
|
||||
#def onchange_add_allowed_internal_users(self):
|
||||
def add_allowed_internal_users(self):
|
||||
user_list = []
|
||||
consultant_list = []
|
||||
employee_obj = []
|
||||
|
@ -102,7 +104,7 @@ class Project(models.Model):
|
|||
consultant_list.append(consultant.employee_id.user_id.id)
|
||||
users = (set(user_list)) - (set(consultant_list))
|
||||
for record in list(users):
|
||||
emp_obj = self.env['hr.employee'].search([('user_id', '=', record)]).id
|
||||
emp_obj = self.env['hr.employee'].search([('user_id', '=', record)])
|
||||
if emp_obj:
|
||||
employee_obj.append(emp_obj)
|
||||
if employee_obj:
|
||||
|
@ -110,8 +112,9 @@ class Project(models.Model):
|
|||
if self._origin.id:
|
||||
if self.pricing_type == 'employee_rate':
|
||||
self.sale_line_employee_ids.create({'project_id': self._origin.id,
|
||||
'employee_id': employee,
|
||||
'start_date': self.date_start})
|
||||
'employee_id': employee.id,
|
||||
'start_date': self.date_start,
|
||||
'employee_price': employee.timesheet_cost})
|
||||
|
||||
def _onchange_calculate_timesheet_hours(self):
|
||||
self.consultant_timesheet_hrs = [(6, 0, False)]
|
||||
|
|
Loading…
Reference in New Issue