From 43ad0025e4b401d504a4d08d855c9389072bf11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Fri, 5 Jun 2026 18:37:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=AD=A3=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_property_approval/models/inherit_yuthon_property.py  | 6 ++++++
 .../wizard/property_reconciliation_wizard.py                | 2 +-
 .../wizard/property_reconciliation_wizard_views.xml         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py
index bece194a0..8a6bff747 100644
--- a/yuthon_property_approval/models/inherit_yuthon_property.py
+++ b/yuthon_property_approval/models/inherit_yuthon_property.py
@@ -510,6 +510,12 @@ class PropertyBankStatements(models.Model):
             all_vals.extend(fee_vals)
             all_vals.extend(rename_vals)
 
+            # 按 due_date 正序排列，最早日期在最上面
+            all_vals.sort(key=lambda x: (x[2].get('due_date') or date.max, x[2].get('contract_id') or 0))
+            # 重新设置 sequence，确保按正序从 10 开始递增
+            for idx, val in enumerate(all_vals, start=1):
+                val[2]['sequence'] = idx * 10
+
             return all_vals, total_rent_month,
         return [], 0
 
diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py
index 23d38e40f..98d185a57 100644
--- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py
+++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py
@@ -543,7 +543,7 @@ class PropertyReconciliationWizard(models.Model):
 class PropertyReconciliationLine(models.Model):
     _name = 'property.reconciliation.line'
     _description = '对账明细'
-    _order = 'due_date desc'
+    _order = 'sequence, due_date'
 
     reconciliation_id = fields.Many2one('property.reconciliation.wizard', string='关联对账单弹窗')
     sequence = fields.Integer(string='顺序')
diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
index 74495bf5e..7ebb560a9 100644
--- a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
+++ b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
@@ -62,7 +62,7 @@
                         <field name="warning_msg"  style="color: red; font-weight: bold;" readonly="1" invisible="not warning_msg" string=" "/>
                     </group>
                     <field name="reconciliation_line_ids">
-                        <tree editable="bottom" create="false" delete="false">
+                        <tree editable="bottom" create="false" delete="false" default_order="due_date desc">
                             <field name="sequence" column_invisible="1" />
                             <field name="color" column_invisible="1" force_save="1"/>
                             <field name="reconciliation_id" column_invisible="1"/>

From 7ead53237984c9ffbc423d9374a4c308a40c4542 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: Fri, 5 Jun 2026 18:39:18 +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

---
 yuthon_hr_attendance/controllers/applet_attendance.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py
index 1c173b4a0..bd92319c6 100644
--- a/yuthon_hr_attendance/controllers/applet_attendance.py
+++ b/yuthon_hr_attendance/controllers/applet_attendance.py
@@ -724,6 +724,8 @@ class AppletAttendance(Controller):
                 standard_check_out_str = f"{end_hour:02d}:{end_minute:02d}"
 
             # 实际打卡时间
+            check_in_str = ''
+            check_out_str = ''
             check_in = att.check_in
             check_out = att.check_out
             is_early_card = att.is_early_card