diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml index 0f27615d9..750f4fb81 100644 --- a/yuthon_purchase/views/inherit_purchase_order_views.xml +++ b/yuthon_purchase/views/inherit_purchase_order_views.xml @@ -161,7 +161,7 @@ - + 1 diff --git a/yuthon_report/models/pre_arrears_report.py b/yuthon_report/models/pre_arrears_report.py index 6d66e4860..d536b1d03 100644 --- a/yuthon_report/models/pre_arrears_report.py +++ b/yuthon_report/models/pre_arrears_report.py @@ -12,7 +12,7 @@ class PreArrearsReport(models.Model): 前期欠收报表(数据源:receivable.modify.line): - 查询条件的日期对应应收账单的 due_date(应收日期在查询月内) - 收款日期(reconciliation_date)晚于应收日期(due_date)的记录就是欠收 - - 金额取收款记录的 amount + - 金额取收款记录的 not_collected(未收金额/欠收金额) - 按应收账单聚合,每张账单只出一行(汇总该账单下所有欠收收款金额) """ today = datetime.date.today() @@ -82,7 +82,7 @@ class PreArrearsReport(models.Model): rid = line.receivable_id.id if rid not in rec_map: rec_map[rid] = {'rec': line.receivable_id, 'amount': 0.0} - rec_map[rid]['amount'] += line.amount or 0.0 + rec_map[rid]['amount'] += line.not_collected or 0.0 rows = [] total_amount = 0.0