From ec6a6782c9356387afc36fc4d00d0d4c40ab61c6 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 8 Feb 2013 18:20:25 +0100 Subject: [PATCH] [FIX] crm merge dont tamper fields constant bzr revid: al@openerp.com-20130208172025-cj4mzshz9j3jmui5 --- 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 d5f90d8a653..9dc4686ed02 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -567,7 +567,8 @@ class crm_lead(base_stage, format_address, osv.osv): for opportunity in opportunities: subject.append(opportunity.name) title = "%s : %s" % (opportunity.type == 'opportunity' and _('Merged opportunity') or _('Merged lead'), opportunity.name) - details.append(self._mail_body(cr, uid, opportunity, CRM_LEAD_FIELDS_TO_MERGE, title=title, context=context)) + fields = list(CRM_LEAD_FIELDS_TO_MERGE) + details.append(self._mail_body(cr, uid, opportunity, fields, title=title, context=context)) # Chatter message's subject subject = subject[0] + ": " + ", ".join(subject[1:]) @@ -636,7 +637,8 @@ class crm_lead(base_stage, format_address, osv.osv): tail_opportunities = opportunities_rest - merged_data = self._merge_data(cr, uid, ids, highest, CRM_LEAD_FIELDS_TO_MERGE, context=context) + fields = list(CRM_LEAD_FIELDS_TO_MERGE) + merged_data = self._merge_data(cr, uid, ids, highest, fields, context=context) # Merge messages and attachements into the first opportunity self._merge_opportunity_history(cr, uid, highest.id, tail_opportunities, context=context)