From aca8c57f94b3eb19291f347e946eb8d9ade22575 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 17 Nov 2011 19:09:29 +0530 Subject: [PATCH 1/3] [FIX]crm: change the context lp bug: https://launchpad.net/bugs/889056 fixed bzr revid: kjo@tinyerp.com-20111117133929-9yi8lmpaurj3rhsa --- addons/crm/crm_lead.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 91c8a453cd6..5b92a49a5a5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -432,6 +432,8 @@ class crm_lead(crm_case, osv.osv): This opens Meeting's calendar view to schedule meeting on current Opportunity @return : Dictionary value for created Meeting view """ + if context is None: + context = {} value = {} for opp in self.browse(cr, uid, ids, context=context): data_obj = self.pool.get('ir.model.data') @@ -449,7 +451,7 @@ class crm_lead(crm_case, osv.osv): if id3: id3 = data_obj.browse(cr, uid, id3, context=context).res_id - context = { + context .update( { 'default_opportunity_id': opp.id, 'default_partner_id': opp.partner_id and opp.partner_id.id or False, 'default_user_id': uid, @@ -457,7 +459,7 @@ class crm_lead(crm_case, osv.osv): 'default_email_from': opp.email_from, 'default_state': 'open', 'default_name': opp.name - } + }) value = { 'name': _('Meetings'), 'context': context, From c24da43a6d26df8eea163984c145e9f3eab0d4e9 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 18 Nov 2011 17:21:20 +0530 Subject: [PATCH 2/3] [IMP] crm: remove the space and initialized object to outside the loop bzr revid: kjo@tinyerp.com-20111118115120-3gtfr92s6ia509ls --- addons/crm/crm_lead.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 5b92a49a5a5..7886c001869 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -435,9 +435,8 @@ class crm_lead(crm_case, osv.osv): if context is None: context = {} value = {} + data_obj = self.pool.get('ir.model.data') for opp in self.browse(cr, uid, ids, context=context): - data_obj = self.pool.get('ir.model.data') - # Get meeting views result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter') res = data_obj.read(cr, uid, result, ['res_id']) @@ -450,8 +449,7 @@ class crm_lead(crm_case, osv.osv): id2 = data_obj.browse(cr, uid, id2, context=context).res_id if id3: id3 = data_obj.browse(cr, uid, id3, context=context).res_id - - context .update( { + context .update({ 'default_opportunity_id': opp.id, 'default_partner_id': opp.partner_id and opp.partner_id.id or False, 'default_user_id': uid, From 048c85f41d18731a6b7dba8d92992ff6d3548776 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 18 Nov 2011 17:29:18 +0530 Subject: [PATCH 3/3] [IMP] crm: remove the space bzr revid: kjo@tinyerp.com-20111118115918-p1da630zdjjp54nt --- addons/crm/crm_lead.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 7886c001869..13865852429 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -449,7 +449,7 @@ class crm_lead(crm_case, osv.osv): id2 = data_obj.browse(cr, uid, id2, context=context).res_id if id3: id3 = data_obj.browse(cr, uid, id3, context=context).res_id - context .update({ + context.update({ 'default_opportunity_id': opp.id, 'default_partner_id': opp.partner_id and opp.partner_id.id or False, 'default_user_id': uid,