!5647 添加功能

Merge pull request !5647 from 李鹏宇/dev_zhou

yuthon_property/models/property_meter_archives.py

@@ -19,7 +19,7 @@ class PropertyMeterArchives(models.Model):
     installation_location = fields.Char(string="安装位置")
     is_state = fields.Boolean(string="是否启用")
     type = fields.Selection([("public", "公共"), ("fees", "收费")], string="类型")
-    gauge_magnification = fields.Integer(string="仪表倍率", default=1)
+    gauge_magnification = fields.Integer(string="仪表倍率", default=1, group_operator='count_true')
     maximum_count = fields.Integer(string="最大位数")
     lessee_id = fields.Many2one(
         "property.tenant.information",

yuthon_property/models/property_meter_water.py

@@ -21,7 +21,7 @@ class PropertyMeterWater(models.Model):
     installation_location = fields.Char(string="安装位置")
     is_state = fields.Boolean(string="是否启用")
     type = fields.Selection([("public", "公共"), ("fees", "收费")], string="类型")
-    gauge_magnification = fields.Integer(string="仪表倍率", default=1)
+    gauge_magnification = fields.Integer(string="仪表倍率", default=1, group_operator='count_true')
     maximum_count = fields.Integer(string="最大位数")
     lessee_id = fields.Many2one(
         "property.tenant.information",
@@ -187,7 +187,7 @@ class MeterWaterLine(models.Model):
     unit_number = fields.Char(string='单元编号/用途')
     unit = fields.Float(string='当月单价', group_operator=None)
     receivables = fields.Float(string="应收", store=True, group_operator=None, help="应收金额=本次用量*单价*(1+线损)")
-    gauge_magnification = fields.Integer(string='仪表倍率', readonly=True, default=1, group_operator=None)
+    gauge_magnification = fields.Integer(string='仪表倍率', readonly=True, default=1, group_operator='count_true')
     last_reading_time = fields.Date(string="最后读数时间")
     type = fields.Selection([("public", "公共"), ("fees", "收费")], string="类型")
     start_time = fields.Date(string="安装日期")

yuthon_property/views/property_meter_archives_views.xml

@@ -108,8 +108,8 @@
                 <field name="last_meter" readonly="1"/>
                  <field name="last_dosage" readonly="1"/>
                 <field name="line_loss" column_invisible="1"/>
-                <field name="archives_state"/>
-                <field name="employee_ids"  widget="many2many_tags" options="{'no_create': True}" readonly="1"/>
+                <field name="archives_state"  column_invisible="1"/>
+                <field name="employee_ids"  widget="many2many_tags" options="{'no_create': True}" readonly="1"  column_invisible="1"/>
                 <field name="line_loss"/>
             </tree>
         </field>

yuthon_property/views/property_meter_water_views.xml

@@ -115,7 +115,7 @@
                 <field name="last_meter" readonly="1"/>
                  <field name="last_dosage" readonly="1"/>
                 <field name="line_loss"/>
-                <field name="employee_ids"  widget="many2many_tags" options="{'no_create': True, 'no_open': True}" readonly="1"/>
+                <field name="employee_ids"  widget="many2many_tags" options="{'no_create': True, 'no_open': True}" readonly="1"  column_invisible="1"/>
             </tree>
         </field>
     </record>

yuthon_property_approval/models/property_lease_renewal.py

@@ -34,7 +34,7 @@ class PropertyLeaseRenewal(models.Model):
     cycle_dict = fields.Selection(related="contract_id.cycle_dict", string='租金支付周期')
     original_start_date = fields.Date(related="contract_id.term_start_time", string='原租赁期开始时间')
     original_end_date = fields.Date(related="contract_id.term_end_time", string='原租赁期结束时间')
-    property_ids = fields.Many2many('yuthon.property', string='物业信息')
+    property_name = fields.Char(related="contract_id.property_name", string='物业信息')
 
     # 变更信息
     new_lessee_name = fields.Char(string='新承租方')

yuthon_property_approval/views/property_lease_renewal.xml

@@ -64,7 +64,7 @@
                         </group>
                         <group>
                             <field name="monthly_rent"/>
-                            <field name="property_ids" widget="many2many_tags" options="{'no_create': True}"/>
+                            <field name="property_name"/>
                         </group>
                     </group>
                     <group string="变更信息" col="3">