From 4b1fce143eead9045d33513aac108bbcf478e15d 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: Tue, 11 Aug 2026 16:09:13 +0800
Subject: [PATCH 1/3] =?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/duty_adjustment_schedule.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/duty_adjustment_schedule.py b/yuthon_hr_attendance/models/duty_adjustment_schedule.py
index 359221ca5..ae9503687 100644
--- a/yuthon_hr_attendance/models/duty_adjustment_schedule.py
+++ b/yuthon_hr_attendance/models/duty_adjustment_schedule.py
@@ -60,7 +60,8 @@ class DutyAdjustmentSchedule(models.Model):
             over_record = self.env['vacation.over.line'].search([
                 ('employee_id', '=', record.employee_id.id),
                 ('update_date', '=', record.duty_date),
-                ('vacation_id', '=', record.vacation_id.id)
+                ('vacation_id', '=', record.vacation_id.id),
+                ('text', '=', '值班调休'),
             ], limit=1)
             if not over_record:
                 self.env['vacation.over.line'].create({

From 1d9a973fce7bcebfe9f55fe2f02cbc8a8afeac05 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: Tue, 11 Aug 2026 16:14:59 +0800
Subject: [PATCH 2/3] =?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/views/yuthon_vacation_reports_views.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index 490293708..ac8067716 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -422,7 +422,7 @@
                         </page>
                         <page string="育儿假">
                             <field name="parenting_line_ids" context="{'default_employee_id': employee_id}">
-                                <tree editable="bottom" delete="false" edit="false" create="false">
+                                <tree editable="bottom" edit="false" create="false" delete="false">
                                     <field name="employee_id" column_invisible="1"/>
                                     <field name="vacation_id" column_invisible="1"/>
                                     <field name="update_date"/>
@@ -430,6 +430,7 @@
                                     <field name="lines"/>
                                     <field name="text"/>
                                     <field name="is_confirm" column_invisible="1"/>
+                                     <button name="unlink" string="删除" type="object" class="btn-primary" groups="yuthon_holiday.group_yuthon_holiday_admin"/>
                                 </tree>
                             </field>
                         </page>

From 55e2a6736effd85cabb93544f9cc290aac6c32e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Tue, 11 Aug 2026 16:15:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 room/views/room_booking_views.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml
index ed4fc51aa..a621fb2ac 100644
--- a/room/views/room_booking_views.xml
+++ b/room/views/room_booking_views.xml
@@ -128,16 +128,16 @@
         <field name="model">room.booking</field>
         <field name="arch" type="xml">
             <form duplicate="0">
+                <header>
+                    <button name="meet_notice" string="会议通知" type="object" class="oe_highlight" invisible="not work_end"/>
+                    <button name="meeting_sign_in" string="签到" invisible="meeting_type != 'down' or not work_end " type="object"
+                            class="oe_highlight"/>
+                    <button name="meeting_partner_create" string="录入" invisible="meeting_type != 'down' or not work_end"
+                            type="object" class="oe_highlight"/>
+                    <button name="sync_wechat_room" string="同步企业微信" type="object" class="oe_highlight" invisible="not work_end"/>
+                    <button name="action_print_room_booking_agenda" string="打印" type="object" class="btn-primary"/>
+                </header>
                 <sheet>
-                    <header>
-                        <button name="meet_notice" string="会议通知" type="object" class="oe_highlight" invisible="not work_end"/>
-                        <button name="meeting_sign_in" string="签到" invisible="meeting_type != 'down' or not work_end " type="object"
-                                class="oe_highlight"/>
-                        <button name="meeting_partner_create" string="录入" invisible="meeting_type != 'down' or not work_end"
-                                type="object" class="oe_highlight"/>
-                        <button name="sync_wechat_room" string="同步企业微信" type="object" class="oe_highlight" invisible="not work_end"/>
-                        <button name="action_print_room_booking_agenda" string="打印" type="object" class="btn-primary"/>
-                    </header>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>