diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index bc0971d66..f1a6b652d 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -153,7 +153,7 @@ class PropertyReconciliationWizard(models.Model): first_line = bank_lines[0] for line in rec.reconciliation_line_ids: # 跳过金额为0的行 - if (line.amount == 0 or line.collection_type == 'penalty') or \ + if (line.amount == 0 and line.collection_type != 'penalty') or \ (line.contract_id and line.contract_id.is_split): continue if line.amount != line.rent: @@ -181,14 +181,15 @@ class PropertyReconciliationWizard(models.Model): is_reconciliation = True else: is_reconciliation = False - receivable.write({ - 'is_reconciliation': is_reconciliation, - 'delivered1': line.amount, - 'payout_date': rec.bank_id.start_time.date(), - 'remark': line.remake, - 'reconciliation_time': fields.Datetime.now(), - 'receivable_log': f'当前登录人{rec.env.user.name}于{fields.Datetime.now()}对户名为{rec.bank_id.name_account}进行对账操作,对账应收金额为{rec.receivable_total},实际金额为{rec.actual_total}' - }) + if line.collection_type != 'penalty': + receivable.write({ + 'is_reconciliation': is_reconciliation, + 'delivered1': line.amount, + 'payout_date': rec.bank_id.start_time.date(), + 'remark': line.remake, + 'reconciliation_time': fields.Datetime.now(), + 'receivable_log': f'当前登录人{rec.env.user.name}于{fields.Datetime.now()}对户名为{rec.bank_id.name_account}进行对账操作,对账应收金额为{rec.receivable_total},实际金额为{rec.actual_total}' + }) management_type_id = self.env['yuthon.management.type'].search([('name', '=', '违约金')]) if line.collection_type == 'penalty': domain2 = [