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

!6017 添加功能

Browse Source 
Merge pull request !6017 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-10-28 01:46:47 +00:00
committed by Gitee
parent df6ee4dda3 f420a7bf1f
commit 075cb0fe00
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/wizard/property_reconciliation_wizard.py
+2 -2
View File
@@ -45,7 +45,7 @@ class PropertyReconciliationWizard(models.Model):
rec.amount_reconciled = max(rec.bank_id.no_amount - sum(line.amount for line in rec.reconciliation_line_ids), 0)
for line in rec.reconciliation_line_ids:
if line.amount and line.collection_type != 'penalty':
if (line.due_date.month > rec.actual_date.month and line.due_date.year == line.due_date.year) or (line.due_date.year < rec.actual_date.year):
if (line.due_date.month > rec.actual_date.month and line.due_date.year == line.due_date.year) or (line.due_date.year > rec.actual_date.year):
if line.rent >= line.amount:
due_date_str = fields.Date.to_date(line.due_date).strftime('%Y-%m')
line.remake = f'预{due_date_str}，欠{round(line.rent - line.amount, 2)}'
@@ -55,7 +55,7 @@ class PropertyReconciliationWizard(models.Model):
due_date_str = fields.Date.to_date(line.due_date).strftime('%Y-%m')
line.remake = f'交{due_date_str}，欠{round(line.rent - line.amount, 2)}'
if (line.due_date.month < rec.actual_date.month and line.due_date.year == line.due_date.year) or (line.due_date.year > rec.actual_date.year):
if (line.due_date.month < rec.actual_date.month and line.due_date.year == line.due_date.year) or (line.due_date.year < rec.actual_date.year):
if line.rent >= line.amount:
due_date_str = fields.Date.to_date(line.due_date).strftime('%Y-%m')
line.remake = str(rec.actual_date) + '补' + str(due_date_str) + '，欠' + str(round(line.rent - line.amount, 2))