diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index 7745d597f..b22c0fe01 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -611,7 +611,7 @@ class YuthonPropertyEnergy(models.Model): _description = '电表' property_meter_archives_id = fields.Many2one('property.meter.archives', string="电表编号") - rate = fields.Integer(related='property_meter_archives_id.gauge_magnification', string="倍率", store=True) + unit_number = fields.Char(related='property_meter_archives_id.unit_number', string="单元编号/用途", store=True) standard_id = fields.Many2one(related='property_meter_archives_id.standards_id', string="标准", store=True) installation_date = fields.Date(related='property_meter_archives_id.start_time', string="安装日期") demolition_date = fields.Date(related='property_meter_archives_id.end_time', string="拆除日期") diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index e80a7855e..004a0602c 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -247,7 +247,7 @@ - + diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index 92836b234..cb685092c 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -682,6 +682,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml index 740961b6d..878747f4c 100644 --- a/yuthon_salary/views/inherit_hr_payslip_views.xml +++ b/yuthon_salary/views/inherit_hr_payslip_views.xml @@ -14,7 +14,6 @@ false - "{'no_open': True}" 1 @@ -248,7 +247,7 @@