diff --git a/yuthon_hr_employee/models/inherit_hr_job.py b/yuthon_hr_employee/models/inherit_hr_job.py
index f32b6aaab..c24ca3e05 100644
--- a/yuthon_hr_employee/models/inherit_hr_job.py
+++ b/yuthon_hr_employee/models/inherit_hr_job.py
@@ -13,7 +13,6 @@ class HrJob(models.Model):
]
number = fields.Char(string="序号")
- yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), ('thlc', '天河粮储')], string="所属公司")
job_type_id = fields.Many2one('hr.job.type', string="岗位类别")
start_date = fields.Date(string="生效日期", default=lambda self: fields.Date.today())
end_date = fields.Date(string="失效日期", default=fields.Date.from_string('2099-01-01'))
diff --git a/yuthon_hr_employee/models/yuthon_hr_department.py b/yuthon_hr_employee/models/yuthon_hr_department.py
index 1c145e3ce..4ab518130 100644
--- a/yuthon_hr_employee/models/yuthon_hr_department.py
+++ b/yuthon_hr_employee/models/yuthon_hr_department.py
@@ -8,12 +8,7 @@ class YuthonHrDepartment(models.Model):
_rec_name = 'name'
_order = 'department_code asc'
- def change_company_id(self):
- company_dict = {'thtz':'集团本部', 'thwg':'天河物管', 'thlc':'天河粮储', }
- employee_ids = self.browse(self._context.get('active_ids', self._context.get('active_id')))
- for i in employee_ids:
- company_id = self.env['res.company'].search([('name', '=', company_dict[i.yuthon_company])])
- i.company_id = company_id
+
department_phone = fields.Char(string="部门电话")
department_fax = fields.Char(string="部门传真")
@@ -21,8 +16,6 @@ class YuthonHrDepartment(models.Model):
department_function = fields.Char(string="部门职能")
is_institution = fields.Boolean(string="是否机构")
is_global_department = fields.Boolean(string="是否全局部门")
- yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'),
- ('thlc', '天河粮储')], default='thtz', store=True, compute="_compute_company",string="所属公司")
create_date = fields.Date(string="创建时间", default=fields.Date.today())
start_date = fields.Date(string="生效日期", default=fields.Date.today())
expiration_date = fields.Date(string="失效日期", default=fields.Date.today())
diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index 59545d7bd..4b33171ff 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -26,13 +26,6 @@ class YuthonHrEmployee(models.Model):
_inherit = "hr.employee"
_order = 'number asc'
- def change_company_id(self):
- company_dict = {'thtz':'集团本部', 'thwg':'天河物管', 'thlc':'天河粮储', }
- employee_ids = self.browse(self._context.get('active_ids', self._context.get('active_id')))
- for i in employee_ids:
- company_id = self.env['res.company'].search([('name', '=', company_dict[i.yuthon_company])])
- i.company_id = company_id
- # odoo里是这样做的,一个用户可以多个公司绑定多个员工,每个员工都有自己的部门和岗位
user_role_ids_changed = fields.Boolean(string="xxx") # bug
wecom_userid = fields.Char(string="成员UserID", default="")
number = fields.Char(string="序号", store=True)
@@ -42,10 +35,6 @@ class YuthonHrEmployee(models.Model):
('formal_none', '正式合同(无固定)'),
('part_time', '兼职协议'), ('employment', '用工协议'), ('internship', '实习协议')], string="用工形式")
- contract_company = fields.Selection([('thtz', '天河投资'), ('thwg', '天河物管'),
- ('thlc', '天河粮储'), ('ttcj','天投城建')], default='thtz', string="合同所属公司")
- yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'),
- ('thlc', '天河粮储')], default='thtz', store=True, compute="compute_company", string="所属公司")
# 个人信息
user_salary = fields.Float(string="基本工资")
job_lv_salary = fields.Float(string="职级工资")
diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml
index b702142b9..a3a5949f5 100644
--- a/yuthon_hr_employee/views/inherit_hr_job_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml
@@ -34,7 +34,6 @@
-
diff --git a/yuthon_hr_employee/views/yuthon_hr_department_views.xml b/yuthon_hr_employee/views/yuthon_hr_department_views.xml
index d1eb8bbf5..c28389a49 100644
--- a/yuthon_hr_employee/views/yuthon_hr_department_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_department_views.xml
@@ -29,7 +29,6 @@
-
diff --git a/yuthon_salary/models/inherit_hr_payroll_structure_type.py b/yuthon_salary/models/inherit_hr_payroll_structure_type.py
index 1af1d8c0f..82f040ee3 100644
--- a/yuthon_salary/models/inherit_hr_payroll_structure_type.py
+++ b/yuthon_salary/models/inherit_hr_payroll_structure_type.py
@@ -5,5 +5,4 @@ class HrPayrollStructureType(models.Model):
_inherit = 'hr.payroll.structure.type'
_description = '职级类别'
- name = fields.Char(string='职级类型', required=True)
- yuthon_company = fields.Selection([])
\ No newline at end of file
+ name = fields.Char(string='职级类型', required=True)
\ 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 1f84d935d..3bb26703d 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -29,12 +29,12 @@
-
-
-
-
-
-
+
+
+
+
+
+