添加功能

yuthon_property/models/yuthon_property.py

@@ -40,8 +40,10 @@ class YuthonProperty(models.Model):
                               ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'),
                               ('signed', '已备案'), ('leased', '已租'), ('idle', '空置'), ('no_lease','不可租')], string='资产目前状态', default='to')
     is_meter = fields.Boolean(string="水表")
+    meter_id = fields.Many2one('yuthon.water.setting', string="水费标准配置")
     live_room = fields.Many2one('yuthon.live.room', string="居住用房")
     is_electricity_meter = fields.Boolean(string="电表")
+    electricity_id = fields.Many2one('yuthon.electricity.setting', string="电费标准配置")
     admin_id = fields.Many2one('res.users', string="管理员")
     purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
     is_confirm_authorization = fields.Boolean(string="确权")
@@ -61,12 +63,12 @@ class YuthonProperty(models.Model):
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_message_code'))
     rental_unit_price = fields.Float(string="评估单价")
     address = fields.Text(string="物业地址")
+    equity_area = fields.Float(string="产权面积")
     title_number = fields.Char(string="产权编号")
     suite_area = fields.Float(string="套内面积")
     start_time = fields.Date(string="生效时间")
     end_date = fields.Date(string="失效日期")
     lessee_id = fields.Many2one('yuthon.property.lessee', string='承租方')
-    manage_standard = fields.Char(string="物业管理费标准")
     title_address = fields.Many2one('yuthon.property.message', string="产权地址")
     rental_address = fields.Text(string="出租地址")
     ame = fields.Char(string='标题')
@@ -80,6 +82,7 @@ class YuthonProperty(models.Model):
     disassembly_information_ids = fields.One2many('disassembly.information.line', 'yuthon_property_id',
                                                   string='关联拆分信息明细行')
     property_merge_approval_id = fields.Many2one('yuthon.property', string='关联物业信息')
+    manage_fee_line_ids = fields.One2many('manage.information.fee.line', 'yuthon_property_id', string='关联管理费明细行')
 
     @api.onchange('building_area')
     def _onchange_building_area(self):
@@ -319,3 +322,10 @@ class DisassemblyInformationLine(models.Model):
     start_time = fields.Date(related='property_id.start_time',string="生效日期")
     end_date = fields.Date(related='property_id.end_date',string="失效日期")
 
+class ManageInformationFeeLine(models.Model):
+    _name = 'manage.information.fee.line'
+    _description = '管理费用明细行'
+
+    yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息")
+    manage_id = fields.Many2one('property.message.fee', string="管理费标准")
+

yuthon_property/models/yuthon_resource_mgmt_config.py

@@ -61,3 +61,21 @@ class YuthonLiveRoom(models.Model):
     _description = '居住用房'
 
     name = fields.Char(string="居住用房")
+
+class YuthonElectricitySetting(models.Model):
+    _name = 'yuthon.electricity.setting'
+    _description = '电费标准配置'
+
+    name = fields.Char(string="电费标准")
+
+class YuthonWaterSetting(models.Model):
+    _name = 'yuthon.water.setting'
+    _description = '水费标准配置'
+
+    name = fields.Char(string="水费标准")
+
+class YuthonPropertySetting(models.Model):
+    _name = 'yuthon.property.setting'
+    _description = '物业费标准配置'
+
+    name = fields.Char(string="物业费标准")

yuthon_property/security/ir.model.access.csv

@@ -47,4 +47,8 @@ access_yuthon_tariff_setting,yuthon_tariff_setting,model_yuthon_tariff_setting,b
 access_yuthon_live_room,yuthon_live_room,model_yuthon_live_room,base.group_user,1,1,1,1
 access_yuthon_precinct_message,yuthon_precinct_message,model_yuthon_precinct_message,base.group_user,1,1,1,1
 access_yuthon_property_message,yuthon_property_message,model_yuthon_property_message,base.group_user,1,1,1,1
-access_yuthon_property_lessee,yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
+access_yuthon_property_lessee, yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
+access_yuthon_property_lessee,yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
+access_yuthon_electricity_setting,yuthon_electricity_setting,model_yuthon_electricity_setting,base.group_user,1,1,1,1
+access_yuthon_water_setting,yuthon_water_setting,model_yuthon_water_setting,base.group_user,1,1,1,1
+access_manage_information_fee_line,manage.information.fee.line,model_manage_information_fee_line,base.group_user,1,1,1,1

yuthon_property/views/menuitem.xml

@@ -330,6 +330,11 @@
                   action="yuthon_property_penalty_action" sequence="37"/>
     <menuitem id="yuthon_property_live_room_menu" parent="resource_mgmt_config_menu" name="居住用房配置"
                   action="yuthon_live_room_action" sequence="40"/>
+    <menuitem id="yuthon_electricity_setting_menu" parent="resource_mgmt_config_menu" name="电费标准配置"
+                  action="view_yuthon_electricity_setting_action" sequence="45"/>
+    <menuitem id="yuthon_water_setting_menu" parent="resource_mgmt_config_menu" name="水费标准配置"
+                  action="view_yuthon_water_setting_action" sequence="50"/>
+
 
 
 

yuthon_property/views/yuthon_property_views.xml

@@ -61,20 +61,6 @@
                             <field name="state" readonly="1"/>
                             <field name="is_done_split" invisible="1"/>
                             <field name="is_done_merge" invisible="1"/>
-                            <field name="message_standard_id" invisible="not is_message_fee"/>
-
-                        </group>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="is_electricity_meter"/>
-                            <field name="is_meter"/>
-                            <field name="is_message_fee"/>
-                        </group>
-                        <group>
-                            <field name="is_confirm_authorization"/>
-                            <field name="is_hvac"/>
-                            <field name="is_handle_land"/>
                         </group>
                     </group>
                     <group col="2">
@@ -82,12 +68,27 @@
                             <field name="life_timer"/>
                             <field name="effective_date"/>
                             <field name="notice_documents_ids" widget="preview_many2many"/>
+                            <field name="is_electricity_meter"/>
+                            <field name="electricity_id" invisible="not is_electricity_meter"/>
+                            <field name="is_meter"/>
+                            <field name="meter_id" invisible="not is_meter"/>
+                            <field name="is_message_fee"/>
+                            <field name="message_standard_id" invisible="not is_message_fee"/>
                         </group>
                         <group>
                             <field name="property_use_time"/>
                             <field name="end_date"/>
                         </group>
                     </group>
+                    <group string="产权信息">
+                        <field name="equity_area"/>
+                        <field name="management_area"/>
+                        <field name="building_area"/>
+                    </group>
+                    <group string="管理信息">
+                        <field name="property_precinct"/>
+                        <field name="admin_id"/>
+                    </group>
                     <notebook>
                         <page string="产权信息">
                             <field name="title_information_ids">
@@ -131,9 +132,12 @@
                             <group>
                                 <group>
                                     <field name="remark"/>
+                                    <field name="is_confirm_authorization"/>
+                                    <field name="is_handle_land"/>
                                 </group>
                                 <group>
                                     <field name="vr_link"/>
+                                    <field name="is_hvac"/>
                                 </group>
                             </group>
                         </page>
@@ -179,6 +183,14 @@
                                 </tree>
                             </field>
                         </page>
+                        <page string="管理费信息"  invisible="is_message_fee == False">
+                            <field name="manage_fee_line_ids">
+                            <tree editable="bottom">
+                                <field name="yuthon_property_id" column_invisible="1"/>
+                                <field name="manage_id"/>
+                            </tree>
+                            </field>
+                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">

yuthon_property/views/yuthon_resource_mgmt_config_views.xml

@@ -132,4 +132,32 @@
         <field name="res_model">yuthon.live.room</field>
         <field name="view_mode">tree</field>
     </record>
+    <record id="view_yuthon_electricity_setting_tree" model="ir.ui.view">
+        <field name="name">yuthon.electricity.setting.tree</field>
+        <field name="model">yuthon.electricity.setting</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_yuthon_electricity_setting_action" model="ir.actions.act_window">
+        <field name="name">电费标准配置</field>
+        <field name="res_model">yuthon.electricity.setting</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <record id="view_yuthon_water_setting_tree" model="ir.ui.view">
+        <field name="name">yuthon.water.setting.tree</field>
+        <field name="model">yuthon.water.setting</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_yuthon_water_setting_action" model="ir.actions.act_window">
+        <field name="name">水费标准配置</field>
+        <field name="res_model">yuthon.water.setting</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>