diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 4f156018c..37ef1f4b1 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -794,8 +794,8 @@ class AppletAttendance(Controller): state = electric.state electric_value = { 'id': electric.id, - 'current_meter': water.current_meter or 0, - 'current_read': water.current_read or 0, + 'current_meter': electric.current_meter or 0, + 'current_read': electric.current_read or 0, 'code': electric.archives_id.name or '', 'last_dosage': electric.last_dosage or 0, 'mater_data': str(electric.meter_date) if electric.meter_date else '', diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index 6d12c6e04..5b8a97038 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -38,7 +38,7 @@