[IMP] all: next pass of review/renaming for new mail API

bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q

2 files changed, 4 insertions, 7 deletions

diff --git a/addons/project/wizard/email_compose_message.py b/addons/project/wizard/email_compose_message.py
index 921cbf1b081..2eee75c22b1 100644
--- a/addons/project/wizard/email_compose_message.py
+++ b/addons/project/wizard/email_compose_message.py
@@ -24,7 +24,7 @@ from osv import fields
 from tools.translate import _
 
 class email_compose_message(osv.osv_memory):
-    _inherit = 'email.compose.message'
+    _inherit = 'mail.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
         '''
@@ -34,8 +34,6 @@ class email_compose_message(osv.osv_memory):
 
         @return: Returns a dictionary
         '''
-        if context is None:
-            context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
         if model == 'project.task' and resource_id:
             task_pool = self.pool.get('project.task')
@@ -61,7 +59,7 @@ class email_compose_message(osv.osv_memory):
             if partner and len(partner.address):
                 result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
             result.update({
-                       'body': description or False,
+                       'body_text': description or False,
                        'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,
                        'subject':  _("Task '%s' Closed") % task_data.name,
                        'model': model,
@@ -70,6 +68,5 @@ class email_compose_message(osv.osv_memory):
 
         return result
 
-email_compose_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
index a0710d288b3..fddc8e46f2f 100644
--- a/addons/project/wizard/project_task_close.py
+++ b/addons/project/wizard/project_task_close.py
@@ -68,7 +68,7 @@ class project_task_close(osv.osv_memory):
         if context is None:
             context = {}
 
-        email_message_obj = self.pool.get('email.message')
+        mail_message = self.pool.get('mail.message')
         task_pool = self.pool.get('project.task')
         task_id = context.get('active_id', False)
         if not task_id:
@@ -113,7 +113,7 @@ class project_task_close(osv.osv_memory):
                     to_adr.append(data.manager_email)
                 if data.partner_warn and data.partner_email:
                     to_adr.append(data.partner_email)
-                mail_id = email_message_obj.schedule_with_attach(cr, uid, from_adr, to_adr, subject, tools.ustr(body), model='project.task.close', email_bcc=[from_adr])
+                mail_id = mail_message.schedule_with_attach(cr, uid, from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr], context=context)
                 if not mail_id:
                     raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings"))
         return {'type': 'ir.actions.act_window_close'}