From 11fbd38e672c52c7f7e8aede1cd789a517518c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sun, 19 Apr 2026 17:18:02 +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 --- yuthon_hr_attendance/models/vacation_overtime_active.py | 2 +- yuthon_hr_attendance/models/yuthon_vacation_reports.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/vacation_overtime_active.py b/yuthon_hr_attendance/models/vacation_overtime_active.py index 0900a7a8a..8e5803d08 100644 --- a/yuthon_hr_attendance/models/vacation_overtime_active.py +++ b/yuthon_hr_attendance/models/vacation_overtime_active.py @@ -138,7 +138,7 @@ class VacationOvertimeActive(models.Model): carryover_id = self.env['overtime.carryover'].search([ ('carry_forward_date', '=', self.carry_forward_date), ('employee_id', '=', self.employee_id.id), - ('is_void', '!=', False), + ('is_void', '!=', True), ('carryover_type', '=', 'fee'),]) if carryover_id: carryover_id.is_void = True diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index a95fb3c33..8ed5c96bf 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -2536,7 +2536,7 @@ class VacationOverline(models.Model): workflow_id = fields.Many2one('soong.workflow', compute="_compute_overtime", string='审批类型', store=True) start_time = fields.Datetime(string="开始时间", compute="_compute_overtime", store=True) end_time = fields.Datetime(string="结束时间", compute="_compute_overtime", store=True) - duration = fields.Float(string="时长", compute="_compute_overtime", store=True) + duration = fields.Float(string="时长", compute="_compute_overtime", store=True, digits=(16, 1)) remaining_quantity = fields.Float(string='剩余数', compute="_compute_carry_forward_info", store=True, digits=(16, 1)) remaining_quantity1 = fields.Float(string='剩余数', compute="_compute_carry_forward_info1", digits=(16, 1)) # 动态值根据选择的年月过滤无效额度 logging_data = fields.Char(string="日志日志日志")