[MERGE]:merged purchase config wizard.

bzr revid: apa@tinyerp.com-20120720110054-qya0mgox0acum6bj

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 9cfcf4e..47816e4 100644 (file)
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -1,34 +1,64 @@
 <openerp>
     <data>
-
         <record id="view_purchase_configuration" model="ir.ui.view">
             <field name="name">purchase settings</field>
             <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>
+                    <separator string="Purchase Order"/>
                     <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"/>
-                        </group>
-                    </group>
+                        <label for="id" string="Order Setting"/>   
+                        <div>
+                                                       <div>
+                                                               <field name="group_purchase_pricelist" class="oe_inline"/>
+                                                               <label for="group_purchase_pricelist"/>
+                                                       </div>    
+                                                       <div>
+                                                               <field name="group_uom" class="oe_inline"/>
+                                                               <label for="group_uom"/>
+                                                       </div>                   
+                                                       <div>
+                                                               <field name="group_purchase_delivery_address" class="oe_inline"/>
+                                                               <label for="group_purchase_delivery_address"/>
+                                                       </div>    
+                                                       <div name="module_purchase_double_validation">
+                                                               <field name="module_purchase_double_validation" class="oe_inline"/>
+                                                               <label for="module_purchase_double_validation"/>
+                                                       </div>     
+                                                       <div>
+                                                               <field name="module_purchase_requisition" class="oe_inline"/>
+                                                               <label for="module_purchase_requisition"/>
+                                                       </div>
+                                                       <div>    
+                                                               <field name="module_warning" class="oe_inline"/>
+                                                               <label for="module_warning"/>
+                                                       </div>
+                                                       <div>
+                                                               <field name="module_purchase_analytic_plans" class="oe_inline"/>
+                                                               <label for="module_purchase_analytic_plans"/>
+                                                       </div>
+                        </div>    
+                               </group>
+                               <separator string="Invoicing"/>
+                                       <group>
+                                               <label for="id" string="Invoicing Setting"/>   
+                                               <div>
+                                                       <div>
+                                                               <label for="default_invoice_method"/>
+                                                               <field name="default_invoice_method" class="oe_inline"/>
+                                                       </div>
+                                                       <div>
+                                                                <label for="decimal_precision"/>
+                                                                <field name="decimal_precision" class="oe_inline"/>
+                                                       </div>
+                                               </div>            
+                                       </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 426dcae..c934569 100644 (file)
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,11 +7,13 @@
             <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>
+                <div name="module_purchase_double_validation" position="before">
+                    <div>
+                        <label for="limit_amount"/>
+                        <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
+                    </div>
+                </div>
             </field>
         </record>
-
     </data>
 </openerp>