From 8700defb6af7c87564543d896d883a1626baf477 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: Sat, 9 May 2026 12:15:15 +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 --- .../models/yuthon_regularization_approval.py | 1 - yuthon_property_approval/wizard/property_rental_wizard.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py index cf301553a..deb720be4 100644 --- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py @@ -61,7 +61,6 @@ class YuthonRegularizationPrepareApproval(models.Model): def end_approval(self): for rec in self: - # ===================== 原有合同逻辑（不动） ===================== version_str = rec.confirmation_user_id.employee_ids.contract_id.version.lstrip('V') main_version = version_str.split('.')[0] new_main_version = int(main_version) + 1 diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py index 4d3b9d967..c96597a4f 100644 --- a/yuthon_property_approval/wizard/property_rental_wizard.py +++ b/yuthon_property_approval/wizard/property_rental_wizard.py @@ -237,7 +237,7 @@ class PropertyRentalWizard(models.Model): # 当期应收日期 if new_version: - if start_year_month <= date_field_year_month <= end_year_month: + if start_year_month < date_field_year_month <= end_year_month: if rent_id.period_rent != 0 and record.contract_sort not in ['guanggao', 'guanzi', 'room']: self.create_rent_list(record, rent_id, rent_amount, start_date, multiplier) self.create_management_list(record, start_date, manage_amount) @@ -266,6 +266,7 @@ class PropertyRentalWizard(models.Model): records = self.env['property.lease.contract'].search(domain +[ ('actual_start_time', '<', next_month_first_day), ('actual_end_time', '>=', first_day), + ('contract_code', '=', '租（2026）08') ]) if not records: records = self.env['property.lease.contract'].search(domain +[