diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 22f93a087..1e1f1faf1 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -401,10 +401,10 @@ class HolidaysRequestBatch(models.Model): if self.leave_ids: for record in self.leave_ids: - record.write({'state': 'validate'}) + record.sudo().write({'state': 'validate'}) if self.hour_leave_ids: for record in self.hour_leave_ids: - record.write({'state': 'validate'}) + record.sudo().write({'state': 'validate'}) """提交请假申请,区分年假和其他假期处理""" self._process_specific_leaves('年假', is_annual_leave=True) @@ -602,8 +602,6 @@ class HolidaysRequestBatch(models.Model): actual_vacation_report._compute_working_overtime() if self.env.user.company_id.name == '集团本部': domain = [ - ('employee_id.name', '=', '吴欣欣'), - '|', ('is_initial_number', '=', True), '&', ('is_initial_number', '=', False), '&', ('update_type', '=', 'add'), diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py index c7b50c756..6bc1bdb4f 100644 --- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py +++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py @@ -313,6 +313,8 @@ class HrAttendanceDetail(models.Model): check_in_time = min(valid_checkins) - timedelta(hours=8) if valid_checkins else None check_out_start = self.float_to_datetime(current_data, template.check_out_start) check_out_end = self.float_to_datetime(current_data, template.check_out_end) + if template.check_out_start == 0.0: + template.check_out_start = 24.0 if template.check_out_end < template.check_out_start: check_out_end = self.float_to_datetime(next_day, template.check_out_end) # 筛选在下班时间范围内的打卡记录