From dadea7a86682437a64e5abb60bc06ee168360044 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 31 Mar 2025 19:36:19 +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

---
 yuthon_holiday/models/inherit_hr_leave_allocation.py |  3 ++-
 yuthon_hr_attendance/views/hr_attendance_views.xml   | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/yuthon_holiday/models/inherit_hr_leave_allocation.py b/yuthon_holiday/models/inherit_hr_leave_allocation.py
index 2a0642637..477f5b2d0 100644
--- a/yuthon_holiday/models/inherit_hr_leave_allocation.py
+++ b/yuthon_holiday/models/inherit_hr_leave_allocation.py
@@ -87,6 +87,8 @@ class HrLeaveAllocation(models.Model):
             now_type = 'hours'
         else:
             now_type = 'days'
+        self.write({'is_approval': True, 'is_abnormal': False, 'is_no_card': False,
+                    'is_early_card': False, 'is_late_card': False})
         return {
             "type": "ir.actions.act_window",
             "name": "修正申请",
@@ -101,7 +103,6 @@ class HrLeaveAllocation(models.Model):
                 'default_original_hours': self.number_of_days_display,
                }
         }
-
     def all_refuse(self):
         leave_ids = self.env["hr.leave.allocation"].browse(
             self._context.get('active_ids', self._context.get('active_id')))
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 754245938..70cad3736 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -49,6 +49,15 @@
             </search>
         </field>
     </record>
+    <record id="view_hr_attendance_search" model="ir.ui.view">
+        <field name="name">hr.attendance.search</field>
+        <field name="model">hr.attendance</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="employee_id"/>
+            </search>
+        </field>
+    </record>
     <record id="view_attendance_going_action" model="ir.actions.act_window">
         <field name="name">出勤</field>
         <field name="res_model">hr.attendance</field>
@@ -59,12 +68,14 @@
         <field name="res_model">hr.attendance</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('employee_id.resource_calendar_id.name', '=', '行政考勤')]</field>
+        <field name="search_view_id" ref="view_hr_attendance_search"/>
     </record>
     <record id="hr_attendance_action1" model="ir.actions.act_window">
         <field name="name">我的考勤</field>
         <field name="res_model">hr.attendance</field>
         <field name="view_mode">tree,form,search</field>
         <field name="domain">[('employee_id.user_id', '=', uid)]</field>
+        <field name="search_view_id" ref="view_attendance_going_search"/>
     </record>
     <record id="action_attendance_yuthon_company_form" model="ir.actions.act_window">
         <field name="name">考勤记录</field>