From 237feab08ee83d26a14e00fd93685b08bf202699 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: Wed, 7 Jan 2026 18:11:14 +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 --- soong_workflow/wizard/soong_workflow_comment_wizard.py | 2 +- yuthon_hr_attendance/models/yuthon_vacation_reports.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 6494a41bf..19ee010c3 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -650,7 +650,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): title=record_id._description, description=f"编号为{record_id.code}的{record_id._description}已结束，请归档", url=url, btntxt="查看详情") - self.node_btn_id.with_context(cx).run() + self.node_btn_id.with_context(cx).run() if self.node_btn_name == "分发": record_id.is_send = True workflow_record_id = self.env['soong.workflow.record'].search([('code', '=', record_id.code)]) diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index 8f489316f..53fa3529b 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -30,9 +30,9 @@ class YuthonVacationReports(models.Model): valid_date1 = fields.Date(string="有效期至") year_holiday = fields.Float(string="本年公休日", digits=(16, 3)) year_workday = fields.Float(string="本年工作日", digits=(16, 3)) - year_sum = fields.Float(string="本年应休合计", digits=(16, 3), compute="_compute_year_sum") + year_sum = fields.Float(string="本年调休合计", digits=(16, 3), compute="_compute_year_sum") used_this_year1 = fields.Float(string="本年已休", digits=(16, 3)) - remainder_year1 = fields.Float(string="本年剩余(补休)", digits=(16, 3), compute="_compute_year_sum") + remainder_year1 = fields.Float(string="剩余(补休)", digits=(16, 3), compute="_compute_year_sum") company_id = fields.Many2one(related="employee_id.company_id", string="公司", store=True) late_allowed = fields.Float(related="employee_id.late_allowed", string="允许迟到次数") From 1ded8d61745e36a432585eafe4b34c60b61a1bd5 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: Wed, 7 Jan 2026 18:24:44 +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_holiday/models/inherit_hr_leave_allocation.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yuthon_holiday/models/inherit_hr_leave_allocation.py b/yuthon_holiday/models/inherit_hr_leave_allocation.py index aa9ccb6fb..32423d6ea 100644 --- a/yuthon_holiday/models/inherit_hr_leave_allocation.py +++ b/yuthon_holiday/models/inherit_hr_leave_allocation.py @@ -192,10 +192,12 @@ class HrLeaveAllocation(models.Model): 'valid_date': leave.date_to, } existing_leave_line.write(update_leave_vals) + leave_list.append([0, 0, { 'vacation_id': reports_id.id, 'update_type': 'add', 'update_date': fields.Datetime.now(), + 'valid_date': leave.date_from, 'update_lines': current_leave_hours, 'text': '年假分配' }]) @@ -205,6 +207,7 @@ class HrLeaveAllocation(models.Model): 'vacation_id': reports_id.id, 'employee_id': reports_id.employee_id.id, 'update_type': 'add', + 'valid_date': leave.date_from, 'update_date': fields.Date.today(), 'workday': leave.number_of_hours_display, 'legal_day': 0,