Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang

2026-03-16 12:08:00 +08:00
parent e3e09f29c2 1fc5e7ea40
commit 9459d0cfb2
1 changed files with 2 additions and 1 deletions
@@ -108,11 +108,12 @@ class YuthonProperty(models.Model):
        for prop in rentable_properties:
            contract_lines = self.env['property.lease.contract.line'].search([
                ('address_id', '=', prop.id),
+                ('lease_id.is_contract', '=', False),
            ])
            if contract_lines:
                sorted_lines = sorted(
                    contract_lines,
-                    key=lambda line: line.lease_id.actual_end_time,
+                    key=lambda line: line.lease_id.actual_end_time or date.max,
                    reverse=True
                )
                lease_id = sorted_lines[0]