diff --git a/yuthon_issue/security/issue_security_group.xml b/yuthon_issue/security/issue_security_group.xml
index 8588f4080..2f831fce0 100644
--- a/yuthon_issue/security/issue_security_group.xml
+++ b/yuthon_issue/security/issue_security_group.xml
@@ -3,72 +3,20 @@
议题权限
-
-
-
- 党支委议题
+
+ 议题用户
-
-
-
- 班子会议题
-
-
-
-
-
- 董事会议题
-
-
-
-
-
- 物管党支委议题
-
-
-
-
-
- 物管班子会议题
-
-
-
-
-
- 物管议题管理员
-
-
-
-
-
-
-
- 粮储党支委议题
-
-
-
-
-
- 粮储班子会议题
-
-
-
-
-
- 粮储议题管理员
-
-
-
-
-
-
-
+
议题管理员
-
+
+
+ yuthon_issue_company_rule_admin
+
+ [('yuthon_company', '=', user.employee_id.yuthon_company)]
+
+
\ No newline at end of file
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index ce1166961..2efb39289 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -1093,1618 +1093,7 @@
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree5')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form5')})]"/>
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- issue.library.on.meeting.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- 议题库
- issue.library
- tree,form
- [('is_boss', '=', True)]
-
-
-
-
-
- 待上会
- issue.library
- tree,form
- [('state','=','will')]
-
-
-
-
- 已上会
- issue.library
- tree,form
- [('state','=','on_meet')]
-
-
-
-
- 已取消
- issue.library
- tree,form
- [('state','=','cancel')]
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- issue.library.on.meeting.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- 议题库
- issue.library
- tree,form
- [('is_boss', '=', True)]
-
-
-
-
-
- 待上会
- issue.library
- tree,form
- [('state','=','will')]
-
-
-
-
- 已上会
- issue.library
- tree,form
- [('state','=','on_meet')]
-
-
-
-
- 已取消
- issue.library
- tree,form
- [('state','=','cancel')]
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- 议题库
- issue.library
- tree,form
- [('is_boss', '=', True)]
-
-
-
-
-
- issue.library.on.meeting.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- 待上会
- issue.library
- tree,form
- [('state','=','will')]
-
-
-
-
- 已上会
- issue.library
- tree,form
- [('state','=','on_meet')]
-
-
-
-
- 已取消
- issue.library
- tree,form
- [('state','=','cancel')]
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- 议题库
- issue.library
- tree,form
- [('is_boss', '=', True)]
-
-
-
-
-
- issue.library.on.meeting.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- 待上会
- issue.library
- tree,form
- [('state','=','will')]
-
-
-
-
- 已上会
- issue.library
- tree,form
- [('state','=','on_meet')]
-
-
-
-
- 已取消
- issue.library
- tree,form
- [('state','=','cancel')]
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- issue.library.on.meeting.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- 议题库
- issue.library
- tree,form
-
-
-
-
-
- 已审批
- issue.library
- tree,form
- [('state','=','approval')]
-
-
-
-
- 待上会
- issue.library
- tree,form
- [('state','=','will')]
-
-
-
-
- 已上会
- issue.library
- tree,form
- [('state','=','on_meet')]
-
-
-
-
- 已取消
- issue.library
- tree,form
- [('state','=','cancel')]
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
-
- issue.library.on.meeting.tree
- issue.library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- issue.library.tree
- issue.library
-
-
-
-
-
- 议题库
- issue.library
- tree,form
-
-
-
-
-
- 已审批
- issue.library
- tree,form
- [('state','=','approval')]
-
-
-
-
- 待上会
- issue.library
- tree,form
- [('state','=','will')]
-
-
-
-
- 已上会
- issue.library
- tree,form
- [('state','=','on_meet')]
-
-
-
-
- 已取消
- issue.library
- tree,form
- [('state','=','cancel')]
-
-
我的议题库
issue.library
diff --git a/yuthon_issue/views/menus.xml b/yuthon_issue/views/menus.xml
index af4e28544..4fdc91d06 100644
--- a/yuthon_issue/views/menus.xml
+++ b/yuthon_issue/views/menus.xml
@@ -5,7 +5,6 @@
web_icon="yuthon_issue,static/description/icon.png"
sequence="1"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 天河投资
+ 职级类型
hr.payroll.structure.type
tree,form,search
{'search_default_group_lv_id': 1}
- [('yuthon_company', '=' , 'thtz')]
-
-
- 天河粮储
- hr.payroll.structure.type
- tree,form,search
- {'search_default_group_lv': 1}
- [('yuthon_company', '=', 'thlc')]
-
-
- 天河物管
- hr.payroll.structure.type
- tree,form,search
- {'search_default_group_lv': 1}
- [('yuthon_company', '=', 'thwg')]
\ No newline at end of file
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index d794a5aea..93b5b1bc8 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -72,27 +72,6 @@
tree,form,search
{'search_default_group_lv_name': 1}
-
- 天河投资
- hr.payroll.structure
- tree,form,search
- {'search_default_group_lv_name': 1}
- [('yuthon_company', '=' , 'thtz')]
-
-
- 天河粮储
- hr.payroll.structure
- tree,form,search
- {'search_default_group_lv_name': 1}
- [('yuthon_company', '=', 'thlc')]
-
-
- 天河物管
- hr.payroll.structure
- tree,form,search
- {'search_default_group_lv_name': 1}
- [('yuthon_company', '=', 'thwg')]
-
批量更新职级类型
diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml
index 2dcac4d23..ff8db503a 100644
--- a/yuthon_salary/views/yuthon_payroll_project_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_project_views.xml
@@ -14,24 +14,12 @@
-
+
薪资常用项
yuthon.payroll.common
[('yuthon_company','=','thtz')]
tree
-
- 薪资常用项
- yuthon.payroll.common
- [('yuthon_company','=','thlc')]
- tree
-
-
- 薪资常用项
- yuthon.payroll.common
- [('yuthon_company','=','thwg')]
- tree
-
yuthon.payroll.temporary.tree
yuthon.payroll.temporary
@@ -45,22 +33,9 @@
-
+
临时工资项
yuthon.payroll.temporary
- [('yuthon_company','=','thtz')]
- tree
-
-
- 临时工资项
- yuthon.payroll.temporary
- [('yuthon_company','=','thlc')]
- tree
-
-
- 临时工资项
- yuthon.payroll.temporary
- [('yuthon_company','=','thwg')]
tree
@@ -88,22 +63,9 @@
-
+
五险一金
yuthon.payroll.insurances
- [('yuthon_company','=','thtz')]
- tree
-
-
- 五险一金
- yuthon.payroll.insurances
- [('yuthon_company','=','thlc')]
- tree
-
-
- 五险一金
- yuthon.payroll.insurances
- [('yuthon_company','=','thwg')]
tree
diff --git a/yuthon_salary/views/yuthon_payroll_type_setting_views.xml b/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
index 1c9c3ed12..f0553fba6 100644
--- a/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
@@ -14,18 +14,5 @@
职级类别配置
yuthon.payroll.type.setting
tree
- [('yuthon_company', '=' , 'thtz')]
-
-
- 职级类别配置
- yuthon.payroll.type.setting
- tree
- [('yuthon_company', '=', 'thlc')]
-
-
- 职级类别配置
- yuthon.payroll.type.setting
- tree
- [('yuthon_company', '=', 'thwg')]
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 999ea1fd7..eb3755bc9 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -310,7 +310,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
+
+ parent="human_resources_salary_root_board"
+ action="yuthon_salary.yuthon_payroll_type_setting_action"
+ sequence="35"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sequence="40"/>
+ sequence="45"/>
+ sequence="50"/>