diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py index 767039f7c..badddeb7e 100644 --- a/yuthon_hr_attendance/__manifest__.py +++ b/yuthon_hr_attendance/__manifest__.py @@ -12,8 +12,7 @@ 'category': 'Human Resources/Attendances', 'sequence': 240, 'website': 'https://www.pengyuthon.com', - # 'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail', 'soong_workflow'], - 'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail','soong_workflow','yuthon_holiday'], + 'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail', 'soong_workflow'], 'data': [ 'security/ir.model.access.csv', # 'security/approval_attendance.xml', @@ -29,7 +28,6 @@ 'views/go_approval.xml', 'views/duty_approval.xml', 'views/leave_approval.xml', - # 'views/holidays_approval.xml', 'views/remove_holiday_approval.xml', 'views/card_approval.xml', 'views/holiday_manage.xml', diff --git a/yuthon_hr_attendance/models/__init__.py b/yuthon_hr_attendance/models/__init__.py index 18702cbd0..70b02613f 100644 --- a/yuthon_hr_attendance/models/__init__.py +++ b/yuthon_hr_attendance/models/__init__.py @@ -8,7 +8,6 @@ from . import overtime_approval from . import go_approval from . import duty_approval from . import leave_approval -from . import holidays_approval from . import remove_holiday_approval from . import card_approval from . import holiday_manage diff --git a/yuthon_hr_attendance/models/holidays_approval.py b/yuthon_hr_attendance/models/holidays_approval.py deleted file mode 100644 index 07b36fbd5..000000000 --- a/yuthon_hr_attendance/models/holidays_approval.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -from email.policy import default - -from odoo import api, fields, models, tools, _ -from datetime import datetime, time, timedelta -from odoo.exceptions import ValidationError, UserError - - -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', 'soong.workflow.mixin'] - - name = fields.Char(string="名称") - company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司") - applicant_id = fields.Many2one('hr.employee', string="申请人", default=lambda self: self.env.user.id) - leave_absence_id = fields.Many2one('hr.employee', string="请假人") - code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('holidays_approval')) - department_id = fields.Many2one('hr.department', string="部门") - approvals_ids = fields.One2many('holidays.approvals.line', 'approvals_id', string="请假审批行") - - def holiday_approval(self): - pass - - @api.onchange('applicant_id') - def _onchange_applicant_id(self): - self.leave_absence_id = self.applicant_id - - -class HolidaysApprovalsLine(models.Model): - _name = 'holidays.approvals.line' - _description = '请假审批行' - - name = fields.Char(string="请假事由") - approvals_id = fields.Many2one('holidays.approval', string="管理请假审批") - vacation_category = fields.Many2one('holiday.type.setting', string="休假类别") - leave_type_id = fields.Many2one('hr.leave.type', string="请假类型",) - days_available = fields.Float(string="可用天数", store=True) - applicants = fields.Selection([('hour', '按小时'), ('day', '天'), ('half_day', '半天')], string="申请单位", - store=True) - date_start = fields.Datetime(string="开始时间", default=fields.Datetime.now) - date_end = fields.Datetime(string="结束时间") - leave_days = fields.Float(string='请假天数', store=True,compute='_compute_leave_days') - surplus_days = fields.Float(string="剩余天数",compute='_compute_surplus_days') - - @api.onchange('leave_type_id') - def onchange_approvals_ids(self): - for rec in self: - rec.days_available = rec.leave_type_id.holiday_days - rec.applicants = rec.leave_type_id.request_unit - - @api.depends('date_start', 'date_end') - def _compute_leave_days(self): - for rec in self: - if rec.date_start and rec.date_end: - delta = rec.date_end - rec.date_start - rec.leave_days = delta.days + (delta.seconds / 86400) - if rec.applicants == 'hour': - rec.leave_days = rec.leave_days / 24 - else: - rec.leave_days = 0 - - @api.depends('leave_days', 'days_available') - def _compute_surplus_days(self): - for rec in self: - rec.surplus_days = rec.days_available - rec.leave_days - - def button_holiday_detail(self): - return { - 'name': '请假详情', - 'view_mode': 'form', - 'res_model': 'holiday.details.wizard', - 'type': 'ir.actions.act_window', - 'target': 'new', - "context": { - 'default_holiday_days': self.leave_type_id.holiday_days, - 'default_vacation_days_description': self.leave_type_id.vacation_days_description, - 'default_vacation_type_id': self.vacation_category.id, - 'default_annual': self.leave_type_id.annual, - 'default_treated': self.leave_type_id.treated, - 'default_remarks': self.leave_type_id.remarks, - 'default_leave_type_id': self.leave_type_id.id, - } - } diff --git a/yuthon_hr_attendance/security/ir.model.access.csv b/yuthon_hr_attendance/security/ir.model.access.csv index 257207994..b3e4a98ad 100644 --- a/yuthon_hr_attendance/security/ir.model.access.csv +++ b/yuthon_hr_attendance/security/ir.model.access.csv @@ -20,4 +20,3 @@ access_holidays_approvals_line,holidays.approvals.line,model_holidays_approvals_ access_go_approvals_line,go.approvals.line,model_go_approvals_line,base.group_user,1,1,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 -access_holiday_details_wizard,holiday.details.wizard,model_holiday_details_wizard,base.group_user,1,1,1,1 diff --git a/yuthon_hr_attendance/views/holidays_approval.xml b/yuthon_hr_attendance/views/holidays_approval.xml deleted file mode 100644 index c3e62f4ad..000000000 --- a/yuthon_hr_attendance/views/holidays_approval.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - holiday.approval.tree - holidays.approval - - - - - - - - - - - holiday.approval.actions - holidays.approval - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -