From 5696dae2fb3ec9579a304e310449cebcced8d907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Wed, 11 Mar 2026 18:53:08 +0800
Subject: [PATCH] =?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 @@
                 <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
-<!--                <field name="allowed_user_ids" invisible="1"/>-->
+                <field name="allowed_user_ids" invisible="1"/>
                 <field name="number"/>
                 <field name="establishment_quotas"/>
                 <field name="no_of_employee" string="在编人数"/>
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 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
+    <!-- 继承并修改 maintenance.hr_equipment_action 的名称 -->
+    <record id="maintenance.hr_equipment_action" model="ir.actions.act_window">
+        <field name="name">固定资产</field>
+    </record>
+
     <menuitem id="purchase_assets_equipment_root"
               name="固定资产"
               parent="stock.menu_stock_inventory_control"