!229 zhou

Merge pull request !229 from 李鹏宇/dev_zhou

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='社保时长')

yuthon_hr_employee_approval/views/menuitem.xml

@@ -27,6 +27,11 @@
                   parent="hr_process_work_job"
                   action="yuthon_message_login_action"
                   sequence="7"/>
+         <menuitem id="hr_menu_prepare_approval"
+                  name="编制调整申请表"
+                  parent="hr_process_work_job"
+                  action="yuthon_prepare_approval_action"
+                  sequence="5"/>
 
 
         <!--人事管理 -->
@@ -44,11 +49,6 @@
                   parent="hr_set_process_menu"
                   action="yuthon_leaving_approval_action"
                   sequence="3"/>
-        <menuitem id="hr_menu_prepare_approval"
-                  name="编制调整申请表"
-                  parent="hr_set_process_menu"
-                  action="yuthon_prepare_approval_action"
-                  sequence="5"/>
         <menuitem id="hr_menu_rank_approval"
                   name="职级调整申请表"
                   parent="hr_set_process_menu"

yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml

@@ -56,7 +56,7 @@
                         <label for="duration_employment"/>
                         <div>
                             <field name="duration_employment" class="oe_inline"/>至
-                            <field name="duration_employment" class="oe_inline"/>
+                            <field name="duration_employment_end" class="oe_inline"/>
                         </div>
                     </group>
                     <group col="2">

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='上级事项')

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"/>
+    <menuitem id="hr_menu_prepare_approval_root_board"
+              name="编制调整申请表"
+              parent="hr_process_work_job_menu_board"
+              action="yuthon_hr_employee_approval.yuthon_prepare_approval_action"
+              sequence="11"/>
     <menuitem id="hr_recruitment_app2_menu_board"
               name="应用"
               parent="hr_recruitment_setting_menu_board"
@@ -137,6 +142,8 @@
               parent="hr_recruitment_setting_menu_board"
               action="hr_recruitment.hr_applicant_category_action"
               sequence="15"/>
+
+
     <!--  人事  -->
     <menuitem id="hr_menu_root_board"
               name="人事管理"
@@ -189,21 +196,16 @@
               parent="hr_set_process_menu_root_board"
               action="yuthon_hr_employee_approval.yuthon_leaving_approval_action"
               sequence="3"/>
-    <menuitem id="hr_menu_prepare_approval_root_board"
-              name="编制调整申请表"
-              parent="hr_set_process_menu_root_board"
-              action="yuthon_hr_employee_approval.yuthon_prepare_approval_action"
-              sequence="5"/>
     <menuitem id="hr_menu_rank_approval_root_board"
               name="职级调整申请表"
               parent="hr_set_process_menu_root_board"
               action="yuthon_none_action"
-              sequence="7"/>
+              sequence="5"/>
     <menuitem id="hr_menu_reassignment_approval_root_board"
               name="调岗申请"
               parent="hr_set_process_menu_root_board"
               action="yuthon_hr_employee_approval.yuthon_reassignment_approval_action"
-              sequence="9"/>
+              sequence="7"/>
     <menuitem id="hr_menu_reward_approval_root_board"
               name="员工奖罚"
               parent="hr_set_process_menu_root_board"