diff --git a/yuthon_announcement/views/announcement_manager_view.xml b/yuthon_announcement/views/announcement_manager_view.xml index 7924ef93a..c442e4aea 100644 --- a/yuthon_announcement/views/announcement_manager_view.xml +++ b/yuthon_announcement/views/announcement_manager_view.xml @@ -28,7 +28,6 @@ - diff --git a/yuthon_hr_employee/__init__.py b/yuthon_hr_employee/__init__.py index b4cda3c6b..0650744f6 100644 --- a/yuthon_hr_employee/__init__.py +++ b/yuthon_hr_employee/__init__.py @@ -1,13 +1 @@ from . import models -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models, _ - - -class TianHeHrEmployee(models.Model): - _inherit = "hr.employee" - - # 编号,用工形式,所属公司名称,员工编号,姓名,部门,岗位,办公电话,手机号码,最新职级,基本工资,职级工资,入职时间,转正时间,司龄,身份证号,身份中有效开始时间,身份证有效到期时间 - # 民族,性别,婚否,出生年月日,年龄,人员类别,退休日期,离退休年限,政治面貌,入团(党)时间,籍贯,户口所在地,户籍类型,最新合同开始日期,最新合同终止日期,参加工作时间,参加工作时间至今 - # 中断工作月数,累计工作月数,累计工作年限,最高学历,最高学位,全日制学历学位,毕业院校,专业,毕业时间,非全日制学历学位,毕业院校,专业,毕业时间,职级等级/签发日期(人事员),专业技术/技能等级(劳动局) - # 职业资格/考取日期, 职级变动,异动情况/移动日期,通讯地址,紧急联系人,称谓,电话,银行卡号,需补充材料,存档机构,最呕更新数据时间 \ No newline at end of file diff --git a/yuthon_hr_employee/views/yuthon_job_lv_views.xml b/yuthon_hr_employee/views/yuthon_job_lv_views.xml index ba58179eb..1e47b5138 100644 --- a/yuthon_hr_employee/views/yuthon_job_lv_views.xml +++ b/yuthon_hr_employee/views/yuthon_job_lv_views.xml @@ -1,9 +1,9 @@ - - yuthon.user.role.tree - yuthon.user.role + + yuthon.job.lv.tree + yuthon.job.lv @@ -11,16 +11,16 @@ - + 角色配置 - yuthon.user.role + yuthon.job.lv tree,form + sequence="7"/> \ No newline at end of file