diff --git a/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py b/ks_dashboard_ninja/models/ks_dashboard_ninja_items.py index 4f2f5dc6e..32d9d7321 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/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_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 @@ + + + 固定资产 + +