diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 264aad7ebc5..94fb456d3b8 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -27,11 +27,6 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 	
-	<record id="group_costing_method" model="res.groups">
-        <field name="name">Costing Method</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-	
     <record id="group_uom" model="res.groups">
         <field name="name">Manage Multiple Units of Measure</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/product_extended/product_extended_view.xml b/addons/product_extended/product_extended_view.xml
index fe6b982cea2..01432a9358b 100644
--- a/addons/product_extended/product_extended_view.xml
+++ b/addons/product_extended/product_extended_view.xml
@@ -10,7 +10,7 @@
                 <field name="standard_price" position="after">
                     <button name="%(action_view_compute_price_wizard)d" string="Recompute price from BoM"
                             type="action" attrs="{'invisible': [('cost_method', '!=', 'standard')]}"
-                             groups="product.group_costing_method"/>
+                             groups="stock_account.group_inventory_valuation"/>
                 </field>
             </field>
         </record>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index eeecd85180e..50525b165b6 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -39,8 +39,8 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_costing_method':fields.boolean("The default costing method applied to all products",
-            implied_group='product.group_costing_method',
+        'group_costing_method':fields.boolean("Use 'Real Price' or 'Average' costing methods.",
+            implied_group='stock_account.group_inventory_valuation',
             help="""Allows you to compute product cost price based on average cost."""),
         'module_warning': fields.boolean("Alerts by products or supplier",
             help='Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier.\n'
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index d9ad9ea1001..9f3a373020d 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -45,10 +45,6 @@ class stock_config_settings(osv.osv_memory):
         'module_claim_from_delivery': fields.boolean("Allow claim on deliveries",
             help='Adds a Claim link to the delivery order.\n'
                  '-This installs the module claim_from_delivery.'),
-        'module_stock_invoice_directly': fields.boolean("Create and open the invoice when the user finish a delivery order",
-            help='This allows to automatically launch the invoicing wizard if the delivery is '
-                 'to be invoiced when you send or deliver goods.\n'
-                 '-This installs the module stock_invoice_directly.'),
         'module_product_expiry': fields.boolean("Expiry date on serial numbers",
             help="""Track different dates on products and serial numbers.
 The following dates can be tracked:
@@ -76,8 +72,6 @@ This installs the module product_expiry."""),
         'group_stock_tracking_owner': fields.boolean("Manage owner on stock",
             implied_group='stock.group_tracking_owner',
             help="""This way you can receive products attributed to a certain owner. """),
-        'module_stock_account': fields.boolean("Generate accounting entries per stock movement",
-            help="""Allows to configure inventory valuations on products and product categories."""),
         'group_stock_multiple_locations': fields.boolean("Manage multiple locations and warehouses",
             implied_group='stock.group_locations',
             help="""This will show you the locations and allows you to define multiple picking types and warehouses."""),
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 6817c2a6477..140ab36c774 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -23,7 +23,7 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <separator string="Traceability"/>
-                    <group>
+                    <group name="traceability">
                         <label for="id" string="Traceability"/>
                         <div>
                             <div>
@@ -44,20 +44,6 @@
                              </div>
                         </div>    
                     </group>
-                    <separator string="Accounting"/>
-                    <group>
-                        <label for="id" string="Accounting"/>
-                        <div>
-                            <div>
-                                <field name="module_stock_account" class="oe_inline"/>
-                                <label for="module_stock_account"/>
-                            </div>
-                            <div>
-                                <field name="module_stock_invoice_directly" class="oe_inline"/>
-                                <label for="module_stock_invoice_directly"/>
-                            </div>
-                         </div>
-                    </group>
                     <separator string="Location &amp; Warehouse"/>
                     <group>
                         <label for="id" string="Logistic"/>
diff --git a/addons/stock_account/__init__.py b/addons/stock_account/__init__.py
index d74ac75cb98..bc6c5f0e3a8 100644
--- a/addons/stock_account/__init__.py
+++ b/addons/stock_account/__init__.py
@@ -23,4 +23,4 @@ import product
 import stock_account
 import stock
 import wizard
-
+import res_config
diff --git a/addons/stock_account/__openerp__.py b/addons/stock_account/__openerp__.py
index be52f3e7572..67a495f42e5 100644
--- a/addons/stock_account/__openerp__.py
+++ b/addons/stock_account/__openerp__.py
@@ -56,6 +56,7 @@ Dashboard / Reports for Warehouse Management will include:
         'product_data.xml',
         'product_view.xml',
         'stock_account_view.xml',
+        'res_config_view.xml',
     ],
     'test': [
 
diff --git a/addons/stock_account/product_view.xml b/addons/stock_account/product_view.xml
index 93570d50ee8..74ef2440ac7 100644
--- a/addons/stock_account/product_view.xml
+++ b/addons/stock_account/product_view.xml
@@ -43,7 +43,7 @@
 		</xpath>
 		<xpath expr="//field[@name='standard_price']" position='replace'>
                     <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                    <field name="cost_method" groups="product.group_costing_method"/>
+                    <field name="cost_method" groups="stock_account.group_inventory_valuation"/>
 		</xpath>
             </field>
         </record>
@@ -54,13 +54,13 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace" version="7.0">
-                    <field name="cost_method" groups="product.group_costing_method" attrs="{'readonly': [('is_only_child', '=', False)]}"/>
+                    <field name="cost_method" groups="stock_account.group_inventory_valuation" attrs="{'readonly': [('is_only_child', '=', False)]}"/>
                     <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
                     <div groups="base.group_user">
                         <field name="standard_price" attrs="{'readonly':['|', ('is_only_child', '=', False), '&amp;', ('valuation','=','real_time'), ('cost_method', 'in', ['standard', 'average'])]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="- update"
                             type="action" attrs="{'invisible':['|', '|', ('is_only_child', '=', False), ('valuation','!=', 'real_time'), ('cost_method', 'not in', ['standard', 'average'])]}"
-                            class="oe_link" groups="product.group_costing_method"/>
+                            class="oe_link" groups="stock_account.group_inventory_valuation"/>
                     </div>
                 </field>
             </field>
@@ -73,7 +73,7 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='properties']" position="before">
-                    <group>
+                    <group groups="stock_account.group_stock_inventory_valuation">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
diff --git a/addons/stock_account/res_config.py b/addons/stock_account/res_config.py
new file mode 100644
index 00000000000..bcbbab1d641
--- /dev/null
+++ b/addons/stock_account/res_config.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+
+
+class stock_config_settings(osv.osv_memory):
+    _inherit = 'stock.config.settings'
+
+    _columns = {
+        'group_stock_inventory_valuation': fields.boolean("Generate accounting entries per stock movement",
+            implied_group='stock_account.group_inventory_valuation',
+            help="""Allows to configure inventory valuations on products and product categories."""),
+        'module_stock_invoice_directly': fields.boolean("Create and open the invoice when the user finish a delivery order",
+            help='This allows to automatically launch the invoicing wizard if the delivery is '
+                 'to be invoiced when you send or deliver goods.\n'
+                 '-This installs the module stock_invoice_directly.'),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_account/res_config_view.xml b/addons/stock_account/res_config_view.xml
new file mode 100644
index 00000000000..9ed855fc170
--- /dev/null
+++ b/addons/stock_account/res_config_view.xml
@@ -0,0 +1,27 @@
+<openerp>
+    <data>
+        <record id="view_stock_config_settings_inherit" model="ir.ui.view">
+            <field name="name">stock.config.settings.inherit</field>
+            <field name="model">stock.config.settings</field>
+            <field name="inherit_id" ref="stock.view_stock_config_settings"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='traceability']" position="after">
+                    <separator string="Accounting"/>
+                    <group>
+                        <label for="id" string="Accounting"/>
+                        <div>
+                            <div>
+                                <field name="group_stock_inventory_valuation" class="oe_inline"/>
+                                <label for="group_stock_inventory_valuation"/>
+                            </div>
+                            <div>
+                                <field name="module_stock_invoice_directly" class="oe_inline"/>
+                                <label for="module_stock_invoice_directly"/>
+                            </div>
+                         </div>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/stock_account/security/stock_account_security.xml b/addons/stock_account/security/stock_account_security.xml
index 082a9bdc98c..97ecaecd278 100644
--- a/addons/stock_account/security/stock_account_security.xml
+++ b/addons/stock_account/security/stock_account_security.xml
@@ -4,6 +4,10 @@
     <record id="stock.group_stock_manager" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('account.group_account_invoice'))]"/>
     </record>
+    <record id="group_inventory_valuation" model="res.groups">
+        <field name="name">Manage Inventory Valuation and Costing Methods</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
 </data>
 </openerp>