From 402a7eb42f82abf0faedfd87f765e5a7a8ca4b8b Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 20 Jul 2012 12:08:42 +0530
Subject: [PATCH] [IMP] Make Changes into the Purchases Wizard and resubmit it

bzr revid: rma@tinyerp.com-20120720063842-w1lk7ea44qpawrvc
---
 addons/purchase/res_config_view.xml           | 30 +++++++++----------
 .../purchase_double_validation_installer.xml  |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index fd0b398ed5a..83b6154602f 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -5,62 +5,60 @@
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Purchases" version="7.0">
+                <form string="Configure Purchases" 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>
-                        <separator string="Purchase Order" colspan="2"/>
-                        <group colspan="2">
+                        <separator string="Purchase Order"/>
+                        <group>
                             <label for="id" string="Purchase Order Setting"/>   
                             <div>
                                 <div>
                                     <field name="group_purchase_pricelist" class="oe_inline"/>
-                                    <label for="group_purchase_pricelist"/>As Per Supplier Category
+                                    <label for="group_purchase_pricelist"/>
                                 </div>    
                                 <div>
                                     <field name="group_uom" class="oe_inline"/>
-                                    <label for="group_uom" />In Purchase Order 
+                                    <label for="group_uom"/>
                                 </div>                   
                                 <div>
                                     <field name="group_purchase_delivery_address" class="oe_inline"/>
-                                    <label for="group_purchase_delivery_address"/>To Suppliers
+                                    <label for="group_purchase_delivery_address"/>
                                 </div>    
                                 <div>
                                     <field name="module_purchase_double_validation" class="oe_inline"/>
-                                    Manage<label for="module_purchase_double_validation"/>
+                                    <label for="module_purchase_double_validation"/>
                                 </div>     
                                 <div>
                                     <field name="module_purchase_requisition" class="oe_inline"/>
-                                    <label for="module_purchase_requisition"/>For Purchase Documentation
+                                    <label for="module_purchase_requisition"/>
                                 </div>
                                 <div>    
                                     <field name="module_warning" class="oe_inline"/>
-                                    To Set<label for="module_warning"/>
+                                    <label for="module_warning"/>
                                 </div>
                                 <div>
                                     <field name="module_purchase_analytic_plans" class="oe_inline"/>
-                                    Allow To<label for="module_purchase_analytic_plans"/>
+                                    <label for="module_purchase_analytic_plans"/>
                                 </div>
                             </div>    
 			            </group>
-			            <separator string="Invoicing" colspan="2"/>
-			            <group colspan="2">
+			            <separator string="Invoicing"/>
+			            <group>
                             <label for="id" string="Invoicing Setting"/>   
                             <div>
                                 <div>
-                                    <label for="default_invoice_method" />Selection
+                                    <label for="default_invoice_method"/>
                                     <field name="default_invoice_method" class="oe_inline"/>
                                 </div>
                                 <div>
-                                     To Set<label for="decimal_precision"/>
+                                     <label for="decimal_precision"/>
                                      <field name="decimal_precision" class="oe_inline"/>
                                 </div>
                             </div>            
                         </group>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index c58ee681a89..d03a90ff6bf 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <field name="module_purchase_double_validation" position="before">
                     <div>
-                        <label for="limit_amount"/>On Purchase Order
+                        <label for="limit_amount"/>
                         <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
                     </div>
                 </field>