From 455c4f223976c7cc090b6625418648c57243d5e1 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: Thu, 29 Jan 2026 14:54:46 +0800 Subject: [PATCH 1/2] =?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/yuthon_overtime_line.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/yuthon_overtime_line.py b/yuthon_hr_attendance/models/yuthon_overtime_line.py index 576a12237..7b63d9f58 100644 --- a/yuthon_hr_attendance/models/yuthon_overtime_line.py +++ b/yuthon_hr_attendance/models/yuthon_overtime_line.py @@ -25,13 +25,13 @@ class YuthonOvertimeLine(models.Model): carry_forward_quantity = fields.Float(string="结转时长") carry_forward_date = fields.Date(string="结转日期") archive_state = fields.Selection([('to_do', '待归档'), ('done', '已归档')], default='to_do', string='状态') - remaining_quantity = fields.Float(string="剩余数", compute='_compute_vacation_sum') + remaining_quantity = fields.Float(string="剩余数") @api.depends('workday', 'public_holidays', 'last_balance', 'carry_forward_quantity') def _compute_vacation_sum(self): for rec in self: rec.vacation_sum = rec.public_holidays + rec.workday + rec.last_balance - rec.remaining_quantity = max((rec.vacation_sum - rec.carry_forward_quantity), 0) + rec.remaining_quantity = rec.vacation_sum - rec.carry_forward_quantity def open_record(self): self.ensure_one() From 12014780a417504e2dae3f668fd8617cd1f870fe 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: Thu, 29 Jan 2026 14:55:40 +0800 Subject: [PATCH 2/2] =?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/yuthon_overtime_line.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/yuthon_overtime_line.py b/yuthon_hr_attendance/models/yuthon_overtime_line.py index 7b63d9f58..9fb3c7a27 100644 --- a/yuthon_hr_attendance/models/yuthon_overtime_line.py +++ b/yuthon_hr_attendance/models/yuthon_overtime_line.py @@ -27,10 +27,10 @@ class YuthonOvertimeLine(models.Model): archive_state = fields.Selection([('to_do', '待归档'), ('done', '已归档')], default='to_do', string='状态') remaining_quantity = fields.Float(string="剩余数") - @api.depends('workday', 'public_holidays', 'last_balance', 'carry_forward_quantity') + @api.depends('workday', 'public_holidays', 'carry_forward_quantity') def _compute_vacation_sum(self): for rec in self: - rec.vacation_sum = rec.public_holidays + rec.workday + rec.last_balance + rec.vacation_sum = rec.public_holidays + rec.workday rec.remaining_quantity = rec.vacation_sum - rec.carry_forward_quantity def open_record(self):