fix merge error
This commit is contained in:
parent
0b5d28d4bb
commit
51844ef15e
|
|
@ -117,7 +117,7 @@ class HrOfficialMission(models.Model):
|
|||
def chick_employee_ids(self):
|
||||
for item in self:
|
||||
if not item.employee_ids:
|
||||
raise exceptions.Warning(_('The Request cannot Be completed without Employees'))'''
|
||||
raise exceptions.Warning(_('The Request cannot Be completed without Employees'))
|
||||
|
||||
### context process_type solve ###########
|
||||
@api.onchange('mission_type')
|
||||
|
|
@ -504,7 +504,7 @@ class HrOfficialMission(models.Model):
|
|||
|
||||
item.employee_ids.compute_Training_cost_emp()
|
||||
# item.chick_employee_ids()
|
||||
'''for line in item.employee_ids:
|
||||
for line in item.employee_ids:
|
||||
mail_content = "Hello I'm", line.employee_id.name, " request Need to ", item.mission_type.name, "Please approved thanks."
|
||||
main_content = {
|
||||
'subject': _('Request To %s Employee %s') % (item.mission_type.name, line.employee_id.name),
|
||||
|
|
@ -512,7 +512,8 @@ class HrOfficialMission(models.Model):
|
|||
'body_html': mail_content,
|
||||
'email_to': line.employee_id.department_id.email_manager,
|
||||
}
|
||||
self.env['mail.mail'].sudo().create(main_content).send()'''
|
||||
self.env['mail.mail'].sudo().create(main_content).send()
|
||||
|
||||
self.employee_ids.chick_not_overtime()
|
||||
self.state = "send"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue