From 6daaaf039d9f29983c0d19f0451de1abaf40d1dd Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 19 Jul 2012 11:37:38 +0530
Subject: [PATCH 1/4] [IMP]Make changes in Manufacturing wizard

bzr revid: rma@tinyerp.com-20120719060738-brs727pse6xbazxk
---
 addons/mrp/res_config_view.xml | 77 ++++++++++++++++++++++++++--------
 1 file changed, 60 insertions(+), 17 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 8d81a3d2d0a..691f872ea76 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -1,38 +1,81 @@
 <openerp>
     <data>
-
         <record id="view_mrp_config" model="ir.ui.view">
             <field name="name">mrp settings</field>
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing" version="7.0">
+                <form string="Configure Manufacturing" class= "oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                            <separator string="Logistics" colspan="2"/>
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
+                    <separator string="Manufacturing Order" colspan="4" />
+                        <group colspan="2">
+                            <label for="id" string="Manufacturing Order Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="module_mrp_operations" class="oe_inline"/>
+                                    Detailed Planning Of <label for="module_mrp_operations" string="Work Orders"/>
+                                </div>
+                                <div>
+                                    <field name="module_stock_planning" class="oe_inline"/>
+                                    Master<label for="module_stock_planning" string="Production"/>Schedule
+                                </div>    
+                                <div>
+                                    <field name="module_mrp_subproduct" class="oe_inline"/>
+                                    Produce Several Products from One<label for="module_mrp_subproduct" string=" Manufacturing Order"/>                               
+                                </div>
+                                <div>
+                                    <field name="module_mrp_repair" class="oe_inline"/>
+                                    Manage<label for="module_mrp_repair" string="Product Repairs"/>
+                                </div>                            
+                            </div>
                         </group>
-                        <group string="Products">
-                            <field name="module_product_manufacturer"/>
-                            <separator string="Bill Of Material" colspan="2"/>
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
+                        <separator string="Logistics" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Logistics Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="module_mrp_jit" class="oe_inline"/>
+                                    <label for="module_mrp_jit" string="Real-Time"/>Scheduling
+                                </div>
+                                <div>
+                                     <field name="module_stock_no_autopicking" class="oe_inline"/>
+                                     Manual Picking to Fulfill<label for="module_stock_no_autopicking" string="Manufacturing Orders"/>
+                                </div>
+                            </div>    
                         </group>
-                    </group>
+                        <separator string="Products" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Product Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="module_product_manufacturer" class="oe_inline"/>
+                                    Define<label for="module_product_manufacturer" string="Manufacturers"/>on Products
+                                </div>
+                            </div>    
+                        </group>                           
+                        <separator string="Bill Of Material" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Bill Of Material Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="group_mrp_routings" class="oe_inline"/>
+                                    Manage<label for="group_mrp_routings" string="Routings and Work Orders"/>
+                                </div>
+                                <div>
+                                    <field name="group_mrp_properties" class="oe_inline"/>
+                                    Allows Several<label for="group_mrp_properties" string="BoMs Per Product"/>
+                                </div>
+                            </div>
+                        </group>
+                   </group>
                 </form>
             </field>
         </record>
-
         <record id="action_mrp_configuration" model="ir.actions.act_window">
             <field name="name">Configure Manufacturing</field>
             <field name="type">ir.actions.act_window</field>

From a913bee60826c780cd9a43180d0170bd18d6181a Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 19 Jul 2012 15:13:09 +0530
Subject: [PATCH 2/4] [IMP]Make Changes into the Manufacturing Wizard

bzr revid: rma@tinyerp.com-20120719094309-p6y2ws172ybg8zbj
---
 addons/mrp/res_config_view.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 691f872ea76..65f8ed5c2aa 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -14,37 +14,37 @@
                     <group>
                     <separator string="Manufacturing Order" colspan="4" />
                         <group colspan="2">
-                            <label for="id" string="Manufacturing Order Settings"/>   
+                            <label for="id" string="Manufacturing Order Settings"/>
                             <div>
                                 <div>
                                     <field name="module_mrp_operations" class="oe_inline"/>
-                                    Detailed Planning Of <label for="module_mrp_operations" string="Work Orders"/>
+                                    Manage<label for="module_mrp_operations" />
                                 </div>
                                 <div>
                                     <field name="module_stock_planning" class="oe_inline"/>
-                                    Master<label for="module_stock_planning" string="Production"/>Schedule
+                                    <label for="module_stock_planning"/>Of Products
                                 </div>    
                                 <div>
                                     <field name="module_mrp_subproduct" class="oe_inline"/>
-                                    Produce Several Products from One<label for="module_mrp_subproduct" string=" Manufacturing Order"/>                               
+                                    <label for="module_mrp_subproduct"/>For Sub-Prodcuts                               
                                 </div>
                                 <div>
                                     <field name="module_mrp_repair" class="oe_inline"/>
-                                    Manage<label for="module_mrp_repair" string="Product Repairs"/>
+                                    Allow To<label for="module_mrp_repair"/>
                                 </div>                            
                             </div>
                         </group>
-                        <separator string="Logistics" colspan="2"/>
+                        <separator string="Logistics" />Prodouction
                         <group colspan="2">
-                            <label for="id" string="Logistics Settings"/>   
+                            <label for="id" string="Logistics Settings"/>Of Products   
                             <div>
                                 <div>
                                     <field name="module_mrp_jit" class="oe_inline"/>
-                                    <label for="module_mrp_jit" string="Real-Time"/>Scheduling
+                                    Manage<label for="module_mrp_jit" string="Real-Time"/>Logistics
                                 </div>
                                 <div>
                                      <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                     Manual Picking to Fulfill<label for="module_stock_no_autopicking" string="Manufacturing Orders"/>
+                                     <label for="module_stock_no_autopicking" />
                                 </div>
                             </div>    
                         </group>
@@ -54,7 +54,7 @@
                             <div>
                                 <div>
                                     <field name="module_product_manufacturer" class="oe_inline"/>
-                                    Define<label for="module_product_manufacturer" string="Manufacturers"/>on Products
+                                    Manage<label for="module_product_manufacturer"/>For Productions
                                 </div>
                             </div>    
                         </group>                           
@@ -64,11 +64,11 @@
                             <div>
                                 <div>
                                     <field name="group_mrp_routings" class="oe_inline"/>
-                                    Manage<label for="group_mrp_routings" string="Routings and Work Orders"/>
+                                    <label for="group_mrp_routings"/>For BoMs
                                 </div>
                                 <div>
                                     <field name="group_mrp_properties" class="oe_inline"/>
-                                    Allows Several<label for="group_mrp_properties" string="BoMs Per Product"/>
+                                    To Set<label for="group_mrp_properties" string="BoMs Per Product"/>
                                 </div>
                             </div>
                         </group>

From 286b5bbe1f57072188e6eadff7559b0206b019e3 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 20 Jul 2012 11:42:03 +0530
Subject: [PATCH 3/4] [IMP] Make Changes into the Manufacturing Wizard and
 resubmit it

bzr revid: rma@tinyerp.com-20120720061203-ff3efztoxqvhzhjg
---
 addons/mrp/res_config_view.xml | 36 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 65f8ed5c2aa..2524556d1ef 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -11,36 +11,35 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
-                    <separator string="Manufacturing Order" colspan="4" />
-                        <group colspan="2">
+                    <separator string="Manufacturing Order" />
+                        <group>
                             <label for="id" string="Manufacturing Order Settings"/>
                             <div>
                                 <div>
                                     <field name="module_mrp_operations" class="oe_inline"/>
-                                    Manage<label for="module_mrp_operations" />
+                                    <label for="module_mrp_operations" />
                                 </div>
                                 <div>
                                     <field name="module_stock_planning" class="oe_inline"/>
-                                    <label for="module_stock_planning"/>Of Products
+                                    <label for="module_stock_planning"/>
                                 </div>    
                                 <div>
                                     <field name="module_mrp_subproduct" class="oe_inline"/>
-                                    <label for="module_mrp_subproduct"/>For Sub-Prodcuts                               
+                                    <label for="module_mrp_subproduct"/>                          
                                 </div>
                                 <div>
                                     <field name="module_mrp_repair" class="oe_inline"/>
-                                    Allow To<label for="module_mrp_repair"/>
+                                    <label for="module_mrp_repair"/>
                                 </div>                            
                             </div>
                         </group>
-                        <separator string="Logistics" />Prodouction
-                        <group colspan="2">
-                            <label for="id" string="Logistics Settings"/>Of Products   
+                        <separator string="Logistics" />
+                        <group >
+                            <label for="id" string="Logistics Settings"/>   
                             <div>
                                 <div>
                                     <field name="module_mrp_jit" class="oe_inline"/>
-                                    Manage<label for="module_mrp_jit" string="Real-Time"/>Logistics
+                                   <label for="module_mrp_jit" string="Real-Time"/>
                                 </div>
                                 <div>
                                      <field name="module_stock_no_autopicking" class="oe_inline"/>
@@ -48,31 +47,30 @@
                                 </div>
                             </div>    
                         </group>
-                        <separator string="Products" colspan="2"/>
-                        <group colspan="2">
+                        <separator string="Products"/>
+                        <group >
                             <label for="id" string="Product Settings"/>   
                             <div>
                                 <div>
                                     <field name="module_product_manufacturer" class="oe_inline"/>
-                                    Manage<label for="module_product_manufacturer"/>For Productions
+                                    <label for="module_product_manufacturer"/>
                                 </div>
                             </div>    
                         </group>                           
-                        <separator string="Bill Of Material" colspan="2"/>
-                        <group colspan="2">
+                        <separator string="Bill Of Material" />
+                        <group >
                             <label for="id" string="Bill Of Material Settings"/>   
                             <div>
                                 <div>
                                     <field name="group_mrp_routings" class="oe_inline"/>
-                                    <label for="group_mrp_routings"/>For BoMs
+                                    <label for="group_mrp_routings"/>
                                 </div>
                                 <div>
                                     <field name="group_mrp_properties" class="oe_inline"/>
-                                    To Set<label for="group_mrp_properties" string="BoMs Per Product"/>
+                                    <label for="group_mrp_properties" />
                                 </div>
                             </div>
                         </group>
-                   </group>
                 </form>
             </field>
         </record>

From 8ca1be5f85a2ac110c2f0ab0237fc837e05f10a4 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:13:08 +0530
Subject: [PATCH 4/4] [IMP]:improved manufacturing config wizard.

bzr revid: apa@tinyerp.com-20120720104308-sdn4cbj8ei26a6o1
---
 addons/mrp/res_config_view.xml | 108 ++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 2524556d1ef..1e6f9ae63f8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -11,66 +11,66 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <separator string="Manufacturing Order" />
-                        <group>
-                            <label for="id" string="Manufacturing Order Settings"/>
+                    <separator string="Manufacturing Order"/>
+                    <group>
+                        <label for="id" string="Order Settings"/>
+                        <div>
                             <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"/>                          
-                                </div>
-                                <div>
-                                    <field name="module_mrp_repair" class="oe_inline"/>
-                                    <label for="module_mrp_repair"/>
-                                </div>                            
+                                <field name="module_mrp_operations" class="oe_inline"/>
+                                <label for="module_mrp_operations" />
                             </div>
-                        </group>
-                        <separator string="Logistics" />
-                        <group >
-                            <label for="id" string="Logistics Settings"/>   
                             <div>
-                                <div>
-                                    <field name="module_mrp_jit" class="oe_inline"/>
-                                   <label for="module_mrp_jit" string="Real-Time"/>
-                                </div>
-                                <div>
-                                     <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                     <label for="module_stock_no_autopicking" />
-                                </div>
+                                <field name="module_stock_planning" class="oe_inline"/>
+                                <label for="module_stock_planning"/>
                             </div>    
-                        </group>
-                        <separator string="Products"/>
-                        <group >
-                            <label for="id" string="Product Settings"/>   
                             <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="Bill Of Material 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" />
-                                </div>
+                                <field name="module_mrp_subproduct" class="oe_inline"/>
+                                <label for="module_mrp_subproduct"/>                          
                             </div>
-                        </group>
+                            <div>
+                                <field name="module_mrp_repair" class="oe_inline"/>
+                                <label for="module_mrp_repair"/>
+                            </div>                            
+                        </div>
+                    </group>
+                    <separator string="Logistics" />
+                    <group >
+                        <label for="id" string="Logistics Settings"/>   
+                        <div>
+                            <div>
+                                <field name="module_mrp_jit" class="oe_inline"/>
+                               <label for="module_mrp_jit" string="Real-Time"/>
+                            </div>
+                            <div>
+                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
+                                 <label for="module_stock_no_autopicking" />
+                            </div>
+                        </div>    
+                    </group>
+                    <separator string="Products"/>
+                    <group >
+                        <label for="id" string="Product Settings"/>   
+                        <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" />
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>