From 5c0308f078e30e5b6a2aa4d4bb5fba0682ecd760 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 10 May 2011 19:20:48 +0530
Subject: [PATCH 1/3] [FIX]

bzr revid: rha@tinyerp.com-20110510135048-f044stg7gaij0867
---
 addons/email_template/email_template.py       |  4 +--
 .../wizard/email_compose_message.py           | 34 ++++++++++---------
 .../wizard/email_template_preview.py          |  2 +-
 .../wizard/email_compose_message_view.xml     |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 20a98c009ca..6169b7a2937 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -45,7 +45,7 @@ class email_template(osv.osv):
         "Return Template Object"
         if context is None:
             context = {}
-        
+
         if not template_id:
             return False
 
@@ -404,7 +404,7 @@ class email_template(osv.osv):
         # Add document attachments
         for attach in template.attachment_ids:
             #attach = attahcment_obj.browse(cr, uid, attachment_id, context)
-            attachment[attach.datas_fname] = attach.datas
+            attachment[attach.datas_fname] = base64.decodestring(attach.datas)
         values['attachment'] = attachment
         return values
 
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 9dbb940d3da..ef6058ff892 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -61,22 +61,24 @@ class email_compose_message(osv.osv_memory):
         if context is None:
             context = {}
         att_ids = []
-        res_id = context.get('active_id', False)
-        values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
-        if values['attachment']:
-            attachment = values['attachment']
-            attachment_obj = self.pool.get('ir.attachment')
-            for fname, fcontent in attachment.items():
-                data_attach = {
-                    'name': fname,
-                    'datas': binascii.b2a_base64(str(fcontent)),
-                    'datas_fname': fname,
-                    'description': _('Mail attachment'),
-                    'res_model' : self._name,
-                    'res_id' : ids and ids[0] or False
-                }
-                att_ids.append(attachment_obj.create(cr, uid, data_attach))
-            values['attachment_ids'] = att_ids
+        values = {}
+        if template_id:
+            res_id = context.get('active_id', False)
+            values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
+            if values['attachment']:
+                attachment = values['attachment']
+                attachment_obj = self.pool.get('ir.attachment')
+                for fname, fcontent in attachment.items():
+                    data_attach = {
+                        'name': fname,
+                        'datas': binascii.b2a_base64(str(fcontent)),
+                        'datas_fname': fname,
+                        'description': _('Mail attachment'),
+                        'res_model' : self._name,
+                        'res_id' : ids and ids[0] or False
+                    }
+                    att_ids.append(attachment_obj.create(cr, uid, data_attach))
+                values['attachment_ids'] = att_ids
         return {'value': values}
 
     def save_as_template(self, cr, uid, ids, context=None):
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 94b86deec8b..6b2b546c267 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -38,7 +38,7 @@ class email_template_preview(osv.osv_memory):
         if context is None:
             context = {}
 
-        template_id = context.get('active_id', False)
+        template_id = context.get('template_id', False)
         if not template_id:
             return []
         template_pool = self.pool.get('email.template')
diff --git a/addons/mail/wizard/email_compose_message_view.xml b/addons/mail/wizard/email_compose_message_view.xml
index dd89d0267ff..0cc90f3e7c9 100644
--- a/addons/mail/wizard/email_compose_message_view.xml
+++ b/addons/mail/wizard/email_compose_message_view.xml
@@ -33,7 +33,7 @@
                     <group col="4" colspan="4">
                         <label string="" colspan="1"/>
                         <button icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
                     </group>
                 </form>
             </field>

From 89ee28b7d1894e8260407ed96d47a86504b5f24c Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 11 May 2011 16:34:23 +0530
Subject: [PATCH 2/3] email_template: code optimization, removed unused imports
 and useability fix

bzr revid: rha@tinyerp.com-20110511110423-ojb059dpf1m39ib5
---
 addons/email_template/email_template.py                | 7 +------
 addons/email_template/mako_template.py                 | 1 -
 addons/email_template/wizard/email_compose_message.py  | 9 ++++-----
 addons/email_template/wizard/email_template_preview.py | 9 ++-------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6169b7a2937..92ff5329d6b 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -23,13 +23,8 @@
 from osv import osv
 from osv import fields
 import base64
-import random
 import netsvc
-import logging
-import re
 from tools.translate import _
-import tools
-import pooler
 
 class email_template(osv.osv):
     "Templates for sending Email"
@@ -355,7 +350,7 @@ class email_template(osv.osv):
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, record_id, context)
         def _get_template_value(field):
-            if context.get('mass_mail',False): # Mass Mail: Gets original template values for multiple email change
+            if context.get('mass_mail', False): # Mass Mail: Gets original template values for multiple email change
                 return getattr(template, field)
             else:
                 return self.get_template_value(cr, uid, getattr(template, field), template.model, record_id, context=context)
diff --git a/addons/email_template/mako_template.py b/addons/email_template/mako_template.py
index 509bcbc66b3..c0c348e5e49 100644
--- a/addons/email_template/mako_template.py
+++ b/addons/email_template/mako_template.py
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 import tools
-from tools.translate import _
 import pooler
 import logging
 
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index ef6058ff892..61e62278750 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -21,7 +21,6 @@
 
 from osv import osv
 from osv import fields
-import tools
 from tools.translate import _
 import binascii
 
@@ -42,10 +41,10 @@ class email_compose_message(osv.osv_memory):
             message_pool = self.pool.get('email.message')
             message_data = message_pool.browse(cr, uid, int(context.get('message_id')), context)
             model = message_data.model
-        elif context.get('active_model',False):
-            model =  context.get('active_model')
+        elif context.get('active_model', False):
+            model = context.get('active_model')
         if model:
-            record_ids = email_temp_pool.search(cr, uid, [('model','=',model)])
+            record_ids = email_temp_pool.search(cr, uid, [('model', '=', model)])
             return email_temp_pool.name_get(cr, uid, record_ids, context) + [(False,'')]
         return []
 
@@ -91,7 +90,7 @@ class email_compose_message(osv.osv_memory):
         model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
             model = context.get('active_model', record.model or False)
-            model = model_pool.search(cr, uid, [('model','=', model)])[0]
+            model = model_pool.search(cr, uid, [('model', '=', model)])[0]
             model_name = model_pool.browse(cr, uid, model, context=context).name
             values = {
                 'name': model_name,
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 6b2b546c267..f26dea0cd7a 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -21,9 +21,6 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
-import tools
-
 
 class email_template_preview(osv.osv_memory):
     _inherit = "email.template"
@@ -42,7 +39,6 @@ class email_template_preview(osv.osv_memory):
         if not template_id:
             return []
         template_pool = self.pool.get('email.template')
-        model_pool = self.pool.get('ir.model')
         template = template_pool.browse(cr, uid, int(template_id), context=context)
         template_object = template.model_id
         model =  self.pool.get(template_object.model)
@@ -61,7 +57,7 @@ class email_template_preview(osv.osv_memory):
         result = super(email_template_preview, self).default_get(cr, uid, fields, context=context)
 
         template_pool = self.pool.get('email.template')
-        template_id = context.get('active_id',False)
+        template_id = context.get('active_id', False)
         if 'res_id' in fields:
             records = self._get_records(cr, uid, context=context)
             result['res_id'] = records and records[0][0] or False # select first record as a Default
@@ -72,8 +68,7 @@ class email_template_preview(osv.osv_memory):
     _columns = {
         'res_id':fields.selection(_get_records, 'Referred Document'),
     }
-    _defaults = {
-    }
+
     def on_change_ref(self, cr, uid, ids, res_id, context=None):
         if context is None:
             context = {}

From 3f18d22fc99be63fcab14a38e1e612ea6973f74b Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 11 May 2011 17:51:51 +0530
Subject: [PATCH 3/3] [FIX]: useability

bzr revid: rha@tinyerp.com-20110511122151-0dc5z3blbp2co9c1
---
 addons/mail/email_message.py                | 7 +++----
 addons/mail/email_thread.py                 | 5 ++---
 addons/mail/wizard/email_compose_message.py | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/mail/email_message.py b/addons/mail/email_message.py
index 8ef0dde0228..c8fbc645922 100644
--- a/addons/mail/email_message.py
+++ b/addons/mail/email_message.py
@@ -162,7 +162,7 @@ class email_message(osv.osv):
         """
         action_data = False
         action_pool = self.pool.get('ir.actions.act_window')
-        message_pool = self.browse(cr ,uid, ids, context=context)[0]
+        message_pool = self.browse(cr, uid, ids, context=context)[0]
         att_ids = [x.id for x in message_pool.attachment_ids]
         action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')])
         if action_ids:
@@ -309,8 +309,8 @@ class email_message(osv.osv):
             text = decode_header(text.replace('\r', ''))
             return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
-    def to_email(self,text):
-        return re.findall(r'([^ ,<@]+@[^> ,]+)',text)
+    def to_email(self, text):
+        return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
     def parse_message(self, message):
         """Return Dictionary Object after parse EML Message String
@@ -390,7 +390,6 @@ class email_message(osv.osv):
             msg['body'] = tools.ustr(body, encoding)
 
         attachments = {}
-        has_plain_text = False
         if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
             body = ""
             if 'multipart/alternative' in msg.get('content-type', ''):
diff --git a/addons/mail/email_thread.py b/addons/mail/email_thread.py
index 44d957c7ee1..236a0b51b5c 100644
--- a/addons/mail/email_thread.py
+++ b/addons/mail/email_thread.py
@@ -26,7 +26,6 @@ import binascii
 import email
 
 from email.utils import parsedate
-import base64
 
 from tools.translate import _
 import logging
@@ -77,7 +76,7 @@ class email_thread(osv.osv):
         model_pool = self.pool.get(model)
         fields = model_pool.fields_get(cr, uid, context=context)
         data = model_pool.default_get(cr, uid, fields, context=context)
-        if 'name' in fields and not data.get('name',False):
+        if 'name' in fields and not data.get('name', False):
             data['name'] = msg.get('from','')
         res_id = model_pool.create(cr, uid, data, context=context)
 
@@ -137,7 +136,7 @@ class email_thread(osv.osv):
         if isinstance(ids, (str, int, long)):
             ids = [long(ids)]
         for thread in self.browse(cr, uid, ids, context=context):
-            l=[]
+            l = []
             for message in thread.message_ids:
                 l.append((message.user_id and message.user_id.email) or '')
                 l.append(message.email_from or '')
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 98fdd641f84..b542d2e2dbb 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -131,7 +131,7 @@ class email_compose_message(osv.osv_memory):
             message_id = False
 
             # Reply Email
-            if context.get('mail',False) == 'reply' and  mail.message_id:
+            if context.get('mail') == 'reply' and  mail.message_id:
                 references = mail.references and mail.references + "," + mail.message_id or mail.message_id
             else:
                 message_id = mail.message_id