From a29a608533d46b3726644a07fbdcd0b27b5ea7e3 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 18 Jul 2012 18:51:29 +0530
Subject: [PATCH] [IMP]Make changes into the purchases wizard

bzr revid: rma@tinyerp.com-20120718132129-yfylbf3mut8dgpns
---
 addons/purchase/res_config_view.xml           | 62 ++++++++++++++-----
 .../purchase_double_validation_installer.xml  |  7 ++-
 2 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 9cfcf4ea3d6..21d56727e5d 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -1,6 +1,5 @@
 <openerp>
     <data>
-
         <record id="view_purchase_configuration" model="ir.ui.view">
             <field name="name">purchase settings</field>
             <field name="model">purchase.config.settings</field>
@@ -13,20 +12,53 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group>
-                            <separator string="Purchase Order" colspan="2"/>
-                            <field name="group_purchase_pricelist"/>
-                            <field name="group_uom"/>
-                            <field name="group_purchase_delivery_address"/>
-                            <field name="module_purchase_double_validation"/>
-                            <field name="module_purchase_requisition"/>
-                            <field name="module_warning"/>
-                            <field name="module_purchase_analytic_plans"/>
-                        </group>
-			<group>
-                            <separator string="Invoicing" colspan="2"/>
-                            <field name="default_invoice_method" class="oe_inline"/>
-                            <field name="decimal_precision" class="oe_inline"/>
+                        <separator string="Purchase Order" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Purchase Order Setting"/>   
+                            <div>
+                                <div>
+                                    <field name="group_purchase_pricelist" class="oe_inline"/>
+                                    Pricelist Per<label for="group_purchase_pricelist" string="Supplier"/>
+                                </div>    
+                                <div>
+                                    <field name="group_uom" class="oe_inline"/>
+                                    Manage Different <label for="group_uom" string="Units of Measure"/>For Products 
+                                </div>                   
+                                <div>
+                                    <field name="group_purchase_delivery_address" class="oe_inline"/>
+                                     Allow Different Addresses for <label for="group_purchase_delivery_address" string="Delivery and Invoice"/>
+                                </div>    
+                                <div>
+                                    <field name="module_purchase_double_validation" class="oe_inline"/>
+                                    Two Levels of<label for="module_purchase_double_validation" string="Approval"/>
+                                </div>     
+                                <div>
+                                    <field name="module_purchase_requisition" class="oe_inline"/>
+                                    Manage<label for="module_purchase_requisition" string="Purchase Requisitions"/>
+                                </div>
+                                <div>    
+                                    <field name="module_warning" class="oe_inline"/>
+                                    Alert By<label for="module_warning" string="Products or Supplier"/>
+                                </div>
+                                <div>
+                                    <field name="module_purchase_analytic_plans" class="oe_inline"/>
+                                    Use<label for="module_purchase_analytic_plans" string="Multiple Analytic Accounts"/>On Purchases
+                                </div>
+                            </div>    
+			            </group>
+			            <separator string="Invoicing" colspan="2"/>
+			            <group colspan="2">
+                            <label for="id" string="Invoicing Setting"/>   
+                            <div>
+                                <div>
+                                    Default <label for="default_invoice_method" string="Invoicing Control"/>Method
+                                    <field name="default_invoice_method" class="oe_inline"/>
+                                </div>
+                                <div>
+                                     <label for="decimal_precision " string="Decimal"/>Precision
+                                     <field name="decimal_precision" class="oe_inline"/>
+                                </div>
+                            </div>            
                         </group>
                     </group>
                 </form>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 426dcae859a..d9080cea6b5 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,8 +7,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_purchase_double_validation" position="after">
-                    <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}"/>
+                <field name="module_purchase_double_validation" position="before">
+                    <div>
+                        Limit to Require a <label for="limit_amount" string="Second Approval "/>
+                        <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
+                    </div>
                 </field>
             </field>
         </record>