From b0cd1b621e4cdb11134d6f6cddcf36cd4c7beec4 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 20 Jun 2025 21:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property_accounts_receivable_views.xml    | 27 +------------------
 .../views/inherit_yuthon_property_views.xml   | 26 ++++++++++++++++++
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/yuthon_property/views/property_accounts_receivable_views.xml b/yuthon_property/views/property_accounts_receivable_views.xml
index d8b6a08bf..3d9168a4c 100644
--- a/yuthon_property/views/property_accounts_receivable_views.xml
+++ b/yuthon_property/views/property_accounts_receivable_views.xml
@@ -37,32 +37,7 @@
                 </tree>
             </field>
         </record>
-         <record id="view_property_accounts_receivable_search" model="ir.ui.view">
-            <field name="name">property.accounts.receivable.search</field>
-            <field name="model">property.accounts.receivable</field>
-            <field name="arch" type="xml">
-                <search>
-                    <field name="property_id"/>
-                    <field name="lessee_id"/>
-                    <group expand="0" string="group_by">
-                        <filter name="group_is_reconciliation" string="对账" context="{'group_by':'is_reconciliation'}"/>
-                        <filter name="group_property_id" string="物业" context="{'group_by':'property_id'}"/>
-                        <filter name="group_lessee_id" string="承租方" context="{'group_by':'lessee_id'}"/>
-                        <filter name='group_by_contract_id' string="合同" context="{'group_by':'contract_id'}"/>
-                    </group>
-                 <header_search>
-                    <quick_filter string="应收状态">
-                         <filter string="红冲" name="is_red" domain="[('is_red', '=', True)]"/>
-                         <filter string="开票" name="is_billing " domain="[('is_billing', '=', True)]"/>
-                         <filter string="对账" name="is_reconciliation" domain="[('is_reconciliation', '=', True)]"/>
-                         <filter string="未对账" name="not_reconciliation" domain="[('is_reconciliation', '=', False)]"/>
-                         <filter string="未开票" name="not_billing" domain="[('is_billing', '=', False)]"/>
-                         <filter string="作废" name="is_invalid" domain="[('is_invalid', '=', True)]"/>
-                    </quick_filter>
-                </header_search>
-                </search>
-            </field>
-        </record>
+
             <record id="all_property_accounts_receivable_contract" model="ir.actions.server">
             <field name="name">批量导入合同</field>
             <field name="model_id" ref="yuthon_property.model_property_accounts_receivable"/>
diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
index ffa0ce27a..76f75cf27 100644
--- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml
+++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
@@ -385,6 +385,32 @@
             </xpath>
         </field>
     </record>
+    <record id="view_property_accounts_receivable_search" model="ir.ui.view">
+        <field name="name">property.accounts.receivable.search</field>
+        <field name="model">property.accounts.receivable</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="property_id"/>
+                <field name="lessee_id"/>
+                <group expand="0" string="group_by">
+                    <filter name="group_is_reconciliation" string="对账" context="{'group_by':'is_reconciliation'}"/>
+                    <filter name="group_property_id" string="物业" context="{'group_by':'property_id'}"/>
+                    <filter name="group_lessee_id" string="承租方" context="{'group_by':'lessee_id'}"/>
+                    <filter name='group_by_contract_id' string="合同" context="{'group_by':'contract_id'}"/>
+                </group>
+             <header_search>
+                <quick_filter string="应收状态">
+                     <filter string="红冲" name="is_red" domain="[('is_red', '=', True)]"/>
+                     <filter string="开票" name="is_billing " domain="[('is_billing', '=', True)]"/>
+                     <filter string="对账" name="is_reconciliation" domain="[('is_reconciliation', '=', True)]"/>
+                     <filter string="未对账" name="not_reconciliation" domain="[('is_reconciliation', '=', False)]"/>
+                     <filter string="未开票" name="not_billing" domain="[('is_billing', '=', False)]"/>
+                     <filter string="作废" name="is_invalid" domain="[('is_invalid', '=', True)]"/>
+                </quick_filter>
+            </header_search>
+            </search>
+        </field>
+    </record>
     <record id="property_accounts_receivable_action" model="ir.actions.act_window">
         <field name="name">应收账单</field>
         <field name="res_model">property.accounts.receivable</field>