From 2e93dd80b5df327b67703202027ca3c389483cff Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 22 Mar 2012 14:14:49 +0100
Subject: [PATCH] [IMP] sale, purchase: rename field 'group_sale_uom' into
 'group_uom' (not sale-specific)

bzr revid: rco@openerp.com-20120322131449-wohuxotp8b92fupc
---
 addons/purchase/res_config.py       | 2 +-
 addons/purchase/res_config_view.xml | 2 +-
 addons/sale/res_config.py           | 2 +-
 addons/sale/res_config_view.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index d8d36dd328e..2f6aa8e14ac 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -37,7 +37,7 @@ 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_sale_uom':fields.boolean("UOM per product",
+        'group_uom':fields.boolean("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',
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 033dc294cd7..0bc9f86ae7b 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -20,7 +20,7 @@
                        <field name="module_purchase_analytic_plans"/>
                     </group>
                     <group colspan="2" col="4">
-                        <field name="group_sale_uom"/>
+                        <field name="group_uom"/>
                         <newline/>
                         <field name="module_purchase_double_validation"/>
                         <newline/>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index be34100c474..831a5f97aaa 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -57,7 +57,7 @@ class sale_configuration(osv.osv_memory):
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers. 
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_sale_uom':fields.boolean("UOM per product",
+        'group_uom':fields.boolean("UOM per product",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different unit of measures per product."""),
         'group_sale_delivery_address': fields.boolean("Specify delivery and invoice addresses",
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index ab3d34a7096..c7bffa13ca3 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -36,7 +36,7 @@
                         <field name="module_warning"/>
                     </group>
                     <group colspan="2" col="2">
-                        <field name="group_sale_uom"/>
+                        <field name="group_uom"/>
                         <field name="group_sale_delivery_address"/>
                         <field name="group_discount_per_so_line"/>
                         <field name="module_sale_layout"/>