pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!5989 添加功能

Browse Source 
Merge pull request !5989 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-10-27 02:51:11 +00:00
committed by Gitee
parent 6a1da8863a eb2e6d0d5a
commit 95bf0e6bda
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/wizard/property_reconciliation_wizard.py
+6 -6
View File
@@ -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