diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 228ee5b971b..5bd35d7dbd9 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -101,9 +101,6 @@ class account_config_settings(osv.osv_memory):
         'module_account_followup': fields.boolean('Manage Customer Payment Follow-Ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
-        'module_account_analytic_plans': fields.boolean('Support Multiple Analytic Plans',
-            help="""This allows to use several analytic plans, according to the general journal.
-                This installs the module account_analytic_plans."""),
         'module_account_invoice_layout': fields.boolean('Allow notes and subtotals',
             help="""This provides some features to improve the layout of invoices.
                 It gives you the possibility to:
@@ -115,7 +112,6 @@ class account_config_settings(osv.osv_memory):
         'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
-
         'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
         'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
     }
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index cda3885c94c..fa309221e8b 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -100,7 +100,6 @@
                         <group colspan="2" col="2">
                             <separator string="Analytic Accounting" colspan="2"/>
                             <group name="analytic_accounting" colspan="2"/>
-                            <field name="module_account_analytic_plans"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 5d1b6206d2a..a6df77f6e2a 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -73,6 +73,8 @@ class purchase_config_settings(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
+        'module_purchase_analytic_plans': fields.boolean('Several Analytic Accounts on Purchases',
+            help="""This allows install module purchase_analytic_plans."""),                 
         'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 26d40ac0be0..bec6c0eb125 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -48,6 +48,7 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="arch" type="xml">
                 <group name="analytic_accounting" position="after">
+                    <field name="module_purchase_analytic_plans"/>
                     <field name="group_analytic_account_for_purchases"/>
                 </group>
             </field>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 3d2f63790c5..3625b6c7d6c 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -174,6 +174,8 @@ class sale_configuration(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
+        'module_sale_analytic_plans': fields.boolean('Several Analytic Accounts on Sales',
+            help="""This allows install module sale_analytic_plans."""),                 
         'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sale orders."),
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 1341a446162..22ed3fb9fae 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -52,6 +52,7 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="arch" type="xml">
                 <group name="analytic_accounting" position="after">
+                    <field name="module_purchase_analytic_plans"/>
                     <field name="group_analytic_account_for_sales"/>
                 </group>
             </field>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 14ba77d6993..b3c73e6616d 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -26,7 +26,7 @@ class stock_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_claim_from_delivery': fields.boolean("Track Claims from Delivery",
+        'module_claim_from_delivery': fields.boolean("Allows Claims on Delivery Orders",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
         'module_stock_invoice_directly': fields.boolean("Invoice Directly from the Picking",