diff --git a/yuthon_hr_attendance/models/__init__.py b/yuthon_hr_attendance/models/__init__.py index b5692b618..bc510373e 100644 --- a/yuthon_hr_attendance/models/__init__.py +++ b/yuthon_hr_attendance/models/__init__.py @@ -9,7 +9,6 @@ from . import card_approval from . import planning_template_inherit from . import overtime_page from . import inherit_planning_role -# from . import inherit_hr_employee from . import yuthon_shift_planning from . import yuthon_run_planning from . import duty_approval diff --git a/yuthon_issue/__manifest__.py b/yuthon_issue/__manifest__.py index ba4a8d6a6..cfbc983e4 100644 --- a/yuthon_issue/__manifest__.py +++ b/yuthon_issue/__manifest__.py @@ -23,7 +23,6 @@ 'views/inherit_room_booking.xml', 'views/issue_approval_decision_views.xml', 'views/issue_approval_decision_type_views.xml', - 'views/inherit_hr_employee_views.xml', 'views/issue_meeting_minutes_views.xml', 'report/meeting_minutes_report.xml', 'views/menus.xml', diff --git a/yuthon_issue/models/__init__.py b/yuthon_issue/models/__init__.py index 0f738ffb8..78f7d3ec4 100644 --- a/yuthon_issue/models/__init__.py +++ b/yuthon_issue/models/__init__.py @@ -6,6 +6,5 @@ from . import issue_approval_decision from . import issue_approval_decision_type from . import inherit_room_booking from . import issue_approval -# from . import inherit_hr_employee from . import issue_meeting_minutes diff --git a/yuthon_issue/models/inherit_hr_employee.py b/yuthon_issue/models/inherit_hr_employee.py deleted file mode 100644 index 2506e058c..000000000 --- a/yuthon_issue/models/inherit_hr_employee.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models - - -class YuthonHrEmployee(models.Model): - _inherit = "hr.employee" - - user_role_ids_changed = fields.Boolean(compute='_compute_user_roles') - - @api.depends('user_role_ids') - def _compute_user_roles(self): - group_mapping = { - '党支委议题': 'group_party_topic', - '班子会议题': 'group_team_topic', - '董事会议题': 'group_board_topic', - '议题管理员': 'group_topic_admin', - '物管议题管理员': 'group_property_admin', - '物管党支委议题': 'property_group_party_topic', - '物管班子会议题': 'property_group_team_topic', - '粮储党支委议题': 'group_grain_party_topic', - '粮储班子会议题': 'group_grain_team_topic', - '粮储议题管理员': 'group_grain_admin', - } - - old_users_ids = self.user_role_ids - for employee in self: - for role in employee.user_role_ids: - group_id = group_mapping.get(role.name) - if group_id: - group = self.env.ref('yuthon_issue.' + group_id, raise_if_not_found=False) - if group: - # 未知因素屏蔽选择值 - group.write({'users': [(4, employee.user_id.id)]}) - self.user_role_ids = old_users_ids - self.user_role_ids_changed = True diff --git a/yuthon_issue/views/inherit_hr_employee_views.xml b/yuthon_issue/views/inherit_hr_employee_views.xml deleted file mode 100644 index 146f35254..000000000 --- a/yuthon_issue/views/inherit_hr_employee_views.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - hr.employee.inherit.del.issue.form - hr.employee - - - - - - - - \ No newline at end of file