From e819426f6416c0feb6ce9b6bd2732735a7669a20 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 2 Apr 2012 16:04:02 +0200
Subject: [PATCH] [IMP] purchase.config.settings: improve labels, and modify
 default value for limit in double validation

bzr revid: rco@openerp.com-20120402140402-inpgnvclupfdb92m
---
 addons/purchase/res_config.py                        | 12 ++++++------
 addons/purchase/res_config_view.xml                  |  6 +++---
 .../purchase_double_validation_workflow.xml          |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 7ef8d1b3b11..cffdc1927a9 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -37,28 +37,28 @@ class purchase_config_settings(osv.osv_memory):
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("Allow different UoM per product",
+        'group_uom':fields.boolean("Allow Different UoM per Product",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different unit of measures per product."""),
-        'module_purchase_analytic_plans': fields.boolean('Purchase analytic plan',
+        'module_purchase_analytic_plans': fields.boolean('Purchase Analytic Plan',
             help ="""Allows the user to maintain several analysis plans. These let you split
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
-        'module_warning': fields.boolean("Alerts by products or supplier",
+        'module_warning': fields.boolean("Alerts by Products or Supplier",
             help="""To trigger warnings in OpenERP objects.
                 Warning messages can be displayed for objects like sale order, purchase order, picking and invoice.
                 This installs the module warning."""),
-        'module_product_manufacturer': fields.boolean("Define a manufacturer of products",
+        'module_product_manufacturer': fields.boolean("Define a Manufacturer of Products",
             help="""This allows you to define the following for a product:
                     * Manufacturer
                     * Manufacturer Product Name
                     * 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("Configure Limit Amount",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("Track the best price with Purchase Requisition",
+        'module_purchase_requisition': fields.boolean("Purchase Requisition",
             help="""When a purchase order is created, you have the opportunity to save the related requisition.
                 This object regroups and allows you to keep track and order all your purchase orders.
                 This installs the module purchase_requisition."""),
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index fa1b29d2932..3c1dd83c034 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -13,14 +13,14 @@
 
                         <separator string="Purchase Order" colspan="6"/>
                         <field name="group_purchase_pricelist"/>
-                        <field name="group_uom"/>
-                        <newline/>
                         <field name="module_purchase_double_validation"/>
                         <newline/>
-                        <field name="module_warning"/>
+                        <field name="group_uom"/>
                         <field name="module_purchase_requisition"/>
                         <newline/>
+                        <field name="module_warning"/>
                         <field name="module_purchase_analytic_plans"/>
+                        <newline/>
 
                         <separator string="Products" colspan="6"/>
                         <field name="module_product_manufacturer"/>
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index b4005133b60..61503564246 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -3,7 +3,7 @@
     <data>
 
          <record id="purchase.trans_confirmed_router" model="workflow.transition">
-            <field name="condition">amount_untaxed &gt;= 1000</field>
+            <field name="condition">amount_untaxed &gt;= 5000</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
@@ -11,7 +11,7 @@
         <record id="trans_waiting_confirmed" model="workflow.transition">
             <field name="act_from" ref="purchase.act_confirmed"/>
             <field name="act_to" ref="purchase.act_router"/>
-            <field name="condition">amount_untaxed &lt; 1000</field>
+            <field name="condition">amount_untaxed &lt; 5000</field>
         </record>
 
     </data>