From 54df38d07a80837e36697473ee8be21656bd9bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Fri, 8 May 2026 18:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E6=9C=9F=E6=AC=A0=E6=94=B6=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_purchase/views/inherit_purchase_order_views.xml | 2 +-
 yuthon_report/models/pre_arrears_report.py             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="before">
                     <field name="pay_way"/>
-                    <field name="purchase_type"/>
+                    <field name="purchase_type" widget="radio"/>
                 </xpath>
                 <xpath expr="//div[@name='date_approve']" position="attributes">
                     <attribute name="invisible">1</attribute>
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