diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py
index 0328fc66f..e779d3dcd 100644
--- a/yuthon_hr_attendance/__manifest__.py
+++ b/yuthon_hr_attendance/__manifest__.py
@@ -12,7 +12,7 @@
'category': 'Human Resources/Attendances',
'sequence': 240,
'website': 'https://www.pengyuthon.com',
- 'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail', 'soong_workflow','yuthon_issue'],
+ 'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail', 'soong_workflow','yuthon_issue','planning'],
'data': [
'security/ir.model.access.csv',
# 'security/approval_attendance.xml',
diff --git a/yuthon_hr_attendance/models/__init__.py b/yuthon_hr_attendance/models/__init__.py
index 27a7adb7d..4ec4d0507 100644
--- a/yuthon_hr_attendance/models/__init__.py
+++ b/yuthon_hr_attendance/models/__init__.py
@@ -21,7 +21,7 @@ from . import remove_holiday_approval
from . import card_approval
from . import planning_template_inherit
from . import overtime_page
-
+from . import inherit_planning_role
diff --git a/yuthon_hr_attendance/models/inherit_planning_role.py b/yuthon_hr_attendance/models/inherit_planning_role.py
new file mode 100644
index 000000000..010354756
--- /dev/null
+++ b/yuthon_hr_attendance/models/inherit_planning_role.py
@@ -0,0 +1,8 @@
+from odoo import api, fields, models, tools
+from odoo.exceptions import ValidationError
+
+
+class PlanningRole(models.Model):
+ _inherit = 'planning.role'
+
+ name = fields.Char(string='班次名称', required=True)
diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py
index 0b921037b..0417339f6 100644
--- a/yuthon_hr_employee/__manifest__.py
+++ b/yuthon_hr_employee/__manifest__.py
@@ -11,7 +11,7 @@
'license': 'LGPL-3',
'author': 'pengyuthon',
'website': 'https://www.pengyuthon.com',
- 'depends': ['base', 'hr', 'hr_recruitment', 'soong_workflow'],
+ 'depends': ['base', 'hr', 'hr_recruitment', 'soong_workflow','documents'],
'data': [
'data/yuthon.job.lv.csv',
'data/job_lv_groups_data.xml',
diff --git a/yuthon_hr_employee/models/inherit_hr_applicant.py b/yuthon_hr_employee/models/inherit_hr_applicant.py
index 1d2536d96..7f3eb69ea 100644
--- a/yuthon_hr_employee/models/inherit_hr_applicant.py
+++ b/yuthon_hr_employee/models/inherit_hr_applicant.py
@@ -15,7 +15,7 @@ class HrApplicant(models.Model):
original_position = fields.Char(string='原工作岗位')
previous_position = fields.Char(string='原职务')
status_first = fields.Selection([('in_service', '尚在职'), ('retired', '办理离职'), ('leaving', '已离职')] ,string='现就业状态')
- documents_ids = fields.Many2many('documents.document', string="附件")
+ documents_ids = fields.Many2many('ir.attachment', string="附件")
tage_ids = fields.Many2many('applicant.tage.setting', string="应聘标签")
is_interview_status = fields.Boolean(string="面试状态")
diff --git a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
index 0b5e35470..4b1a8100d 100644
--- a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/yuthon_hr_employee_approval/controllers/employee_login.py b/yuthon_hr_employee_approval/controllers/employee_login.py
index 1875192bf..7eaa8fbba 100644
--- a/yuthon_hr_employee_approval/controllers/employee_login.py
+++ b/yuthon_hr_employee_approval/controllers/employee_login.py
@@ -20,15 +20,15 @@ class EmployeeLogin(Controller):
values['political'] = record.political
values['email'] = record.email
values['home_address'] = record.home_address
- values['sex'] = record.sex
- values['date_birth'] = record.date_birth.strftime('%Y/%m/%d')
- values['party_time'] = record.party_time.strftime('%Y/%m/%d')
- values['marital_status'] = record.marital_status
- values['working_time'] = record.working_time.strftime('%Y/%m/%d')
+ # values['sex'] = record.sex
+ # values['date_birth'] = record.date_birth.strftime('%Y/%m/%d')
+ # values['party_time'] = record.party_time.strftime('%Y/%m/%d')
+ # values['marital_status'] = record.marital_status
+ # values['working_time'] = record.working_time.strftime('%Y/%m/%d')
values['home_phone'] = record.home_phone
values['origin'] = record.origin
values['nation'] = record.nation
- values['house_type'] = 'city'
+ # values['house_type'] = 'city'
values['current_address'] = record.current_address
values['house_hold'] = record.house_hold
if request.httprequest.method == 'POST':
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 2ad58b0b6..81fb56acf 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -400,14 +400,14 @@
sequence="9"/>
+ sequence="1"/>
+ sequence="2"/>