From d525eab56be0e83291101555a3d0cbb23a2cf7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
<9664676+pengyuthon@user.noreply.gitee.com>
Date: Sat, 18 Oct 2025 15:54:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_property/models/property_meter_water.py | 4 ++--
yuthon_property/views/property_meter_water_views.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py
index 7dd419d48..581f82e34 100644
--- a/yuthon_property/models/property_meter_water.py
+++ b/yuthon_property/models/property_meter_water.py
@@ -190,7 +190,7 @@ class MeterWaterLine(models.Model):
string="上次用量", store=True, group_operator=None, compute="_compute_last"
)
last_read = fields.Float(
- string="上次读数", store=True, group_operator=None, compute="_compute_last"
+ string="上次读数", group_operator=None, compute="_compute_last"
)
meter_date = fields.Date(string="任务日期")
@@ -287,7 +287,7 @@ class MeterWaterLine(models.Model):
i.current_meter = 0
else:
i.last_read = i.initial_value
- i.last_read = 0
+ i.last_dosage = 0
i.last_meter = i.meter_date
i.current_meter = 0
diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml
index 2ab02a642..bcb491eff 100644
--- a/yuthon_property/views/property_meter_water_views.xml
+++ b/yuthon_property/views/property_meter_water_views.xml
@@ -102,6 +102,7 @@
+
From affc773a702127986309adde8572c7468f669493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
<9664676+pengyuthon@user.noreply.gitee.com>
Date: Sat, 18 Oct 2025 15:55:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_property/views/property_meter_water_views.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml
index bcb491eff..daed22229 100644
--- a/yuthon_property/views/property_meter_water_views.xml
+++ b/yuthon_property/views/property_meter_water_views.xml
@@ -109,8 +109,8 @@
-
-
+
+