From 1053dbf5f12c234bbb7887a00c6d0c69a94441b9 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Thu, 20 Apr 2017 10:40:04 +0530
Subject: [PATCH] [IMP] mrp: Improve menuitems labels and display

PURPOSE
=======

Clean menus in manufacturing

SPECIFICATION
=============

* Operations > Orders
* Scrap > Scrap Orders
* Bill of materials > Bills of materials # bistray
* Move the menu "Work Order Messages" in Master Data
* Remove menu "Planning" if WO or MPS no active
* Menu "Orders to plan" > visible only if WO active
* Menu "Waiting for material availability" > visible only if WO active, put it above "Orders to plan"
* Master Data, order of submenus : Products / BOM / Routings / Work Centers
---
 addons/mrp/views/mrp_bom_views.xml        | 4 ++--
 addons/mrp/views/mrp_message_views.xml    | 4 ++--
 addons/mrp/views/mrp_views_menus.xml      | 2 +-
 addons/mrp/views/mrp_workcenter_views.xml | 2 +-
 addons/mrp/views/stock_move_views.xml     | 2 +-
 addons/stock/views/stock_scrap_views.xml  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 01c474d7bc3..4449a383e64 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -137,7 +137,7 @@
             </field>
         </record>
         <record id="mrp_bom_form_action" model="ir.actions.act_window">
-            <field name="name">Bill of Materials</field>
+            <field name="name">Bills of Materials</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="domain">[]</field> <!-- force empty -->
@@ -160,7 +160,7 @@
         <menuitem id="menu_mrp_bom_form_action"
             action="mrp_bom_form_action"
             parent="menu_mrp_bom"
-            sequence="99"/>
+            sequence="13"/>
 
         <!-- BOM Line -->
         <record id="mrp_bom_line_view_form" model="ir.ui.view">
diff --git a/addons/mrp/views/mrp_message_views.xml b/addons/mrp/views/mrp_message_views.xml
index bb980d730d5..1a4cc84f976 100644
--- a/addons/mrp/views/mrp_message_views.xml
+++ b/addons/mrp/views/mrp_message_views.xml
@@ -146,8 +146,8 @@
     </record>
 
     <menuitem id="mrp_message_menu"
-          parent="menu_mrp_manufacturing"
+          parent="menu_mrp_bom"
           action="mrp_message_action_main"
           groups="group_mrp_routings"
-          sequence="26"/>
+          sequence="99"/>
 </odoo>
\ No newline at end of file
diff --git a/addons/mrp/views/mrp_views_menus.xml b/addons/mrp/views/mrp_views_menus.xml
index 4a611f17fd8..cf84eefee39 100644
--- a/addons/mrp/views/mrp_views_menus.xml
+++ b/addons/mrp/views/mrp_views_menus.xml
@@ -10,7 +10,7 @@
             sequence="35"/>
 
         <menuitem id="menu_mrp_manufacturing"
-            name="Operations"
+            name="Orders"
             parent="menu_mrp_root"
             sequence="10"/>
 
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index 5408a657ba3..f25178127ed 100644
--- a/addons/mrp/views/mrp_workcenter_views.xml
+++ b/addons/mrp/views/mrp_workcenter_views.xml
@@ -384,7 +384,7 @@
             action="mrp_workcenter_action"
             groups="group_mrp_routings"
             parent="menu_mrp_bom"
-            sequence="100"/>
+            sequence="90"/>
 
         <menuitem id="menu_mrp_dashboard"
             name="Dashboard"
diff --git a/addons/mrp/views/stock_move_views.xml b/addons/mrp/views/stock_move_views.xml
index 6cd71dac6b2..75214ba147b 100644
--- a/addons/mrp/views/stock_move_views.xml
+++ b/addons/mrp/views/stock_move_views.xml
@@ -56,7 +56,7 @@
           sequence="10"/>
 
     <menuitem id="menu_mrp_scrap"
-            name="Scrap"
+            name="Scrap Orders"
             parent="menu_mrp_manufacturing"
             action="stock.action_stock_scrap"
             sequence="25"/>
diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml
index f2fb8ff3bbd..fbd2684d80a 100644
--- a/addons/stock/views/stock_scrap_views.xml
+++ b/addons/stock/views/stock_scrap_views.xml
@@ -85,7 +85,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_scrap">
-            <field name="name">Scrap</field>
+            <field name="name">Scrap Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.scrap</field>
             <field name="view_type">form</field>