jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理冲突

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2023-06-16 10:02:33 +08:00
parent e9ad452c43
commit 018fecfc59
25 changed files with 2855 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
sf_base/views/tool_base_menu.xml
View File

@@ -11,7 +11,7 @@
</record>
<!-- 功能刀具action -->
<record id="action_sf_functional_cutting_tool" model="ir.actions.act_window">
<field name="name">功能刀具型号</field>
<field name="name">功能刀具</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.cutting.tool</field>
<field name="view_mode">tree,form</field>
@@ -100,17 +100,15 @@
<field name="res_model">sf.chuck.model</field>
<field name="view_mode">tree,form</field>
</record>
<!-- 刀具物料action -->
<record id="action_sf_cutting_tool_material" model="ir.actions.act_window">
<field name="name">刀具物料</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.cutting.tool.material</field>
<field name="view_mode">tree,form</field>
</record>
<!-- 刀具 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool" -->
<!-- parent="mrp.menu_mrp_configuration" -->
<!-- name="刀具" -->
<!-- sequence="3" -->
<!-- /> -->
<!-- 功能刀具 -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- 功能刀具 -->
<menuitem
id="menu_sf_functional_cutting_tool"
parent="menu_sf_base"
@@ -118,21 +116,15 @@
sequence="3"
action="action_sf_functional_cutting_tool"
/>
<!-- --><!-- 刀具物料 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool_material" -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- name="刀具物料" -->
<!-- sequence="1" -->
<!-- /> -->
<!-- 刀具物料 -->
<menuitem
id="menu_sf_cutting_tool_material"
parent="menu_sf_base"
name="刀具物料"
sequence="1"
action="action_sf_cutting_tool_material"
/>
<!-- --><!-- 刀头 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool_head" -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- name="刀头" -->
<!-- sequence="2" -->
<!-- /> -->
<!-- 整体式刀具 -->
<menuitem
@@ -238,7 +230,5 @@
sequence="64"
action="action_sf_cutting_tool_clamp_head_type"
/>
</data>
</odoo>