[IMP] Convert to opportunity convert if no opportunity for a given partner

bzr revid: tfr@openerp.com-20110206215240-cvsliu757hh5hq5z
This commit is contained in:
tfr 2011-02-06 22:52:40 +01:00
parent fac1d52e2e
commit 810204d16a
2 changed files with 7 additions and 5 deletions

View File

@ -30,8 +30,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
_inherit = 'crm.lead2partner'
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner'),
'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'),
#'partner_id': fields.many2one('res.partner', 'Partner'),
#'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'),
'name': fields.selection([('convert', 'Convert to Opportunity'), ('merge', 'Merge with existing Opportunity')],'Select Action', required=True),
'opportunity_ids': fields.many2many('crm.lead', 'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
}
@ -50,9 +50,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
opportunities = res.get('opportunity_ids') or []
name = 'convert'
if res.get('partner_id'):
name = 'merge'
partner_id = res.get('partner_id')
ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity')])
if ids:
name = 'merge'
opportunities += ids

View File

@ -31,7 +31,8 @@ class crm_lead2partner(osv.osv_memory):
_columns = {
'action': fields.selection([('exist', 'Link to an existing partner'), \
('create', 'Create a new partner')], \
('create', 'Create a new partner'), \
('nothing', 'Do not link to a partner')], \
'Action', required=True),
'partner_id': fields.many2one('res.partner', 'Partner'),
'msg': fields.text('Message', readonly=True)
@ -66,7 +67,6 @@ class crm_lead2partner(osv.osv_memory):
@return : default values of fields.
"""
print "SUPER DEFAULT GET"
lead_obj = self.pool.get('crm.lead')
partner_obj = self.pool.get('res.partner')
contact_obj = self.pool.get('res.partner.address')