From 654bf4cdfb3f9e7adb69f3cdd7e7bf050b7a51d3 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 27 May 2025 21:23: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

---
 .../views/yuthon_shift_approval_views.xml          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index 82271cb57..d818a7a41 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -66,12 +66,16 @@
                     </group>
                     <group col="2">
                         <group>
-                            <field name="shift_id"  domain="[('resource_id', '=', resource_id)]" context="{'tree_view_ref':'yuthon_hr_attendance.view_yuthon_shift_context'}"/>
-                            <field name="return_id"  domain="[('resource_id', '=', transferees_id)]" invisible="alternate_shifts != 'transferees'" context="{'tree_view_ref':'yuthon_hr_attendance.view_yuthon_shift_context'}"/>
+                            <field name="shift_id"  domain="[('resource_id', '=', resource_id)]"  context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
+                                'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context'}"/>
+                            <field name="return_id"  domain="[('resource_id', '=', transferees_id)]" invisible="alternate_shifts != 'transferees'" context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
+                                'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context'}"/>
                         </group>
                         <group>
-                            <field name="shift_two_id" domain="[('resource_id', '=', resource_id)]" invisible="alternate_shifts != 'transferees'" context="{'tree_view_ref':'yuthon_hr_attendance.view_yuthon_shift_context'}"/>
-                            <field name="return_two_id" domain="[('resource_id', '=', transferees_id)]" invisible="alternate_shifts != 'transferees'" context="{'tree_view_ref':'yuthon_hr_attendance.view_yuthon_shift_context'}"/>
+                            <field name="shift_two_id" domain="[('resource_id', '=', resource_id)]" invisible="alternate_shifts != 'transferees'" context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
+                                'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context'}"/>
+                            <field name="return_two_id" domain="[('resource_id', '=', transferees_id)]" invisible="alternate_shifts != 'transferees'" context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
+                                'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context'}"/>
                         </group>
                     </group>
                 </sheet>
@@ -109,6 +113,6 @@
         <field name="res_model">yuthon.shift.context</field>
         <field name="view_mode">tree,search</field>
         <field name="search_view_id" ref="search_yuthon_shift_context"/>
-         <field name="context">{'group_by': 'start_datetime:month'}</field>
+        <field name="context">{'group_by': 'start_datetime:month', 'order': 'start_datetime desc'}</field>
     </record>
 </odoo>
\ No newline at end of file