!11383 !11382 添加功能

Merge pull request !11383 from 李鹏宇/dev

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

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 +[