diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 6bf11b90d..dc6432c88 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -393,8 +393,8 @@ class PropertyReconciliationWizard(models.Model): for line in rec.reconciliation_line_ids: remaining_amount += line.amount - if round(rec.bank_id.no_amount, 2) > round(remaining_amount, 2): - rec.bank_id.registered = rec.actual_total - remaining_amount + if round(rec.amount_water_been, 2) > round(remaining_amount, 2): + rec.bank_id.registered = rec.amount_water_bee - remaining_amount rec.bank_id.bank_state = 'registered' else: rec.bank_id.registered = 0 @@ -445,7 +445,7 @@ class PropertyReconciliationWizard(models.Model): 'payout_date': rec.actual_date, 'remark': final_remark, '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}' + 'receivable_log': f'当前登录人{rec.env.user.name}于{fields.Datetime.now()}对户名为{rec.bank_id.name_account}进行对账操作,对账应收金额为{rec.receivable_total},实际金额为{rec.amount_water_bee}' }) self.env['receivable.modify.line'].create({ 'bank_id': rec.bank_id.id, @@ -515,8 +515,8 @@ class PropertyReconciliationWizard(models.Model): # 计算已对账和未对账金额 rec.amount_been_reconciled += line.amount - if rec.actual_total > rec.amount_been_reconciled: - amount_reconciled = rec.actual_total - rec.amount_been_reconciled + if rec.amount_water_bee > rec.amount_been_reconciled: + amount_reconciled = rec.amount_water_bee - rec.amount_been_reconciled else: amount_reconciled = 0.0 rec.bank_id.yes_amount = rec.amount_been_reconciled