添加功能

yuthon_property/models/yuthon_property.py

@@ -65,7 +65,7 @@ class YuthonProperty(models.Model):
     admin_id = fields.Many2one('res.users', string="管理员")
     lessee_id = fields.Many2one('property.tenant.information', string='承租方')
     title_address = fields.Many2one('yuthon.property.message', string="产权地址")
-    yuthon_company = fields.Selection([('thtz', '天河投资'), ('thwg', '天河物管'), ('thlc', '天河粮储'), ('thtj', '天城投建'), ('housing', '房总')],string="所属公司")
+    company_id = fields.Many2one('yuthon.property.company', string="所属公司")
     rental_address = fields.Text(string="出租地址")
     tenure_type = fields.Selection([('self', '自有'), ('agency', '代管')], string='权属类型')
     ame = fields.Char(string='标题')
@@ -328,7 +328,7 @@ class ManageInformationLine(models.Model):
     rent_area = fields.Float(string="可租面积")
     equity_area = fields.Float(string="产权面积")
     admin_id = fields.Many2one('res.users', string="管理员")
-    yuthon_company = fields.Selection([('thtz', '天河投资'), ('thwg', '天河物管'), ('thlc', '天河粮储'), ('thtj', '天城投建'), ('housing', '房总')], string="所属公司")
+    company_id = fields.Many2one('yuthon.property.company', string="所属公司")
     start_time = fields.Date(string="生效日期", default=fields.Date.today)
     end_date = fields.Date(string="失效日期")
 

yuthon_property/models/yuthon_resource_mgmt_config.py

@@ -43,6 +43,7 @@ class YuthonPropertySource(models.Model):
 
     name = fields.Char(string="资产来源")
 
+
 class YuthonOwnerMessage(models.Model):
     _name = 'yuthon.owner.message'
     _description = '权属人'
@@ -56,32 +57,46 @@ class YuthonRentalPurposes(models.Model):
 
     name = fields.Char(string="出租用途")
 
+
 class YuthonLiveRoom(models.Model):
     _name = 'yuthon.live.room'
     _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="物业费标准")
 
+
 class YuthonLotSetting(models.Model):
     _name = 'yuthon.lot.setting'
     _description = '地段配置'
 
-    name = fields.Char(string="地段")
+    name = fields.Char(string="地段")
+
+
+class YuthonPropertyCompany(models.Model):
+    _name = 'yuthon.property.company'
+    _description = '物业公司配置'
+
+    name = fields.Char(string="物业公司")
+
+

yuthon_property/security/ir.model.access.csv

@@ -53,4 +53,5 @@ access_yuthon_electricity_setting,yuthon_electricity_setting,model_yuthon_electr
 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
 access_yuthon_lot_setting,yuthon_lot_setting,model_yuthon_lot_setting,base.group_user,1,1,1,1
-access_yuthon_property_wizard,yuthon_property_wizard,model_yuthon_property_wizard,base.group_user,1,1,1,1
+access_yuthon_property_wizard,yuthon_property_wizard,model_yuthon_property_wizard,base.group_user,1,1,1,1
+access_yuthon_property_company,yuthon_property_company,model_yuthon_property_company,base.group_user,1,1,1,1

yuthon_property/views/menuitem.xml

@@ -347,6 +347,8 @@
                   action="yuthon_live_room_action" sequence="40"/>
     <menuitem id="yuthon_lot_setting_action_menu" parent="resource_mgmt_config_menu" name="地段配置"
                   action="view_yuthon_lot_setting_action" sequence="55"/>
+    <menuitem id="yuthon_property_company_action_mentu" parent="resource_mgmt_config_menu" name="物业公司配置"
+                  action="view_yuthon_property_company_action" sequence="56"/>
 
 
 

yuthon_property/views/yuthon_property_views.xml

@@ -57,7 +57,7 @@
                             <field name="street"/>
                         </group>
                         <group>
-                            <field name="yuthon_company"/>
+                            <field name="company_id"/>
                             <field name="tenure_type"/>
                             <field name="precinct_id"/>
                             <field name="asset_type_id"/>
@@ -121,7 +121,7 @@
                                     <field name="purpose_id"/>
                                     <field name="admin_id"/>
                                     <field name="tenure_type"/>
-                                    <field name="yuthon_company"/>
+                                    <field name="company_id"/>
                                     <field name="management_area"/>
                                     <field name="rent_area"/>
                                     <field name="equity_area"/>
@@ -227,7 +227,7 @@
                     <filter name="admin_id" string="管理员" context="{'group_by': 'admin_id'}"/>
                 </group>
                 <searchpanel>
-                    <field name="yuthon_company" enable_counters="1"/>
+                    <field name="company_id" enable_counters="1"/>
                     <field name="tenure_type" enable_counters="1"/>
                     <field name="precinct_id" string="所属片区" enable_counters="1"/>
                     <field name="referred_id" enable_counters="1"/>

yuthon_property/views/yuthon_resource_mgmt_config_views.xml

@@ -174,4 +174,18 @@
         <field name="res_model">yuthon.lot.setting</field>
         <field name="view_mode">tree</field>
     </record>
+    <record id="view_yuthon_property_company_tree" model="ir.ui.view">
+        <field name="name">yuthon.property.company.tree</field>
+        <field name="model">yuthon.property.company</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_yuthon_property_company_action" model="ir.actions.act_window">
+        <field name="name">公司配置</field>
+        <field name="res_model">yuthon.property.company</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>

yuthon_property/wizard/yuthon_property_wizard.py

@@ -38,8 +38,11 @@ class YuthonPropertyWizard(models.Model):
             owner_id = self.env['yuthon.owner.message'].create({
                 'name': row[13].value,
             })
-        yuthon_company_dict = {'天河投资': 'thtz', '天河物管': 'thwg', '天河粮储': 'thlc', '天投城建': 'thtj', '房总': 'housing', '': ''}
-        yuthon_company = yuthon_company_dict.get(row[3].value, '')
+        company_id = self.env['yuthon.property.company'].search([('name', '=', row[3].value)])
+        if not company_id:
+            company_id = self.env['yuthon.property.company'].create({
+                'name': row[3].value,
+            })
         tenure_type_dict = {'自有':'self', '代管':'agency', '': ''}
         tenure_type = tenure_type_dict.get(row[4].value, '')
         admin_id = self.env['res.users'].search([('name', '=', row[5].value)])
@@ -88,7 +91,7 @@ class YuthonPropertyWizard(models.Model):
         property_date = {
             'name': property_name,
             'referred_id': referred_id.id,
-            'yuthon_company': yuthon_company,
+            'company_id': company_id.id,
             'tenure_type': tenure_type,
             'state': state,
             'title_deed':title_certificate,

yuthon_property_approval/views/property_lease_contract.xml

@@ -35,6 +35,7 @@
                                 <field name="name"/>
                             </tree>
                         </field>
+                        <field name="contract_code"/>
                         <field name="lessor"/>
                         <field name="lessee_id"/>
                         <field name="users_id"/>