!2803 !2802 添加功能

Merge pull request !2803 from 李鹏宇/dev

yuthon_salary/models/inherit_hr_payroll_structure.py

@@ -174,4 +174,4 @@ class HrPayrollStructure(models.Model):
             self._context.get('active_ids', self._context.get('active_id')))
         for payroll in payroll_ids:
             for rule in payroll.rule_ids:
-                rule.sudo().unlink()
+                rule.sudo().unlink()

yuthon_salary/models/yuthon_payroll_project.py

@@ -209,5 +209,3 @@ class YuthonPayrollInsurances (models.Model):
                     sal.write({'rule_ids': rule_list})
                 else:
                     sal.rule_ids.search([('name', '=', ins.name)]).write({'amount_python_compute': formula_salary})
-
-

yuthon_work_brand/views/hr_menus.xml

@@ -144,6 +144,16 @@
               sequence="40" action="yuthon_hr_attendance.hr_attendance_year_action"/>
     <menuitem id="menu_hr_attendance_month_detail_view_attendances" name="考勤详情"
               parent="menu_hr_attendance_month_board" sequence="50" action="yuthon_hr_attendance.hr_attendance_month_detail_action"/>
+     <menuitem id="holiday_overview_menu_board"
+              name="假期管理"
+              parent="hr_attendance_root_board_menu"
+              action="hr_holidays.action_hr_holidays_dashboard"
+              sequence="12"/>
+        <menuitem id="holiday_my_allocation_menu_board"
+              name="假期余额"
+              parent="holiday_manage_menu_root_board"
+              action="hr_holidays.hr_leave_allocation_action_my"
+              sequence="13"/>
     <menuitem id="menu_hr_attendance_detail_view_attendances"
               name="打卡详情"
               parent="hr_attendance_root_board_menu"
@@ -521,11 +531,6 @@
               name="考勤"
               web_icon="yuthon_work_brand,static/description/holiday.png"
               sequence="29"/>
-    <menuitem id="holiday_overview_menu_board"
-              name="假期管理"
-              parent="holiday_manage_menu_root_board"
-              action="hr_holidays.action_hr_holidays_dashboard"
-              sequence="1"/>
     <menuitem id="menu_hr_attendance_my_record_board"
               name="我的考勤"
               parent="holiday_manage_menu_root_board"
@@ -536,11 +541,6 @@
               parent="holiday_manage_menu_root_board"
               sequence="10"
               action="yuthon_hr_attendance.hr_attendance_month_my_detail_action"/>
-    <menuitem id="holiday_my_allocation_menu_board"
-              name="假期余额"
-              parent="holiday_manage_menu_root_board"
-              action="hr_holidays.hr_leave_allocation_action_my"
-              sequence="4"/>
      <menuitem id="menu_hr_attendance_approval_request_board"
               name="流程"
               parent="holiday_manage_menu_root_board"