diff --git a/room/views/room_menus.xml b/room/views/room_menus.xml index 9619dbd1a..71d63ce62 100644 --- a/room/views/room_menus.xml +++ b/room/views/room_menus.xml @@ -20,4 +20,15 @@ action="room.room_room_action" parent="room.room_menu_root" sequence="2"/> + + + + diff --git a/soong_workflow/models/soong_user_role.py b/soong_workflow/models/soong_user_role.py index 8c91e8534..414ad93ba 100644 --- a/soong_workflow/models/soong_user_role.py +++ b/soong_workflow/models/soong_user_role.py @@ -12,4 +12,4 @@ class YuthonUserRole(models.Model): department_id = fields.Many2one('hr.department', string="所属机构部门") create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now) end_time = fields.Datetime(string="结束时间") - yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储'), ('tctj', '天投城建')], string="所属公司") + yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储'), ('tctj', '天投城建'),('thtjbb', '天河投资本部')], string="所属公司") diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml index 7d35d01f5..823688a2f 100644 --- a/soong_workflow/views/menuitem.xml +++ b/soong_workflow/views/menuitem.xml @@ -58,7 +58,7 @@ parent="menu_soong_workflow_inspector_transact"/> @@ -66,7 +66,7 @@ - - - inherit.room.booking.issue - room.booking - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml index a14cf5adf..a99b694ef 100644 --- a/yuthon_issue/views/issue_approval_decision_views.xml +++ b/yuthon_issue/views/issue_approval_decision_views.xml @@ -72,6 +72,9 @@ + + + @@ -80,5 +83,6 @@ 决策清单 issue.approval.decision tree,form + {'search_default_group_statu': True,} diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 180172e85..926809476 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -8,14 +8,8 @@ decoration-info="statu == 'will'" decoration-success="statu == 'done'" decoration-muted="statu == 'cancel'"> - - - - - - @@ -41,29 +35,34 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -71,7 +70,7 @@ - + diff --git a/yuthon_issue/views/menus.xml b/yuthon_issue/views/menus.xml index 19bb82ae5..8cb93223b 100644 --- a/yuthon_issue/views/menus.xml +++ b/yuthon_issue/views/menus.xml @@ -32,7 +32,7 @@ tree - - \ No newline at end of file diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml index 03eba1a27..a0672aa17 100644 --- a/yuthon_notice/views/yuthon_notice_views.xml +++ b/yuthon_notice/views/yuthon_notice_views.xml @@ -175,14 +175,14 @@ \ No newline at end of file diff --git a/yuthon_official/views/yuthon_official_incoming_normal_views.xml b/yuthon_official/views/yuthon_official_incoming_normal_views.xml index 5609c290e..812e561e0 100644 --- a/yuthon_official/views/yuthon_official_incoming_normal_views.xml +++ b/yuthon_official/views/yuthon_official_incoming_normal_views.xml @@ -25,6 +25,7 @@ invisible="not is_supervising"/> +
- diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 7a3a6a78f..8e1700cd9 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -196,65 +196,6 @@ parent="hr_set_process_menu_root_board" action="hr_org_chart.action_hr_employee_org_chart" sequence="15"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - + + + - - False - + + + - - False - + + + - - False - + + + False @@ -43,193 +43,174 @@ parent="yuthon_dashboard_setting" action="spreadsheet_dashboard.spreadsheet_dashboard_action_configuration_dashboards" sequence="1"/> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file