!8104 !8103 添加功能

Merge pull request !8104 from 李鹏宇/dev

soong_workflow/models/soong_workflow_mixin.py

@@ -894,7 +894,7 @@ class SoongWorkflowMixin(models.AbstractModel):
                         if button.has_icon:
                             btn_exec_action_el.set("icon", button.icon)
                         # 接下来是隐藏的配置
-                        invisible = "not id or state != '{0}' ".format(str(node.node_name))
+                        invisible = "state != '{0}' ".format(str(node.node_name))
                         if button.review_type == 'user_role':
                             # 构建角色条件
                             role_domain = []

yuthon_hr_attendance/__manifest__.py

@@ -26,7 +26,6 @@
         'report/go_approval_templates.xml',
         'views/hr_attendance_views.xml',
         'views/resource_calendar_leaves_views.xml',
-        'views/yuthon_meal_case_view.xml',
         'views/inherit_hr_employee.xml',
         'views/inherit_planning_role_views.xml',
         'views/inherit_planning_slot_views.xml',

yuthon_hr_attendance/views/yuthon_meal_case_view.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="view_yuthon_meal_case_tree" model="ir.ui.view">
-        <field name="name">yuthon.meal.case.tree</field>
-        <field name="model">yuthon.meal.case</field>
-        <field name="arch" type="xml">
-            <tree string="误餐情况" editable="bottom">
-                <field name="employee_id"/>
-                <field name="number"/>
-            </tree>
-        </field>
-    </record>
-    <record id="view_yuthon_meal_case_action" model="ir.actions.act_window">
-        <field name="name">误餐情况</field>
-        <field name="res_model">yuthon.meal.case</field>
-        <field name="view_mode">tree</field>
-    </record>
-</odoo>
-

yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml

@@ -558,7 +558,7 @@
         <field name="res_model">yuthon.vacation.reports</field>
         <field name="view_mode">tree</field>
         <field name="domain">[('meal_fee', '!=', 0)]</field>
-        <field name="context">{'search_default_group_by_employee_id': 1, 'search_default_group_by_vacation_month': True}</field>
+        <field name="context">{'search_default_group_by_vacation_month': True}</field>
          <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_attendance.view_yuthon_vacation_meal_tree')}),]"/>
     </record>