diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index 1df0bb399..695ecaca8 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -33,6 +33,7 @@ class YuthonOnboardApproval(models.Model): probation_period = fields.Selection([('zero', '0个月'), ('one', '1个月'), ('two', '2个月'), ('three', '3个月'), ('year', '1年')], string='试用期结束时间') duration_employment = fields.Date(string='劳动合同期限') + duration_employment_end = fields.Date(string='劳动合同结束时间') salary = fields.Float(string='基本工资') oter = fields.Text(string='其他约定') social_security = fields.Char(string='社保时长') diff --git a/yuthon_hr_employee_approval/views/menuitem.xml b/yuthon_hr_employee_approval/views/menuitem.xml index d06a3aa20..99f7976ed 100644 --- a/yuthon_hr_employee_approval/views/menuitem.xml +++ b/yuthon_hr_employee_approval/views/menuitem.xml @@ -27,6 +27,11 @@ parent="hr_process_work_job" action="yuthon_message_login_action" sequence="7"/> + @@ -44,11 +49,6 @@ parent="hr_set_process_menu" action="yuthon_leaving_approval_action" sequence="3"/> -
至 - +
diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py index 021b8d105..b87ecae3d 100644 --- a/yuthon_issue/models/issue_approval_decision.py +++ b/yuthon_issue/models/issue_approval_decision.py @@ -7,6 +7,7 @@ class IssueApprovalDecision(models.Model): _description = '决策清单' _order = 'sequence asc' + name = fields.Char(string='事项') sequence = fields.Char(string='序号', store=True) decision_id = fields.Many2one('issue.approval.decision', string='上级事项') diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 7549dbb86..b47d4063e 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -93,6 +93,11 @@ parent="hr_process_work_job_menu_board" action="yuthon_hr_employee_approval.yuthon_message_login_action" sequence="9"/> + + + - + sequence="5"/> + sequence="7"/>