!276 zhou

Merge pull request !276 from dev_zhou

yuthon_hr_attendance/__manifest__.py

@@ -13,7 +13,7 @@
     'sequence': 240,
     'website': 'https://www.pengyuthon.com',
     # 'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail', 'soong_workflow'],
-    'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail'],
+    'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail','soong_workflow'],
     'data': [
         'security/ir.model.access.csv',
         # 'security/approval_attendance.xml',

yuthon_hr_attendance/models/card_approval.py

@@ -7,7 +7,7 @@ class CardApprovals(models.Model):
     _name = 'card.approval'
     _description = "补卡审批"
     # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
-    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
+    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin','soong.workflow.mixin']
     _rec_name = 'name'
 
     company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司")

yuthon_hr_attendance/models/duty_approval.py

@@ -7,7 +7,7 @@ class DutyApprovals(models.Model):
     _name = 'duty.approval'
     _description = "值班审批"
     # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
-    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
+    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin','soong.workflow.mixin']
     _rec_name = 'name'
 
     company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司")

yuthon_hr_attendance/models/go_approval.py

@@ -7,7 +7,7 @@ class GoApprovals(models.Model):
     _name = 'go.approval'
     _description = "外出审批"
     # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
-    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
+    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin','soong.workflow.mixin']
     _rec_name = 'name'
 
     company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司")

yuthon_hr_attendance/models/holidays_approval.py

@@ -7,7 +7,7 @@ class HolidaysApprovals(models.Model):
     _name = 'holidays.approval'
     _description = "请假审批"
     # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
-    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
+    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin','soong.workflow.mixin']
     _rec_name = 'name'
 
     company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司")

yuthon_hr_attendance/models/leave_approval.py

@@ -7,7 +7,7 @@ class LeaveApprovals(models.Model):
     _name = 'leave.approval'
     _description = "调休审批"
     # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
-    _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'))

yuthon_hr_attendance/models/overtime_approval.py

@@ -7,14 +7,15 @@ class OvertimeApprovals(models.Model):
     _name = 'overtime.approval'
     _description = "加班审批"
     # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
-    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
+    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin','soong.workflow.mixin']
     _rec_name = 'name'
 
     company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司")
     name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('overtime_approval'))
     users_id = fields.Many2one('res.users', string="申请人",default=lambda self: self.env.user.id)
-    overtime_approval_ids = fields.One2many('overtime.users.line', 'overtime_approval_id', string="加班审批行")
+    overtime_approval_ids = fields.One2many('overtime.user.line', 'overtime_approval_id', string="加班审批行")
     department_id = fields.Many2one('hr.department', string="部门")
+
     @api.onchange('overtime_department_id')
     def onchange_overtime_users(self):
         users_data_list = []
@@ -47,8 +48,8 @@ class OvertimeApprovals(models.Model):
             over.overtime_user_ids = users_data_list
 
 
-class OvertimeUsersLine(models.Model):
-    _name = 'overtime.users.line'
+class OvertimeUserLine(models.Model):
+    _name = 'overtime.user.line'
     _rec_name = 'overtime_approval_id'
     _description = "加班明细行"
 

yuthon_hr_attendance/models/remove_holiday_approval.py

@@ -7,7 +7,7 @@ class RemoveHolidayApprovals(models.Model):
     _name = 'remove.holiday.approval'
     _description = "销假审批"
     # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
-    _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'))

yuthon_hr_attendance/security/ir.model.access.csv

@@ -18,5 +18,5 @@ access_holidays_approvals_line,holidays.approvals.line,model_holidays_approvals_
 access_card_approvals_line,card.approval.line,model_card_approvals_line,base.group_user,1,1,1,1
 access_holidays_approvals_line,holidays.approvals.line,model_holidays_approvals_line,base.group_user,1,1,1,1
 access_go_approvals_line,go.approvals.line,model_go_approvals_line,base.group_user,1,1,1,1
-access_overtime_users_line,overtime.users.line,model_overtime_users_line,base.group_user,1,1
+access_overtime_user_line,overtime.user.line,model_overtime_user_line,base.group_user,1,1,1,1
 access_duty_approval_line,duty.approval.line,model_duty_approval_line,base.group_user,1,1,1,1