From e76573f945fb3883bdf17c9774bd83a2fc856253 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 6 Dec 2012 15:04:28 +0100 Subject: [PATCH] [FIX] reintroduce modifications forward ported from 6.1 from Olivier Dony bzr revid: abo@openerp.com-20121206140428-2v271z0ozdwl1yi3 --- addons/crm/crm_lead.py | 6 ++++-- addons/crm/crm_phonecall.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 12c1b62a50a..75af5fdf223 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -767,10 +767,12 @@ class crm_lead(base_stage, format_address, osv.osv): """ #TODO this is a duplication of the handle_partner_assignation method of crm_phonecall partner_ids = {} + # If a partner_id is given, force this partner for all elements + force_partner_id = partner_id for lead in self.browse(cr, uid, ids, context=context): # If the action is set to 'create' and no partner_id is set, create a new one - if action == 'create' and not partner_id: - partner_id = self._create_lead_partner(cr, uid, lead, context) + if action == 'create': + partner_id = force_partner_id or self._create_lead_partner(cr, uid, lead, context) self._lead_set_partner(cr, uid, lead, partner_id, context=context) partner_ids[lead.id] = partner_id return partner_ids diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 17b696b1795..fccfa96b61e 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -183,10 +183,12 @@ class crm_phonecall(base_state, osv.osv): """ #TODO this is a duplication of the handle_partner_assignation method of crm_lead partner_ids = {} + # If a partner_id is given, force this partner for all elements + force_partner_id = partner_id for call in self.browse(cr, uid, ids, context=context): # If the action is set to 'create' and no partner_id is set, create a new one - if action == 'create' and not partner_id: - partner_id = self._call_create_partner(cr, uid, call, context) + if action == 'create': + partner_id = force_partner_id or self._call_create_partner(cr, uid, call, context=context) self._call_create_partner_address(cr, uid, call, partner_id, context=context) self._call_set_partner(cr, uid, [call.id], partner_id, context=context) partner_ids[call.id] = partner_id