diff --git a/soong_workflow/__manifest__.py b/soong_workflow/__manifest__.py index cc995cf4d..b8c5333c9 100644 --- a/soong_workflow/__manifest__.py +++ b/soong_workflow/__manifest__.py @@ -5,7 +5,7 @@ "author": "soong bo", "license": "AGPL-3", "version": "17.0.0.1.0", - "depends": ["base", "crnd_web_diagram_plus", "hr"], + "depends": ["base", "crnd_web_diagram_plus", "hr",], "data": [ "data/soong_workflow_note_data.xml", "data/soong_workflow_inspector_code.xml", @@ -16,6 +16,7 @@ "views/kklw_workflow_approval_views.xml", "views/soong_approval_users_views.xml", "views/soong_note_views.xml", + "views/soong_note_setting_views.xml", "views/soong_hr_employee_views.xml", "views/soong_user_role_views.xml", "views/soong_workflow_node_views.xml", @@ -30,8 +31,6 @@ 'wizard/approval_notice_wizard_views.xml', "wizard/soong_workflow_comment_wizard_view.xml", "templates/soong_workflow_templates.xml", - - "views/menuitem.xml", ], "installable": True, diff --git a/soong_workflow/models/__init__.py b/soong_workflow/models/__init__.py index c4942f25e..785ed5b37 100644 --- a/soong_workflow/models/__init__.py +++ b/soong_workflow/models/__init__.py @@ -15,3 +15,4 @@ from . import soong_approval_group from . import trans_link from . import soong_workflow_entrust from . import soong_workflow_inspector +from . import soong_note_setting diff --git a/soong_workflow/models/soong_note.py b/soong_workflow/models/soong_note.py index 20a9f057c..528e8a07c 100644 --- a/soong_workflow/models/soong_note.py +++ b/soong_workflow/models/soong_note.py @@ -6,5 +6,4 @@ class SoongNote(models.Model): _name = 'soong.note' name = fields.Char(string="审批意见") - users_role_ids = fields.Many2many('soong.user.role', string='角色范围') - type = fields.Selection([('bm', '部门经理意见'), ('fg', '分管领导意见'), ('zjl', '总经理意见')], string="意见类型") \ No newline at end of file + type = fields.Many2one('soong.note.setting', string="意见类型") diff --git a/soong_workflow/models/soong_note_setting.py b/soong_workflow/models/soong_note_setting.py new file mode 100644 index 000000000..dda5b1d75 --- /dev/null +++ b/soong_workflow/models/soong_note_setting.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, _ + + +class SoongNoteSetting(models.Model): + _name = 'soong.note.setting' + + name = fields.Char(string="名称") + users_role_ids = fields.Many2many('soong.user.role', string='角色范围') \ No newline at end of file diff --git a/soong_workflow/security/ir.model.access.csv b/soong_workflow/security/ir.model.access.csv index 046c4f4af..bcb374464 100644 --- a/soong_workflow/security/ir.model.access.csv +++ b/soong_workflow/security/ir.model.access.csv @@ -15,7 +15,7 @@ access_soong_workflow_node_button_manager,soong_workflow_node_button_manager,mod access_soong_workflow_link_manager,soong_workflow_link_manager,model_soong_workflow_link,soong_workflow.group_soong_workflow_manager,1,1,1,1 ,,,,,,, access_soong_workflow_record_user,soong_workflow_record_user,model_soong_workflow_record,soong_workflow.group_soong_workflow_user,1,1,1,1 -access_soong_user_role,soong_user_role,model_soong_user_role,soong_workflow.group_soong_workflow_user,1,1,1,1 +access_soong_user_role,soong_user_role,model_soong_user_role,group_soong_workflow_user,1,1,1,1 access_soong_approval_users,soong_approval_users,model_soong_approval_users,soong_workflow.group_soong_workflow_user,1,1,1,1 access_soong_note,soong_note,model_soong_note,soong_workflow.group_soong_workflow_user,1,1,1,1 access_soong_approval_group,soong_approval_group,model_soong_approval_group,soong_workflow.group_soong_workflow_user,1,1,1,1 @@ -30,4 +30,7 @@ access_entrust_all,entrust_all,model_entrust_all,soong_workflow.group_soong_work access_soong_workflow_log,soong_workflow_log,model_soong_workflow_log,soong_workflow.group_soong_workflow_user,1,1,1,1 access_soong_workflow_inspector,soong_workflow_inspector,model_soong_workflow_inspector,soong_workflow.group_soong_workflow_user,1,1,1,1 access_soong_workflow_inspector_line,soong_workflow_inspector_line,model_soong_workflow_inspector_line,soong_workflow.group_soong_workflow_user,1,1,1,1 -access_soong_workflow_inspector_line2,soong_workflow_inspector_line2,model_soong_workflow_inspector_line2,soong_workflow.group_soong_workflow_user,1,1,1,1 \ No newline at end of file +access_soong_workflow_inspector_line2,soong_workflow_inspector_line2,model_soong_workflow_inspector_line2,soong_workflow.group_soong_workflow_user,1,1,1,1 +access_soong_workflow_note,soong_workflow_note,model_soong_workflow_note,soong_workflow.group_soong_workflow_user,1,1,1,1 + +access_soong_note_setting,soong_note_setting,model_soong_note_setting,soong_workflow.group_soong_workflow_user,1,1,1,1 \ No newline at end of file diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml index fc24746fa..799c91747 100644 --- a/soong_workflow/views/menuitem.xml +++ b/soong_workflow/views/menuitem.xml @@ -79,11 +79,15 @@ parent="menu_soong_other_setting" action="soong_note_action" sequence="3"/> - + + sequence="9"/> \ No newline at end of file diff --git a/soong_workflow/views/soong_note_setting_views.xml b/soong_workflow/views/soong_note_setting_views.xml new file mode 100644 index 000000000..f93bb54db --- /dev/null +++ b/soong_workflow/views/soong_note_setting_views.xml @@ -0,0 +1,19 @@ + + + + soong.note.setting.tree + soong.note.setting + + + + + + + + + 审批意见配置 + soong.note.setting + tree + + + diff --git a/soong_workflow/views/soong_note_views.xml b/soong_workflow/views/soong_note_views.xml index 670ae1f14..a99d6ef68 100644 --- a/soong_workflow/views/soong_note_views.xml +++ b/soong_workflow/views/soong_note_views.xml @@ -7,7 +7,6 @@ -