From eb2e6d0d5a13057959b5e09a04c2a02a62976a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Mon, 27 Oct 2025 10:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wizard/property_reconciliation_wizard.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 5a95be317..70b3dd033 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.amount_water_been, 2) > round(remaining_amount, 2): - rec.bank_id.registered = rec.amount_water_been - remaining_amount + if round(rec.amount_water, 2) > round(remaining_amount, 2): + rec.bank_id.registered = rec.amount_water - 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.amount_water_been}' + 'receivable_log': f'当前登录人{rec.env.user.name}于{fields.Datetime.now()}对户名为{rec.bank_id.name_account}进行对账操作，对账应收金额为{rec.receivable_total}，实际金额为{rec.amount_water}' }) self.env['receivable.modify.line'].create({ 'bank_id': rec.bank_id.id, @@ -515,11 +515,11 @@ class PropertyReconciliationWizard(models.Model): # 计算已对账和未对账金额 rec.amount_been_reconciled += line.amount - if rec.amount_water_been > rec.amount_been_reconciled: - amount_reconciled = rec.amount_water_been - rec.amount_been_reconciled + if rec.amount_water > rec.amount_been_reconciled: + amount_reconciled = rec.amount_water - rec.amount_been_reconciled else: amount_reconciled = 0.0 - rec.bank_id.yes_amount = rec.amount_been_reconciled + rec.bank_id.yes_amount = rec.amount_water + rec.amount_water_been rec.bank_id.no_amount = amount_reconciled