From 70e4f3e6f48b8d691dbff01383ad75e48dc2887a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 19:42:01 +0530
Subject: [PATCH] [IMP]: crm: Implemented type=choice for lead to opportunity
 wizard, removed old wizard

bzr revid: rpa@tinyerp.com-20100323141201-8ral0ueq1r8uzy69
---
 addons/crm/crm_lead.py                        |  81 +++-
 addons/crm/crm_lead_view.xml                  |   6 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  | 380 +++++-------------
 .../wizard/crm_lead_to_opportunity_view.xml   |  32 +-
 addons/crm/wizard/crm_lead_to_partner.py      |   3 +-
 5 files changed, 184 insertions(+), 318 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00cebd4dcbf..49a8f47e0a2 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,9 +23,10 @@ from osv import fields, osv, orm
 from datetime import datetime, timedelta
 import crm
 import math
+from tools.translate import _
 
 class crm_lead(osv.osv):
-    """ CRm Lead Case """
+    """ CRM Lead Case """
 
     _name = "crm.lead"
     _description = "Leads Cases"
@@ -67,8 +68,8 @@ class crm_lead(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of closeday’s IDs
-        @return: difference between current date and closed date
         @param context: A standard dictionary for contextual values
+        @return: difference between current date and closed date
         """
 
         result = {}
@@ -87,33 +88,77 @@ class crm_lead(osv.osv):
 
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type',\
+                        ('object_id.model', '=', 'crm.opportunity')]"), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Contact Name", size=64),
+                        ('object_id.model', '=', 'crm.lead')]"), 
+        'partner_name': fields.char("Contact Name", size=64), 
 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage',\
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
                             domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.lead')]"),
-        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
+                            ('object_id.model', '=', 'crm.lead')]"), 
+        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 
 
-        'user_id': fields.many2one('res.users', 'Salesman'),
-        'referred': fields.char('Referred By', size=32),
+        'user_id': fields.many2one('res.users', 'Salesman'), 
+        'referred': fields.char('Referred By', size=32), 
         'day_open': fields.function(_compute_openday, string='Days to Open', \
-                                method=True, type="integer", store=True),
+                                method=True, type="integer", store=True), 
         'day_close': fields.function(_compute_closeday, string='Days to Close', \
-                                method=True, type="integer", store=True),
-        'function_name' : fields.char('Function', size=64),
+                                method=True, type="integer", store=True), 
+        'function_name' : fields.char('Function', size=64), 
         }
 
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
     }
 
+
+    def convert_opportunity(self, cr, uid, ids, context=None):
+        """ Precomputation for converting lead to opportunity
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of closeday’s IDs
+        @param context: A standard dictionary for contextual values
+        @return: Value of action in dict
+        """
+        if not context:
+            context = {}
+        context.update({'active_ids': ids})
+
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+        value = {}
+
+        view_id = False
+        if data_id:
+            view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+        for case in self.browse(cr, uid, ids):
+            context.update({'opportunity_id': case.id})
+            context.update({'active_id': case.id})
+            if not case.partner_id:
+                data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_partner')
+                view_id = False
+                if data_id:
+                    view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+                break
+            
+        value = {            
+            'name': _('Create Opportunity'), 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'crm.lead2opportunity', 
+            'view_id': False, 
+            'context': context,  
+            'views': [(view_id, 'form')], 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+            'destroy': False
+        }
+        return value
+
 crm_lead()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dc379ddacfb..3f9c9c6c376 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -42,11 +42,11 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(wizard_crm_lead_opportunity_set)d"
+                            name="convert_opportunity"
                             string="Convert"
                             help="Convert into Opportunity"
-                            icon="gtk-index"
-                            type="action"
+                            icon="gtk-index"   
+                            type="object"                         
                             attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index a5f97b1abd6..f1cf92e512d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -22,293 +22,11 @@
 from mx.DateTime import now
 from osv import osv, fields
 from tools.translate import _
-import ir
-import netsvc
-import pooler
-import wizard
-
-#===============================================================================
-# Put original wizard because of type=choice in init
-# Remove it after solution for type=choice
-#===============================================================================
-
-class partner_create(wizard.interface):
-
-    case_form = """<?xml version="1.0"?>
-    <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"/>
-        <!--field name="close"/-->
-    </form>"""
-
-    case_fields = {
-        'close': {'type':'boolean', 'string':'Close Lead'}
-    }
-
-    partner_form = """<?xml version="1.0"?>
-    <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"/>
-        <newline />
-        <field name="action"/>
-        <group attrs="{'invisible':[('action','!=','exist')]}">
-            <field name="partner_id"/>
-        </group>
-    </form>"""
-
-    partner_fields = {
-        'action': {'type':'selection',
-                'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
-                'string':'Action', 'required':True, 'default': lambda *a:'exist'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _selectPartner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or 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
-        vals = {'partner_id': partner_id}
-        if not partner_id:
-            vals['action'] = 'create'            
-        return vals
-
-    def _create_partner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)        
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if data['form']['action'] == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or 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,
-                    'mobile': case.mobile,
-                    'email': case.email_from,
-                    'fax': case.fax,
-                    'title': case.title,
-                    'function': case.function and case.function.id or False,
-                    'street': case.street,
-                    'street2': case.street2,
-                    'zip': case.zip,
-                    'city': case.city,
-                    'country_id': case.country_id and case.country_id.id or False,
-                    'state_id': case.state_id and case.state_id.id or False,
-                })
-
-            else:
-                if data['form']['partner_id']:
-                    partner = partner_obj.browse(cr,uid,data['form']['partner_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, data, context): 
-        pool = pooler.get_pool(cr.dbname)             
-        partner_ids = self._create_partner(cr, uid, data, context)
-        mod_obj = 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
-
-    states = {
-        'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create_partner', 'Create Partner', 'gtk-go-forward')]}
-        },
-        'create_partner': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _make_partner, 'state': 'end'}
-        }
-    }
-
-partner_create('crm.lead.partner_create')
-
-
-class lead2opportunity(partner_create):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Convert To Opportunity">
-        <field name="name"/>
-        <field name="partner_id"/>
-        <newline/>
-        <field name="planned_revenue"/>
-        <field name="probability"/>
-    </form>"""
-
-    case_fields = {
-        'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
-        'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
-        'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _check_state(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.state != 'open':
-                raise wizard.except_wizard(_('Warning !'),
-                    _('Lead should be in \'Open\' state before converting to Opportunity.'))
-        return {}
-
-    def _selectopportunity(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        case = case_obj.browse(cr, uid, data['id'])
-        return {'name': case.name, 'partner_id':case.partner_id and case.partner_id.id or False}
-
-    def _selectChoice(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if not case.partner_id:
-                return 'create_partner'
-        return 'opportunity'
-
-    def _makeOrder(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_obj = 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
-
-        lead_case_obj = pool.get('crm.lead')
-        history_obj = pool.get('crm.case.history')
-        opportunity_case_obj = pool.get('crm.opportunity')
-        model_obj = pool.get('ir.model')        
-        for lead in lead_case_obj.browse(cr, uid, data['ids']):             
-            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                'name': data['form']['name'],
-                'planned_revenue': data['form']['planned_revenue'],
-                'probability': data['form']['probability'],
-                'partner_id': data['form']['partner_id'],
-                'section_id':lead.section_id.id,
-                'description':lead.description,
-                'date_deadline': lead.date_deadline,
-                'partner_address_id':lead.partner_address_id.id, 
-                'priority': lead.priority,
-                'phone': lead.phone,                
-                'email_from': lead.email_from,                
-            })       
-            
-            new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-            model_ids = model_obj.search(cr, uid, [('model','=','crm.opportunity')])
-
-            for his_id in lead.history_line:
-                history_ids = history_obj.copy(cr, uid, his_id.id, {'model_id' : model_ids[0], 'res_id':new_opportunity})    
-
-            vals = {
-                'partner_id': data['form']['partner_id'],                
-                }
-            if not lead.opportunity_id:
-                vals.update({'opportunity_id' : new_opportunity.id})
-
-            lead_case_obj.write(cr, uid, [lead.id], vals)
-            lead_case_obj.case_close(cr, uid, [lead.id])
-            opportunity_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
-
-    def _makePartner(self, cr, uid, data, context):
-        partner_ids = self._create_partner(cr, uid, data, context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_check_state],
-            'result': {'type':'choice','next_state':_selectChoice}
-        },
-        'create_partner': {
-            'actions': [partner_create._selectPartner],
-            'result': {'type': 'form', 'arch': partner_create.partner_form, 'fields': partner_create.partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('opportunity', 'Skip', 'gtk-goto-last'), ('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
-        },
-        'opportunity': {
-            'actions': [_selectopportunity],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
-        },
-        'confirm': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
-        }
-    }
-
-lead2opportunity('crm.lead.opportunity_set')
-
 class crm_lead2opportunity(osv.osv_memory):
     _name = 'crm.lead2opportunity'
     _description = 'Lead To Opportunity'
-
+    _inherit = 'crm.lead2partner'
+    
     def action_cancel(self, cr, uid, ids, context=None):
         """
         Closes Lead To Opportunity form
@@ -320,6 +38,26 @@ class crm_lead2opportunity(osv.osv_memory):
 
         """
         return {'type': 'ir.actions.act_window_close'}
+    
+    def make_partner(self, cr, uid, ids, context=None):
+        """
+        This function Makes partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Partner form.
+        """
+        if not context:
+            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'])
+        return self.action_apply(cr, uid, ids, context)
 
     def action_apply(self, cr, uid, ids, context=None):
         """
@@ -338,8 +76,8 @@ class crm_lead2opportunity(osv.osv_memory):
             lead_obj = self.pool.get('crm.lead')
             opp_obj = self. pool.get('crm.opportunity')
             data_obj = self.pool.get('ir.model.data')
-            history_obj = pool.get('crm.case.history')
-            model_obj = pool.get('ir.model')
+            history_obj = self.pool.get('crm.case.history')
+            model_obj = self.pool.get('ir.model')
 
             # Get Opportunity views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
@@ -407,7 +145,75 @@ class crm_lead2opportunity(osv.osv_memory):
         'probability': fields.float('Success Probability'),
         'planned_revenue': fields.float('Expected Revenue'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action'),
+        
     }
+    
+    def _select_partner(self, cr, uid, context=None):
+        """
+        This function Searches for Partner from selected lead.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : Partner id if any for selected lead.
+        """
+        if not context:
+            context = {}
+        
+        lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('active_ids', [])
+        partner_id = False
+
+        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
+            if not partner_ids and lead.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.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
+        return partner_id
+    
+    _defaults = {
+        'action': lambda *a:'exist',
+        'partner_id': _select_partner
+        }
+    
+    def action_skip(self, cr, uid, ids, context=None):
+        """
+        This skips partner creation
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for Opportunity form
+        """
+        value = {}
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+        view_id = False
+        if data_id:
+            view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+            
+        value = {            
+            'name': _('Create Opportunity'), 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'crm.lead2opportunity', 
+            'view_id': False, 
+            'context': context,  
+            'views': [(view_id, 'form')], 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+        }
+        return value
 
     def view_init(self, cr, uid, fields, context=None):
         """
@@ -448,8 +254,6 @@ Leads Could not convert into Opportunity"))
         for lead in lead_obj.browse(cr, uid, data, []):
             if 'name' in fields:
                 res.update({'name': lead.partner_name})
-            if 'partner_id' in fields:
-                res.update({'partner_id': lead.partner_id and lead.partner_id.id or False})
         return res
 
 crm_lead2opportunity()
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index f76b54a91b9..7634354087e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,14 +1,6 @@
 <openerp>
   	<data>
 
-	<wizard
-            id="wizard_crm_lead_opportunity_set"
-            keyword="client_action_multi"
-            model="crm.lead"
-            name="crm.lead.opportunity_set"
-            multi="True" menu="False"
-            string="Convert To Opportunity"/>
-            
 		<!-- Lead to Opportunity confirmation view -->
 
         <record model="ir.ui.view" id="lead_to_opportunity_pre_view">
@@ -60,5 +52,29 @@
 	      <field name="target">new</field>
 	   </record>
 
+
+        <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
+	      <field name="name">crm.lead2opportunity.partner</field>
+	      <field name="model">crm.lead2opportunity</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"/>
+                <newline />
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+		        </group>
+		        <separator string="" colspan="4" />
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
+	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+            </form>
+	      </field>
+	   </record> 
+
  	</data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index aa47a3a808c..2cd0ab541fe 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -71,7 +71,8 @@ class crm_lead2partner(osv.osv_memory):
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
         rec_ids = context and context.get('active_ids', [])
-        value={}
+        partner_id = False
+
         for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
             partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
             if not partner_ids and lead.email_from: