添加功能

soong_workflow/models/soong_approval_group.py

@@ -6,5 +6,5 @@ class SoongApprovalGroup(models.Model):
     _name = 'soong.approval.group'
     _order = 'sequence'
 
-    name = fields.Char(string="分组名称")
+    name = fields.Char(string="分组")
     sequence = fields.Integer(default=1)

yuthon_hr_attendance/models/yuthon_shift_approval.py

@@ -19,7 +19,7 @@ class YuthonShiftApproval(models.Model):
     shift_id = fields.Many2one('planning.slot', string="申请人班次1")
     shift_two_id = fields.Many2one('planning.slot', string="申请人班次2")
     return_id = fields.Many2one('planning.slot', string="调班人班次1")
-    return_two_id = fields.Many2one('planning.slot', string="申请人班次2")
+    return_two_id = fields.Many2one('planning.slot', string="调班人班次2")
     department_id = fields.Many2one('hr.department', string="部门", related='resource_id.employee_id.department_id')
     resource_ids = fields.Many2many('resource.resource', string="资源用户列表")
     is_issues = fields.Boolean(string='是否上会')

yuthon_hr_attendance/views/resource_calendar_leaves_views.xml

@@ -66,14 +66,14 @@
             </xpath>
         </field>
     </record>
-    <record id="yuthon_resource_calendar_leaves_tree" model="ir.ui.view">
-        <field name="name">resource.calendar.leaves.tree</field>
-        <field name="model">resource.calendar.leaves</field>
-        <field name="inherit_id" ref="hr_holidays.resource_calendar_leaves_tree_inherit"/>
-        <field name="arch" type="xml">
-            <xpath expr="//tree/field[@name='date_to']" position="after">
-                <field name="is_holidays" string="人员"/>
-            </xpath>
-        </field>
-    </record>
+<!--    <record id="yuthon_resource_calendar_leaves_tree" model="ir.ui.view">-->
+<!--        <field name="name">resource.calendar.leaves.tree</field>-->
+<!--        <field name="model">resource.calendar.leaves</field>-->
+<!--        <field name="inherit_id" ref="hr_holidays.resource_calendar_leaves_tree_inherit"/>-->
+<!--        <field name="arch" type="xml">-->
+<!--            <xpath expr="//tree/field[@name='date_to']" position="after">-->
+<!--                <field name="is_holidays" string="人员"/>-->
+<!--            </xpath>-->
+<!--        </field>-->
+<!--    </record>-->
 </odoo>

yuthon_hr_employee/controllers/employee_banner_route.py

@@ -10,20 +10,20 @@ class EmployeeBannerRoute(Controller):
         in_hired_count = employees.search_count([])  # 在职
         all_hired_count = employees.search_count([])  # 全职
         return {
-            'html': f"""
-                    <div style="display: flex; justify-content: space-around; align-items: center; text-align: center; padding: 20px; width: 100%;margin-top:25px;margin-bottom:25px;">
-                        <div style="flex: 1; padding: 20px;">
-                            <h2>正式</h2>
-                            <p style="font-size: 24px; color: #4CAF50;">{hired_count}</p>
-                        </div>
-                        <div style="flex: 1; padding: 20px;">
-                            <h2>在职</h2>
-                            <p style="font-size: 24px; color: #2196F3;">{in_hired_count}</p>
-                        </div>
-                        <div style="flex: 1; padding: 20px;">
-                            <h2>全职</h2>
-                            <p style="font-size: 24px; color: #FF5722;">{all_hired_count}</p>
-                        </div>
-                    </div>
-                """
+            # 'html': f"""
+            #         <div style="display: flex; justify-content: space-around; align-items: center; text-align: center; padding: 20px; width: 100%;margin-top:25px;margin-bottom:25px;">
+            #             <div style="flex: 1; padding: 20px;">
+            #                 <h2>正式</h2>
+            #                 <p style="font-size: 24px; color: #4CAF50;">{hired_count}</p>
+            #             </div>
+            #             <div style="flex: 1; padding: 20px;">
+            #                 <h2>在职</h2>
+            #                 <p style="font-size: 24px; color: #2196F3;">{in_hired_count}</p>
+            #             </div>
+            #             <div style="flex: 1; padding: 20px;">
+            #                 <h2>全职</h2>
+            #                 <p style="font-size: 24px; color: #FF5722;">{all_hired_count}</p>
+            #             </div>
+            #         </div>
+            #     """
         }

yuthon_work_brand/views/hr_menus.xml

@@ -314,9 +314,9 @@
     <!--  薪资管理  -->
     <menuitem id="human_resources_salary_root_board"
               name="薪资管理"
-              parent="human_resources_menu_root_board"
+              web_icon="yuthon_work_brand,static/description/salary.png"
               groups="yuthon_hr_employee.group_hr_employee_salary_user"
-              sequence="11"/>
+              sequence="9"/>
     <menuitem id="human_work_entry_board"
               name="工作分录"
               parent="human_resources_salary_root_board"
@@ -355,15 +355,15 @@
               parent="human_pay_setting_structural_tt_board"
               action="yuthon_salary.view_yuthon_payroll_tt_common_action"
               sequence="5"/>
-    <menuitem id="hr_payroll_temporary_tt_board"
-              name="临时项"
-              parent="human_pay_setting_structural_tt_board"
-              action="yuthon_salary.view_yuthon_payroll_tt_temporary_action"
-              sequence="7"/>
     <menuitem id="hr_payroll_insurance_tt_board"
               name="五险一金"
               parent="human_pay_setting_structural_tt_board"
               action="yuthon_salary.view_yuthon_payroll_tt_insurances_action"
+              sequence="7"/>
+    <menuitem id="hr_payroll_temporary_tt_board"
+              name="临时项"
+              parent="human_pay_setting_structural_tt_board"
+              action="yuthon_salary.view_yuthon_payroll_tt_temporary_action"
               sequence="9"/>
 <!--    <menuitem id="human_pay_setting_payroll_items_tt_board"-->
 <!--              name="工资项"-->
@@ -394,15 +394,15 @@
               parent="human_pay_setting_structural_lc_board"
               action="yuthon_salary.view_yuthon_payroll_lc_common_action"
               sequence="5"/>
-    <menuitem id="hr_payroll_temporary_lc_board"
-              name="临时项"
-              parent="human_pay_setting_structural_lc_board"
-              action="yuthon_salary.view_yuthon_payroll_lc_temporary_action"
-              sequence="7"/>
     <menuitem id="hr_payroll_insurances_lc_board"
               name="五险一金"
               parent="human_pay_setting_structural_lc_board"
               action="yuthon_salary.view_yuthon_payroll_lc_insurances_action"
+              sequence="7"/>
+    <menuitem id="hr_payroll_temporary_lc_board"
+              name="临时项"
+              parent="human_pay_setting_structural_lc_board"
+              action="yuthon_salary.view_yuthon_payroll_lc_temporary_action"
               sequence="9"/>
 <!--    <menuitem id="human_pay_setting_payroll_items_lc_board"-->
 <!--              name="工资项"-->
@@ -433,15 +433,15 @@
               parent="human_pay_setting_structural_wg_board"
               action="yuthon_salary.view_yuthon_payroll_wg_common_action"
               sequence="7"/>
-    <menuitem id="hr_payroll_temporary_wg_board"
-              name="临时项"
-              parent="human_pay_setting_structural_wg_board"
-              action="yuthon_salary.view_yuthon_payroll_wg_temporary_action"
-              sequence="9"/>
     <menuitem id="hr_payroll_insurance_wg_board"
               name="五险一金"
               parent="human_pay_setting_structural_wg_board"
               action="yuthon_salary.view_yuthon_payroll_wg_insurances_action"
+              sequence="9"/>
+    <menuitem id="hr_payroll_temporary_wg_board"
+              name="临时项"
+              parent="human_pay_setting_structural_wg_board"
+              action="yuthon_salary.view_yuthon_payroll_wg_temporary_action"
               sequence="11"/>
 <!--    <menuitem id="human_pay_setting_payroll_items_wg_board"-->
 <!--              name="工资项"-->