From fb4e88f294d0f6fadf3cf68f4c82d3c79da2bec4 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: Wed, 5 Nov 2025 18:28:07 +0800
Subject: [PATCH 1/2] =?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/property_reconciliation_wizard_views.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
index ba7f68539..3586f68b1 100644
--- a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
+++ b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
@@ -39,7 +39,7 @@
                         <group/>
                     </group>
                     <group>
-                        <field name="contract_ids" widget="many2many_tags"/>
+                        <field name="contract_ids" widget="many2many_tags"  options="{'no_create': True}"/>
                          <field name="amount_reconciled" readonly="1"/>
                         <field name="remake" readonly="1"/>
                     </group>

From 4efd9dd986881883168cf174015c5488753082eb 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: Wed, 5 Nov 2025 18:40:03 +0800
Subject: [PATCH 2/2] =?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     | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index f3d89c7d1..555804635 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -65,11 +65,14 @@
                             <field name="resource_id" class="oe_inline"/>日期
                             <field name="shift_date" class="oe_inline"/>我的班次:
                             <field name="shift_id" class="oe_inline"  invisible="shift_rest" readonly="1"/>
-                            <field name="shift_rest" class="oe_inline" invisible="shift_id or shift_date == False"/>换班对象
+                            <field name="shift_rest" class="oe_inline" invisible="shift_id or shift_date == False"/>
+                        </div>
+                        <label for="transferees_id"/>
+                        <div>
                             <field name="transferees_id" class="oe_inline"/>日期
                             <field name="return_date" class="oe_inline"/>对方班次:
                             <field name="return_id" class="oe_inline" invisible="return_rest" readonly="1"/>
-                            <field name="return_rest" class="oe_inline" invisible="return_id or return_date == False"/>
+                            <field name="return_rest" class="oe_inline" invisible="return_id or return_date == False" />
                         </div>
                     </group>
                     <group invisible="alternate_shifts == 'transferees'">
@@ -93,17 +96,20 @@
                                  'order': 'start_datetime desc',
                                  'search_default_group_by_month': True,}" options="{'no_create': True, 'no_edit':True}"
                             />
-                            <field name="shift_two_rest" class="oe_inline" invisible="shift_two_id or shift_two_date == False"/>换班对象
-                            <field name="transferees_id" class="oe_inline"/>日期
-                            <field name="return_two_date" class="oe_inline"/>对方班次:
-                            <field name="return_two_id" class="oe_inline" readonly="1" invisible="return_two_rest"
-                                context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
-                                'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context',
-                                'order': 'start_datetime desc',
-                                'search_default_group_by_month': True,}" options="{'no_create': True, 'no_edit':True}"
-                            />
-                            <field name="return_two_rest" class="oe_inline" invisible="return_two_id or return_two_date == False"/>
+                            <field name="shift_two_rest" class="oe_inline" invisible="shift_two_id or shift_two_date == False"/>
                         </div>
+                        <label for="transferees_id"/>
+                            <div>
+                                <field name="transferees_id" class="oe_inline"/>日期
+                                <field name="return_two_date" class="oe_inline"/>对方班次:
+                                <field name="return_two_id" class="oe_inline" readonly="1" invisible="return_two_rest"
+                                    context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
+                                    'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context',
+                                    'order': 'start_datetime desc',
+                                    'search_default_group_by_month': True,}" options="{'no_create': True, 'no_edit':True}"
+                                />
+                                <field name="return_two_rest" class="oe_inline" invisible="return_two_id or return_two_date == False"/>
+                            </div>
                     </group>
                 </sheet>
             </form>