添加功能

room/__manifest__.py

@@ -12,10 +12,12 @@
         'data/message_template_views.xml',
         'data/room_wechat_cron_data.xml',
         'data/ir_module_category_data.xml',
+        'data/room_meeting_type_data.xml',
         'security/ir_rule.xml',
         'security/ir.model.access.csv',
         'views/room_booking_views.xml',
         'views/room_room_views.xml',
+        'views/room_meeting_type.xml',
         'views/room_menus.xml',
         'views/room_booking_templates_frontend.xml',
         'views/room_office_views.xml',

room/data/room_meeting_type_data.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="room_meeting_setting_sequence0" model="room.meeting.type">
+        <field name="name">党委会</field>
+    </record>
+    <record id="room_meeting_setting_sequence1" model="room.meeting.type">
+        <field name="name">班子会</field>
+    </record>
+    <record id="room_meeting_setting_sequence2" model="room.meeting.type">
+        <field name="name">董事会</field>
+    </record>
+    <record id="room_meeting_setting_sequence3" model="room.meeting.type">
+        <field name="name">培训会</field>
+    </record>
+    <record id="room_meeting_setting_sequence4" model="room.meeting.type">
+        <field name="name">临时会议</field>
+    </record>
+    <record id="room_meeting_setting_sequence5" model="room.meeting.type">
+        <field name="name">部门会议</field>
+    </record>
+    <record id="room_meeting_setting_sequence6" model="room.meeting.type">
+        <field name="name">项目会议</field>
+    </record>
+</odoo>

room/models/__init__.py

@@ -6,3 +6,4 @@ from . import room_office
 from . import room_room
 from . import room_meeting_sign
 from . import inherit_calendar_event
+from . import room_meeting_type

room/models/room_booking.py

@@ -34,9 +34,7 @@ class RoomBooking(models.Model):
     is_day = fields.Boolean(string="提前一天", default=True)
     meeting_type = fields.Selection([('up', '线上'), ('down', '线下'), ('exterior', '外部')], default='down', string="会议形式",
                                     required=True)
-    meeting_form = fields.Selection([('party', '党委会'), ('team', '班子会'), ('director', '董事会'),
-                                    ('train', '培训会'), ('temporary', '临时会议'), ('department', '部门例会'),
-                                    ('project', '项目会议')], string="会议类型",)
+    meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型",)
     department_ids = fields.Many2many('hr.department', string='部门范围')
     employee_ids = fields.Many2many('hr.employee', string='人员范围')
     users_role_ids = fields.Many2many('soong.user.role', string='角色范围')

room/models/room_meeting_type.py

@@ -0,0 +1,9 @@
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class RoomMeetingType(models.Model):
+    _name = 'room.meeting.type'
+    _description = '会议类型配置'
+
+    name = fields.Char(string='名字', required=True)

room/security/ir.model.access.csv

@@ -6,6 +6,6 @@ access_room_room_manager,access.room.room.manager,room.model_room_room,room.grou
 access_room_booking_user,access.room.booking.user,room.model_room_booking,base.group_user,1,1,1,1
 
 access_room_meeting_sign,access.room.meeting.sign,model_room_meeting_sign,base.group_user,1,1,1,1
-
+access_room_meeting_type,access.room.meeting.type,model_room_meeting_type,base.group_user,1,1,1,1
 access_room_booking_sign_wizard,room.booking.sign.wizard,model_room_booking_sign_wizard,,1,1,1,1
 access_room_booking_partner_create_wizard,room.booking.partner.create.wizard,model_room_booking_partner_create_wizard,,1,1,1,1

room/views/room_booking_views.xml

@@ -149,7 +149,7 @@
                         </group>
                         <group>
                             <field name="department_id"/>
-                            <field name="meeting_form"/>
+                            <field name="meeting_type_id"/>
                         </group>
                     </group>
                     <group>

room/views/room_meeting_type.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_room_meeting_type_tree" model="ir.ui.view">
+        <field name="name">room_meeting_type_tree</field>
+        <field name="model">room.meeting.type</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_room_meeting_type_action" model="ir.actions.act_window">
+        <field name="res_model">room.meeting.type</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+</odoo>

yuthon_issue/views/inherit_room_booking_views.xml

@@ -10,8 +10,10 @@
                     <field name="issue_room_booking_ids">
                         <tree>
                             <field name="name"/>
+                            <field name="notice_documents_ids" string="会议附件材料"/>
                         </tree>
                     </field>
+
                 </page>
             </xpath>
         </field>

yuthon_work_brand/views/work_menus.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+
 <odoo>
     <!--  工作流  -->
     <record id="soong_workflow.menu_soong_workflow_root" model="ir.ui.menu">
@@ -20,8 +21,28 @@
     <record id="website.menu_website_configuration" model="ir.ui.menu">
         <field name="active">False</field>
     </record>
+    <record id="spreadsheet_dashboard.spreadsheet_dashboard_menu_configuration" model="ir.ui.menu">
+        <field name="active">False</field>
+    </record>
+    <record id="board.menu_board_my_dash" model="ir.ui.menu">
+        <field name="name">工作台</field>
+    </record>
 
     <!--  协同办公-通知公告  -->
+    <menuitem id="yuthon_dashboard_menu"
+              name="仪表板"
+              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_dashboard"
+              sequence="1"
+              action="spreadsheet_dashboard.ir_actions_dashboard_action"/>
+    <menuitem id="yuthon_dashboard_setting"
+              name="配置"
+              parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_dashboard"
+              sequence="1"/>
+    <menuitem id="yuthon_dashboard_set"
+              name="仪表板配置"
+              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"
@@ -42,6 +63,7 @@
               action="yuthon_notice.approval_notice_type_action"
               sequence="7"/>
 
+
     <!--  工作流程  -->
     <menuitem id="menu_soong_workflow_root_board"
               name="工作流程"
@@ -196,4 +218,13 @@
               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>