From fcb3d6ec2353e45c21aaa71c2f92d39ae77f7512 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: Fri, 23 Jan 2026 17:47:40 +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 --- .../wizard/soong_workflow_comment_wizard.py | 2 +- .../static/src/js/button_vacation_confirm.js | 14 ++++++++------ .../static/src/xml/button_vacation_confirm.xml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 2e4ea154b..a6dd004b7 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -553,7 +553,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): is_work_remind = False current_user = self.env.user current_datetime = fields.Datetime.now() - is_admin = current_user.has_group('soong_workflow.group_soong_workflow_manager') + is_admin = current_user.has_group('base.group_system') if is_admin: record_id.log_ids[-1].sudo().write({ 'comment': self.comment, diff --git a/yuthon_hr_attendance/static/src/js/button_vacation_confirm.js b/yuthon_hr_attendance/static/src/js/button_vacation_confirm.js index 42d44f38c..00223dbe0 100644 --- a/yuthon_hr_attendance/static/src/js/button_vacation_confirm.js +++ b/yuthon_hr_attendance/static/src/js/button_vacation_confirm.js @@ -7,12 +7,14 @@ export class CustomAttendanceVacationConfirmController extends ListController { setup() { super.setup(); } - async openConfirm() { - await this.model.orm.call( - 'vacation.over.line', - 'confirm', - [] - ); + + async getAction(lock_type) { + const action = await this.orm.call('vacation.over.line', 'confirm', [lock_type], {context: this.props.context}); + action["context"] = { + ...action.context, + ...this.model.root.context, + } + return action } } diff --git a/yuthon_hr_attendance/static/src/xml/button_vacation_confirm.xml b/yuthon_hr_attendance/static/src/xml/button_vacation_confirm.xml index dfe90d6ce..a62709af5 100644 --- a/yuthon_hr_attendance/static/src/xml/button_vacation_confirm.xml +++ b/yuthon_hr_attendance/static/src/xml/button_vacation_confirm.xml @@ -2,7 +2,7 @@ -