From ebd087a26c3564d55f6c4b670991e264d41220c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 11 Mar 2026 18:50:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/wizard/soong_workflow_comment_wizard_view.xml | 3 ++- yuthon_will_task/models/inherit_room_booking.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml index a0cfadd70..cf2573708 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml +++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml @@ -108,7 +108,8 @@ options="{'no_open': True}" widget="radio" force_save="1"/> - 退回节点 + diff --git a/yuthon_will_task/models/inherit_room_booking.py b/yuthon_will_task/models/inherit_room_booking.py index ab1f0b61b..6dccb47c7 100644 --- a/yuthon_will_task/models/inherit_room_booking.py +++ b/yuthon_will_task/models/inherit_room_booking.py @@ -78,7 +78,7 @@ class InheritRoomBooking(models.Model): if task_time_ids: start_datetime = new_record.start_datetime - start_date = (start_datetime + timedelta(hours=8)).date() + start_date = start_datetime.date() request_hour_from = get_hour_selection(new_record.start_datetime) request_hour_to = get_hour_selection(new_record.stop_datetime) task_id = self.env['yuthon.will.task'].sudo().create({ @@ -95,4 +95,5 @@ class InheritRoomBooking(models.Model): 'task_state': 'will', }) task_id._onchange_employee_ids() + task_id._sync_dates_task() return new_record From 5696dae2fb3ec9579a304e310449cebcced8d907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 11 Mar 2026 18:53:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ks_dashboard_ninja/models/ks_dashboard_ninja_items.py | 1 + yuthon_hr_employee/views/inherit_hr_job_views.xml | 2 +- yuthon_stock/views/menu.xml | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py b/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py index 4f2f5dc6e..0dd2cc03a 100644 --- a/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py +++ b/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py @@ -100,6 +100,7 @@ def ks_read(self, records): sql = comodel._order_to_sql(None, wquery) order_by_clause = comodel.env.cr.mogrify(sql).decode() order_by = order_by_clause and (' ORDER BY %s ' % order_by_clause) or '' + order_by = '' # 临时修复：跳过排序 from_c, where_c, where_params = wquery.get_sql() query = """ SELECT {rel}.{id1}, {rel}.{id2} FROM {rel}, {from_c} WHERE {where_c} AND {rel}.{id1} IN %s AND {rel}.{id2} = {tbl}.id diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml index 845d9b0d1..312856978 100644 --- a/yuthon_hr_employee/views/inherit_hr_job_views.xml +++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml @@ -82,7 +82,7 @@ 1 - + diff --git a/yuthon_stock/views/menu.xml b/yuthon_stock/views/menu.xml index b0f598afb..c2dd181e5 100644 --- a/yuthon_stock/views/menu.xml +++ b/yuthon_stock/views/menu.xml @@ -1,5 +1,10 @@ + + + 固定资产 + + Date: Wed, 11 Mar 2026 19:18:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ks_dashboard_ninja/models/ks_dashboard_ninja_items.py | 2 +- yuthon_hr_employee/views/inherit_hr_job_views.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py b/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py index 0dd2cc03a..32d9d7321 100644 --- a/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py +++ b/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py @@ -100,7 +100,7 @@ def ks_read(self, records): sql = comodel._order_to_sql(None, wquery) order_by_clause = comodel.env.cr.mogrify(sql).decode() order_by = order_by_clause and (' ORDER BY %s ' % order_by_clause) or '' - order_by = '' # 临时修复：跳过排序 + # order_by = '' # 临时修复：跳过排序 from_c, where_c, where_params = wquery.get_sql() query = """ SELECT {rel}.{id1}, {rel}.{id2} FROM {rel}, {from_c} WHERE {where_c} AND {rel}.{id1} IN %s AND {rel}.{id2} = {tbl}.id diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml index 312856978..845d9b0d1 100644 --- a/yuthon_hr_employee/views/inherit_hr_job_views.xml +++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml @@ -82,7 +82,7 @@ 1 - +