From 580eb7d244b93dce4407e53c3c1e17dea871ae32 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, 15 May 2026 18:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E6=9C=9F=E6=AC=A0=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/yuthon_report/models/pre_arrears_report.py b/yuthon_report/models/pre_arrears_report.py
index 53e49e438..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),
         ]
 
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 @@
 <odoo>
     <data>
         <record id="action_property_accounts_receivable_report" model="ir.actions.client">
-            <field name="name">应收账单报表</field>
+            <field name="name">当期应收</field>
             <field name="tag">receivable_report_client</field>
             <field name="context">
                 {
@@ -37,7 +37,7 @@
 
         <menuitem
             id="menu_property_accounts_receivable_report2"
-            name="应收账单报表"
+            name="当期应收"
             parent="yuthon_property_income_menu"
             action="action_property_accounts_receivable_report"
             sequence="1"