[IMP] purchase.config.settings: replace boolean field 'Double Validation' by amount...

bzr revid: rco@openerp.com-20120402142009-8m8v77x9bb1w5nlf

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index cffdc19..f2030bf 100644 (file)
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -55,7 +55,7 @@ class purchase_config_settings(osv.osv_memory):
                     * Manufacturer Product Code
                     * Product Attributes.
                 This installs the module product_manufacturer."""),
-        'module_purchase_double_validation': fields.boolean("Configure Limit Amount",
+        'module_purchase_double_validation': fields.boolean("Double Validation",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
         'module_purchase_requisition': fields.boolean("Purchase Requisition",

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 3c1dd83..f2fe6c9 100644 (file)
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -7,24 +7,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Purchases">
-                    <group colspan="4" col="6">
-                        <separator string="Invoicing" colspan="6"/>
-                        <field name="default_invoice_method" />
+                    <separator string="Invoicing" colspan="4"/>
+                    <field name="default_invoice_method" />
 
-                        <separator string="Purchase Order" colspan="6"/>
-                        <field name="group_purchase_pricelist"/>
-                        <field name="module_purchase_double_validation"/>
-                        <newline/>
-                        <field name="group_uom"/>
-                        <field name="module_purchase_requisition"/>
-                        <newline/>
-                        <field name="module_warning"/>
-                        <field name="module_purchase_analytic_plans"/>
-                        <newline/>
+                    <separator string="Purchase Order" colspan="4"/>
+                    <field name="group_purchase_pricelist"/>
+                    <field name="group_uom"/>
+                    <field name="module_purchase_double_validation"/>
+                    <field name="module_purchase_requisition"/>
+                    <field name="module_warning"/>
+                    <field name="module_purchase_analytic_plans"/>
 
-                        <separator string="Products" colspan="6"/>
-                        <field name="module_product_manufacturer"/>
-                    </group>
+                    <separator string="Products" colspan="4"/>
+                    <field name="module_product_manufacturer"/>
                 </form>
             </field>
         </record>

diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 705570c..9bf0347 100644 (file)
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -24,8 +24,8 @@ from osv import fields, osv
 class purchase_config_settings(osv.osv_memory):
     _inherit = 'purchase.config.settings'
     _columns = {
-        'limit_amount': fields.integer('Maximum Purchase Amount',required=True,
-            help="Maximum amount after which validation of purchase is required."),
+        'limit_amount': fields.integer('Double Validation Limit',required=True,
+            help="Amount after which validation of purchase is required."),
     }
 
     _defaults = {

diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 302dbaa..582312b 100644 (file)
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,8 +7,8 @@
             <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" nolabel="1"/>
+                <field name="module_purchase_double_validation" position="replace">
+                    <field name="limit_amount"/>
                 </field>
             </field>
         </record>