diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py
index 6bcb2f7eb..a3d8e76df 100644
--- a/yuthon_property/models/property_meter_archives.py
+++ b/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",
diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py
index 38b77c384..480588c4e 100644
--- a/yuthon_property/models/property_meter_water.py
+++ b/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="安装日期")
diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml
index a3cea96cf..3463b1675 100644
--- a/yuthon_property/views/property_meter_archives_views.xml
+++ b/yuthon_property/views/property_meter_archives_views.xml
@@ -108,8 +108,8 @@
-
-
+
+
diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml
index ce8abefe0..80eaa99ab 100644
--- a/yuthon_property/views/property_meter_water_views.xml
+++ b/yuthon_property/views/property_meter_water_views.xml
@@ -115,7 +115,7 @@
-
+
diff --git a/yuthon_property_approval/models/property_lease_renewal.py b/yuthon_property_approval/models/property_lease_renewal.py
index ec8997f34..d17c2f2e1 100644
--- a/yuthon_property_approval/models/property_lease_renewal.py
+++ b/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='新承租方')
diff --git a/yuthon_property_approval/views/property_lease_renewal.xml b/yuthon_property_approval/views/property_lease_renewal.xml
index 8b90f7811..12a3210ce 100644
--- a/yuthon_property_approval/views/property_lease_renewal.xml
+++ b/yuthon_property_approval/views/property_lease_renewal.xml
@@ -64,7 +64,7 @@
-
+