From 39090544af792ed080fc077a85be9d2b1addb28f Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 30 Jul 2012 16:34:18 +0530
Subject: [PATCH 1/2] [IMP] improvement in manufacturing wizard

bzr revid: rma@tinyerp.com-20120730110418-ht0w5403tq5kw9lw
---
 addons/mrp/res_config_view.xml | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 1e6f9ae63f8..75b6a43629f 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -13,16 +13,12 @@
                     </header>
                     <separator string="Manufacturing Order"/>
                     <group>
-                        <label for="id" string="Order Settings"/>
+                        <label for="id" string="Order"/>
                         <div>
                             <div>
                                 <field name="module_mrp_operations" class="oe_inline"/>
                                 <label for="module_mrp_operations" />
                             </div>
-                            <div>
-                                <field name="module_stock_planning" class="oe_inline"/>
-                                <label for="module_stock_planning"/>
-                            </div>    
                             <div>
                                 <field name="module_mrp_subproduct" class="oe_inline"/>
                                 <label for="module_mrp_subproduct"/>                          
@@ -33,38 +29,36 @@
                             </div>                            
                         </div>
                     </group>
-                    <separator string="Logistics" />
+                   
                     <group >
-                        <label for="id" string="Logistics Settings"/>   
+                        <label for="id" string="Planing"/>   
                         <div>
                             <div>
                                 <field name="module_mrp_jit" class="oe_inline"/>
                                <label for="module_mrp_jit" string="Real-Time"/>
                             </div>
+                            <div>
+                                <field name="module_stock_planning" class="oe_inline"/>
+                                <label for="module_stock_planning"/>
+                            </div>   
+                            <div>
+                                <field name="group_mrp_routings" class="oe_inline"/>
+                                <label for="group_mrp_routings"/>
+                            </div>
                             <div>
                                  <field name="module_stock_no_autopicking" class="oe_inline"/>
                                  <label for="module_stock_no_autopicking" />
                             </div>
                         </div>    
                     </group>
-                    <separator string="Products"/>
+                    <separator string="Master Data"/>
                     <group >
-                        <label for="id" string="Product Settings"/>   
+                        <label for="id" string="Products"/>   
                         <div>
                             <div>
                                 <field name="module_product_manufacturer" class="oe_inline"/>
                                 <label for="module_product_manufacturer"/>
                             </div>
-                        </div>    
-                    </group>                           
-                    <separator string="Bill Of Material" />
-                    <group >
-                        <label for="id" string="BOM Settings"/>   
-                        <div>
-                            <div>
-                                <field name="group_mrp_routings" class="oe_inline"/>
-                                <label for="group_mrp_routings"/>
-                            </div>
                             <div>
                                 <field name="group_mrp_properties" class="oe_inline"/>
                                 <label for="group_mrp_properties" />

From 9733defd19db0c730eab350044fe71d038fe9647 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 31 Jul 2012 14:20:56 +0530
Subject: [PATCH 2/2] [IMP] make changes in mrp wizard

bzr revid: rma@tinyerp.com-20120731085056-pim4040x57o8qb3a
---
 addons/mrp/res_config_view.xml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 75b6a43629f..e370419ce5e 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -15,10 +15,6 @@
                     <group>
                         <label for="id" string="Order"/>
                         <div>
-                            <div>
-                                <field name="module_mrp_operations" class="oe_inline"/>
-                                <label for="module_mrp_operations" />
-                            </div>
                             <div>
                                 <field name="module_mrp_subproduct" class="oe_inline"/>
                                 <label for="module_mrp_subproduct"/>                          
@@ -26,29 +22,32 @@
                             <div>
                                 <field name="module_mrp_repair" class="oe_inline"/>
                                 <label for="module_mrp_repair"/>
-                            </div>                            
+                            </div> 
+                             <div>
+                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
+                                 <label for="module_stock_no_autopicking" />
+                            </div>                           
                         </div>
                     </group>
-                   
                     <group >
-                        <label for="id" string="Planing"/>   
+                        <label for="id" string="Planning"/>   
                         <div>
                             <div>
                                 <field name="module_mrp_jit" class="oe_inline"/>
                                <label for="module_mrp_jit" string="Real-Time"/>
                             </div>
-                            <div>
-                                <field name="module_stock_planning" class="oe_inline"/>
-                                <label for="module_stock_planning"/>
-                            </div>   
                             <div>
                                 <field name="group_mrp_routings" class="oe_inline"/>
                                 <label for="group_mrp_routings"/>
                             </div>
-                            <div>
-                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                 <label for="module_stock_no_autopicking" />
+                             <div>
+                                <field name="module_mrp_operations" class="oe_inline"/>
+                                <label for="module_mrp_operations" />
                             </div>
+                            <div>
+                                <field name="module_stock_planning" class="oe_inline"/>
+                                <label for="module_stock_planning"/>
+                            </div>   
                         </div>    
                     </group>
                     <separator string="Master Data"/>