diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml
index 4c8c6c172..4644c46ab 100644
--- a/yuthon_property/views/property_bank_statements_views.xml
+++ b/yuthon_property/views/property_bank_statements_views.xml
@@ -118,7 +118,7 @@
receivable.modify.line.tree
receivable.modify.line
-
+
diff --git a/yuthon_report/models/pre_arrears_report.py b/yuthon_report/models/pre_arrears_report.py
index f8bb1f5e7..85c89b9eb 100644
--- a/yuthon_report/models/pre_arrears_report.py
+++ b/yuthon_report/models/pre_arrears_report.py
@@ -30,9 +30,9 @@ class PreArrearsReport(models.Model):
query_month_start = datetime.datetime.fromisoformat(date_start).date() if date_start else this_month_first
query_month_end = datetime.datetime.fromisoformat(date_end).date() if date_end else this_month_first
- # 核心逻辑:due_date <= cutoff_date(查询月及之前的应收)
+ # 核心逻辑:due_date < query_month_start(应收日期在查询月之前,不包含查询月)
domain = [
- ('receivable_id.due_date', '<=', cutoff_date),
+ ('receivable_id.due_date', '<', query_month_start),
('receivable_id.is_invalid', '=', False),
]
@@ -83,14 +83,6 @@ class PreArrearsReport(models.Model):
(l.not_collected and l.not_collected > 0)
)
)
-
- # 调试日志
- print(f"[前期欠收报表] 查询到的 lines 数量: {len(lines)}")
- for line in lines:
- print(f" - line.id={line.id}, receivable_id={line.receivable_id.id}, "
- f"due_date={line.receivable_id.due_date}, "
- f"reconciliation_date={line.reconciliation_date}, "
- f"not_collected={line.not_collected}, amount={line.amount}")
# 按应收账单聚合
rec_map = {}
@@ -103,11 +95,6 @@ class PreArrearsReport(models.Model):
# 收集收款日期
if line.reconciliation_date:
rec_map[rid]['reconciliation_dates'].append(line.reconciliation_date)
-
- # 调试日志
- print(f"[前期欠收报表] 聚合后的 rec_map 数量: {len(rec_map)}")
- for rid, data in rec_map.items():
- print(f" - receivable_id={rid}, amount={data['amount']}")
rows = []
total_amount = 0.0
diff --git a/yuthon_report/models/receivable_report.py b/yuthon_report/models/receivable_report.py
index c5dc6dd01..7b6dd6eb3 100644
--- a/yuthon_report/models/receivable_report.py
+++ b/yuthon_report/models/receivable_report.py
@@ -98,7 +98,7 @@ class YuthonProperty(models.Model):
for rec in data['recs']:
type_name = rec.management_type_id.name if rec.management_type_id else ''
col = self._classify_fee_type(type_name)
- fee_row[col] += rec.original_amount or 0.0
+ fee_row[col] += (rec.original_amount or 0.0) - (rec.discount_amount or 0.0)
subtotal = sum(fee_row.values())
for col in self.FEE_COLUMNS:
diff --git a/yuthon_report/views/receivable_report_views.xml b/yuthon_report/views/receivable_report_views.xml
index eba60276d..092fa09a0 100644
--- a/yuthon_report/views/receivable_report_views.xml
+++ b/yuthon_report/views/receivable_report_views.xml
@@ -2,7 +2,7 @@
- 应收账单报表
+ 当期应收
receivable_report_client
{
@@ -37,7 +37,7 @@
-->
-
-
+
+