From 7e6466f7cb24bb44473437322393cefea17fb853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 13 Aug 2025 09:25:30 +0800 Subject: [PATCH 1/2] 1 --- yuthon_hr_attendance/controllers/applet_attendance.py | 2 +- yuthon_official/__manifest__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index dcecd0f64..150f0139b 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -120,7 +120,7 @@ class AppletAttendance(Controller): '缺卡'] else f'

{check_out_str}

' state = "no" message = "超出范围或wifi未连接，不允许打卡" - address_ids = request.env(user=SUPERUSER_ID)["applet.address"].search([]) + address_ids = request.env(user=SUPERUSER_ID)["applet.address"].search([('company_id', '=', employee_id.company_id.id)]) if kw['att_latitude'] != kw['att_longitude']: self_address = self.get_address_from_coords(kw['att_latitude'], kw['att_longitude']) else: diff --git a/yuthon_official/__manifest__.py b/yuthon_official/__manifest__.py index 58f28df2e..b07c56514 100644 --- a/yuthon_official/__manifest__.py +++ b/yuthon_official/__manifest__.py @@ -23,7 +23,7 @@ 'views/yuthon_official_incoming_labor_views.xml', 'views/yuthon_official_party_views.xml', 'views/yuthon_official_incoming_party_views.xml', - 'views/inherit_soong_workflow_insector_views.xml', + # 'views/inherit_soong_workflow_insector_views.xml', 'views/inherit_room_booking_views.xml', 'views/inherit_issue_library_views.xml', 'views/official_menus.xml', From f6dfa71cfec92c5d80624963defb81ddd501831c Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 13 Aug 2025 09:31:22 +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 --- .../views/property_lease_contract.xml | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index 93279d682..d3c4282c9 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -316,6 +316,20 @@ + + + + + + + + + + + + + + @@ -335,20 +349,6 @@ - - - - - - - - - - - - - - @@ -722,6 +722,21 @@ + + + + + + + + + + + + + + @@ -748,21 +763,6 @@ - - - - - - - - - - - - - -