From 2162e7141096b22138ed6ed935b8639b73224509 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 31 Jul 2025 21:25:11 +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.py                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py
index 83efb3496..e6a17a36c 100644
--- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py
+++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py
@@ -129,8 +129,8 @@ class PropertyReconciliationWizard(models.Model):
                         ('lessee_id', '=', first_line.tenant_id.id),
                         ('is_reconciliation', '=', False),
                         ('is_suspend', '=', False),
-                        ('due_date', '>=', first_day_str),
-                        ('due_date', '<=', last_day_str),
+                        ('due_date', '>=', first_day),
+                        ('due_date', '<=', last_day),
                     ]
                     # 如果有物业信息
                     if line.property_id:

From e1a387005a59d93e747a079cf03287191036b5c6 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 31 Jul 2025 21:26:11 +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_employee_approval/models/yuthon_onboard_approval.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
index 0953f90f8..917e501c9 100644
--- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
@@ -59,7 +59,7 @@ class YuthonOnboardApproval(models.Model):
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
     # 合同
     is_office = fields.Boolean(string='是否领用办公物品', default=False)
-    structure_type_id = fields.Many2one('hr.payroll.structure.type', string='工资结构类型', readonly=True)
+    structure_type_id = fields.Many2one('hr.payroll.structure.type', string='工资结构类型')
     is_annual_salary = fields.Boolean(string="是否年薪")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')