[IMP] crm*: update crm modules to new mail module (wip)

[odoo/odoo.git] / addons / crm / wizard / crm_merge_opportunities.py

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index d339481..9b48f43 100644 (file)
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -76,7 +76,7 @@ class crm_merge_opportunity(osv.osv_memory):
             @param opp_ids : list of opportunities ids to merge
         """
         opp_obj = self.pool.get('crm.lead')
-        message_obj = self.pool.get('email.message')
+        message_obj = self.pool.get('mail.message')
 
         lead_ids = context and context.get('lead_ids', []) or []
 
@@ -138,8 +138,8 @@ class crm_merge_opportunity(osv.osv_memory):
         for opp in tail_opportunities + [first_opportunity]:
             attach_ids = self.get_attachments(cr, uid, opp, context=context)
             self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
-            for history in opp.message_ids:
-                new_history = message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.subject) }, context=context)
+            for mail_msg in opp.message_ids:
+                message_obj.write(cr, uid, mail_msg.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, mail_msg.subject) }, context=context)
 
         #Notification about loss of information
         details = []
@@ -171,7 +171,7 @@ class crm_merge_opportunity(osv.osv_memory):
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
 
-        opp_obj.history(cr, uid, [first_opportunity], subject, details=details)
+        opp_obj.history(cr, uid, [first_opportunity], subject, body_text=details)
         #data.update({'message_ids' : [(6, 0 ,self._concat_o2m('message_ids', op_ids))]})
         opp_obj.write(cr, uid, [first_opportunity.id], data)
         unlink_ids = map(lambda x: x.id, tail_opportunities)
@@ -179,8 +179,6 @@ class crm_merge_opportunity(osv.osv_memory):
 
         models_data = self.pool.get('ir.model.data')
 
-
-
         # Get Opportunity views
         result = models_data._get_id(
             cr, uid, 'crm', 'view_crm_case_opportunities_filter')