From d6d82c46dc4306edcee73fea531f96be3aa2402c Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 18 Mar 2025 21:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/hr_attendance_month.py | 4 +++ .../models/resource_calendar_leaves.py | 7 +++-- .../views/all_attendance_menu.xml | 5 ++++ .../views/hr_attendance_month_views.xml | 1 + .../views/resource_calendar_leaves_views.xml | 29 +++++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/hr_attendance_month.py b/yuthon_hr_attendance/models/hr_attendance_month.py index 66ccb5c98..3adc0eb48 100644 --- a/yuthon_hr_attendance/models/hr_attendance_month.py +++ b/yuthon_hr_attendance/models/hr_attendance_month.py @@ -137,6 +137,7 @@ class HrAttendanceMonthDetail(models.Model): selection=[ ('unconfirmed', "未确认"), ('confirmed', "已确认"), + ('pending' , "待定"), ], string="状态", readonly=True, copy=False, index=True, @@ -490,6 +491,9 @@ class HrAttendanceMonthDetail(models.Model): for detail in attendance_details: detail.write({'state': 'confirmed'}) + def button_pending(self): + for record in self: + record.write({'state': 'pending'}) def button_all_attendance_month(self): attendance_details = self.env['hr.attendance.month.detail'].search([]) diff --git a/yuthon_hr_attendance/models/resource_calendar_leaves.py b/yuthon_hr_attendance/models/resource_calendar_leaves.py index d2632db15..a01720d9b 100644 --- a/yuthon_hr_attendance/models/resource_calendar_leaves.py +++ b/yuthon_hr_attendance/models/resource_calendar_leaves.py @@ -24,7 +24,7 @@ class ResourceCalendar(models.Model): is_allow_late_early_work = fields.Boolean(string="下班晚走次日晚到") work_late = fields.Selection(selection=selection_list, string="下班晚走") work_after = fields.Selection(selection=selection_list, string="次日可晚到") - + active_id = fields.Boolean('Active', default=True, tracking=True) resource_user_ids = fields.Many2many('hr.employee', string="白名单") def get_baidu_holiday(self): @@ -118,4 +118,7 @@ class ResourceCalendarHolidaye(models.Model): class ResourceCalendarLeave(models.Model): _inherit = "resource.calendar.leaves" - is_holidays = fields.Boolean(string="法定节假日") \ No newline at end of file + is_holidays = fields.Boolean(string="法定节假日") + alternate_rest_day = fields.Text(string='调休休息日') + shift_replacement_day = fields.Text(string='调班补办日') + total_days = fields.Integer(string='总天数') \ No newline at end of file diff --git a/yuthon_hr_attendance/views/all_attendance_menu.xml b/yuthon_hr_attendance/views/all_attendance_menu.xml index fae965671..49a1fa23c 100644 --- a/yuthon_hr_attendance/views/all_attendance_menu.xml +++ b/yuthon_hr_attendance/views/all_attendance_menu.xml @@ -138,6 +138,11 @@ parent="attendance_resources_setting_root_board" sequence="4" action="view_overtime_page_action"/> +