diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py
index 118bd8937..404b320ef 100644
--- a/yuthon_property/models/property_meter_archives.py
+++ b/yuthon_property/models/property_meter_archives.py
@@ -68,22 +68,19 @@ class PropertyMeterArchives(models.Model):
return record
def update_epitope_values(self):
- meter_ids = self.env["property.meter.archives"].browse(
- self._context.get("active_ids", self._context.get("active_id"))
- )
- for meter in meter_ids:
- for property in meter.yuthon_property_ids:
+ for record in self:
+ for property in record.yuthon_property_ids:
existing_energy = self.env["yuthon.property.energy"].search(
[
("yuthon_property_id", "=", property.id),
- ("property_meter_archives_id", "=", meter.id),
+ ("property_meter_archives_id", "=", record.id),
],
limit=1,
)
if not existing_energy:
self.env["yuthon.property.energy"].create(
{
- "property_meter_archives_id": meter.id,
+ "property_meter_archives_id": record.id,
"yuthon_property_id": property.id,
}
)
diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py
index 85019dadf..edaa17239 100644
--- a/yuthon_property/models/property_meter_water.py
+++ b/yuthon_property/models/property_meter_water.py
@@ -69,22 +69,19 @@ class PropertyMeterWater(models.Model):
return record
def update_epitope_values(self):
- meter_ids = self.env["property.meter.water"].browse(
- self._context.get("active_ids", self._context.get("active_id"))
- )
- for meter in meter_ids:
- for property in meter.yuthon_property_ids:
- existing_energy = self.env["yuthon.property.water"].search(
+ for record in self:
+ for property in record.yuthon_property_ids:
+ existing_energy = self.env["yuthon.property.energy"].search(
[
("yuthon_property_id", "=", property.id),
- ("property_meter_water_id", "=", meter.id),
+ ("property_meter_archives_id", "=", record.id),
],
limit=1,
)
if not existing_energy:
- self.env["yuthon.property.water"].create(
+ self.env["yuthon.property.energy"].create(
{
- "property_meter_water_id": meter.id,
+ "property_meter_archives_id": record.id,
"yuthon_property_id": property.id,
}
)
diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml
index 70eaac21c..f35b85d32 100644
--- a/yuthon_property/views/property_meter_archives_views.xml
+++ b/yuthon_property/views/property_meter_archives_views.xml
@@ -8,7 +8,7 @@
diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml
index b52c39e79..2ab02a642 100644
--- a/yuthon_property/views/property_meter_water_views.xml
+++ b/yuthon_property/views/property_meter_water_views.xml
@@ -9,8 +9,8 @@
-
+
+