pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] backport of email_template fix from trunk

Browse Source 
bzr revid: odo@openerp.com-20110120140304-rlj30oe4v8n2agfl
This commit is contained in:
Olivier Dony
2011-01-20 15:03:04 +01:00
parent 20e94b74a5
commit 8551300ae1
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/email_template/email_template_mailbox.py
+16 -37
View File
@@ -25,7 +25,6 @@ import time
import netsvc
from tools.translate import _
import tools
import base64
LOGGER = netsvc.Logger()
@@ -61,7 +60,7 @@ class email_template_mailbox(osv.osv):
self.write(cr, uid, ids, {'state':'sending'}, context)
self.send_this_mail(cr, uid, ids, context)
return True
def send_this_mail(self, cr, uid, ids=None, context=None):
#previous method to send email (link with email account can be found at the revision 4172 and below
result = True
@@ -70,42 +69,22 @@ class email_template_mailbox(osv.osv):
try:
account_obj = self.pool.get('email_template.account')
values = self.read(cr, uid, id, [], context)
attach_to_send = None
payload = {}
if values['attachments_ids']:
attach_to_send = self.pool.get('ir.attachment').read(cr, uid, values['attachments_ids'], ['datas_fname','datas', 'name'])
attach_to_send = map(lambda x: (x['datas_fname'] or x['name'], base64.decodestring(x['datas'])), attach_to_send)
if values.get('body_html'):
body = values.get('body_html')
subtype = "html"
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'',
to,
values['subject'] or u'',
body or u'',
reply_to=values.get('reply_to') or u'',
email_bcc = bcc,
email_cc = cc,
subtype=subtype,
attach=attach_to_send,
openobject_id=values['message_id']
)
for attid in values['attachments_ids']:
attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
payload[attachment.datas_fname] = attachment.datas
result = account_obj.send_mail(cr, uid,
[values['account_id'][0]],
{'To':values.get('email_to') or u'',
'CC':values.get('email_cc') or u'',
'BCC':values.get('email_bcc') or u'',
'Reply-To':values.get('reply_to') or u''},
values['subject'] or u'',
{'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
payload=payload,
message_id=values['message_id'],
context=context)
if result == True:
account = account_obj.browse(cr, uid, values['account_id'][0], context=context)
if account.auto_delete: