diff options
| author | Olivier Dony <odo@openerp.com> | 2011-08-22 19:16:59 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-08-22 19:16:59 +0200 |
| commit | 8f9f45ea948d1ffecb79601e860d522fc6686c2d (patch) | |
| tree | a789d72a67cef289e770323aaf45c158579ecc6c /addons/project_scrum/wizard | |
| parent | 50507512cbaf6d0119a29943c9ca85deb4057404 (diff) | |
[IMP] all: next pass of review/renaming for new mail API
bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
Diffstat (limited to 'addons/project_scrum/wizard')
| -rw-r--r-- | addons/project_scrum/wizard/email_compose_message.py | 5 | ||||
| -rw-r--r-- | addons/project_scrum/wizard/project_scrum_email.py | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/addons/project_scrum/wizard/email_compose_message.py b/addons/project_scrum/wizard/email_compose_message.py index 0eee41ae894..d3d23f42c45 100644 --- a/addons/project_scrum/wizard/email_compose_message.py +++ b/addons/project_scrum/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): ''' @@ -55,12 +55,11 @@ class email_compose_message(osv.osv_memory): message = _("Hello , \nI am sending you Scrum Meeting : %s for the Sprint '%s' of Project '%s'") %(meeting.date, sprint.name, sprint.project_id.name) result.update({ 'subject': subject, - 'body': message, + 'body_text': message, 'model': model, 'res_id': resource_id }) return result -email_compose_message() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py index 63764c48794..f1d5b6665f7 100644 --- a/addons/project_scrum/wizard/project_scrum_email.py +++ b/addons/project_scrum/wizard/project_scrum_email.py @@ -69,7 +69,7 @@ class project_scrum_email(osv.osv_memory): if context is None: context = {} - email_message_obj = self.pool.get('email.message') + mail_message = self.pool.get('mail.message') active_id = context.get('active_id', False) scrum_meeting_pool = self.pool.get('project.scrum.meeting') user_pool = self.pool.get('res.users') @@ -101,8 +101,7 @@ class project_scrum_email(osv.osv_memory): if data.scrum_master_email == data.product_owner_email: data.product_owner_email = False if data.scrum_master_email: - email_message_obj.schedule_with_attach(cr, uid, user_email, [data.scrum_master_email], data.subject, body, model='project.scrum.email', reply_to=user_email) + mail_message.schedule_with_attach(cr, uid, user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email, context=context) if data.product_owner_email: - email_message_obj.schedule_with_attach(cr, uid, user_email, [data.product_owner_email], data.subject, body, model='project.scrum.email', reply_to=user_email) + mail_message.schedule_with_attach(cr, uid, user_email, [data.product_owner_email], data.subject, body, reply_to=user_email, context=context) return {'type': 'ir.actions.act_window_close'} -project_scrum_email() |