!5633 添加功能

Merge pull request !5633 from 李鹏宇/dev_zhou

yuthon_property/models/yuthon_property.py

@@ -93,7 +93,7 @@ class YuthonProperty(models.Model):
     annual_increase_percentage = fields.Float(string='递增百分比', igits=(6, 2))
     annual_increase_amount = fields.Float(string='递增金额', igits=(6, 2))
     rent_unit = fields.Float(string='租金单价', igits=(6, 2))
-    property_type = fields.Selection([('property', '物业'), ('guanggao', '广告位'), ('guanzi', '管子间')], string="资产类型", default='property')
+    property_type = fields.Selection([('property', '物业'), ('guanggao', '广告位'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')], string="资产类型", default='property')
 
     def update_mange(self):
         property_ids = self.env['yuthon.property'].search([('name', 'ilike', '天河商贸大厦')])

yuthon_property/views/property_accounts_receivable_views.xml

@@ -7,10 +7,10 @@
                 <field name="due_date" readonly="1" width="300px"/>
                 <field name="due_date_end" readonly="1"/>
                 <field name="payout_date" readonly="1"/>
-                <field name="original_amount" readonly="1"/>
-                <field name="discount_amount" readonly="1"/>
-                <field name="delivered1" readonly="1"/>
-                <field name="submitted" readonly="1"/>
+                <field name="original_amount" readonly="0"/>
+                <field name="discount_amount" readonly="0"/>
+                <field name="delivered1" readonly="0"/>
+                <field name="submitted" readonly="0"/>
                 <field name="management_type_id" readonly="1"/>
                 <field name="multiplier" column_invisible="1"/>
                 <field name="is_push" optional="hide" readonly="1"/>

yuthon_property_approval/models/property_lease_contract.py

@@ -273,7 +273,7 @@ class PropertyLeaseContract(models.Model):
 
     name_title = fields.Char(default=_get_default_name_title)
 
-    contract_sort = fields.Selection([('property', '物业'), ('ads', '广告位'), ('guan', '管子间')], string="合同类型")
+    contract_sort = fields.Selection([('property', '物业'), ('guanggao', '广告位'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')], string="资产类型", default='property')
 
     @api.depends('lease_ids.address_id.title_deed')
     def _compute_title_information(self):

yuthon_property_approval/models/property_lease_renewal.py

@@ -47,7 +47,6 @@ class PropertyLeaseRenewal(models.Model):
     document_ids = fields.Many2many('ir.attachment', string="变更附件")
 
     early_reason = fields.Text(string="退租原因")
-    display_quitting_date = fields.Date(string="退租日期")
     early_quitting_date = fields.Date(string="退租日期")
 
     active = fields.Boolean('Active', default=True, tracking=True)

yuthon_trade/views/yuthon_contract_addition_views.xml

@@ -45,7 +45,7 @@
                         <field name="name"/>
                         <field name="users_id"/>
                         <field name="reason"/>
-                        <field name="workflow_id" required="1"/>
+                        <field name="workflow_id"/>
                         <field name="document_ids" widget="preview_many2many"/>
                         <field name="department_id" invisible="1"/>
                     </group>