From 319e7d129cd1c4fda427a169a2671c30ce7620af Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 27 Mar 2013 16:44:08 +0100
Subject: [PATCH] [IMP] salesteams: move config to sales settings

bzr revid: chm@openerp.com-20130327154408-pa1f6ygbyo7zr0an
---
 addons/crm/crm.py                    |  2 +-
 addons/crm/crm_case_section_view.xml | 24 ++++++++++++++----------
 addons/crm/res_config_view.xml       |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index bb2a71f55fd..85d58ce4a79 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -238,7 +238,7 @@ class crm_payment_mode(osv.osv):
 
 
 class base_config_settings(osv.osv_memory):
-    _inherit = 'base.config.settings'
+    _inherit = 'sale.config.settings'
     _columns = {
         'group_multi_salesteams': fields.boolean("Use mutli sales teams",
             implied_group='base.group_multi_salesteams',
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 73f99707eda..8ab1606e873 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -266,17 +266,21 @@
             </field>
         </record>
 
-        <record id="view_general_configuration" model="ir.ui.view">
-            <field name="name">base.config.settings.crm</field>
-            <field name="model">base.config.settings</field>
-            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+        <record id="view_salesteams_settings" model="ir.ui.view">
+            <field name="name">crm salesteams settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <xpath expr='//div[@name="multi_company"]' position="after">
-                    <div name="multi_salesteams">
-                        <field name="group_multi_salesteams" class="oe_inline"/>
-                        <label for="group_multi_salesteams"/>
-                    </div>
-                </xpath>
+                <div name="config_sale" position="before">
+                    <separator string="Multi Sales Teams"/>
+                    <group>
+                        <label for="id" string="Sales Teams"/>
+                        <div>
+                            <field name="group_multi_salesteams" class="oe_inline"/>
+                            <label for="group_multi_salesteams"/>
+                        </div>
+                    </group>
+                </div>
             </field>
         </record>
 
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index ba0b7e693c7..a6ec87b8243 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -12,7 +12,7 @@
                     <group>
                         <label for="id" string="Features"/>
                         <div>
-                            <div>
+                            <div> 
                                 <field name="module_crm_claim" class="oe_inline"/>
                                 <label for="module_crm_claim"/>
                             </div>