From 4f384f74c8cbc53c3f5846b40386525bbcdb546a Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Fri, 24 Dec 2010 12:51:50 +0100
Subject: [PATCH] [IMP] email_template : use global server to send email

bzr revid: tfr@openerp.com-20101224115150-zs6zym9knapgc3e2
---
 .../email_template/email_template_mailbox.py  | 58 ++++++++++++++-----
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index 2fb3b0fa54c..acde96dafd4 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -25,6 +25,7 @@ import time
 import netsvc
 from tools.translate import _
 import tools
+import base64
 
 LOGGER = netsvc.Logger()
 
@@ -68,22 +69,49 @@ class email_template_mailbox(osv.osv):
             try:
                 account_obj = self.pool.get('email_template.account')
                 values = self.read(cr, uid, id, [], context) 
-                payload = {}
+                #payload = {}
+                attach_to_send = None
                 if values['attachments_ids']:
-                    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)
+                    #for attid in values['attachments_ids']:
+                        #attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
+                        #payload[attachment.datas_fname] = attachment.datas
+                    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)
+                #work around to uniformize send email while waiting for a merge of fetchmail, email_template, mailgate
+                #using tools.send_email instead
+                #No need to use email account
+                #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 values.get('body_html'):
+                    body = values.get('body_html')
+                    subtype = "html"
+                else :
+                    body = values.get('body_text')
+                    subtype = "plain"
+                    
+                result = tools.email_send(
+                    values.get('email_from') or u'',
+                    [values.get('email_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'',
+                    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: