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

!10430 !10429 添加功能

Browse Source 
Merge pull request !10430 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-03-31 07:04:05 +00:00
committed by Gitee
parent 535df6009a aa7d8afe5f
commit ca9990ce97
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/wizard/property_reconciliation_wizard.py
+3 -1
View File
@@ -571,7 +571,7 @@ class PropertyReconciliationLine(models.Model):
amount = round(line.amount or 0, 2)
debt_amount = round(rent - amount, 2)
same_month = (due_month == actual_month) and (due_year == actual_year)
no_remark = same_month and (rent == rent_month)
no_remark = same_month and rent == rent_month == amount
if no_remark:
line.remake = ""
continue
@@ -583,6 +583,8 @@ class PropertyReconciliationLine(models.Model):
# 条件2：rent == amount → 补齐
elif rent_month != rent and rent == amount and amount != 0:
line.remake = f'补齐{due_date_str}'
elif rent_month == rent and rent > amount and amount != 0:
line.remake = f'补交{due_date_str}欠 {debt_amount}'
continue
if (due_month > actual_month and due_year == actual_year) or (due_year > actual_year):
line.remake = f'{actual_date_str}预{due_date_str}{debt_str}'