diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 683d608b5c4..1f91f6af4c5 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -67,7 +67,6 @@ between mails and Open ERP.""",
         'wizard/phonecall2meeting.xml',
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
-        'wizard/opportunity2partner_view.xml',
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/opportunity2phonecall.xml',
         'crm_wizard.xml', 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index f1faf00ad5d..55f3d2f3dc1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -75,11 +75,6 @@
                     <group col="3" colspan="2">
                         <separator colspan="3" string="Contacts"/>
                         <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-						<button string="Create a Partner"
-                        icon="terp-crm"
-                        name="%(action_crm_opportunity2partner)d"
-                        type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}" />
                         <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                         <field name="email_from" string="Email"/>
                         <field name="phone"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 986b674911d..5bcdfe32d03 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -35,7 +35,6 @@ import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
-import opportunity2partner
 
 import opportunity2phonecall
 
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index a2e8b4a1a23..78898dd25da 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -12,8 +12,8 @@
 	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
         		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
 	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      			<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+	      			<button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
 	      		</group>
 	      	</form>
 	      </field>
diff --git a/addons/crm/wizard/opportunity2partner.py b/addons/crm/wizard/opportunity2partner.py
deleted file mode 100644
index 308898f71ad..00000000000
--- a/addons/crm/wizard/opportunity2partner.py
+++ /dev/null
@@ -1,133 +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 mx.DateTime import now
-
-from osv import osv, fields
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class crm_opportunity2partner(osv.osv_memory):
-    _name = 'crm.opportunity2partner'
-    _description = 'Phone Call to Partner'
-    
-    _columns = {
-        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
-        'partner_id': fields.many2one('res.partner','Partner'), 
-    }
-    _defaults = {
-        'action': lambda *a:'exist',
-    }
-    
-    def create_partner(self, cr, uid, ids, context):
-        view_obj = self.pool.get('ir.ui.view')
-        view_id = view_obj.search(cr,uid,[('model','=','crm.opportunity2partner'),('name','=','crm.opportunity2partner.view')])
-        return {
-            'view_mode': 'form',
-            'view_type': 'form',
-            'view_id': view_id or False,
-            'res_model': 'crm.opportunity2partner',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-        
-    def selectPartner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.opportunity')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('record_ids',False)
-        value={}
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if case.partner_id:
-                raise osv.except_osv(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.name)])            
-            if not partner_ids and case.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
-            partner_id = partner_ids and partner_ids[0] or False
-        if not partner_id:
-            value = self._make_partner(cr, uid, ids, context)           
-        return value 
-
-    def _create_partner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.opportunity')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        datas = self.browse(cr, uid, ids)[0]
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        rec_ids = context and context.get('record_ids',False)
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if datas.action == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name':  case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.phone,
-                    'email': case.email_from
-                })
-
-            else:
-                if datas.partner_id:
-                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, ids, context): 
-        partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-    
-crm_opportunity2partner()
-
diff --git a/addons/crm/wizard/opportunity2partner_view.xml b/addons/crm/wizard/opportunity2partner_view.xml
deleted file mode 100644
index 8a3e6780b59..00000000000
--- a/addons/crm/wizard/opportunity2partner_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<openerp>
-  	<data>
-  		<record id="view_crm_opportunity2partner_create" model="ir.ui.view">
-	      <field name="name">crm.opportunity2partner.view.create</field>
-	      <field name="model">crm.opportunity2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_opportunity2partner_create" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.opportunity2partner</field>
-	      <field name="view_id" ref="view_crm_opportunity2partner_create"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
-	   
-	   <record model="ir.values" id="values_crm_phonecall2partner_create">
-            <field name="model_id" ref="crm.model_crm_opportunity" />
-            <field name="object" eval="1" />
-            <field name="name">Create Partner</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_opportunity2partner_create'))" />
-            <field name="key">action</field>
-            <field name="model">crm.opportunity</field>
-        </record>
-	   
-	   <record id="view_crm_opportunity2partner" model="ir.ui.view">
-	      <field name="name">crm.opportunity2partner.view</field>
-	      <field name="model">crm.opportunity2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id"/>
-		        </group>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_opportunity2partner" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.opportunity2partner</field>
-	      <field name="view_id" ref="view_crm_opportunity2partner"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
- 	</data>
-</openerp>