!6687 添加功能

Merge pull request !6687 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-11-25 10:45:08 +00:00
committed by Gitee
@@ -450,7 +450,7 @@ class PropertyReconciliationWizard(models.Model):
yes_amount = 0
for line in rec.reconciliation_line_ids:
# 跳过金额为0的行
if (round(line.rent or 0, 2) == 0 and line.collection_type != 'penalty') or \
if (round(line.amount or 0, 2) == 0 and line.collection_type != 'penalty') or \
(line.contract_id and line.contract_id.is_contract):
continue
first_day = line.due_date.replace(day=1)
@@ -466,7 +466,7 @@ class PropertyReconciliationWizard(models.Model):
domain.append(('contract_id', '=', line.contract_id.id))
receivable_ids = self.env['property.accounts.receivable'].search(domain)
for receivable in receivable_ids:
if line.rent == line.amount:
if round(line.rent or 0, 2) == line.amount:
is_reconciliation = True
else:
is_reconciliation = False