From 68f3ed65691f8adc0d5b8a2e800b9d9a0c7a2073 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 20 Jan 2015 16:37:30 +0100 Subject: [PATCH] [FIX] crm: convert to opportunity, avoid overwrite user defined action default --- addons/crm/wizard/crm_lead_to_opportunity.py | 2 +- addons/crm/wizard/crm_partner_binding.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 73b329cf0f0..5f8727eb6da 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -66,7 +66,7 @@ class crm_lead2opportunity_partner(osv.osv_memory): tomerge.extend(self._get_duplicated_leads(cr, uid, partner_id, email, include_lost=True, context=context)) tomerge = list(set(tomerge)) - if 'action' in fields: + if 'action' in fields and not res.get('action'): res.update({'action' : partner_id and 'exist' or 'create'}) if 'partner_id' in fields: res.update({'partner_id' : partner_id}) diff --git a/addons/crm/wizard/crm_partner_binding.py b/addons/crm/wizard/crm_partner_binding.py index cb2184dca2a..ec73e066e22 100644 --- a/addons/crm/wizard/crm_partner_binding.py +++ b/addons/crm/wizard/crm_partner_binding.py @@ -89,7 +89,7 @@ class crm_partner_binding(osv.osv_memory): res = super(crm_partner_binding, self).default_get(cr, uid, fields, context=context) partner_id = self._find_matching_partner(cr, uid, context=context) - if 'action' in fields: + if 'action' in fields and not res.get('action'): res['action'] = partner_id and 'exist' or 'create' if 'partner_id' in fields: res['partner_id'] = partner_id