summaryrefslogtreecommitdiff
path: root/addons/project_scrum
diff options
context:
space:
mode:
authorYSA (Openerp) <ysa@tinyerp.com>2011-02-04 11:48:19 +0530
committerYSA (Openerp) <ysa@tinyerp.com>2011-02-04 11:48:19 +0530
commitbbdac458fdbd5ece78fc674767177f91b045e4bc (patch)
treee6d019dc4d5d638435b34f492c891f41bb1bd9e9 /addons/project_scrum
parente9e229568be13dbc9d56f3057e81de7824ff6aec (diff)
[IMP] call email_send method of email.message object insted of tools.
bzr revid: ysa@tinyerp.com-20110204061819-bb3p94bs7og680je
Diffstat (limited to 'addons/project_scrum')
-rw-r--r--addons/project_scrum/project_scrum.py3
-rw-r--r--addons/project_scrum/wizard/project_scrum_email.py7
2 files changed, 6 insertions, 4 deletions
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 7d1d071a7c3..f8f5b727c1f 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -317,6 +317,7 @@ class project_scrum_meeting(osv.osv):
return True
def email_send(self, cr, uid, ids, email, context=None):
+ email_message_obj = self.pool.get('email.message')
email_from = tools.config.get('email_from', False)
meeting_id = self.browse(cr, uid, ids, context=context)[0]
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
@@ -325,7 +326,7 @@ class project_scrum_meeting(osv.osv):
body += "\n"+ _('*Tasks since yesterday:')+ '\n_______________________%s' % (meeting_id.question_yesterday) + '\n' +_("*Task for Today:")+ '\n_______________________ %s\n' % (meeting_id.question_today )+ '\n' +_('*Blocks encountered:') +'\n_______________________ %s' % (meeting_id.question_blocks or _('No Blocks'))
body += "\n\n"+_('Thank you')+",\n"+ user.name
sub_name = meeting_id.name or _('Scrum Meeting of %s') % meeting_id.date
- flag = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id))
+ flag = email_message_obj.email_send(user_email , [email], sub_name, body, model='project.scrum.meeting', reply_to=None, openobject_id=str(meeting_id.id))
if not flag:
return False
return True
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index ae8ba092981..259a9ace64c 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -69,6 +69,7 @@ class project_scrum_email(osv.osv_memory):
if context is None:
context = {}
+ email_message_obj = self.pool.get('email.message')
active_id = context.get('active_id', False)
scrum_meeting_pool = self.pool.get('project.scrum.meeting')
user_pool = self.pool.get('res.users')
@@ -91,7 +92,7 @@ class project_scrum_email(osv.osv_memory):
body += "\n%s\n" %_("Task for Today")
body += "_______________________ \n"
body += "\n%s\n" %(meeting.question_today or _('None'))
- body += "\n%s\n" % _('Blocking points encountered:')
+ body += "\n%s\n" % _('Blocking points encountered:')
body += "_______________________ \n"
body += "\n%s\n" %(meeting.question_blocks or _('None'))
body += "\n%s\n%s" %(_('Thank you,'), user.name)
@@ -100,8 +101,8 @@ 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:
- tools.email_send(user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email)
+ email_message_obj.email_send(user_email, [data.scrum_master_email], data.subject, body, model='project.scrum.email', reply_to=user_email)
if data.product_owner_email:
- tools.email_send(user_email, [data.product_owner_email], data.subject, body, reply_to=user_email)
+ email_message_obj.email_send(user_email, [data.product_owner_email], data.subject, body, model='project.scrum.email', reply_to=user_email)
return {'type': 'ir.actions.act_window_close'}
project_scrum_email()