!670 zhou

Merge pull request !670 from 李鹏宇/dev

yuthon_hr_employee/wizard/hr_employee_wizard.py

@@ -67,7 +67,7 @@ class YuthonHrEmployeeWizard(models.Model):
         employee_date = {
             'number':row[0].value, # 序号
             'name': row[1].value,  # 姓名
-            'work_phone': row[2].value if row[2].value else None,
+            'mobile_phone': row[2].value if row[2].value else None,
             'user_role_id': user_role_id.id if user_role_id else None,
             'job_id': job_id[0].id if job_id else None,
             'use_user_type': use_user_type_dict.get(row[5].value) if row[5].value else None,  # 用工形式

yuthon_work_brand/views/hr_menus.xml

@@ -258,11 +258,6 @@
               name="休假类型"
               parent="holiday_set_menu_board"
               sequence="1"/>
-    <menuitem id="holiday_set_type_board1"
-              name="全部"
-              parent="holiday_set_type_board"
-              action="yuthon_holiday.action_leave_type_form"
-              sequence="1"/>
     <menuitem id="holiday_set_type_board2"
               name="天河投资"
               parent="holiday_set_type_board"