From 9dd910ab3d29a48eed93d058566687e042e59b4a Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Sun, 13 Oct 2024 11:54:40 +0800
Subject: [PATCH 1/6] =?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

---
 yuthon_work_brand/views/work_menus.xml | 363 ++++++++++++-------------
 1 file changed, 172 insertions(+), 191 deletions(-)

diff --git a/yuthon_work_brand/views/work_menus.xml b/yuthon_work_brand/views/work_menus.xml
index 67946b167..aaf180aa5 100644
--- a/yuthon_work_brand/views/work_menus.xml
+++ b/yuthon_work_brand/views/work_menus.xml
@@ -2,21 +2,21 @@
 
 <odoo>
     <!--  工作流  -->
-    <record id="soong_workflow.menu_soong_workflow_root" model="ir.ui.menu">
-        <field name="active">False</field>
-    </record>
+<!--    <record id="soong_workflow.menu_soong_workflow_root" model="ir.ui.menu">-->
+<!--        <field name="active">False</field>-->
+<!--    </record>-->
     <!--  议题  -->
-    <record id="yuthon_issue.tianhe_issue_library_menu_root" model="ir.ui.menu">
-        <field name="active">False</field>
-    </record>
+<!--    <record id="yuthon_issue.tianhe_issue_library_menu_root" model="ir.ui.menu">-->
+<!--        <field name="active">False</field>-->
+<!--    </record>-->
     <!--  通知公告  -->
-    <record id="yuthon_notice.yuthon_notice_menu_config_root" model="ir.ui.menu">
-        <field name="active">False</field>
-    </record>
+<!--    <record id="yuthon_notice.yuthon_notice_menu_config_root" model="ir.ui.menu">-->
+<!--        <field name="active">False</field>-->
+<!--    </record>-->
     <!--  会议室  -->
-    <record id="room.room_menu_root" model="ir.ui.menu">
-        <field name="active">False</field>
-    </record>
+<!--    <record id="room.room_menu_root" model="ir.ui.menu">-->
+<!--        <field name="active">False</field>-->
+<!--    </record>-->
     <!--  网站  -->
     <record id="website.menu_website_configuration" model="ir.ui.menu">
         <field name="active">False</field>
@@ -43,193 +43,174 @@
               parent="yuthon_dashboard_setting"
               action="spreadsheet_dashboard.spreadsheet_dashboard_action_configuration_dashboards"
               sequence="1"/>
-    <menuitem id="yuthon_notice_menu"
-              name="通知公告"
-              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"
-              sequence="3"/>
-    <menuitem id="yuthon_notice_my_menu_board"
-              parent="yuthon_notice_menu"
-              name="我的通知公告"
-              action="yuthon_notice.approval_notice_action2"
-              sequence="2"/>
-    <menuitem id="yuthon_notice_manager_menu_board"
-              parent="yuthon_notice_menu"
-              name="通知公告管理"
-              action="yuthon_notice.approval_notice_action"
-              sequence="5"/>
-    <menuitem id="yuthon_notice_type_menu_board"
-              parent="yuthon_notice_menu"
-              name="公告类型管理"
-              action="yuthon_notice.approval_notice_type_action"
-              sequence="7"/>
 
 
     <!--  工作流程  -->
-    <menuitem id="menu_soong_workflow_root_board"
-              name="工作流程"
-              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"
-              sequence="5"/>
-    <menuitem id="menu_workflow_approval_request_new_board"
-              name="新的流程"
-              parent="menu_soong_workflow_root_board"
-              action="soong_workflow.action_kklw_workflow_approval_request"
-              sequence="1"/>
-    <menuitem id="menu_workflow_approval_my_request_board"
-              name="流程查询"
-              parent="menu_soong_workflow_root_board"
-              action="soong_workflow.soong_workflow_record_action"
-              sequence="3"/>
-    <menuitem id="menu_soong_workflow_entrust_board"
-              sequence="3"
-              name="工作委托"
-              action="soong_workflow.soong_workflow_entrust_action"
-              parent="menu_soong_workflow_root_board"/>
-    <menuitem id="menu_soong_workflow_inspector_board"
-              sequence="4"
-              name="督查督办"
-              parent="menu_soong_workflow_root_board"/>
-    <menuitem id="menu_soong_workflow_inspector_approval_board"
-              sequence="1"
-              name="督察审批"
-              action="soong_workflow.soong_workflow_inspector_action"
-              parent="menu_soong_workflow_inspector_board"/>
-    <menuitem id="menu_soong_workflow_inspector_transact_board"
-              sequence="3"
-              name="督察办理"
-              parent="menu_soong_workflow_inspector_board"/>
-    <menuitem id="menu_soong_workflow_inspector_transact_sth_board"
-              sequence="1"
-              name="督察事项"
-              action="soong_workflow.soong_workflow_inspector_line_action"
-              parent="menu_soong_workflow_inspector_transact_board"/>
-    <menuitem id="menu_soong_workflow_inspector_transact_my_board"
-              sequence="3"
-              name="我的任务"
-              action="soong_workflow.soong_workflow_inspector_line_action"
-              parent="menu_soong_workflow_inspector_transact_board"/>
-    <menuitem id="menu_soong_other_setting_board"
-              sequence="5"
-              name="其他配置"
-              parent="menu_soong_workflow_root_board"/>
-    <menuitem id="menu_soong_workflow_board"
-              name="工作流配置"
-              parent="menu_soong_other_setting_board"
-              action="soong_workflow.action_soong_workflow"
-              sequence="1"/>
-    <menuitem id="menu_soong_approval_note_board"
-              name="常用审批意见"
-              parent="menu_soong_other_setting_board"
-              action="soong_workflow.soong_note_action"
-              sequence="3"/>
-    <menuitem id="menu_soong_approval_group_board"
-              name="审批分组"
-              parent="menu_soong_other_setting_board"
-              action="soong_workflow.soong_approval_group_action"
-              sequence="5"/>
+<!--    <menuitem id="menu_soong_workflow_root_board"-->
+<!--              name="工作流程"-->
+<!--              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"-->
+<!--              sequence="5"/>-->
+<!--    <menuitem id="menu_workflow_approval_request_new_board"-->
+<!--              name="新的流程"-->
+<!--              parent="menu_soong_workflow_root_board"-->
+<!--              action="soong_workflow.action_kklw_workflow_approval_request"-->
+<!--              sequence="1"/>-->
+<!--    <menuitem id="menu_workflow_approval_my_request_board"-->
+<!--              name="流程查询"-->
+<!--              parent="menu_soong_workflow_root_board"-->
+<!--              action="soong_workflow.soong_workflow_record_action"-->
+<!--              sequence="3"/>-->
+<!--    <menuitem id="menu_soong_workflow_entrust_board"-->
+<!--              sequence="3"-->
+<!--              name="工作委托"-->
+<!--              action="soong_workflow.soong_workflow_entrust_action"-->
+<!--              parent="menu_soong_workflow_root_board"/>-->
+<!--    <menuitem id="menu_soong_workflow_inspector_board"-->
+<!--              sequence="4"-->
+<!--              name="督查督办"-->
+<!--              parent="menu_soong_workflow_root_board"/>-->
+<!--    <menuitem id="menu_soong_workflow_inspector_approval_board"-->
+<!--              sequence="1"-->
+<!--              name="督察审批"-->
+<!--              action="soong_workflow.soong_workflow_inspector_action"-->
+<!--              parent="menu_soong_workflow_inspector_board"/>-->
+<!--    <menuitem id="menu_soong_workflow_inspector_transact_board"-->
+<!--              sequence="3"-->
+<!--              name="督察办理"-->
+<!--              parent="menu_soong_workflow_inspector_board"/>-->
+<!--    <menuitem id="menu_soong_workflow_inspector_transact_sth_board"-->
+<!--              sequence="1"-->
+<!--              name="督察事项"-->
+<!--              action="soong_workflow.soong_workflow_inspector_line_action"-->
+<!--              parent="menu_soong_workflow_inspector_transact_board"/>-->
+<!--    <menuitem id="menu_soong_workflow_inspector_transact_my_board"-->
+<!--              sequence="3"-->
+<!--              name="我的任务"-->
+<!--              action="soong_workflow.soong_workflow_inspector_line_action"-->
+<!--              parent="menu_soong_workflow_inspector_transact_board"/>-->
+<!--    <menuitem id="menu_soong_other_setting_board"-->
+<!--              sequence="5"-->
+<!--              name="其他配置"-->
+<!--              parent="menu_soong_workflow_root_board"/>-->
+<!--    <menuitem id="menu_soong_workflow_board"-->
+<!--              name="工作流配置"-->
+<!--              parent="menu_soong_other_setting_board"-->
+<!--              action="soong_workflow.action_soong_workflow"-->
+<!--              sequence="1"/>-->
+<!--    <menuitem id="menu_soong_approval_note_board"-->
+<!--              name="常用审批意见"-->
+<!--              parent="menu_soong_other_setting_board"-->
+<!--              action="soong_workflow.soong_note_action"-->
+<!--              sequence="3"/>-->
+<!--    <menuitem id="menu_soong_approval_group_board"-->
+<!--              name="审批分组"-->
+<!--              parent="menu_soong_other_setting_board"-->
+<!--              action="soong_workflow.soong_approval_group_action"-->
+<!--              sequence="5"/>-->
     <!--    <menuitem id="soong_workflow_record_menu_board"-->
     <!--              name="工作流记录"-->
     <!--              parent="menu_soong_workflow_root_board"-->
     <!--              action="soong_workflow.soong_workflow_record_action"-->
     <!--              sequence="5"/>-->
     <!--  议题库  -->
-    <menuitem id="tianhe_issue_library_menu_root_board"
-              name="议题管理"
-              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"
-              sequence="7"/>
-    <menuitem id="tianhe_issue_library_manage_menu_root_board"
-              name="议题库"
-              parent="tianhe_issue_library_menu_root_board"
-              sequence="1"/>
-    <menuitem id="tianhe_issue_library_all_board"
-              parent="tianhe_issue_library_manage_menu_root_board"
-              name="全部"
-              action="yuthon_issue.issue_library_action"
-              sequence="1"/>
-    <menuitem id="tianhe_issue_library_menu_root_board_will_board"
-              parent="tianhe_issue_library_manage_menu_root_board"
-              name="待上会"
-              action="yuthon_issue.issue_library_action_will"
-              sequence="5"/>
-    <menuitem id="tianhe_issue_library_menu_root_board_on_meet_board"
-              parent="tianhe_issue_library_manage_menu_root_board"
-              name="已上会"
-              action="yuthon_issue.issue_library_action_done"
-              sequence="10"/>
-    <menuitem id="tianhe_other_issue_library_menu_board"
-              parent="tianhe_issue_library_menu_root_board"
-              name="子部门议题库"
-              sequence="3"/>
-    <menuitem id="tianhe_issue_library_all2_board"
-              parent="tianhe_other_issue_library_menu_board"
-              name="全部"
-              action="yuthon_issue.issue_library_action2"
-              sequence="1"/>
-    <menuitem id="other_issue_library_menu_will_board"
-              parent="tianhe_other_issue_library_menu_board"
-              name="待上会"
-              action="yuthon_issue.issue_library_action_will2"
-              sequence="3"/>
-    <menuitem id="other_issue_library_menu_on_meet_board"
-              parent="tianhe_other_issue_library_menu_board"
-              name="已上会"
-              action="yuthon_issue.issue_library_action_done2"
-              sequence="5"/>
-    <menuitem id="issue_approval_menu_board"
-              parent="tianhe_issue_library_menu_root_board"
-              name="议题审批"
-              action="yuthon_issue.issue_library_action"
-              sequence="5"/>
-    <menuitem id="issue_approval_party_menu_board"
-              parent="issue_approval_menu_board"
-              name="党总支议题审批"
-              action="yuthon_issue.issue_approval_party_action"
-              sequence="1"/>
-    <menuitem id="issue_approval_class_menu_board"
-              parent="issue_approval_menu_board"
-              name="领导班子议题审批"
-              action="yuthon_issue.issue_approval_class_action"
-              sequence="3"/>
-    <menuitem id="issue_approval_boss_menu_board"
-              parent="issue_approval_menu_board"
-              name="董事会议题审批"
-              action="yuthon_issue.issue_approval_boss_action"
-              sequence="5"/>
-    <menuitem id="issue_approval_decision_menu_board"
-              parent="tianhe_issue_library_menu_root_board"
-              name="决策清单"
-              action="yuthon_issue.issue_approval_decision_action"
-              sequence="7"/>
-    <menuitem id="issue_approval_decision_setting_menu_board"
-              parent="tianhe_issue_library_menu_root_board"
-              name="配置"
-              sequence="9"/>
-    <menuitem id="issue_approval_decision_type_menu_board"
-              parent="issue_approval_decision_setting_menu_board"
-              name="事项类别配置"
-              action="yuthon_issue.issue_approval_decision_type_action"
-              sequence="1"/>
+<!--    <menuitem id="tianhe_issue_library_menu_root_board"-->
+<!--              name="议题管理"-->
+<!--              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"-->
+<!--              sequence="7"/>-->
+<!--    <menuitem id="tianhe_issue_library_manage_menu_root_board"-->
+<!--              name="议题库"-->
+<!--              parent="tianhe_issue_library_menu_root_board"-->
+<!--              sequence="1"/>-->
+<!--    <menuitem id="tianhe_issue_library_all_board"-->
+<!--              parent="tianhe_issue_library_manage_menu_root_board"-->
+<!--              name="全部"-->
+<!--              action="yuthon_issue.issue_library_action"-->
+<!--              sequence="1"/>-->
+<!--    <menuitem id="tianhe_issue_library_menu_root_board_will_board"-->
+<!--              parent="tianhe_issue_library_manage_menu_root_board"-->
+<!--              name="待上会"-->
+<!--              action="yuthon_issue.issue_library_action_will"-->
+<!--              sequence="5"/>-->
+<!--    <menuitem id="tianhe_issue_library_menu_root_board_on_meet_board"-->
+<!--              parent="tianhe_issue_library_manage_menu_root_board"-->
+<!--              name="已上会"-->
+<!--              action="yuthon_issue.issue_library_action_done"-->
+<!--              sequence="10"/>-->
+<!--    <menuitem id="tianhe_other_issue_library_menu_board"-->
+<!--              parent="tianhe_issue_library_menu_root_board"-->
+<!--              name="子部门议题库"-->
+<!--              sequence="3"/>-->
+<!--    <menuitem id="tianhe_issue_library_all2_board"-->
+<!--              parent="tianhe_other_issue_library_menu_board"-->
+<!--              name="全部"-->
+<!--              action="yuthon_issue.issue_library_action2"-->
+<!--              sequence="1"/>-->
+<!--    <menuitem id="other_issue_library_menu_will_board"-->
+<!--              parent="tianhe_other_issue_library_menu_board"-->
+<!--              name="待上会"-->
+<!--              action="yuthon_issue.issue_library_action_will2"-->
+<!--              sequence="3"/>-->
+<!--    <menuitem id="other_issue_library_menu_on_meet_board"-->
+<!--              parent="tianhe_other_issue_library_menu_board"-->
+<!--              name="已上会"-->
+<!--              action="yuthon_issue.issue_library_action_done2"-->
+<!--              sequence="5"/>-->
+<!--    <menuitem id="issue_approval_menu_board"-->
+<!--              parent="tianhe_issue_library_menu_root_board"-->
+<!--              name="议题审批"-->
+<!--              action="yuthon_issue.issue_library_action"-->
+<!--              sequence="5"/>-->
+<!--    <menuitem id="issue_approval_party_menu_board"-->
+<!--              parent="issue_approval_menu_board"-->
+<!--              name="党总支议题审批"-->
+<!--              action="yuthon_issue.issue_approval_party_action"-->
+<!--              sequence="1"/>-->
+<!--    <menuitem id="issue_approval_class_menu_board"-->
+<!--              parent="issue_approval_menu_board"-->
+<!--              name="领导班子议题审批"-->
+<!--              action="yuthon_issue.issue_approval_class_action"-->
+<!--              sequence="3"/>-->
+<!--    <menuitem id="issue_approval_boss_menu_board"-->
+<!--              parent="issue_approval_menu_board"-->
+<!--              name="董事会议题审批"-->
+<!--              action="yuthon_issue.issue_approval_boss_action"-->
+<!--              sequence="5"/>-->
+<!--    <menuitem id="issue_approval_decision_menu_board"-->
+<!--              parent="tianhe_issue_library_menu_root_board"-->
+<!--              name="决策清单"-->
+<!--              action="yuthon_issue.issue_approval_decision_action"-->
+<!--              sequence="7"/>-->
+<!--    <menuitem id="issue_approval_decision_setting_menu_board"-->
+<!--              parent="tianhe_issue_library_menu_root_board"-->
+<!--              name="配置"-->
+<!--              sequence="9"/>-->
+<!--    <menuitem id="issue_approval_decision_type_menu_board"-->
+<!--              parent="issue_approval_decision_setting_menu_board"-->
+<!--              name="事项类别配置"-->
+<!--              action="yuthon_issue.issue_approval_decision_type_action"-->
+<!--              sequence="1"/>-->
     <!--  会议室  -->
-    <menuitem id="room_menu_root_board"
-              name="会议室"
-              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"
-              sequence="9"/>
-    <menuitem id="room_booking_menu_board"
-              name="预定"
-              action="room.room_booking_action"
-              parent="room_menu_root_board"
-              sequence="1"/>
-    <menuitem id="room_room_menu_board"
-              name="会议地点"
-              action="room.room_room_action"
-              parent="room_menu_root_board"
-              sequence="2"/>
-    <menuitem id="room_type_setting_menu_board"
-              name="配置"
-              parent="room_menu_root_board"
-              sequence="4"/>
-    <menuitem id="room_type_setting"
-              name="会议类型配置"
-              action="room.view_room_meeting_type_action"
-              parent="room_type_setting_menu_board"
-              sequence="1"/>
+<!--    <menuitem id="room_menu_root_board"-->
+<!--              name="会议室"-->
+<!--              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"-->
+<!--              sequence="9"/>-->
+<!--    <menuitem id="room_booking_menu_board"-->
+<!--              name="预定"-->
+<!--              action="room.room_booking_action"-->
+<!--              parent="room_menu_root_board"-->
+<!--              sequence="1"/>-->
+<!--    <menuitem id="room_room_menu_board"-->
+<!--              name="会议地点"-->
+<!--              action="room.room_room_action"-->
+<!--              parent="room_menu_root_board"-->
+<!--              sequence="2"/>-->
+<!--    <menuitem id="room_type_setting_menu_board"-->
+<!--              name="配置"-->
+<!--              parent="room_menu_root_board"-->
+<!--              sequence="4"/>-->
+<!--    <menuitem id="room_type_setting"-->
+<!--              name="会议类型配置"-->
+<!--              action="room.view_room_meeting_type_action"-->
+<!--              parent="room_type_setting_menu_board"-->
+<!--              sequence="1"/>-->
 </odoo>
\ No newline at end of file

From e3ade8ae7666123d0e2937ce37c0778252c20b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sun, 13 Oct 2024 11:56:29 +0800
Subject: [PATCH 2/6] pengyuthon

---
 yuthon_issue/models/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_issue/models/__init__.py b/yuthon_issue/models/__init__.py
index c7e188d7e..eb9f22f01 100644
--- a/yuthon_issue/models/__init__.py
+++ b/yuthon_issue/models/__init__.py
@@ -5,6 +5,6 @@ from . import issue_approval_party
 from . import issue_type
 from . import issue_approval_class
 from . import issue_approval_boss
-from . import inherit_room_booking
+# from . import inherit_room_booking
 from . import issue_approval_decision
 from . import issue_approval_decision_type

From 462ba4bcde4733e988b307a95e0110cf4e6e0f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sun, 13 Oct 2024 14:51:46 +0800
Subject: [PATCH 3/6] pengyuthon

---
 yuthon_issue/__manifest__.py                  |  1 -
 yuthon_issue/models/inherit_room_booking.py   | 10 ----------
 .../views/inherit_room_booking_views.xml      | 20 -------------------
 3 files changed, 31 deletions(-)
 delete mode 100644 yuthon_issue/models/inherit_room_booking.py
 delete mode 100644 yuthon_issue/views/inherit_room_booking_views.xml

diff --git a/yuthon_issue/__manifest__.py b/yuthon_issue/__manifest__.py
index 86f16c12b..bf10ac629 100644
--- a/yuthon_issue/__manifest__.py
+++ b/yuthon_issue/__manifest__.py
@@ -19,7 +19,6 @@
         'views/issue_approval_party_views.xml',
         'views/issue_approval_class_views.xml',
         'views/issue_approval_boss_views.xml',
-        # 'views/inherit_room_booking_views.xml',
         'views/issue_approval_decision_views.xml',
         'views/issue_approval_decision_type_views.xml',
         'views/menus.xml',
diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py
deleted file mode 100644
index 1367a428f..000000000
--- a/yuthon_issue/models/inherit_room_booking.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import api, fields, models, _
-from odoo.exceptions import ValidationError
-
-class RoomBooking(models.Model):
-    _inherit = "room.booking"
-
-    issue_room_booking_ids = fields.One2many('issue.library', 'room_booking_id', string="关联议题")
\ No newline at end of file
diff --git a/yuthon_issue/views/inherit_room_booking_views.xml b/yuthon_issue/views/inherit_room_booking_views.xml
deleted file mode 100644
index 9e36672fb..000000000
--- a/yuthon_issue/views/inherit_room_booking_views.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="inherit_room_booking_issue" model="ir.ui.view">
-        <field name="name">inherit.room.booking.issue</field>
-        <field name="model">room.booking</field>
-        <field name="inherit_id" ref="room.room_booking_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//page[@name='sign']" position="after">
-                <page name="issue_room" string="关联议题">
-                    <field name="issue_room_booking_ids">
-                        <tree>
-                            <field name="name"/>
-                            <field name="notice_documents_ids" string="会议附件材料"/>
-                        </tree>
-                    </field>
-                </page>
-            </xpath>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file

From 8f915c1fe1fa6185915a5ade434ae0f2093e6da0 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Sun, 13 Oct 2024 16:05:47 +0800
Subject: [PATCH 4/6] =?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

---
 soong_workflow/models/soong_user_role.py      |  2 +-
 soong_workflow/views/menuitem.xml             |  4 +-
 yuthon_hr_attendance/models/holiday_manage.py | 34 +++++++----
 yuthon_hr_employee/models/inherit_hr_job.py   |  2 +-
 .../models/issue_approval_decision.py         |  2 +-
 yuthon_issue/models/issue_library.py          | 16 ++---
 .../views/issue_approval_decision_views.xml   |  3 +
 yuthon_issue/views/issue_library_views.xml    | 42 ++++++-------
 yuthon_issue/views/menus.xml                  |  2 +-
 .../yuthon_official_incoming_normal_views.xml |  2 +-
 yuthon_work_brand/views/hr_menus.xml          | 59 -------------------
 11 files changed, 60 insertions(+), 108 deletions(-)

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"/>
 
         <menuitem id="menu_soong_other_setting"
-                  sequence="3"
+                  sequence="5"
                   name="其他配置"
                   parent="menu_soong_workflow_root"
                   action="soong_note_action"/>
@@ -66,7 +66,7 @@
         <menuitem id="menu_soong_workflow"
                   name="工作流配置"
                   parent="menu_soong_other_setting"
-                  action="soong_note_action"
+                  action="action_soong_workflow"
                   sequence="1"/>
 
         <menuitem id="menu_soong_approval_note"
diff --git a/yuthon_hr_attendance/models/holiday_manage.py b/yuthon_hr_attendance/models/holiday_manage.py
index d53332776..9632f9233 100644
--- a/yuthon_hr_attendance/models/holiday_manage.py
+++ b/yuthon_hr_attendance/models/holiday_manage.py
@@ -46,19 +46,27 @@ class HolidayManage(models.Model):
 
     @api.depends('department_ids', 'employee_ids', 'users_role_ids')
     def compute_holiday_users_ids(self):
-        users_role_list = department_users_list = []
-        # 部门人员
-        for depart in self.department_ids:
-            department_users_data = self.env['hr.employee'].search([('department_id', '=', depart.id)])
-            department_users_list = [de.user_id.id for de in department_users_data]
-        # 人员
-        employee_users_list = self.employee_ids.user_id.ids
-        # 角色人员
-        for user_id in self.users_role_ids:
-            department_users_data = self.env['hr.employee'].search([('user_role_id', '=', user_id.id)])
-            users_role_list = [ro.user_id.id for ro in department_users_data]
-        publish_user_list = department_users_list + employee_users_list + users_role_list
-        self.holiday_users_ids = [(6, 0, publish_user_list)]
+        department_users_list = users_role_list = []
+        for users in self:
+            if users.department_ids:
+                # 查看是否下级部门
+                for depart in users.department_ids:
+                    department_users_data = users.env['hr.employee'].search([('department_id', '=', depart.id.origin)])
+                    department_users_list = [de.user_id.id for de in department_users_data]
+                    if depart.child_ids:
+                        for child in depart.child_ids:
+                            department_child_users_data = users.env['hr.employee'].search(
+                                [('department_id', '=', child.id.origin)])
+                            department_users_list += [de.user_id.id for de in department_child_users_data]
+            employee_users_list = users.employee_ids.user_id.ids
+            if users.users_role_ids:
+                for user_id in users.users_role_ids:
+                    user_role_data = users.env['hr.employee'].search(
+                        ['|', ('user_role_id', '=', user_id.id.origin), ('user_role_ids', '=', user_id.id.origin)])
+                    users_role_list = [ro.user_id.id for ro in user_role_data]
+            publish_user_list = department_users_list + employee_users_list + users_role_list
+            false_none_list = [x for x in publish_user_list if x != False]
+            users.room_users_ids = [(6, 0, list(set(false_none_list)))]
 
     @api.depends('start_time', 'end_time')
     def compute_is_enable(self):
diff --git a/yuthon_hr_employee/models/inherit_hr_job.py b/yuthon_hr_employee/models/inherit_hr_job.py
index 7883d809a..dff19e5f4 100644
--- a/yuthon_hr_employee/models/inherit_hr_job.py
+++ b/yuthon_hr_employee/models/inherit_hr_job.py
@@ -12,7 +12,7 @@ class HrJob(models.Model):
     ]
 
     yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
-                                ('thlc', '天河粮储'), ('tctj', '天投城建')], string="所属公司")
+                                ('thlc', '天河粮储'), ('tctj', '天投城建'),('thtjbb', '天河投资本部')], string="所属公司")
     job_type_id = fields.Many2one('hr.job.type', string="岗位类别")
     job_lv_id = fields.Many2one('yuthon.job.lv', string="职级")
     start_time = fields.Date(string="生效时间", default=lambda self: fields.Date.today())
diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py
index a44222017..2e03a97cd 100644
--- a/yuthon_issue/models/issue_approval_decision.py
+++ b/yuthon_issue/models/issue_approval_decision.py
@@ -23,7 +23,7 @@ class IssueApprovalDecision(models.Model):
     start_date = fields.Date(string="生效日期")
     end_date = fields.Date(string="失效日期")
     remarks = fields.Char(string='备注')
-
+    issue_library_id = fields.Many2one('issue.library', string='关联议题库')
     @api.onchange('decision_type_id')
     def onchange_sequence(self):
         for seq in self:
diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index b7eef0328..8e4e25117 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -10,27 +10,20 @@ class IssueLibrary(models.Model):
     _rec_name = 'name'
 
     name = fields.Char(string='议题事项')
-    issue_approval_decision_id = fields.Many2one('issue.approval.decision', string='决策清单')
     code = fields.Char(string='编号', required=True, copy=False,
                        default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code'))
     statu = fields.Selection([('draft', '草稿'), ('approval', '审批中'), ('done', '已通过'), ('stop', '已拒绝'),
                               ('will', '待上会'), ('on_meet', '已上会'), ('cancel', '已取消')], default='draft', string="议题状态")
     is_party = fields.Boolean(string="党之委会")
-    is_party_pass = fields.Boolean(string="通过")
-    is_party_note = fields.Text(string="不通过意见")
     is_class = fields.Boolean(string="班子会")
-    is_class_pass = fields.Boolean(string="通过")
-    is_class_note = fields.Text(string="不通过意见")
     is_boss = fields.Boolean(string="董事会")
-    is_boss_pass = fields.Boolean(string="通过")
-    is_boss_note = fields.Text(string="不通过意见")
     is_note = fields.Boolean(string="备案、核准")
     creart_datetime = fields.Datetime(string="创建时间", default=fields.Datetime.now)
     notice_documents_ids = fields.Many2many('documents.document', string="议题管理文件")
     issue_type_id = fields.Many2one('issue.type', string="议题类型")
     room_booking_id = fields.Many2one('room.booking', string="关联会议")
     relevancy_type = fields.Selection([('none', '无')], string="关联流程类型")
-
+    issue_library_ids = fields.One2many('issue.approval.decision', 'issue_library_id',string="决策清单")
     def issue_cancel(self):
         self.write({"statu": "cancel"})
 
@@ -53,4 +46,11 @@ class IssueLibrary(models.Model):
             }
         }
 
+    @api.onchange('issue_library_ids')
+    def _onchange_issue_library_ids(self):
+        self.is_party = bool(self.issue_library_ids.filtered('council'))
+        self.is_class = bool(self.issue_library_ids.filtered('team_meet'))
+        self.is_boss = bool(self.issue_library_ids.filtered('board_meet'))
+        self.is_note = bool(self.issue_library_ids.filtered('district_bureau'))
+
 
diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml
index a14cf5adf..0a486d211 100644
--- a/yuthon_issue/views/issue_approval_decision_views.xml
+++ b/yuthon_issue/views/issue_approval_decision_views.xml
@@ -72,6 +72,9 @@
                 <searchpanel>
                     <field name="decision_type_id"/>
                 </searchpanel>
+                 <group expand="1">
+                    <filter name="group_statu" string="事项类别" context="{'group_by': 'decision_type_id'}"/>
+                 </group>
             </search>
         </field>
     </record>
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 180172e85..bec1d1d8d 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'">
-
                 <field name="name"/>
                 <field name="code"/>
-                <field name="issue_approval_decision_id"/>
-                <field name="is_party"/>
-                <field name="is_party_pass"/>
-                <field name="is_class_pass"/>
-                <field name="is_boss_pass"/>
                 <field name="creart_datetime"/>
                 <field name="statu"/>
             </tree>
@@ -41,29 +35,34 @@
                     <group>
                         <group>
                             <field name="code"/>
-                            <field name="issue_approval_decision_id"/>
-                            <field name="is_party"/>
-                            <field name="is_party_pass"/>
-                            <field name="is_party_note" invisible="is_party_pass == True"/>
-                            <field name="is_class"/>
-                            <field name="is_class_pass"/>
-                            <field name="is_class_note" invisible="is_class_pass == True"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="is_boss"/>
-                            <field name="is_boss_pass"/>
-                            <field name="is_boss_note" invisible="is_boss_pass == True"/>
-                            <field name="is_note"/>
                             <field name="room_booking_id"/>
                             <field name="notice_documents_ids">
                                 <tree>
                                     <field name="name"/>
                                 </tree>
                             </field>
+                            <field name="creart_datetime"/>
+                        </group>
+                        <group>
+                            <field name="is_party"/>
+                            <field name="is_class"/>
+                            <field name="is_boss"/>
+                            <field name="is_note"/>
                         </group>
                     </group>
                     <notebook>
+                        <page string="决策清单">
+                            <field name="issue_library_ids" string=" ">
+                                <tree>
+                                    <field name="issue_library_id" column_invisible="1"/>
+<!--                                    <field name="issue_approval_decision_id"/>-->
+                                    <field name="council"/>
+                                    <field name="team_meet"/>
+                                    <field name="board_meet"/>
+                                    <field name="district_bureau"/>
+                                </tree>
+                            </field>
+                        </page>
                         <page string="关联流程">
                         <group>
                             <group>
@@ -71,7 +70,7 @@
                             </group>
                             <group/>
                         </group>
-                    </page>
+                        </page>
                     </notebook>
                 </sheet>
             </form>
@@ -97,6 +96,7 @@
         <field name="res_model">issue.library</field>
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_issue_library_filter"/>
+        <field name="context">{'group_manager': 1}</field>
     </record>
 
     <record id="issue_library_action_will" model="ir.actions.act_window">
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 @@
     <!--  物管，粮储  议题库管理  -->
     <menuitem id="tianhe_other_issue_library_menu"
               parent="tianhe_issue_library_menu_root"
-              name="子部门议题库"
+              name="子公司议题库"
               sequence="8"/>
     <menuitem id="tianhe_issue_library_all2"
               parent="tianhe_other_issue_library_menu"
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"/>
                 </header>
                 <sheet>
+                     <field name="code"/>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1>
@@ -33,7 +34,6 @@
                     </div>
                     <group>
                         <group>
-                            <field name="code"/>
                             <field name="reference_cold"/>
                             <field name="major_event_category"/>
                             <field name="urgency"/>
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"/>
-    <!--    <menuitem id="hr_menu_account_approval_root_board"-->
-    <!--              name="薪资核算申请表"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_none_action"-->
-    <!--              sequence="1"/>-->
-    <!--    <menuitem id="hr_menu_prepare_approval_root_board"-->
-    <!--              name="编制调整申请表"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_hr_employee_approval.yuthon_prepare_approval_action"-->
-    <!--              sequence="3"/>-->
-    <!--    <menuitem id="hr_menu_rank_approval_root_board"-->
-    <!--              name="职级调整申请表"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_none_action"-->
-    <!--              sequence="5"/>-->
-    <!--    <menuitem id="hr_menu_reward_approval_root_board"-->
-    <!--              name="员工奖罚"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_hr_employee_approval.yuthon_reward_approval_action"-->
-    <!--              sequence="7"/>-->
-    <!--    <menuitem id="hr_menu_salary_approval_root_board"-->
-    <!--              name="薪酬项目调整表"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_none_action"-->
-    <!--              sequence="9"/>-->
-    <!--    <menuitem id="hr_menu_system_approval_root_board"-->
-    <!--              name="制度调整申请表"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_none_action"-->
-    <!--              sequence="15"/>-->
-    <!--    <menuitem id="hr_menu_title_approval_root_board"-->
-    <!--              name="职称聘任申请表"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_hr_employee_approval.yuthon_appointment_approval_action"-->
-    <!--              sequence="17"/>-->
-    <!--    <menuitem id="hr_menu_enrollment_approval_root_board"-->
-    <!--              name="参保方案申请表"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_none_action"-->
-    <!--              sequence="19"/>-->
-    <!--    <menuitem id="hr_menu_transfer_approval_root_board"-->
-    <!--              name="工作移交"-->
-    <!--              parent="hr_set_process_menu_root_board"-->
-    <!--              action="yuthon_hr_employee_approval.yuthon_transfer_approval_action"-->
-    <!--              sequence="21"/>-->
-    <!--    <menuitem id="hr_department_menu_root_board"-->
-    <!--              name="部门"-->
-    <!--              parent="hr_menu_root_board"-->
-    <!--              action="hr.hr_department_kanban_action"-->
-    <!--              sequence="3"/>-->
-    <!--    <menuitem id="hr_report_menu_root_board"-->
-    <!--              name="报告"-->
-    <!--              parent="hr_menu_root_board"-->
-    <!--              sequence="5"/>-->
-    <!--    <menuitem id="hr_report_skills_menu_root_board"-->
-    <!--              name="技能"-->
-    <!--              parent="hr_report_menu_root_board"-->
-    <!--              action="hr_skills.hr_employee_skill_report_action"-->
-    <!--              sequence="1"/>-->
     <menuitem id="hr_setting_menu_root_board"
               name="配置"
               parent="hr_menu_root_board"

From 98a7b7a94090cafa2cbc7f6b1baf1713667a088f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sun, 13 Oct 2024 16:15:36 +0800
Subject: [PATCH 5/6] pengyuthon

---
 yuthon_issue/views/issue_approval_decision_views.xml | 1 +
 yuthon_issue/views/issue_library_views.xml           | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml
index 0a486d211..a99b694ef 100644
--- a/yuthon_issue/views/issue_approval_decision_views.xml
+++ b/yuthon_issue/views/issue_approval_decision_views.xml
@@ -83,5 +83,6 @@
         <field name="name">决策清单</field>
         <field name="res_model">issue.approval.decision</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_group_statu': True,}</field>
     </record>
 </odoo>
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index bec1d1d8d..926809476 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -96,7 +96,6 @@
         <field name="res_model">issue.library</field>
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="context">{'group_manager': 1}</field>
     </record>
 
     <record id="issue_library_action_will" model="ir.actions.act_window">

From 48619520d5deb99fa5b6fe4f980542996d14090b Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Sun, 13 Oct 2024 16:45:23 +0800
Subject: [PATCH 6/6] =?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

---
 room/views/room_menus.xml                          | 11 +++++++++++
 yuthon_issue/views/issue_library_views.xml         |  1 -
 yuthon_notice/views/yuthon_confirm_users_views.xml |  7 -------
 yuthon_notice/views/yuthon_notice_views.xml        |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

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"/>
+
+    <menuitem id="room_type_setting_menu"
+              name="配置"
+              parent="room.room_menu_root"
+              sequence="3"/>
+
+    <menuitem id="room_type_setting"
+              name="会议类型配置"
+              action="room.view_room_meeting_type_action"
+              parent="room_type_setting_menu"
+              sequence="1"/>
 </odoo>
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index bec1d1d8d..926809476 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -96,7 +96,6 @@
         <field name="res_model">issue.library</field>
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="context">{'group_manager': 1}</field>
     </record>
 
     <record id="issue_library_action_will" model="ir.actions.act_window">
diff --git a/yuthon_notice/views/yuthon_confirm_users_views.xml b/yuthon_notice/views/yuthon_confirm_users_views.xml
index df09d78c2..872a6074b 100644
--- a/yuthon_notice/views/yuthon_confirm_users_views.xml
+++ b/yuthon_notice/views/yuthon_confirm_users_views.xml
@@ -35,11 +35,4 @@
         <field name="view_mode">tree</field>
         <field name="search_view_id" ref="yuthon_confirm_users_filter"/>
     </record>
-
-    <menuitem
-            id="yuthon_confirm_users_menu"
-            parent="yuthon_notice_menu_config_root"
-            name="公告确认信息"
-            action="yuthon_confirm_users_action"
-            sequence="9"/>
 </odoo>
\ 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 @@
     <menuitem
             id="yuthon_notice_my_menu"
             parent="yuthon_notice_menu_config_root"
-            name="我的通知公告"
+            name="通知公告"
             action="approval_notice_action2"
             sequence="2"/>
 
     <menuitem
             id="yuthon_notice_menu"
             parent="yuthon_notice_menu_config_root"
-            name="通知公告管理"
+            name="管理"
             action="approval_notice_action"
             sequence="5"/>
 </odoo>
\ No newline at end of file