diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py index bcd67c757c4..614ef493e96 100644 --- a/addons/scrum/scrum.py +++ b/addons/scrum/scrum.py @@ -310,7 +310,9 @@ class scrum_meeting(osv.osv): meeting_id = self.browse(cr, uid, ids)[0] user = self.pool.get('res.users').browse(cr, uid, uid, context=context) if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email: - self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email) + res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email) + if not res: + raise osv.except_osv(_('Error !'), _(' Email Not send to the scrum master %s!' % meeting_id.sprint_id.scrum_master_id.name)) else: raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.')) return True @@ -321,7 +323,9 @@ class scrum_meeting(osv.osv): context.update({'button_send_product_owner': True}) meeting_id = self.browse(cr, uid, ids)[0] if meeting_id.sprint_id.product_owner_id.user_email: - self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email) + res = self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email) + if not res: + raise osv.except_osv(_('Error !'), _(' Email Not send to the product owner %s!' % meeting_id.sprint_id.product_owner_id.name)) else: raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.')) return True @@ -339,12 +343,7 @@ class scrum_meeting(osv.osv): 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)) if not flag: - if context.get('button_send_product_owner', False): - raise osv.except_osv(_('Error !'), _(' Email Not send to the product owner %s!' % meeting_id.sprint_id.product_owner_id.name)) - raise osv.except_osv(_('Error !'), _(' Email Not send to the scrum master %s!' % meeting_id.sprint_id.scrum_master_id.name)) - if context.get('button_send_product_owner', False): - raise osv.except_osv(_('Information !'), _(' Email send successfully to product owner %s!' % meeting_id.sprint_id.product_owner_id.name)) - raise osv.except_osv(_('Information!'), _(' Email send successfully to scrum master %s!'% meeting_id.sprint_id.scrum_master_id.name)) + return False return True scrum_meeting()