添加功能

yuthon_property/models/property_deposit_list.py

@@ -6,7 +6,10 @@ class PropertyDepositList(models.Model):
     _description = '押金列表'
 
     property_id = fields.Many2one('yuthon.property', string='物业')
+    admin_id = fields.Many2one(related='property_id.admin_id', string="片区管理员")
     lessee_id = fields.Many2one('property.tenant.information', string='承租方')
+    company_id = fields.Many2one(related='property_id.company_id', string="公司")
+
     is_push  = fields.Boolean(string='是否推送')
 
     def unlink(self):

yuthon_property/models/yuthon_property.py

@@ -6,7 +6,6 @@ from pypinyin import pinyin,lazy_pinyin
 class YuthonProperty(models.Model):
     _name = 'yuthon.property'
     _description = '物业管理'
-    _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
     _rec_name = 'name'
     _order = 'first_letter'
 
@@ -84,6 +83,11 @@ class YuthonProperty(models.Model):
 
     first_letter = fields.Char(string="首字母", compute='_compute_first_letter', store=True)
 
+    # 报表新增字段
+    title_certificate = fields.Char(string="产权证号")
+    vacant_duration = fields.Float(string="空置时长", digits=(16, 2))
+
+
     @api.depends('name')
     def _compute_first_letter(self):
         for record in self:

yuthon_property/views/yuthon_property_views.xml

@@ -344,6 +344,49 @@
             </kanban>
         </field>
     </record>
+    <!--管理面积报表 -->
+    <record id="yuthon_property_management_area_report" model="ir.ui.view">
+        <field name="name">yuthon.property.management.area.report</field>
+        <field name="model">yuthon.property</field>
+        <field name="arch" type="xml">
+            <tree string="管理面积报表">
+                <field name="title_certificate"/>
+                <field name="name"/>
+                <field name="rent_area"/>
+                <field name="equity_area"/>
+                <field name="registered_id"/>
+                <field name="message_standard_id"/>
+                <field name="admin_id"/>
+                <field name="company_id"/>
+            </tree>
+        </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</field>
+    </record>
+
+    <!-- 可租面积报表 -->
+    <record id="yuthon_property_rent_area_report" model="ir.ui.view">
+        <field name="name">yuthon.property.rent.area.report</field>
+        <field name="model">yuthon.property</field>
+        <field name="arch" type="xml">
+            <tree string="可租面积报表">
+                <field name="name"/>
+                <field name="rent_area"/>
+                <field name="property_state"/>
+                <field name="vacant_duration"/>
+                <field name="admin_id"/>
+                <field name="company_id"/>
+            </tree>
+        </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>
+    </record>
     <record id="yuthon_property_action" model="ir.actions.act_window">
         <field name="name">物业</field>
         <field name="res_model">yuthon.property</field>

yuthon_property_approval/models/inherit_yuthon_property.py

@@ -260,6 +260,10 @@ class PropertyAccountsReceivable(models.Model):
     contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
     penalty = fields.Float(string="违约金")
     penalty_date = fields.Date(string="违约金日期")
+    # 报表新增字段
+    rent_owed = fields.Float(string="欠租金额")
+    per_day = fields.Float(string="每天违约金（元/天）")
+
 
     @api.model_create_multi
     def create(self, vals_list):
@@ -534,7 +538,7 @@ class PropertyElectricReading(models.Model):
     contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
     is_message = fields.Boolean()
     reading_state = fields.Selection([
-        ('wait', '待抄'), ('finish', '已抄表')])
+        ('wait', '待抄'), ('finish', '已抄表')], string="状态", default="wait")
 
     def button_push_electric(self):
         for rec in self:

yuthon_property_approval/views/inherit_yuthon_property_views.xml

@@ -75,6 +75,25 @@
             </xpath>
         </field>
     </record>
+    <!--押金累计欠收报表-->
+    <record id="property_deposit_list_report_tree" model="ir.ui.view">
+            <field name="name">property.deposit.list.report.tree</field>
+            <field name="model">property.deposit.list</field>
+            <field name="arch" type="xml">
+                <tree string="押金累计欠收报表">
+                    <field name="property_id"/>
+                    <field name="contract_id"/>
+                    <field name="admin_id"/>
+                    <field name="original_amount"/>
+                    <field name="company_id"/>
+                </tree>
+            </field>
+    </record>
+    <record id="property_deposit_list_report_action" model="ir.actions.act_window">
+            <field name="name">押金累计欠收报表</field>
+            <field name="res_model">property.deposit.list</field>
+            <field name="view_mode">tree</field>
+    </record>
     <record id="all_property_deposit_push" model="ir.actions.server">
         <field name="name">批量推送</field>
         <field name="model_id" ref="yuthon_property.model_property_deposit_list"/>
@@ -372,6 +391,89 @@
             <field name="view_mode">tree</field>
             <field name="context">{'group_by': 'contract_id'}</field>
     </record>
+    <!-- 合同应收报表 -->
+    <record id="view_property_accounts_receivable_tree" model="ir.ui.view">
+        <field name="name">property.accounts.receivable.tree.form</field>
+        <field name="model">property.accounts.receivable</field>
+        <field name="arch" type="xml">
+            <tree string="合同应收报表">
+                <field name="due_date"/>
+                <field name="lessee_id"/>
+                <field name="original_amount"/>
+                <field name="property_id"/>
+                <field name="contract_id"/>
+                <field name="admin_id"/>
+            </tree>
+        </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>
+    </record>
+     <!-- 违约金明细报表 -->
+    <record id="view_property_penalty_line_report" model="ir.ui.view">
+        <field name="name">property.accounts.receivable.report</field>
+        <field name="model">property.accounts.receivable</field>
+        <field name="arch" type="xml">
+            <tree string="违约金明细报表">
+                <field name="contract_id" string="合同编号"/>
+                <field name="property_id"/>
+                <field name="lessee_id"/>
+                <field name="original_amount" string="金额"/>
+                <field name="rent_owed"/>
+                <field name="per_day"/>
+                <field name="penalty"/>
+                <field name="delivered1"/>
+                <field name="submitted"/>
+                <field name="due_date"/>
+                <field name="original_amount" string="当月所收金额"/>
+                <field name="title_certificate"/>
+                <field name="company_id"/>
+                <field name="admin_id"/>
+            </tree>
+        </field>
+    </record>
+    <record id="property_penalty_line_report_action" model="ir.actions.act_window">
+        <field name="name">违约金明细报表</field>
+        <field name="res_model">property.accounts.receivable</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <!--本月实收报表-->
+    <record id="view_property_received_month_report" model="ir.ui.view">
+        <field name="name">property.received.month.report</field>
+        <field name="model">property.accounts.receivable</field>
+        <field name="arch" type="xml">
+            <tree string="本月实收报表">
+                <field name="contract_id" string="合同编号"/>
+                <field name="property_id"/>
+                <field name="lessee_id"/>
+                <field name="delivered1" string="金额"/>
+                <field name="company_id"/>
+                <field name="admin_id"/>
+            </tree>
+        </field>
+    </record>
+    <record id="property_received_month_report_action" model="ir.actions.act_window">
+        <field name="name">本月实收报表</field>
+        <field name="res_model">property.accounts.receivable</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <!--累计欠收 -->
+    <record id="view_property_accumulated_underpayment_report" model="ir.ui.view">
+        <field name="name">property.penalty.list.report</field>
+       <field name="model">property.accounts.receivable</field>
+        <field name="arch" type="xml">
+            <tree string="累计欠收">
+                <field name="rent_owed"/>
+            </tree>
+        </field>
+    </record>
+    <record id="accumulated_underpayment_report_report_action" model="ir.actions.act_window">
+        <field name="name">累计欠收报表</field>
+        <field name="res_model">property.accounts.receivable</field>
+        <field name="view_mode">tree</field>
+    </record>
     <record id="all_button_accounts_receivable" model="ir.actions.server">
         <field name="name">批量生成违约金</field>
         <field name="model_id" ref="yuthon_property.model_property_accounts_receivable"/>
@@ -407,6 +509,7 @@
         <field name="state">code</field>
         <field name="code">action = model.button_all_reconciliation()</field>
     </record>
+    <!-- 违约金 -->
     <record id="inherit_view_property_penalty_list_tree" model="ir.ui.view">
         <field name="name">property.penalty.list.tree</field>
         <field name="model">property.penalty.list</field>

yuthon_property_approval/views/property_lease_contract.xml

@@ -753,6 +753,28 @@
             </search>
         </field>
     </record>
+    <!-- 已租面积报表 -->
+    <record id="yuthon_property_rented_area_report" model="ir.ui.view">
+        <field name="name">yuthon.property.rented.area.report</field>
+        <field name="model">property.lease.contract</field>
+        <field name="arch" type="xml">
+            <tree string="已租面积报表">
+                <field name="name"/>
+                <field name="total_area"/>
+                <field name="lessee_id"/>
+                <field name="contract_code"/>
+                <field name="unit_price"/>
+                <field name="rent" string="租金"/>
+                <field name="admin_id"/>
+                <field name="company_id" string="公告"/>
+            </tree>
+        </field>
+    </record>
+    <record id="rented_area_report_action" model="ir.actions.act_window">
+            <field name="name">已租面积报表</field>
+            <field name="res_model">property.lease.contract</field>
+            <field name="view_mode">tree</field>
+    </record>
     <record id="property_lease_contract_message_action" model="ir.actions.act_window">
         <field name="name">合同管理</field>
         <field name="res_model">property.lease.contract</field>

yuthon_property_approval/views/property_menu_all.xml

@@ -336,4 +336,46 @@
               name="零星工程"
               parent="property_construction_process_menu"
               action="view_property_delegated_agent_action"/>
+
+    <!--报表-->
+    <menuitem id="management_area_report_menu"
+              sequence="30"
+              name="管理面积"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="yuthon_property.management_area_report_action"/>
+    <menuitem id="rent_area_report_menu"
+              sequence="35"
+              name="可租面积"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="yuthon_property.rent_area_report_action"/>
+    <menuitem id="yuthon_property_rented_area_menu"
+              sequence="37"
+              name="已租面积"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="rented_area_report_action"/>
+    <menuitem id="accounts_receivable_tree_menu"
+              sequence="40"
+              name="合同应收"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="accounts_receivable_tree_action"/>
+    <menuitem id="property_penalty_line_report_menu"
+              sequence="45"
+              name="违约金明细"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="property_penalty_line_report_action"/>
+    <menuitem id="property_received_month_report_menu"
+              sequence="50"
+              name="本月应收"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="property_received_month_report_action"/>
+    <menuitem id="accumulated_underpayment_report_report_menu"
+              sequence="55"
+              name="累计欠收"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="accumulated_underpayment_report_report_action"/>
+    <menuitem id="property_deposit_list_report_menu"
+              sequence="60"
+              name="押金累计欠收"
+              parent="yuthon_property.yuthon_property_science_menu"
+              action="property_deposit_list_report_action"/>
 </odoo>