添加功能

2025-06-20 10:58:40 +08:00
parent 23573d952d
commit fe1aa35570
4 changed files with 48 additions and 11 deletions
@@ -344,6 +344,7 @@
                <field name="message_standard_id"/>
                <field name="admin_id"/>
                <field name="company_id"/>
+                <field name="tenure_type" optional="hide"/>
                <button name="open_record" string="详情" type="object" class="oe_highlight"/>
            </tree>
        </field>
@@ -352,16 +353,20 @@
            <field name="name">property.management.area.report.search</field>
            <field name="model">yuthon.property</field>
            <field name="arch" type="xml">
-                <search>
+                <search string="管理面积报表">
                    <field name="company_id"/>
                    <field name="admin_id"/>
+                    <group expand="0" string="Group By">
+                    <filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
+                </group>
                </search>
            </field>
    </record>
    <record id="management_area_report_action" model="ir.actions.act_window">
        <field name="name">管理面积报表</field>
        <field name="res_model">yuthon.property</field>
-        <field name="view_mode">tree, search</field>
+        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_group_by_tenure_type': True}</field>
        <field name="view_id" ref="yuthon_property.yuthon_property_management_area_report"/>
        <field name="search_view_id" ref="yuthon_property.property_management_area_report_search"/>
    </record>
@@ -378,15 +383,30 @@
                <field name="vacant_duration"/>
                <field name="admin_id"/>
                <field name="company_id"/>
+                <field name="tenure_type" optional="hide"/>
            </tree>
        </field>
    </record>
+    <record id="rent_area_report_search" model="ir.ui.view">
+            <field name="name">property.management.area.report.search</field>
+            <field name="model">yuthon.property</field>
+            <field name="arch" type="xml">
+                <search string="可租面积报表">
+                    <field name="company_id"/>
+                    <field name="admin_id"/>
+                    <group expand="0" string="Group By">
+                    <filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
+                </group>
+                </search>
+            </field>
+    </record>
    <record id="rent_area_report_action" model="ir.actions.act_window">
-            <field name="name">可租面积报表</field>
-            <field name="res_model">yuthon.property</field>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="yuthon_property.yuthon_property_rent_area_report"/>
-            <field name="search_view_id" ref="yuthon_property.property_management_area_report_search"/>
+        <field name="name">可租面积报表</field>
+        <field name="res_model">yuthon.property</field>
+        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_group_by_tenure_type': True}</field>
+        <field name="view_id" ref="yuthon_property.yuthon_property_rent_area_report"/>
+        <field name="search_view_id" ref="yuthon_property.rent_area_report_search"/>
    </record>
    <record id="yuthon_property_action" model="ir.actions.act_window">
        <field name="name">物业</field>
@@ -258,6 +258,7 @@ class PropertyAccountsReceivable(models.Model):
    _inherit = 'property.accounts.receivable'

    contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
+    tenure_type = fields.Selection(related='property_id.tenure_type', string="权属类型", store=True)
    penalty = fields.Float(string="违约金")
    penalty_date = fields.Date(string="违约金日期")
    # 报表新增字段
@@ -404,6 +404,7 @@
                <field name="property_id"/>
                <field name="contract_id"/>
                <field name="admin_id"/>
+                <field name="tenure_type" optional="hide"/>
            </tree>
        </field>
    </record>
@@ -411,16 +412,20 @@
            <field name="name">property.accounts.receivable.search</field>
            <field name="model">property.accounts.receivable</field>
            <field name="arch" type="xml">
-                    <search>
-                        <field name="contract_id"/>
-                        <field name="admin_id"/>
-                    </search>
+                <search>
+                    <field name="contract_id"/>
+                    <field name="admin_id"/>
+                     <group expand="0" string="Group By">
+                        <filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
+                    </group>
+                </search>
            </field>
    </record>
    <record id="accounts_receivable_tree_action" model="ir.actions.act_window">
        <field name="name">合同应收报表</field>
        <field name="view_mode">tree</field>
        <field name="res_model">property.accounts.receivable</field>
+        <field name="context">{'search_default_group_by_tenure_type': True}</field>
        <field name="view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_tree"/>
        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
    </record>
@@ -444,6 +449,7 @@
                <field name="title_certificate"/>
                <field name="company_id"/>
                <field name="admin_id"/>
+                <field name="tenure_type" optional="hide"/>
            </tree>
        </field>
    </record>
@@ -451,6 +457,7 @@
        <field name="name">违约金明细报表</field>
        <field name="res_model">property.accounts.receivable</field>
        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_group_by_tenure_type': True}</field>
        <field name="view_id" ref="yuthon_property_approval.view_property_penalty_line_report"/>
        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
    </record>
@@ -466,6 +473,7 @@
                <field name="delivered1" string="金额"/>
                <field name="company_id"/>
                <field name="admin_id"/>
+                <field name="tenure_type" optional="hide"/>
            </tree>
        </field>
    </record>
@@ -473,6 +481,7 @@
        <field name="name">本月实收报表</field>
        <field name="res_model">property.accounts.receivable</field>
        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_group_by_tenure_type': True}</field>
        <field name="view_id" ref="yuthon_property_approval.view_property_received_month_report"/>
        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
    </record>
@@ -490,6 +499,7 @@
                <field name="submitted"/>
                <field name="due_date"/>
                <field name="company_id"/>
+                <field name="tenure_type" optional="hide"/>
            </tree>
        </field>
    </record>
@@ -497,6 +507,7 @@
        <field name="name">累计欠收报表</field>
        <field name="res_model">property.accounts.receivable</field>
        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_group_by_tenure_type': True}</field>
        <field name="view_id" ref="yuthon_property_approval.view_property_accumulated_underpayment_report"/>
        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
    </record>
@@ -778,6 +778,10 @@
                <search string="已租面积报表">
                    <field name="admin_id"/>
                    <field name="company_id"/>
+                    <field name="tenure_type"/>
+                    <group expand="0" string="Group By">
+                        <filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
+                    </group>
                </search>
            </field>
    </record>
@@ -785,6 +789,7 @@
        <field name="name">已租面积报表</field>
        <field name="res_model">property.lease.contract</field>
        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_group_by_tenure_type': True}</field>
        <field name="view_id" ref="yuthon_property_approval.yuthon_property_rented_area_report"/>
        <field name="search_view_id" ref="yuthon_property_approval.yuthon_property_rented_area_report_search"/>
    </record>