From cc1d6a3c6c9918801d21857ee2ffab02a38bfb13 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 25 Nov 2009 09:07:08 +0100
Subject: [PATCH] [IMP] mrp: menu reorganisation

bzr revid: olt@tinyerp.com-20091125080708-vwi5nxksm8cbk370
---
 addons/mrp/mrp_view.xml               | 24 +++++++++++++-----------
 addons/mrp/mrp_wizard.xml             | 14 +++++++-------
 addons/mrp_repair/mrp_repair_view.xml | 16 ++++++++--------
 addons/report_mrp/report_mrp_view.xml |  3 ++-
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d44f43a0ab6..74be287ea82 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -7,8 +7,8 @@
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 
         <!--
-    Property / Property Group
-    -->
+        Property / Property Group
+        -->
 
         <record id="mrp_property_group_form_view" model="ir.ui.view">
             <field name="name">mrp.property.group.form</field>
@@ -33,7 +33,8 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="menu_mrp_root"
-            groups="group_mrp_manager"/>
+            groups="group_mrp_manager"
+            sequence="-50" />
         <menuitem
             id="menu_mrp_property_group_action_prop"
             name="Properties"
@@ -84,8 +85,8 @@
             parent="menu_mrp_property_group_action_prop"/>
 
         <!--
-    Workcenters
-    -->
+        Workcenters
+        -->
 
         <record id="mrp_workcenter_tree_view" model="ir.ui.view">
             <field name="name">mrp.workcenter.tree</field>
@@ -144,11 +145,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
         </record>
-        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration"/>
+        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration" groups="base.group_extended" />
 
         <!--
-    Routings
-    -->
+        Routings
+        -->
 
         <record id="mrp_routing_workcenter_tree_view" model="ir.ui.view">
             <field name="name">mrp.routing.workcenter.tree</field>
@@ -218,7 +219,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
         </record>
-        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration"/>
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration" groups="base.group_extended"/>
 
         <!--
           Bill of Materials
@@ -549,7 +550,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
-        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/>
+        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root" sequence="-30"/>
 
         <record id="mrp_production_action2_gantt" model="ir.actions.act_window">
             <field name="name">Production Orders Planning</field>
@@ -775,7 +776,8 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
+        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"
+                  sequence="-40" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
             <field name="name">Unscheduled procurements</field>
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index d88ea321ac9..d4db5c2de61 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data>
         <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/>
-        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="100"/>
-        
+        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="-49"/>
+
         <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Procurements Only" name="mrp.procurement.compute"/>
         <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
-        
+
         <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
         <menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
-        
+
         <wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Workcenter load"/>
-        
+
         <wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>
         <record id="ir_project_cost_structure" model="ir.values">
             <field eval="'client_print_multi'" name="key2"/>
@@ -27,13 +27,13 @@
         name="product.product.procurement"
         keyword="client_action_multi"
         id="product_procurement_wizard"/>
-    
+
     <wizard
         id="stock.track_line"
         model="stock.move"
         multi="True"
         name="mrp.stock.move.track"
-        string="Track line"/>    
+        string="Track line"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index cd73b312fd9..9988d106824 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -86,7 +86,7 @@
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
                                 <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
-								<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
+                                <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                                 <button name="cancel" states="draft" string="Cancel Repair"/>
                                 <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
@@ -102,15 +102,15 @@
                                     <notebook>
                                         <page string="Fees Line">
                                             <field name='name'/>
-		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
-		                                    <field name="product_uom_qty" string="Qty"/>
-		                                    <field name="product_uom" string="UoM" />
-		                                    <field name="price_unit"/>
-		                                    <field name="price_subtotal"/>
+                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
+                                            <field name="product_uom_qty" string="Qty"/>
+                                            <field name="product_uom" string="UoM" />
+                                            <field name="price_unit"/>
+                                            <field name="price_subtotal"/>
                                             <newline/>
                                             <group colspan="2">
                                                 <field name="to_invoice"/>
-    		                                    <field name="invoiced"/>
+                                                <field name="invoiced"/>
                                             </group>
                                             <newline/>
                                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&gt;&gt;','purchase')]"/>
@@ -220,7 +220,7 @@
             <field name="domain">[('state','=','2binvoiced')]</field>
         </record>
 
-        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs"/>
+        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs" sequence="50"/>
 
         <menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
 
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index 6ef87a2ca1c..d908de060d0 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -50,7 +50,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root"/><menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
+        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="100"/>
+        <menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
         
         <!-- stock.move compared to internal location src/dest -->