diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index 31cb60384..8c477d87c 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -6,7 +6,7 @@ from datetime import datetime, time, timedelta class CardApprovals(models.Model): _name = 'card.approval' _description = "补卡审批" - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'name' name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('card_approval')) diff --git a/yuthon_hr_attendance/models/duty_approval.py b/yuthon_hr_attendance/models/duty_approval.py index 0d6c3ec39..5d56da66b 100644 --- a/yuthon_hr_attendance/models/duty_approval.py +++ b/yuthon_hr_attendance/models/duty_approval.py @@ -6,7 +6,7 @@ from datetime import datetime, time, timedelta class DutyApprovals(models.Model): _name = 'duty.approval' _description = "值班审批" - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'name' name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('duty_approval')) diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py index 5e7f90bcd..e7a5d5a7f 100644 --- a/yuthon_hr_attendance/models/go_approval.py +++ b/yuthon_hr_attendance/models/go_approval.py @@ -6,7 +6,7 @@ from datetime import datetime, time, timedelta class GoApprovals(models.Model): _name = 'go.approval' _description = "外出审批" - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'name' name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('go_approval')) @@ -16,7 +16,7 @@ class GoApprovals(models.Model): statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], string="状态", default='drft') user_sex = fields.Selection([('girl', '女'), ('boy', '男')], string="性别") - role_id = fields.Many2one('yuthon.user.role', string="岗位") + job_id = fields.Many2one('hr.role_id', string="岗位") date_start = fields.Datetime(string="开始时间", default=fields.Datetime.now) date_end = fields.Datetime(string="结束时间") leave_time = fields.Char(string="申请时长") diff --git a/yuthon_hr_attendance/models/holidays_approval.py b/yuthon_hr_attendance/models/holidays_approval.py index f2c423080..d07a76bf9 100644 --- a/yuthon_hr_attendance/models/holidays_approval.py +++ b/yuthon_hr_attendance/models/holidays_approval.py @@ -6,7 +6,7 @@ from datetime import datetime, time, timedelta class HolidaysApprovals(models.Model): _name = 'holidays.approval' _description = "请假审批" - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'name' name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('holidays_approval')) diff --git a/yuthon_hr_attendance/models/leave_approval.py b/yuthon_hr_attendance/models/leave_approval.py index 7c0730dd5..30b80eda8 100644 --- a/yuthon_hr_attendance/models/leave_approval.py +++ b/yuthon_hr_attendance/models/leave_approval.py @@ -6,7 +6,7 @@ from datetime import datetime, time, timedelta class LeaveApprovals(models.Model): _name = 'leave.approval' _description = "调休审批" - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'name' name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('leave_approval')) diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index 0de6257a0..7ac5d382a 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/yuthon_hr_attendance/models/overtime_approval.py @@ -6,7 +6,7 @@ from datetime import datetime, time, timedelta class OvertimeApprovals(models.Model): _name = 'overtime.approval' _description = "加班审批" - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'name' name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('overtime_approval')) diff --git a/yuthon_hr_attendance/models/remove_holiday_approval.py b/yuthon_hr_attendance/models/remove_holiday_approval.py index 6af374bc9..978bf4313 100644 --- a/yuthon_hr_attendance/models/remove_holiday_approval.py +++ b/yuthon_hr_attendance/models/remove_holiday_approval.py @@ -6,7 +6,7 @@ from datetime import datetime, time, timedelta class RemoveHolidayApprovals(models.Model): _name = 'remove.holiday.approval' _description = "销假审批" - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'name' name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('remove_holidays_approval')) diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml index 88271dfb1..9c029af35 100644 --- a/yuthon_hr_attendance/views/go_approval.xml +++ b/yuthon_hr_attendance/views/go_approval.xml @@ -41,7 +41,7 @@ - +