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

违约金

Browse Source
This commit is contained in:
李鹏宇
2026-06-13 20:37:56 +08:00
parent ac5f5610c2
commit 489a92875c
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_report/models/penalty_month_received_report.py
+3 -4
View File
@@ -174,7 +174,7 @@ class PenaltyMonthReceivedReport(models.Model):
continue
processed_keys.add(key)
# --- 构建租金信息 ---
# --- 构建租金信息（从租金应收单获取）---
rent_amount_val = 0.0
rent_collected_amt = 0.0
rent_uncollected_amt = 0.0
@@ -346,9 +346,8 @@ class PenaltyMonthReceivedReport(models.Model):
rent_payout_date_str = ""
if rent_receivable:
rent_amount_val = round(
(rent_receivable.original_amount or 0.0) - (rent_receivable.discount_amount or 0.0), 2
)
# 租金金额直接取 original_amount（原始金额）
rent_amount_val = round(rent_receivable.original_amount or 0.0, 2)
rent_collected_amt = round(rent_receivable.delivered1 or 0.0, 2)
rent_uncollected_amt = round(rent_receivable.submitted or 0.0, 2)
rent_due_date_str = rent_receivable.due_date.strftime("%Y-%m-%d") if rent_receivable.due_date else ""
yuthon_report/models/penalty_year_cum_report.py
+2 -3
View File
@@ -347,9 +347,8 @@ class PenaltyYearCumReport(models.Model):
rent_payout_date_str = ""
if rent_receivable:
rent_amount_val = round(
(rent_receivable.original_amount or 0.0) - (rent_receivable.discount_amount or 0.0), 2
)
# 租金金额直接取 original_amount（原始金额）
rent_amount_val = round(rent_receivable.original_amount or 0.0, 2)
rent_collected_amt = round(rent_receivable.delivered1 or 0.0, 2)
rent_uncollected_amt = round(rent_receivable.submitted or 0.0, 2)
rent_due_date_str = rent_receivable.due_date.strftime("%Y-%m-%d") if rent_receivable.due_date else ""