From 20482b8b08c0063a1b403364bbb4b90aedb194b1 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 Dec 2025 16:11: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_hr_attendance/models/overtime_approval.py          | 6 ++++--
 yuthon_hr_attendance/views/overtime_approval.xml          | 2 +-
 yuthon_property_approval/models/property_lease_renewal.py | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py
index 54618c563..507e70548 100644
--- a/yuthon_hr_attendance/models/overtime_approval.py
+++ b/yuthon_hr_attendance/models/overtime_approval.py
@@ -114,6 +114,7 @@ class OvertimeApprovals(models.Model):
     @api.depends('start_time', 'end_time', 'attendance_id', 'rest_start_time', 'rest_end_time')
     def _compute_duration(self):
         for rec in self:
+            max_hours = 99
             rec.duration = 0.0
             rec.overtime_hours = 0.0
             if not (rec.start_time and rec.end_time):
@@ -150,8 +151,9 @@ class OvertimeApprovals(models.Model):
             else:
                 rec.duration = calculated_hours
 
-            if rec.rest_end_time and rec.rest_end_time:
-                rec.duration -= (rec.rest_end_time - rec.c).total_seconds() / 3600
+            if rec.rest_end_time and rec.rest_start_time:
+                calculated_hours -= (rec.rest_end_time - rec.rest_start_time).total_seconds() / 3600
+                rec.duration = min(calculated_hours, max_hours)
 
             employee = rec.users_id.employee_id
             if not employee:
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index cb1fca784..52bc21e73 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -62,6 +62,7 @@
                         <group/>
                     </group>
                     <group col="2" string="加班信息">
+                        <field name="type_overtime"/>
                         <group>
                              <label for="start_time"/>
                             <div class="d-inline-flex w-100">
@@ -83,7 +84,6 @@
                         <group>
                             <field name="rest_start_time"/>
                             <field name="rest_end_time"/>
-                            <field name="type_overtime"/>
                         </group>
                         <group/>
                     </group>
diff --git a/yuthon_property_approval/models/property_lease_renewal.py b/yuthon_property_approval/models/property_lease_renewal.py
index c872ea3a2..a3d19cce0 100644
--- a/yuthon_property_approval/models/property_lease_renewal.py
+++ b/yuthon_property_approval/models/property_lease_renewal.py
@@ -178,8 +178,8 @@ class PropertyLeaseRenewal(models.Model):
                     })
             else:
                 receivable_ids = self.env['property.accounts.receivable'].search([
-                    ('due_date', '<=', self.early_quitting_date),
-                    ('contract_id', '=', self.contract_id.id),
+                    ('due_date', '<=', rec.early_quitting_date),
+                    ('contract_id', '=', rec.contract_id.id),
                 ])
                 if any(not receivable.is_reconciliation for receivable in receivable_ids):
                     raise UserError("该合同下存在未对账的应收单，无法提前退押金")