diff --git a/addons/crm/crm_claims_demo.xml b/addons/crm/crm_claims_demo.xml
index b53cb1b717b..b957d286d85 100644
--- a/addons/crm/crm_claims_demo.xml
+++ b/addons/crm/crm_claims_demo.xml
@@ -13,7 +13,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Problem with the delivery of goods&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim1"/>
@@ -29,7 +29,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Damaged Products&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim2"/>
@@ -45,7 +45,7 @@
 			<field name="user_id" ref="base.user_demo"/>
 			<field eval="&quot;Document related problems&quot;" name="name"/>
 			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim3"/>
@@ -61,7 +61,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Product quality not maintained&quot;" name="name"/>
 			<field eval="&quot;draft&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim1"/>
@@ -77,7 +77,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Some products missing&quot;" name="name"/>
 			<field eval="&quot;pending&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim3"/>
@@ -93,7 +93,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Problem with the delivery of assignments&quot;" name="name"/>
 			<field eval="&quot;cancel&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
 			<field name="categ_id" ref="crm.categ_claim1"/>
@@ -109,7 +109,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Documents unclear&quot;" name="name"/>
 			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;	(463) 014-1208&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
 			<field name="categ_id" ref="crm.categ_claim3"/>
diff --git a/addons/crm/crm_fund_data.xml b/addons/crm/crm_fund_data.xml
index 1adac876265..127a729aa3d 100644
--- a/addons/crm/crm_fund_data.xml
+++ b/addons/crm/crm_fund_data.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<!--    <record model="crm.case.section" id="section_support4">
-        <field name="name">Fund Raising</field>
-        <field name="code">funds</field>
-    </record>-->
 
         <!--    FUNDRAISING CATEGORY(categ_id)        -->
         
diff --git a/addons/crm/crm_fund_demo.xml b/addons/crm/crm_fund_demo.xml
index b4af9776cb8..ef8f590954b 100644
--- a/addons/crm/crm_fund_demo.xml
+++ b/addons/crm/crm_fund_demo.xml
@@ -12,7 +12,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="250000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
             <field name="categ_id" ref="categ_fund1"/>
             <field eval="&quot;Helping Street Children&quot;" name="name"/>
@@ -30,7 +30,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="2000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
             <field eval="8.0" name="duration"/>
             <field name="categ_id" ref="categ_fund1"/>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="500000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
             <field name="categ_id" ref="categ_fund2"/>
             <field eval="&quot;Donating books to school libraries&quot;" name="name"/>
@@ -65,7 +65,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="1000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
             <field name="categ_id" ref="categ_fund2"/>
             <field eval="4.3" name="duration"/>
@@ -82,7 +82,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="5000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
             <field eval="3" name="duration"/>
             <field name="categ_id" ref="categ_fund3"/>
@@ -99,7 +99,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="10000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
             <field eval="12" name="duration"/>
             <field name="categ_id" ref="categ_fund3"/>
@@ -118,7 +118,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="10000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
             <field name="categ_id" ref="categ_fund4"/>
             <field eval="&quot;Encouraging arts&quot;" name="name"/>
@@ -136,7 +136,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="800000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
             <field name="categ_id" ref="categ_fund4"/>
             <field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index d99b8d9f1ea..619c549515f 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<!--        CASE SECTION        -->
-<!--    <record model="crm.case.section" id="section_support2">
-        <field name="name">Leads</field>
-        <field name="code">leads</field>
-    </record>-->
 
-<!--        LEAD CATEGORY(categ_id)        -->
     <record model="crm.lead.categ" id="categ_lead1">
         <field name="name">Existing Customer</field>
         <field name="section_id" ref="section_sales_department"/>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 7bffe5e7f82..bfe9e8ad2e8 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -12,7 +12,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Michel Lafont&quot;" name="partner_name2"/>
             <field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -27,7 +27,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Luc Latour&quot;" name="partner_name2"/>
             <field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -42,7 +42,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;done&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Mike Gardner&quot;" name="partner_name2"/>
             <field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -58,7 +58,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;draft&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_lead1"/>
@@ -72,7 +72,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Carrie Helle&quot;" name="name"/>
             <field eval="&quot;pending&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Sam Stone&quot;" name="partner_name2"/>
             <field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -90,7 +90,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Tina Pinero&quot;" name="name"/>
             <field eval="&quot;cancel&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Benoit Mortier&quot;" name="partner_name2"/>
             <field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_lead8"/>
@@ -106,7 +106,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Wendi Baltz&quot;" name="name"/>
             <field eval="&quot;done&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Will Smith&quot;" name="partner_name2"/>
             <field eval="&quot;(463) 014-1208&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_lead4"/>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index 3935296640f..ecf6cb1d5c0 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -19,7 +19,7 @@
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="75000.0" name="planned_cost"/>
             <field eval="85000.0" name="planned_revenue"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_oppor3"/>
@@ -37,7 +37,7 @@
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="50" name="probability"/>
             <field eval="8.0" name="duration"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor1"/>
@@ -56,7 +56,7 @@
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="70" name="probability"/>
             <field eval="10.0" name="duration"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
             <field name="stage_id" ref="crm.stage_oppor5"/>
@@ -75,7 +75,7 @@
             <field eval="50000.0" name="planned_cost"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="24.0" name="duration"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor4"/>
@@ -93,7 +93,7 @@
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="25000.0" name="planned_cost"/>
             <field eval="42000.0" name="planned_revenue"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_oppor6"/>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 9a9cc80c844..fb8a9a3ebf2 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -70,6 +70,7 @@ class crm_phonecall(osv.osv):
         'probability': fields.float('Probability (%)'),
         'planned_revenue': fields.float('Planned Revenue'),
         'date_closed': fields.datetime('Closed', readonly=True),
+        'case_id': fields.many2one ('crm.case', 'Opportunity'),
     }
 
     def msg_new(self, cr, uid, msg):
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index d2af4cd0d40..571848c54c7 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -12,7 +12,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Left the message&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
@@ -27,7 +27,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Get More information on the proposed deal&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
@@ -42,7 +42,7 @@
 			<field name="user_id" ref="base.user_demo"/>
 			<field eval="&quot;Bad time, will call back&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
@@ -57,7 +57,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Discuss Review Process&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
@@ -72,7 +72,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;More information on the proposed deal&quot;" name="name"/>
 			<field eval="&quot;pending&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
@@ -87,7 +87,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Bad time&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>