diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 0189cc11b2c..d1514a658cf 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -62,7 +62,9 @@ between mails and Open ERP.""",
 
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
-        'wizard/lead_to_partner_view.xml',           
+        'wizard/lead_to_partner_view.xml',
+        'wizard/phonecall2partner_view.xml',
+        'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 53e3aa631d1..11516f3af56 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -49,7 +49,7 @@
                 <field name="partner_phone"/>                
                 <field name="user_id"/>
                 <button string="Opportunity" 
-                    name="%(wizard_crm_phonecall_opportunity_set)d"
+                    name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
@@ -82,7 +82,7 @@
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
                     <button string="Convert to Opportunity"
-                        name="%(wizard_crm_phonecall_opportunity_set)d"
+                        name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
 					<label colspan="6"  string=""/>                                 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 56330ebfd72..6c52d09a558 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -29,7 +29,8 @@ import wizard_history_event
 import crm_phonecall2phonecall
 
 import lead_to_partner
-
+import phonecall2partner
+import phonecall_to_opportunity
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/phonecall2opportunity.xml b/addons/crm/wizard/phonecall2opportunity.xml
new file mode 100644
index 00000000000..607db601433
--- /dev/null
+++ b/addons/crm/wizard/phonecall2opportunity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall2opportunity_view">
+            <field name="name">crm.phonecall2opportunity.form</field>
+            <field name="model">crm.phonecall2opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Opportunity " col="2">
+                		<field name="name"/>
+						<field name="partner_id" />
+						<newline/>
+						<field name="planned_revenue"/>
+						<field name="probability"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall2opportunity_act">
+            <field name="name">Convert To Opportunity</field>
+            <field name="res_model">crm.phonecall2opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall2opportunity_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
new file mode 100644
index 00000000000..025399c1040
--- /dev/null
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -0,0 +1,106 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2opportunity(osv.osv_memory):
+    _name = 'crm.phonecall2opportunity'
+    _description = 'Phonecall To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                 if case.state in ['done', 'cancel']:       
+                            raise osv.except_osv(_("Warning"),
+                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
+                 else:
+                     data_obj = self.pool.get('ir.model.data')
+                     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', '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:
+                        id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+                        opportunity_case_obj = self.pool.get('crm.opportunity')
+                        phonecall_case_obj = self.pool.get('crm.phonecall')
+                        new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                                'name': this.name,
+                                'planned_revenue': this.planned_revenue,
+                                'probability': this.probability,
+                                'partner_id': this.partner_id.id,                 
+                                'section_id': case.section_id.id,
+                                'description': case.description,         
+                                'phonecall_id': case.id,
+                                'priority': case.priority,
+                                'phone': case.partner_phone,
+                            })
+                        new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                        vals = {
+                                'partner_id': this.partner_id.id, 
+                                'opportunity_id' : new_opportunity_id,                
+                                }            
+                        phonecall_case_obj.write(cr, uid, [case.id], vals)
+                        phonecall_case_obj.case_close(cr, uid, [case.id])
+                        phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
+            value = {            
+                'name': _('Opportunity'),
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'crm.opportunity',
+                'res_id': int(new_opportunity_id),
+                'view_id': False,
+                'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'] 
+            }
+            return value
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res['name']=phonecall_id.name
+            res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
+        return res
+crm_phonecall2opportunity()
\ No newline at end of file