From 2691e8db5bf6bc228fbeec2d3b434e09f8a06e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sun, 12 Jan 2025 16:25:22 +0800
Subject: [PATCH] pengyu

---
 yuthon_property/views/menuitem.xml            | 15 +++++--
 .../views/property_rent_list_views.xml        | 42 +++++++++++++++----
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index 36310f64e..45b4b659b 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -184,9 +184,18 @@
               parent="yuthon_property_menu_root"/>
     <menuitem id="yuthon_property_other_list"
               sequence="3"
-              name="应付"
-              parent="yuthon_financial_management_menu"
-              action="view_property_other_list_action"/>
+              name="开票"
+              parent="yuthon_financial_management_menu"/>
+    <menuitem id="yuthon_accounts_receivable_menu"
+              sequence="1"
+              name="应收账单"
+              parent="yuthon_property_other_list"
+              action="view_property_rent_list_action2"/>
+    <menuitem id="yuthon_actual_bills_menu"
+              sequence="2"
+              name="实收账单"
+              parent="yuthon_property_other_list"
+              action="view_property_rent_list_action2"/>
 
     <menuitem id="yuthon_security_inspection_menu"
               sequence="19"
diff --git a/yuthon_property/views/property_rent_list_views.xml b/yuthon_property/views/property_rent_list_views.xml
index 8776ddb27..5284e5155 100644
--- a/yuthon_property/views/property_rent_list_views.xml
+++ b/yuthon_property/views/property_rent_list_views.xml
@@ -9,18 +9,10 @@
                 <field name="property_id"/>
                 <field name="lessee_id"/>
                 <field name="due_date"/>
-                <field name="year"/>
-                <field name="month"/>
                 <field name="original_amount"/>
                 <field name="discount_amount"/>
                 <field name="remark"/>
                 <field name="multiplier" column_invisible="1"/>
-                <field name="is_invalid"/>
-                <field name="is_red"/>
-                <field name="red_date"/>
-                <field name="charge_status"/>
-                <field name="is_invoice"/>
-                <field name="is_suspend"/>
                 <field name="create_time"/>
                 <field name="last_update_time"/>
             </tree>
@@ -43,7 +35,39 @@
         <field name="name">租金列表</field>
         <field name="res_model">property.rent.list</field>
         <field name="view_mode">tree,search</field>
-        <field name="context">{'search_default_group_by_property_id': 1}</field>
+    </record>
+
+    <record id="view_property_rent_list_tree2" model="ir.ui.view">
+        <field name="name">property.rent.list.tree</field>
+        <field name="model">property.rent.list</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom" string="租金列表">
+                <field name="contract_code"/>
+                <field name="property_id"/>
+                <field name="lessee_id"/>
+                <field name="due_date"/>
+                <field name="original_amount"/>
+                <field name="discount_amount"/>
+                <field name="remark"/>
+                <field name="multiplier" column_invisible="1"/>
+                <field name="is_invalid"/>
+                <field name="is_red"/>
+                <field name="red_date"/>
+                <field name="charge_status"/>
+                <field name="is_invoice"/>
+                <field name="is_suspend"/>
+                <field name="create_time"/>
+                <field name="last_update_time"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_property_rent_list_action2" model="ir.actions.act_window">
+        <field name="name">租金列表</field>
+        <field name="res_model">property.rent.list</field>
+        <field name="view_mode">tree,search</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property.view_property_rent_list_tree2')})]"/>
     </record>
 </odoo>