Merge pull request !272 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-10-12 03:53:47 +00:00
committed by Gitee
2 changed files with 27 additions and 49 deletions
+17 -39
View File
@@ -4,96 +4,74 @@
<field name="active">False</field>
</record>
<menuitem id="executive_manage_menu_root"
name="行政管理"
web_icon="yuthon_work_brand,static/description/manage.png"
sequence="1"/>
<menuitem id="executive_manage_union_root"
name="工会"
parent="executive_manage_menu_root"
sequence="1"/>
<menuitem id="executive_manage_welfare"
name="福利"
parent="executive_manage_union_root"
sequence="1"/>
<menuitem id="executive_manage_activities"
name="活动"
parent="executive_manage_union_root"
action="yuthon_trade_none_tree_action"
sequence="3"/>
<menuitem id="executive_manage_insurance"
name="保险"
parent="executive_manage_union_root"
action="yuthon_trade_none_tree_action"
sequence="5"/>
<menuitem id="executive_manage_approval"
name="审批"
parent="yuthon_work_brand.executive_manage_union_root_board"
sequence="7"/>
<menuitem id="executive_manage_expenses"
name="费用"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="yuthon_trade_none_tree_action"
sequence="7"/>
<menuitem id="executive_personal_condolences"
name="个人慰问"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_personal_condolences"
sequence="9"/>
<menuitem id="executive_work_condolences"
name="节日慰问"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_work_condolences"
sequence="11"/>
<menuitem id="executive_trade_activities"
name="工会活动"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_activities"
sequence="13"/>
<menuitem id="executive_trade_borrowing"
name="借支"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_borrowing"
sequence="15"/>
<menuitem id="executive_trade_contract"
name="合同审批"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_contract"
sequence="17"/>
<menuitem id="executive_trade_pay"
name="付款"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_pay"
sequence="19"/>
<menuitem id="executive_trade_policy"
name="保单列表"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_policy"
sequence="21"/>
<menuitem id="executive_trade_premium"
name="缴保申请表"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_premium"
sequence="23"/>
<menuitem id="executive_trade_purchase"
name="采购"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_purchase"
sequence="25"/>
<menuitem id="executive_trade_refund"
name="退款"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_refund"
sequence="27"/>
<menuitem id="executive_trade_supportive"
name="互助申请表"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_supportive"
sequence="29"/>
<menuitem id="executive_trade_reimbursed"
name="报销"
parent="executive_manage_union_root"
parent="executive_manage_approval"
action="action_yuthon_trade_reimbursed"
sequence="31"/>
</odoo>
+10 -10
View File
@@ -19,17 +19,17 @@
parent="executive_manage_union_root_board"
sequence="1"/>
<menuitem id="executive_manage_holiday_condolences_board"
name="节日慰问"
parent="executive_manage_welfare_board"
action="yuthon_none_action"
sequence="1"/>
<!-- <menuitem id="executive_manage_holiday_condolences_board"-->
<!-- name="节日慰问"-->
<!-- parent="executive_manage_welfare_board"-->
<!-- action="yuthon_none_action"-->
<!-- sequence="1"/>-->
<menuitem id="executive_manage_personal_condolences_board"
name="个人慰问"
parent="executive_manage_welfare_board"
action="yuthon_none_action"
sequence="3"/>
<!-- <menuitem id="executive_manage_personal_condolences_board"-->
<!-- name="个人慰问"-->
<!-- parent="executive_manage_welfare_board"-->
<!-- action="yuthon_none_action"-->
<!-- sequence="3"/>-->
<menuitem id="executive_manage_activities_board"
name="活动"