diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 1b0cbed7937..9d276519b3f 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -72,20 +72,18 @@ Dashboard for CRM will include:
 
         'wizard/crm_phonecall_to_phonecall_view.xml',
 
-        'wizard/crm_opportunity_to_phonecall_view.xml',
-
         'wizard/crm_merge_opportunities_view.xml',
 
         'crm_view.xml',
 
+        'crm_phonecall_view.xml',
+        'crm_phonecall_menu.xml',
+
         'crm_lead_view.xml',
         'crm_lead_menu.xml',
 
         'calendar_event_menu.xml',
 
-        'crm_phonecall_view.xml',
-        'crm_phonecall_menu.xml',
-
         'report/crm_lead_report_view.xml',
         'report/crm_phonecall_report_view.xml',
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 6f522f0118f..5493d44ef21 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -317,6 +317,7 @@ class crm_lead(format_address, osv.osv):
 
     def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):
         values = {}
+        phonecall_obj = self.pool.get('crm.phonecall')
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
@@ -332,6 +333,8 @@ class crm_lead(format_address, osv.osv):
                 'fax': partner.fax,
                 'zip': partner.zip,
             }
+        call_ids = phonecall_obj.search(cr, uid, [('opportunity_id','in',ids)], context)
+        phonecall_obj.write(cr, uid, call_ids, {'partner_id': partner_id}, context)
         return {'value': values}
 
     def on_change_user(self, cr, uid, ids, user_id, context=None):
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e76a7a9124d..09299337f32 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -104,9 +104,9 @@
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
-                        <button string="Schedule/Log Call" 
-                                name="%(opportunity2phonecall_act)d"
-                                type="action"/>
+                        <button class="oe_inline" type="action" string="Calls" 
+                            name="%(crm.crm_case_categ_phone_incoming0)d" 
+                            context="{'default_opportunity_id': active_id, 'search_default_opportunity_id': active_id, 'default_partner_id': partner_id, 'default_duration': 1.0}" />
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -279,7 +279,7 @@
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
                                         <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
-                                        <li><a name="%(opportunity2phonecall_act)d" type="action">Schedule/Log Call</a></li>
+                                        <li><a type="action" name="%(crm.crm_case_categ_phone_incoming0)d" >Calls</a></li>
                                         <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
@@ -389,10 +389,11 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button string="Schedule/Log Call" type="action"
-                                name="%(opportunity2phonecall_act)d"/>
-                            <button string="Meeting" type="object"
-                                name="action_makeMeeting"
+                            <button class="oe_inline" type="action" string="Calls" 
+                                name="%(crm.crm_case_categ_phone_incoming0)d" 
+                                context="{'default_opportunity_id': active_id, 'search_default_opportunity_id': active_id, 'default_partner_id': partner_id, 'default_duration': 1.0}" />
+                            <button string="Schedule Meeting" type="action"
+                                name="%(base_calendar.action_crm_meeting)d"
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"/>
                         </div>
                         <div class="oe_title">
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 6380f80c89f..b0749823234 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -144,7 +144,8 @@
 
     <menuitem name="Scheduled Calls" id="menu_crm_case_phone_outbound"
         parent="crm.menu_crm_case_phone"
-        action="crm_case_categ_phone_outgoing0" />
+        groups="crm.group_scheduled_calls_menu"
+        action="crm_case_categ_phone_outgoing0"/>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9675913a0b5..df78d8d3a79 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -177,6 +177,7 @@
                        help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
                <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                <field name="user_id"/>
+               <field name="opportunity_id"/>
                <field name="section_id" string="Sales Team"
                         groups="base.group_multi_salesteams"/>
                <group expand="0" string="Group By...">
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 6af3dc93fce..c3e368ff314 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -30,7 +30,7 @@ class crm_configuration(osv.TransientModel):
     def set_group_multi_salesteams(self, cr, uid, ids, context=None):
         """ This method is automatically called by res_config as it begins
             with set. It is used to implement the 'one group or another'
-            behavior. We have to perform some group manipulation by hand
+            behavior. We have to perform some group manipulation by hand    
             because in res_config.execute(), set_* methods are called
             after group_*; therefore writing on an hidden res_config file
             could not work.
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index b964cca5c7f..b68f04ff500 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -21,6 +21,10 @@
                                 <field name="module_crm_helpdesk" class="oe_inline"/>
                                 <label for="module_crm_helpdesk"/>
                             </div>
+                            <div>
+                                <field name="group_scheduled_calls_menu" class="oe_inline"/>
+                                <label for="group_scheduled_calls_menu"/>
+                            </div>
                         </div>
                     </group>
                     <separator string="Sales Teams"/>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index dfc3a56858e..3b901184381 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -42,6 +42,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_scheduled_calls_menu" model="res.groups">
+        <field name="name">Show Scheduled Calls Menu</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
diff --git a/addons/crm/test/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
index a0952f4aa1f..8f8b855bb8e 100644
--- a/addons/crm/test/lead2opportunity2win.yml
+++ b/addons/crm/test/lead2opportunity2win.yml
@@ -31,18 +31,12 @@
 -
   Now I begin communication and schedule a phone call with the customer.
 -
-  !python {model: crm.opportunity2phonecall}: |
+  !python {model: crm.phonecall2phonecall}: |
     import time
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_3')]})
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_3')],'active_id': ref('crm_case_3')})
     call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'name': "Bonjour M. Jean, Comment allez-vous? J'ai bien reçu votre demande, pourrions-nous en parler quelques minutes?"}, context=context)
     self.action_schedule(cr, uid, [call_id], context=context)
--
-  I check that phonecall is scheduled for that opportunity.
--
-  !python {model: crm.phonecall}: |
-    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_3'))])
-    assert len(ids), 'Phonecall is not scheduled'
 -
   Now I schedule meeting with customer.
 -
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 7bc2c97e5dd..c72e1f34fc8 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -21,7 +21,6 @@
 
 import crm_partner_binding
 import crm_phonecall_to_phonecall
-import crm_opportunity_to_phonecall
 import crm_lead_to_opportunity
 import crm_merge_opportunities
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
deleted file mode 100644
index 5183773b618..00000000000
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ /dev/null
@@ -1,79 +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/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-import time
-
-class crm_opportunity2phonecall(osv.osv_memory):
-    """Converts Opportunity to Phonecall"""
-    _inherit = 'crm.phonecall2phonecall'
-    _name = 'crm.opportunity2phonecall'
-    _description = 'Opportunity to Phonecall'
-
-    def default_get(self, cr, uid, fields, context=None):
-        opp_obj = self.pool.get('crm.lead')
-        categ_id = False
-        data_obj = self.pool.get('ir.model.data')
-        try:
-            res_id = data_obj._get_id(cr, uid, 'crm', 'categ_phone2')
-            categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
-        except ValueError:
-            pass
-
-        record_ids = context and context.get('active_ids', []) or []
-        res = {}
-        res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
-        for opp in opp_obj.browse(cr, uid, record_ids, context=context):
-            if 'name' in fields:
-                res.update({'name': opp.name})
-            if 'user_id' in fields:
-                res.update({'user_id': opp.user_id and opp.user_id.id or False})
-            if 'section_id' in fields:
-                res.update({'section_id': opp.section_id and opp.section_id.id or False})
-            if 'categ_id' in fields:
-                res.update({'categ_id': categ_id})
-            if 'partner_id' in fields:
-                res.update({'partner_id': opp.partner_id and opp.partner_id.id or False})
-            if 'contact_name' in fields:
-                res.update({'contact_name': opp.partner_id and opp.partner_id.name or False})
-            if 'phone' in fields:
-                res.update({'phone': opp.phone or (opp.partner_id and opp.partner_id.phone or False)})
-        return res
-
-    def action_schedule(self, cr, uid, ids, context=None):
-        value = {}
-        if context is None:
-            context = {}
-        phonecall = self.pool.get('crm.phonecall')
-        opportunity_ids = context and context.get('active_ids') or []
-        opportunity = self.pool.get('crm.lead')
-        data = self.browse(cr, uid, ids, context=context)[0]
-        call_ids = opportunity.schedule_phonecall(cr, uid, opportunity_ids, data.date, data.name, \
-                data.note, data.phone, data.contact_name, data.user_id and data.user_id.id or False, \
-                data.section_id and data.section_id.id or False, \
-                data.categ_id and data.categ_id.id or False, \
-                action=data.action, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
deleted file mode 100644
index d04d1bd9ccd..00000000000
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <!-- Opportunity to Phonecall view -->
-
-        <record model="ir.ui.view" id="opportunity2phonecall_view">
-            <field name="name">crm.opportunity2phonecall.form</field>
-            <field name="model">crm.opportunity2phonecall</field>
-            <field name="arch" type="xml">
-                <form string="Schedule/Log a Call" version="7.0">
-                    <group>
-                        <group>
-                            <field name="action"/>
-                            <field name="name"/>
-                            <field name="categ_id" string="Type"
-                                widget="selection"
-                                domain="[('object_id.model', '=', 'crm.phonecall')]"
-                                groups="base.group_no_one"/>
-                            <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
-                        </group>
-                        <group>
-                            <field name="partner_id" readonly="True"/>
-                            <field name="phone"/>
-                            <field name="user_id" attrs="{'invisible': [('action','=','log')]}" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
-                            <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}" groups="base.group_multi_salesteams"/>
-                        </group>
-                    </group>
-                    <field name="note" placeholder="Call Description" />
-                    <footer>
-                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
-                        or
-                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <!-- Opportunity to Phonecall action -->
-
-         <record model="ir.actions.act_window" id="opportunity2phonecall_act">
-            <field name="name">Schedule/Log Call</field>
-            <field name="res_model">crm.opportunity2phonecall</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="opportunity2phonecall_view"/>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
deleted file mode 100644
index e69de29bb2d..00000000000