From 703714894f661be873a6897b3f7f5fa7c52d6f42 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 23 May 2025 14:26:34 +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

---
 soong_workflow/templates/soong_workflow_templates.xml      | 7 ++++---
 .../wizard/soong_workflow_record_revoke_wizard_view.xml    | 2 +-
 yuthon_hr_attendance/models/go_approval.py                 | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml
index 774376f3d..b2de86f7c 100644
--- a/soong_workflow/templates/soong_workflow_templates.xml
+++ b/soong_workflow/templates/soong_workflow_templates.xml
@@ -28,13 +28,14 @@
             </page>
             <page string="关联流程">
                 <field name="soong_record_ids" style="width:100%%; margin-top: 10px;">
-                    <tree edit="true" delete="true" editable="bottom">
+                    <tree edit="true" delete="true" editable="bottom" action="open_record" type="object">
                         <field name="code"/>
-                        <field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"/>
+                        <field name="workflow_record_id" domain="[('users_ids', 'in', uid)]" options="{'no_open': True}"/>
                         <field name="approvals_group_id"/>
                         <field name="create_uid"/>
                         <field name="write_date2"/>
                        <button name="open_record" type="object" string="详情" class="btn-primary"/>
+                        <button name="unlink"  type="object" string="删除" class="btn-primary"/>
                     </tree>
                 </field>
             </page>
@@ -78,7 +79,7 @@
             <page string="关联流程">
                 <field name="soong_record_ids" style="width:100%%; margin-top: 10px;">
                     <tree editable="bottom">
-                        <field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"/>
+                        <field name="workflow_record_id" domain="[('users_ids', 'in', uid)]" options="{'no_open': True}"/>
                         <field name="approvals_group_id"/>
                         <field name="create_uid"/>
                         <field name="write_date2"/>
diff --git a/soong_workflow/wizard/soong_workflow_record_revoke_wizard_view.xml b/soong_workflow/wizard/soong_workflow_record_revoke_wizard_view.xml
index bf3aedff0..c733002e9 100644
--- a/soong_workflow/wizard/soong_workflow_record_revoke_wizard_view.xml
+++ b/soong_workflow/wizard/soong_workflow_record_revoke_wizard_view.xml
@@ -6,7 +6,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="撤销确认">
-               <p>确认要撤销当前所选的工作吗?</p>
+               <p>确认要撤销当前所选的工作流吗?</p>
                <field name="record_id" invisible="1" />
                <footer>
                     <button name="add_comment_revoke" string="确认" type="object" class="oe_highlight"/>
diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py
index 38c28fc77..1b69c32f8 100644
--- a/yuthon_hr_attendance/models/go_approval.py
+++ b/yuthon_hr_attendance/models/go_approval.py
@@ -67,7 +67,7 @@ class GoApprovals(models.Model):
         if self.date_start and self.date_end:
             start = fields.Datetime.from_string(self.date_start)
             end = fields.Datetime.from_string(self.date_end)
-            if start >= end:
+            if start > end:
                 raise ValidationError("开始时间必须小于结束时间，请重新设置。")
             delta = end - start
             self.days = delta.days