openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #02360
[Merge] lp:~openerp-dev/openobject-addons/trunk-dev-addons1-extra into lp:openobject-addons
tfr (Openerp) has proposed merging lp:~openerp-dev/openobject-addons/trunk-dev-addons1-extra into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#701070 cannot schedule only one project
https://bugs.launchpad.net/bugs/701070
#701542 CC field in email_template module, multiple lines ...
https://bugs.launchpad.net/bugs/701542
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-extra/+merge/46395
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-extra/+merge/46395
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-dev-addons1-extra.
=== modified file 'email_template/email_template_mailbox.py'
--- email_template/email_template_mailbox.py 2011-01-14 00:11:01 +0000
+++ email_template/email_template_mailbox.py 2011-01-15 21:08:02 +0000
@@ -82,21 +82,30 @@
else :
body = values.get('body_text')
subtype = "plain"
-
+
+ bcc = cc = False
+ if (values.get('email_bcc') or False):
+ bcc = values.get('email_bcc') or u''
+ bcc = bcc.split(',')
+ if (values.get('email_cc') or False):
+ cc = values.get('email_cc') or u''
+ cc = cc.split(',')
+ to = values.get('email_to')
+ to = to.split(',')
+
result = tools.email_send(
values.get('email_from') or u'',
- [values.get('email_to')],
+ to,
values['subject'] or u'',
body or u'',
reply_to=values.get('reply_to') or u'',
- email_bcc=values.get('email_bcc') or u'',
- email_cc=values.get('email_cc') or u'',
+ email_bcc = bcc,
+ email_cc = cc,
subtype=subtype,
attach=attach_to_send,
openobject_id=values['message_id']
)
-
if result == True:
account = account_obj.browse(cr, uid, values['account_id'][0], context=context)
if account.auto_delete:
Follow ups