Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程
This commit is contained in:
@@ -19,9 +19,9 @@
|
||||
'views/functional_tool_views.xml',
|
||||
'views/mrp_workcenter_views.xml',
|
||||
'views/sf_maintenance_equipment.xml',
|
||||
'views/menu_view.xml',
|
||||
'views/tool_material_search.xml',
|
||||
'views/fixture_material_search_views.xml',
|
||||
'views/menu_view.xml',
|
||||
'data/tool_data.xml',
|
||||
],
|
||||
'demo': [
|
||||
|
||||
@@ -95,12 +95,4 @@
|
||||
<field name="res_model">sf.fixture.material.search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
sequence="25"
|
||||
name="夹具物料查询"
|
||||
id="menu_sf_fixture_material_search"
|
||||
action="action_sf_fixture_material_search"
|
||||
parent="menu_sf_fixture"
|
||||
/>
|
||||
</odoo>
|
||||
@@ -120,5 +120,13 @@
|
||||
parent="menu_sf_tool_material"
|
||||
/>
|
||||
|
||||
<menuitem
|
||||
sequence="25"
|
||||
name="夹具物料查询"
|
||||
id="menu_sf_fixture_material_search"
|
||||
action="action_sf_fixture_material_search"
|
||||
parent="menu_sf_fixture"
|
||||
/>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user