pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] branch merged with trunk-reorganise-menus-mrp-mtr

Browse Source 
bzr revid: mtr@tinyerp.com-20120301093951-lt949m6uf7agn3xf
This commit is contained in:
Meera Trambadia (OpenERP)
2012-03-01 15:09:51 +05:30
parent e71848cee4 8769a5fea8
commit 591f5bc7f9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/mrp_view.xml
+3 -3
View File
@@ -304,7 +304,7 @@
<field name="search_view_id" ref="mrp_routing_search_view"/>
<field name="help">Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
</record>
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="1"/>
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="15"/>
<!--
Bill of Materials
@@ -1012,7 +1012,7 @@
</record>
<menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
<menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="mrp.menu_mrp_bom" sequence="25"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
@@ -1022,7 +1022,7 @@
parent="base.menu_mrp_root" sequence="2"
groups="base.group_extended"/>
<menuitem action="mrp.mrp_production_action_planning"
id="menu_mrp_production_order_action"
id="menu_mrp_production_order_action" name="Orders Planning"
parent="menu_mrp_planning" sequence="1"/>
</data>
addons/mrp_operations/mrp_operations_view.xml
+3 -3
View File
@@ -261,17 +261,17 @@
id="menu_mrp_production_wc_order"
action="mrp_production_wc_action_form"
groups="base.group_extended" sequence="2"/>
<menuitem name="Work Orders" parent="mrp.menu_mrp_planning"
<menuitem name="Work Orders By Resource" parent="mrp.menu_mrp_planning"
id="menu_mrp_production_wc_action_planning"
action="mrp_production_wc_action_planning"
sequence="2"
icon="STOCK_INDENT"
groups="base.group_extended"/>
<menuitem parent="mrp.menu_mrp_planning"
<!-- <menuitem parent="mrp.menu_mrp_planning"
id="menu_mrp_production_wc_resource_planning"
action="mrp_production_wc_resource_planning"
icon="STOCK_INDENT"
groups="base.group_extended"/>
groups="base.group_extended"/>-->
<!-- Operation codes -->