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

!10748 !10746 添加功能

Browse Source 
Merge pull request !10748 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-04-13 13:06:01 +00:00
committed by Gitee
parent ba5f794d36 9133dd753d
commit b2e9ab6465
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property/models/property_accounts_receivable.py
+2 -2
View File
@@ -90,8 +90,8 @@ class PropertyAccountsReceivable(models.Model):
for record in rent_ids:
contract = record.contract_id
is_ended = False
if record.payout_date :
if record.original_amount == record.delivered1:
if record.delivered1 :
if record.original_amount == record.delivered1 + record.discount_amount:
record.deposit_state = 'paid'
else:
record.deposit_state = 'no_paid'
yuthon_property_approval/wizard/property_reconciliation_wizard.py
+2 -2
View File
@@ -394,7 +394,7 @@ class PropertyReconciliationWizard(models.Model):
final_remark = line.remake
if line.collection_type != 'penalty':
receivable.delivered1 = receivable.delivered1 + line.amount
if receivable.original_amount == receivable.delivered1 + line.amount:
if receivable.original_amount == receivable.delivered1 + line.amount + receivable.discount_amount:
deposit_state = 'paid'
else:
deposit_state = 'no_paid'
@@ -478,7 +478,7 @@ class PropertyReconciliationWizard(models.Model):
if receivable_id and source_receivable and not receivable_id.source_receivable_id:
receivable_id.write({'source_receivable_id': source_receivable.id})
if receivable_id and line.amount:
if receivable_id.original_amount == receivable_id.delivered1 + line.amount:
if receivable_id.original_amount == receivable_id.delivered1 + line.amount + receivable_id.discount_amount:
deposit_state = 'paid'
else:
deposit_state = 'no_paid'