diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index f60483f6f59..ecf7d33261b 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/CRM & SRM',
     'description': """The generic Open ERP Customer Relationship Management
 system enables a group of people to intelligently and efficiently manage
-leads, opportunities, claims, meeting, phonecall etc.
+leads, opportunities, meeting, phonecall etc.
 It manages key tasks such as communication, identification, prioritization,
 assignment, resolution and notification.
 
@@ -54,35 +54,63 @@ between mails and Open ERP.""",
     ],
     'init_xml': [
         'crm_data.xml',
+        'crm_meeting_data.xml',
+        'crm_lead_data.xml',
+        'crm_meeting_data.xml',
+        'crm_opportunity_data.xml',
+        'crm_phonecall_data.xml',
     ],
 
     'update_xml': [
+        'wizard/crm_lead_to_partner_view.xml',
+        'wizard/crm_lead_to_opportunity_view.xml',
+
+        'wizard/crm_phonecall_to_phonecall_view.xml',
+        'wizard/crm_phonecall_to_partner_view.xml',
+        'wizard/crm_phonecall_to_opportunity_view.xml',
+
+        'wizard/crm_opportunity_to_phonecall_view.xml',
+        'wizard/crm_partner_to_opportunity_view.xml',
+
         'wizard/crm_send_email_view.xml',
         'wizard/crm_email_add_cc_view.xml',
         'crm_view.xml',
+
         'crm_action_rule_view.xml',
+        'crm_lead_view.xml',
+        'crm_lead_menu.xml',
+        'crm_meeting_view.xml',
+        'crm_meeting_menu.xml',
+        'crm_phonecall_view.xml',
+        'crm_phonecall_menu.xml',
+        'crm_opportunity_view.xml',
+        'crm_opportunity_menu.xml',
 
         'security/crm_security.xml',
         'security/ir.model.access.csv',
 
         'report/crm_report_view.xml',
+        'report/crm_lead_report_view.xml',
+        'report/crm_opportunity_report_view.xml' ,
+        'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
     ],
     'demo_xml': [
-        'test/test_crm_meeting.yml',         
         'crm_demo.xml',
+        'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
+        'crm_opportunity_demo.xml',
+        'crm_phonecall_demo.xml'
     ],
-    'test': ['test/test_crm_lead.yml',
+    'test': [
+            'test/test_crm_meeting.yml', 
+            'test/test_crm_lead.yml',
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml', 
-            'test/test_crm_fund.yml',    
-            'test/test_crm_claim.yml',
-            'test/test_crm_helpdesk.yml',  
              ],
     'installable': True,
     'active': False,
     'certificate': '0079056041421',
 }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_phonecall/crm_phonecall.py b/addons/crm/crm_phonecall.py
similarity index 99%
rename from addons/crm_phonecall/crm_phonecall.py
rename to addons/crm/crm_phonecall.py
index 713ff414f97..c452e1b5055 100644
--- a/addons/crm_phonecall/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -21,7 +21,7 @@
 
 from osv import fields, osv
 from tools.translate import _
-from crm import crm
+import crm
 import time
 
 class crm_phonecall(osv.osv):
diff --git a/addons/crm_phonecall/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
similarity index 76%
rename from addons/crm_phonecall/crm_phonecall_data.xml
rename to addons/crm/crm_phonecall_data.xml
index a716420ad5e..49d02f8848e 100644
--- a/addons/crm_phonecall/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -8,13 +8,13 @@
 	-->
 	<record model="crm.case.categ" id="categ_phone1">
 		<field name="name">Inbound</field>
-		<field name="section_id" ref="crm.section_sales_department"/>
+		<field name="section_id" ref="section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
 		
 	</record>
 	<record model="crm.case.categ" id="categ_phone2">
 		<field name="name">Outbound</field>
-		<field name="section_id" ref="crm.section_sales_department"/>
+		<field name="section_id" ref="section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
 	</record>
 	
@@ -23,18 +23,18 @@
 	-->
 	<record model="crm.case.stage" id="stage_phone1">
 		<field name="name">Planned</field>
-		<field name="section_id" ref="crm.section_sales_department"/>
+		<field name="section_id" ref="section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
 	</record>	
 	<record model="crm.case.stage" id="stage_phone2">
 		<field name="name">Held</field>
-		<field name="section_id" ref="crm.section_sales_department"/>
+		<field name="section_id" ref="section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
 	</record>	
 	<record model="crm.case.stage" id="stage_phone3">
 		<field name="name">Not Held</field>
-		<field name="section_id" ref="crm.section_sales_department"/>
+		<field name="section_id" ref="section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
 	</record>
 </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm_phonecall/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
similarity index 85%
rename from addons/crm_phonecall/crm_phonecall_demo.xml
rename to addons/crm/crm_phonecall_demo.xml
index 264ad840e1a..571848c54c7 100644
--- a/addons/crm_phonecall/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -15,8 +15,8 @@
 			<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_phonecall.categ_phone1"/>
-			<field name="stage_id" ref="crm_phonecall.stage_phone1"/>
+			<field name="categ_id" ref="crm.categ_phone1"/>
+			<field name="stage_id" ref="crm.stage_phone1"/>
 			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
 		</record>
 		<record id="crm_case_phone02" model="crm.phonecall">
@@ -30,8 +30,8 @@
 			<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_phonecall.categ_phone1"/>
-			<field name="stage_id" ref="crm_phonecall.stage_phone2"/>
+			<field name="categ_id" ref="crm.categ_phone1"/>
+			<field name="stage_id" ref="crm.stage_phone2"/>
 			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
 		</record>
 		<record id="crm_case_phone03" model="crm.phonecall">
@@ -45,8 +45,8 @@
 			<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_phonecall.categ_phone1"/>
-			<field name="stage_id" ref="crm_phonecall.stage_phone3"/>
+			<field name="categ_id" ref="crm.categ_phone1"/>
+			<field name="stage_id" ref="crm.stage_phone3"/>
 			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
 			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 		</record>
@@ -60,8 +60,8 @@
 			<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_phonecall.categ_phone2"/>
-			<field name="stage_id" ref="crm_phonecall.stage_phone1"/>
+			<field name="categ_id" ref="crm.categ_phone2"/>
+			<field name="stage_id" ref="crm.stage_phone1"/>
 			<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
 		</record>
 		<record id="crm_case_phone05" model="crm.phonecall">
@@ -75,8 +75,8 @@
 			<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_phonecall.categ_phone2"/>
-			<field name="stage_id" ref="crm_phonecall.stage_phone2"/>
+			<field name="categ_id" ref="crm.categ_phone2"/>
+			<field name="stage_id" ref="crm.stage_phone2"/>
 			<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
 		</record>
 		<record id="crm_case_phone06" model="crm.phonecall">
@@ -90,8 +90,8 @@
 			<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_phonecall.categ_phone2"/>
-			<field name="stage_id" ref="crm_phonecall.stage_phone3"/>
+			<field name="categ_id" ref="crm.categ_phone2"/>
+			<field name="stage_id" ref="crm.stage_phone3"/>
 			<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
 			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 		</record>	
diff --git a/addons/crm_phonecall/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
similarity index 85%
rename from addons/crm_phonecall/crm_phonecall_menu.xml
rename to addons/crm/crm_phonecall_menu.xml
index 2c47797ecbe..176e5aed7bc 100644
--- a/addons/crm_phonecall/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -20,28 +20,28 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="search_view_id" ref="view_crm_case_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_phonecall.crm_case_phone_tree_view"/>
-        <field name="act_window_id" ref="crm_phonecall.crm_case_categ_phone0"/>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_phonecall.crm_case_phone_calendar_view"/>
-        <field name="act_window_id" ref="crm_phonecall.crm_case_categ_phone0"/>
+        <field name="view_id" ref="crm_case_phone_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_phonecall.crm_case_phone_form_view"/>
-        <field name="act_window_id" ref="crm_phonecall.crm_case_categ_phone0"/>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
@@ -56,7 +56,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
         <field name="context">{'set_editable':True,'default_state':'open'}</field>
-        <field name="search_view_id" ref="view_crm_case_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
@@ -81,7 +81,7 @@
     </record>
 
     <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
-        parent="crm_phonecall.menu_crm_case_phone"
+        parent="crm.menu_crm_case_phone"
         action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
@@ -92,7 +92,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
         <field name="context">{'default_state':'open'}</field>
-        <field name="search_view_id" ref="view_crm_case_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
@@ -117,7 +117,7 @@
     </record>
 
     <menuitem name="Outbound" id="menu_crm_case_phone_outbound"
-        parent="crm_phonecall.menu_crm_case_phone"
+        parent="crm.menu_crm_case_phone"
         action="crm_case_categ_phone_outgoing0" />
 
 </data>
diff --git a/addons/crm_phonecall/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
similarity index 94%
rename from addons/crm_phonecall/crm_phonecall_view.xml
rename to addons/crm/crm_phonecall_view.xml
index 678e5b6db5d..e5d6c7565df 100644
--- a/addons/crm_phonecall/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -75,18 +75,18 @@
                     <field name="name" string="Call Summary"/>
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
-<!--                    <button string="Schedule a Meeting"-->
-<!--                        name="action_make_meeting"-->
-<!--                        icon="gtk-redo"-->
-<!--                        type="object" />-->
-					<newline/>
+                    <button string="Schedule a Meeting"
+                        name="action_make_meeting"
+                        icon="gtk-redo"
+                        type="object" />
+
                     <field name="partner_phone"/>
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
-<!--                    <button string="Convert to Opportunity"-->
-<!--                        name="%(phonecall2opportunity_act)d"-->
-<!--                        icon="gtk-index" type="action"-->
-<!--                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />-->
+                    <button string="Convert to Opportunity"
+                        name="%(phonecall2opportunity_act)d"
+                        icon="gtk-index" type="action"
+                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                     <label colspan="6"  string=""/>
                     <button string="Schedule Other Call"
                      icon="gtk-redo"
diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py
index 9832df2bf33..41688e4c31f 100644
--- a/addons/crm/report/__init__.py
+++ b/addons/crm/report/__init__.py
@@ -23,6 +23,7 @@
 import crm_report
 import crm_lead_report
 import crm_opportunity_report
+import crm_phonecall_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_phonecall/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
similarity index 100%
rename from addons/crm_phonecall/report/crm_phonecall_report.py
rename to addons/crm/report/crm_phonecall_report.py
diff --git a/addons/crm_phonecall/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
similarity index 97%
rename from addons/crm_phonecall/report/crm_phonecall_report_view.xml
rename to addons/crm/report/crm_phonecall_report_view.xml
index 10f4a06b586..698a9b88fa3 100644
--- a/addons/crm_phonecall/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -30,7 +30,7 @@
         <record id="view_report_crm_phonecall_form" model="ir.ui.view">
             <field name="name">crm.phonecall.report.form</field>
             <field name="model">crm.phonecall.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_form"/>
+            <field name="inherit_id" ref="view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
@@ -62,7 +62,7 @@
         <record id="view_report_crm_phonecall_filter" model="ir.ui.view">
             <field name="name">crm.phonecall.report.select</field>
             <field name="model">crm.phonecall.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
+            <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
              <data>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 0207e6cb39c..37a36fc5504 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -8,6 +8,7 @@
 "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1
 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1
 "access_crm_opportunity","crm.opportunity","model_crm_opportunity","crm.group_crm_manager",1,1,1,1
+"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
 "access_crm_case_log","crm.case.log","model_crm_case_log","crm.group_crm_user",1,1,1,1
 "access_crm_case_history","crm.case.history","model_crm_case_history","crm.group_crm_user",1,1,1,1
 "access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
@@ -23,11 +24,15 @@
 "access_crm_case_report_user","crm.case.report","model_crm_case_report","crm.group_crm_user",1,0,0,0
 "access_crm_case_report_manager","crm.case.report manager","model_crm_case_report","crm.group_crm_manager",1,1,1,1
 "access_crm_lead_report_user","crm.lead.report","model_crm_lead_report","crm.group_crm_user",1,0,0,0
+"access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
 "access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0
 "access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0
 "access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_opportunity2phonecall","crm.opportunity2phonecall","model_crm_opportunity2phonecall","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
 "access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 75c6a21caa3..f3d92447acd 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -25,6 +25,9 @@ import crm_email_add_cc
 import crm_lead_to_partner
 import crm_lead_to_opportunity
 import crm_opportunity_to_phonecall
+import crm_phonecall_to_phonecall
+import crm_phonecall_to_partner
+import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index ffe91a927d2..148ec3aec6e 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -29,10 +29,10 @@ class crm_opportunity2phonecall(osv.osv_memory):
     _description = 'Opportunity to Phonecall'
 
     _columns = {
-        'name' : fields.char('Call summary', size=64, required=True, select=1),
-        'user_id' : fields.many2one('res.users', "Assign To"),
-        'date': fields.datetime('Date' , required=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'name' : fields.char('Call summary', size=64, required=True, select=1), 
+        'user_id' : fields.many2one('res.users', "Assign To"), 
+        'date': fields.datetime('Date' , required=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -46,6 +46,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         @return : default values of fields.
         """
+
         opp_obj = self.pool.get('crm.opportunity')
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
@@ -92,7 +93,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
         data_obj = self.pool.get('ir.model.data')
         categ_id = mod_obj._get_id(cr, uid, 'crm', 'categ_phone1')
         categ_id = data_obj.browse(cr, uid, categ_id, context=context).res_id
-
+        
         # Select the view
         id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
         id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
@@ -104,32 +105,31 @@ class crm_opportunity2phonecall(osv.osv_memory):
         for this in self.browse(cr, uid, ids, context=context):
             for opp in opp_obj.browse(cr, uid, record_ids, context=context):
                 new_case = phonecall_obj.create(cr, uid, {
-                        'name' : opp.name,
-                        'case_id' : opp.id ,
-                        'user_id' : this.user_id and this.user_id.id or False,
-                        'categ_id' : categ_id,
-                        'description' : opp.description or False,
-                        'date' : this.date,
-                        'section_id' : opp.section_id and opp.section_id.id or False,
-                        'partner_id': opp.partner_id and opp.partner_id.id or False,
-                        'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False,
-                        'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False),
-                        'partner_mobile' : opp.partner_address_id and opp.partner_address_id.mobile or False,
-                        'priority': opp.priority,
+                        'name' : opp.name, 
+                        'case_id' : opp.id , 
+                        'user_id' : this.user_id and this.user_id.id or False, 
+                        'categ_id' : categ_id, 
+                        'description' : opp.description or False, 
+                        'date' : this.date, 
+                        'section_id' : opp.section_id and opp.section_id.id or False, 
+                        'partner_id': opp.partner_id and opp.partner_id.id or False, 
+                        'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False, 
+                        'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False), 
+                        'partner_mobile' : opp.partner_address_id and opp.partner_address_id.mobile or False, 
+                        'priority': opp.priority, 
                         'opp_id': opp.id
                 }, context=context)
 
                 phonecall_obj.case_open(cr, uid, [new_case])
 
             value = {
-                'name': _('Phone Call'),
-                'domain': "[('user_id','=',%s),('opportunity_id','=',%s)]" % (uid,opp.id),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'crm.phonecall',
-                'res_id' : new_case,
-                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
+                'name': _('Phone Call'), 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'crm.phonecall', 
+                'res_id' : new_case, 
+                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar'), (False, 'graph')], 
+                'type': 'ir.actions.act_window', 
                 'search_view_id': res['res_id']
             }
         return value
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
similarity index 92%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_meeting.py
rename to addons/crm/wizard/crm_phonecall_to_meeting.py
index 9dcc88fad0c..bf63c319a71 100644
--- a/addons/crm_phonecall/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -37,9 +37,9 @@ class phonecall2meeting(wizard.interface):
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])
-        id1 = data_obj._get_id(cr, uid, 'crm_meeting', 'crm_case_calendar_view_meet')
-        id2 = data_obj._get_id(cr, uid, 'crm_meeting', 'crm_case_form_view_meet')
-        id3 = data_obj._get_id(cr, uid, 'crm_meeting', 'crm_case_tree_view_meet')
+        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
         if id1:
             id1 = data_obj.browse(cr, uid, id1, context=context).res_id
         if id2:
@@ -115,9 +115,9 @@ class crm_phonecall2meeting(osv.osv_memory):
             # Get meeting views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm_meeting', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm_meeting', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm_meeting', 'crm_case_tree_view_meet')
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
             if id1:
                 id1 = data_obj.browse(cr, uid, id1, context=context).res_id
             if id2:
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
similarity index 100%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_meeting_view.xml
rename to addons/crm/wizard/crm_phonecall_to_meeting_view.xml
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
similarity index 96%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_opportunity.py
rename to addons/crm/wizard/crm_phonecall_to_opportunity.py
index db3c3053738..5d44ad4b2bf 100644
--- a/addons/crm_phonecall/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -75,10 +75,10 @@ Call Could not convert into Opportunity"))
             phonecall_obj = self.pool.get('crm.phonecall')
             case = phonecall_obj.browse(cr, uid, record_id, context=context)
             data_obj = self.pool.get('ir.model.data')
-            result = data_obj._get_id(cr, uid, 'crm_sale', 'view_crm_case_opportunities_filter')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
-            id2 = data_obj._get_id(cr, uid, 'crm_sale', 'crm_case_form_view_oppor')
-            id3 = data_obj._get_id(cr, uid, 'crm_sale', 'crm_case_tree_view_oppor')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
             if id2:
                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
             if id3:
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
similarity index 100%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_opportunity_view.xml
rename to addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
similarity index 100%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_partner.py
rename to addons/crm/wizard/crm_phonecall_to_partner.py
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
similarity index 100%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_partner_view.xml
rename to addons/crm/wizard/crm_phonecall_to_partner_view.xml
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
similarity index 95%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_phonecall.py
rename to addons/crm/wizard/crm_phonecall_to_phonecall.py
index 4c31b9ca894..9eb243603e9 100644
--- a/addons/crm_phonecall/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -58,10 +58,10 @@ class crm_phonecall2phonecall(osv.osv_memory):
             data_obj = self.pool.get('ir.model.data')
 
             # Get Phonecall views
-            result = data_obj._get_id(cr, uid, 'crm_phonecall', 'view_crm_case_phonecalls_filter')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
-            id2 = data_obj._get_id(cr, uid, 'crm_phonecall', 'crm_case_phone_form_view')
-            id3 = data_obj._get_id(cr, uid, 'crm_phonecall', 'crm_case_phone_tree_view')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
             if id2:
                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
             if id3:
diff --git a/addons/crm_phonecall/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
similarity index 100%
rename from addons/crm_phonecall/wizard/crm_phonecall_to_phonecall_view.xml
rename to addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
diff --git a/addons/crm_phonecall/__init__.py b/addons/crm_phonecall/__init__.py
deleted file mode 100644
index fc46be88851..00000000000
--- a/addons/crm_phonecall/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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/>.
-#
-##############################################################################
-
-import crm_phonecall
-import report
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm_phonecall/__openerp__.py b/addons/crm_phonecall/__openerp__.py
deleted file mode 100644
index 8b83bd7293b..00000000000
--- a/addons/crm_phonecall/__openerp__.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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/>.
-#
-##############################################################################
-
-
-{
-    'name': 'CRM Phonecalls',
-    'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
-    'description': """Phonecalls""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['crm'],
-    'init_xml': [
-         'crm_phonecall_data.xml',
-    ],
-
-    'update_xml': [
-        'wizard/crm_phonecall_to_phonecall_view.xml',
-        'wizard/crm_phonecall_to_partner_view.xml',
-        'wizard/crm_phonecall_to_opportunity_view.xml',
-
-        'crm_phonecall_view.xml',
-        'crm_phonecall_menu.xml',
-
-        'security/ir.model.access.csv',
-        'report/crm_phonecall_report_view.xml',
-    ],
-    'demo_xml': [
-        'crm_phonecall_demo.xml',
-    ],
-    'installable': True,
-    'active': False,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_phonecall/report/__init__.py b/addons/crm_phonecall/report/__init__.py
deleted file mode 100644
index ff504f82357..00000000000
--- a/addons/crm_phonecall/report/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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/>.     
-#
-##############################################################################
-
-import crm_phonecall_report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm_phonecall/security/ir.model.access.csv b/addons/crm_phonecall/security/ir.model.access.csv
deleted file mode 100644
index bdae84bdb95..00000000000
--- a/addons/crm_phonecall/security/ir.model.access.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
-"access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,1,1,1
-"access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,1,1,1
-"access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm_phonecall/wizard/__init__.py b/addons/crm_phonecall/wizard/__init__.py
deleted file mode 100644
index 813e82fc1e8..00000000000
--- a/addons/crm_phonecall/wizard/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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/>.
-#
-##############################################################################
-
-import crm_phonecall_to_phonecall
-import crm_phonecall_to_partner
-import crm_phonecall_to_opportunity
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-