diff options
| author | Olivier Dony <odo@openerp.com> | 2011-08-29 14:36:25 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-08-29 14:36:25 +0200 |
| commit | ce34e4563d1dc6c025f07cd33a0285aec2dbf1b0 (patch) | |
| tree | e88cbad36d69375ef7828517b1702750350a2485 | |
| parent | 1ed2aba648770a887ca4d8ad174c41b57fe4e198 (diff) | |
[FIX] ir_actions: restore partial content missing in last merge
bzr revid: odo@openerp.com-20110829123625-9r34t0spef71b88m
| -rw-r--r-- | openerp/addons/base/ir/ir_actions.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 0df992ad66f..93cefe80417 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -627,10 +627,11 @@ class actions_server(osv.osv): cxt = { 'self': obj_pool, 'object': obj, + 'obj': obj, + 'pool': self.pool, 'time': time, 'cr': cr, 'context': dict(context), # copy context to prevent side-effects of eval - 'pool': self.pool, 'uid': uid, 'user': user } @@ -658,14 +659,21 @@ class actions_server(osv.osv): pass if not address: - logger.info('Recipient email address is mandatory') + logger.info('No partner email address specified, not sending any email.') continue + if not email_from: + logger.debug('--email-from command line option is not specified, using a fallback value instead.') + if user.user_email: + email_from = user.user_email + else: + email_from = "%s@%s" % (user.login, gethostname()) + subject = self.merge_message(cr, uid, action.subject, action, context) body = self.merge_message(cr, uid, action.message, action, context) ir_mail_server = self.pool.get('ir.mail_server') - msg = ir_mail_server.build_email(user, [address], subject, body) + msg = ir_mail_server.build_email(email_from, [address], subject, body) res_email = ir_mail_server.send_email(cr, uid, msg) if res_email: logger.info('Email successfully sent to: %s', address) |