diff --git a/yuthon_hr_attendance/security/ir.model.access.csv b/yuthon_hr_attendance/security/ir.model.access.csv index 9f12e96ed..20b4fa5d0 100644 --- a/yuthon_hr_attendance/security/ir.model.access.csv +++ b/yuthon_hr_attendance/security/ir.model.access.csv @@ -43,10 +43,10 @@ access_hr_attendance_detail_image_user,hr.attendance.detail.image.user,model_hr_ access_hr_attendance_detail_image_manager,hr.attendance.detail.image.manager,model_hr_attendance_detail_image,base.group_user,1,1,1,1 -access_hr_attendance_year_manager,hr.attendance.year.manager,model_hr_attendance_year,group_he_attendance_manager,1,1,1,1 -access_hr_attendance_month_manager,hr.attendance.month.manager,model_hr_attendance_month,group_he_attendance_manager,1,1,0,1 -access_hr_attendance_month_detail_user,hr.attendance.month.detail.user,model_hr_attendance_month_detail,group_he_attendance_manager,1,0,0,0 -access_hr_attendance_month_detail_manager,hr.attendance.month.detail.manager,model_hr_attendance_month_detail,group_he_attendance_manager,1,1,1,1 -access_hr_attendance_month_wizard_manager,hr.attendance.month.wizard.manager,model_hr_attendance_month_wizard,group_he_attendance_manager,1,1,1,1 -access_yuthon_delete_planning_wizard,yuthon.delete.planning.wizard,model_yuthon_delete_planning_wizard,group_he_attendance_manager,1,1,1,1 +access_hr_attendance_year_manager,hr.attendance.year.manager,model_hr_attendance_year,base.group_user,1,1,1,1 +access_hr_attendance_month_manager,hr.attendance.month.manager,model_hr_attendance_month,base.group_user,1,1,0,1 +access_hr_attendance_month_detail_user,hr.attendance.month.detail.user,model_hr_attendance_month_detail,base.group_user,1,0,0,0 +access_hr_attendance_month_detail_manager,hr.attendance.month.detail.manager,model_hr_attendance_month_detail,base.group_user,1,1,1,1 +access_hr_attendance_month_wizard_manager,hr.attendance.month.wizard.manager,model_hr_attendance_month_wizard,base.group_user,1,1,1,1 +access_yuthon_delete_planning_wizard,yuthon.delete.planning.wizard,model_yuthon_delete_planning_wizard,base.group_user,1,1,1,1 diff --git a/yuthon_hr_attendance/views/all_attendance_menu.xml b/yuthon_hr_attendance/views/all_attendance_menu.xml index 06e664a65..96316417e 100644 --- a/yuthon_hr_attendance/views/all_attendance_menu.xml +++ b/yuthon_hr_attendance/views/all_attendance_menu.xml @@ -9,8 +9,6 @@ name="月度考勤" parent="hr_attendance_root_board" sequence="4"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -77,7 +72,7 @@ - + \ No newline at end of file diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py index 7bca122c9..caf76040f 100644 --- a/yuthon_salary/models/inherit_hr_payroll_structure.py +++ b/yuthon_salary/models/inherit_hr_payroll_structure.py @@ -23,7 +23,6 @@ class HrPayrollStructure(models.Model): position_subsidy = fields.Monetary(string="岗位补贴", currency_field="currency_id") integrated_subsidy = fields.Monetary(string="综合补贴", currency_field="currency_id") advance_performance_bonuses = fields.Monetary(string="预发绩效奖金", currency_field="currency_id") - yuthon_company = fields.Selection([]) @api.model def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True): diff --git a/yuthon_work_brand/__manifest__.py b/yuthon_work_brand/__manifest__.py index e07dfb68a..6c357af69 100644 --- a/yuthon_work_brand/__manifest__.py +++ b/yuthon_work_brand/__manifest__.py @@ -11,7 +11,6 @@ ], 'data': [ 'security/ir.model.access.csv', - 'security/yuthon_xingzheng_groups.xml', 'views/yuthon_none_views.xml', 'views/hr_menus.xml', 'views/executive_manage.xml', diff --git a/yuthon_work_brand/security/yuthon_xingzheng_groups.xml b/yuthon_work_brand/security/yuthon_xingzheng_groups.xml deleted file mode 100644 index fcf60cc57..000000000 --- a/yuthon_work_brand/security/yuthon_xingzheng_groups.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - 行政管理 - - - - 用户 - - - - - 管理员 - - - - - - - 行政管理 - - - - 用户 - - - \ No newline at end of file diff --git a/yuthon_work_brand/views/executive_manage.xml b/yuthon_work_brand/views/executive_manage.xml index 16090d845..2fabd11fe 100644 --- a/yuthon_work_brand/views/executive_manage.xml +++ b/yuthon_work_brand/views/executive_manage.xml @@ -3,7 +3,6 @@ \ No newline at end of file