From 3ea3c8107e5e5e70fd9c893a0ad21e8f9019655c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 Jun 2010 14:04:22 +0200
Subject: [PATCH 1/5] fix

bzr revid: fp@tinyerp.com-20100625120422-yrods50au0z26175
---
 addons/email_template/email_template.py       |  2 +-
 addons/email_template/email_template_view.xml | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index a015ef81418..0ca89a5bbb8 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -232,7 +232,7 @@ class email_template(osv.osv):
         template_obj = self.browse(cr, uid, ids)[0]
         src_obj = template_obj.object_name.model
         vals['ref_ir_act_window'] = self.pool.get('ir.actions.act_window').create(cr, uid, {
-             'name': _("%s Mail Form") % template_obj.name,
+             'name': template_obj.name,
              'type': 'ir.actions.act_window',
              'res_model': 'email_template.send.wizard',
              'src_model': src_obj,
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index c6eb3757604..3346c6c6162 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -108,15 +108,18 @@
                             </group>
                         </page>
                         <page string="Advanced">
-                            <field name="ref_ir_act_window" />
-                            <field name="ref_ir_value" />
-                            <separator string="Attachments (Report to attach)" colspan="4"/>
-                            <field name="file_name" colspan="2" />
-                            <field name="report_template" colspan="2"
+                            <group colspan="2" col="2">
+                                <separator string="Actions" colspan="2"/>
+                                <button name="create_action" string="Create Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
+                                <field name="ref_ir_act_window"/>
+                                <field name="ref_ir_value"/>
+                                <button name="delete_action" string="Delete Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Attachments (Report to attach)" colspan="4"/>
+                                <field name="file_name" colspan="2" />
+                                <field name="report_template" colspan="2"
                                     domain="[('model','=',model_int_name)]" />
-                            <group colspan="2">
-                                <button name="create_action" string="Create Action" type="object" colspan="1" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
-                                <button name="delete_action" string="Delete Action" type="object" colspan="1" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
                             </group>
                         </page>
                     </notebook>

From 93693b7372deeedc85a79b21f4f60d0c15a83e12 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 25 Jun 2010 14:05:00 +0200
Subject: [PATCH 2/5] [FIX] crm: don't update description of lead upon new
 email + a few minor cleanup fixes

bzr revid: odo@openerp.com-20100625120500-yv2mnfhffe85d3v9
---
 addons/crm/crm_lead.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0ecfdca357e..491784682f2 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -248,7 +248,7 @@ and users by email"),
     def message_new(self, cr, uid, msg, context):
         """
         Automatically calls when new email message arrives
-        
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks
@@ -260,7 +260,7 @@ and users by email"),
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-        
+
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -270,13 +270,13 @@ and users by email"),
         }
         if msg.get('priority', False):
             vals['priority'] = priority
-        
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
+
+        res = mailgate_pool.get_partner(cr, uid, msg.get('from') or msg.get_unixfrom())
         if res:
             vals.update(res)
         res = self.create(cr, uid, vals, context)
-        
-        
+
+
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
@@ -292,21 +292,18 @@ and users by email"),
         return res
 
     def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}):
-        """ 
+        """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of update mail’s IDs 
         """
-        
+
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-        
+
         msg_from = msg['from']
-        vals.update({
-            'description': msg['body']
-        })
-        if msg.get('priority', False):
+        if msg.get('priority'):
             vals['priority'] = msg.get('priority')
 
         maps = {
@@ -314,14 +311,14 @@ and users by email"),
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
-        vls = { }
+        vls = {}
         for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
-            if res and maps.get(res.group(1).lower(), False):
+            if res and maps.get(res.group(1).lower()):
                 key = maps.get(res.group(1).lower())
                 vls[key] = res.group(2).lower()
-        
+
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
         return res

From 2ad555b66e0c66e1d7fd11ffc35c5c46a3394471 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 Jun 2010 14:13:11 +0200
Subject: [PATCH 3/5] [IMP] better partner view

bzr revid: fp@tinyerp.com-20100625121311-9wtsmh2htk3s0ax6
---
 addons/mail_gateway/res_partner_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail_gateway/res_partner_view.xml b/addons/mail_gateway/res_partner_view.xml
index c81b47e6bf1..3cb1bb7fe5a 100644
--- a/addons/mail_gateway/res_partner_view.xml
+++ b/addons/mail_gateway/res_partner_view.xml
@@ -10,9 +10,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <page string="History" position="inside">
-                            <field name="emails" colspan="4" nolabel="1"/>
-                        </page>
+                 <page string="History" position="inside">
+                      <field name="emails" colspan="4" nolabel="1"/>
+                 </page>
             </field>
        </record>
    </data>

From 99aa4eb1b384ce39dd5823ed4c7601462b5d6ea8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 25 Jun 2010 14:17:12 +0200
Subject: [PATCH 4/5] [FIX] crm: revert bad commit + some cleanup

bzr revid: odo@openerp.com-20100625121712-mc39c78ft553pgr7
---
 addons/crm/wizard/crm_send_email.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 3f6aacc0f39..d48f56239e4 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -107,12 +107,13 @@ class crm_send_new_email(osv.osv_memory):
             body = obj.text
 
             body = case_pool.format_body(body)
-            email_from = getattr(obj, 'email_from', False)            
+            email_from = getattr(obj, 'email_from', False)
+            x_headers = {}
             if message_id:
                 x_headers['References'] = "%s" % (message_id)
 
             flag = False
-            
+
             flag = tools.email_send(
                 email_from,
                 emails,

From 5767d1e86da1cb1df3564fa3ce043b94bc160889 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 25 Jun 2010 14:18:47 +0200
Subject: [PATCH 5/5] [IMP] crm, mail_gateway: correct encoding and parsing
 issues for incoming emails + some cleanup

bzr revid: odo@openerp.com-20100625121847-i5cww69ltsvfe33p
---
 addons/mail_gateway/mail_gateway.py           | 74 +++++++++++--------
 .../openerp_mailgate/openerp_mailgate.py      | 16 ++--
 2 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 404049880cd..51c21515f6c 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -28,6 +28,9 @@ from email.header import decode_header
 import base64
 import re
 from tools.translate import _
+import logging
+
+_logger = logging.getLogger('mailgate')
 
 class mailgate_thread(osv.osv):
     '''
@@ -45,12 +48,12 @@ class mailgate_thread(osv.osv):
         raise Exception, _('Method is not implemented')
 
     def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}):
-        raise Exception, _('Method is not implemented') 
+        raise Exception, _('Method is not implemented')
 
     def emails_get(self, cr, uid, ids, context=None):
-        raise Exception, _('Method is not implemented') 
+        raise Exception, _('Method is not implemented')
 
-    def msg_send(self, cr, uid, id, *args, **argv):        
+    def msg_send(self, cr, uid, id, *args, **argv):
         raise Exception, _('Method is not implemented')
 
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, \
@@ -92,7 +95,7 @@ class mailgate_thread(osv.osv):
             if history:
                 for att in attach:
                     attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
-                
+
                 data = {
                     'name': subject or 'History', 
                     'history': True, 
@@ -274,7 +277,7 @@ Thanks
         @param uid: the current user’s ID for security checks,
         @param model: OpenObject Model
         @param message: Email details
-        @param attach: Email attachments        
+        @param attach: Email attachments
         @param context: A standard dictionary for contextual values"""
 
         model_pool = self.pool.get(model)
@@ -282,17 +285,17 @@ Thanks
             context = {}
         res_id = False
         # Create New Record into particular model
-        def create_record(msg):            
+        def create_record(msg):
             if hasattr(model_pool, 'message_new'):
                 res_id = model_pool.message_new(cr, uid, msg, context)
             else:
                 data = {
-                    'name': msg.get('subject'), 
-                    'email_from': msg.get('from'), 
-                    'email_cc': msg.get('cc'), 
-                    'user_id': False, 
-                    'description': msg.get('body'), 
-                    'state' : 'draft', 
+                    'name': msg.get('subject'),
+                    'email_from': msg.get('from'),
+                    'email_cc': msg.get('cc'),
+                    'user_id': False,
+                    'description': msg.get('body'),
+                    'state' : 'draft',
                 }
                 data.update(self.get_partner(cr, uid, msg.get('from'), context=context))
                 res_id = model_pool.create(cr, uid, data, context=context)
@@ -301,28 +304,35 @@ Thanks
                 if attach:
                     for attachment in msg.get('attachments', []):
                         data_attach = {
-                            'name': attachment, 
-                            'datas': binascii.b2a_base64(str(attachments.get(attachment))), 
-                            'datas_fname': attachment, 
-                            'description': 'Mail attachment', 
-                            'res_model': model, 
-                            'res_id': res_id, 
+                            'name': attachment,
+                            'datas': binascii.b2a_base64(str(attachments.get(attachment))),
+                            'datas_fname': attachment,
+                            'description': 'Mail attachment',
+                            'res_model': model,
+                            'res_id': res_id,
                         }
-                        att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))               
-            
+                        att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
+
             return res_id
 
         history_pool = self.pool.get('mailgate.message')
-        msg_txt = email.message_from_string(message)
+
+        # Warning: message_from_string doesn't always work correctly on unicode,
+        # we must use utf-8 strings here :-(
+        msg_txt = email.message_from_string(tools.ustr(message).encode('utf-8'))
         message_id = msg_txt.get('Message-ID', False)
         msg = {}
+
         if not message_id:
-            return False
+            # Very unusual situation, be we should be fault-tolerant here
+            message_id = time.time()
+            msg_txt['Message-ID'] = message_id
+            _logger.info('Message without message-id, generating a random one: %s', message_id)
 
         fields = msg_txt.keys()
         msg['id'] = message_id
-        msg['message-id'] = message_id       
-        
+        msg['message-id'] = message_id
+
         if 'Subject' in fields:
             msg['subject'] = self._decode_header(msg_txt.get('Subject'))
 
@@ -348,19 +358,19 @@ Thanks
             msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
 
         if 'References' in fields:
-            msg['references'] = msg_txt.get('References')        
+            msg['references'] = msg_txt.get('References')
 
         if 'X-Priority' in fields:
             msg['priority'] = msg_txt.get('X-priority', '3 (Normal)').split(' ')[0]
 
-        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', None):
+        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
             encoding = msg_txt.get_content_charset()
             msg['body'] = msg_txt.get_payload(decode=True)
             if encoding:
                 msg['body'] = tools.ustr(msg['body'])
 
         attachments = {}
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', None):
+        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
             body = ""
             counter = 1
             for part in msg_txt.walk():
@@ -396,7 +406,7 @@ Thanks
             msg['attachments'] = attachments
         res_ids = []
         new_res_id = False
-        if msg.get('references', False):
+        if msg.get('references'):
             references = msg.get('references')
             if '\r\n' in references:
                 references = msg.get('references').split('\r\n')
@@ -415,16 +425,16 @@ Thanks
                     res_id = int(res_id)
                     res_ids.append(res_id)
                     model_pool = self.pool.get(model)
-                
+
                     vals = {}
                     if hasattr(model_pool, 'message_update'):
                         model_pool.message_update(cr, uid, [res_id], vals, msg, context=context)
-                    
+
         if not len(res_ids):
             new_res_id = create_record(msg)
             res_ids = [new_res_id]
         # Store messages
-        context.update({'model' : model})        
+        context.update({'model' : model})
         if hasattr(model_pool, '_history'):
             model_pool._history(cr, uid, res_ids, _('Receive'), history=True, 
                             subject = msg.get('subject'), 
@@ -448,7 +458,7 @@ Thanks
         """
         address_pool = self.pool.get('res.partner.address')
         res = {
-            'partner_address_id': False, 
+            'partner_address_id': False,
             'partner_id': False
         }
         from_email = self.to_email(from_email)
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index f294c819c78..1b433c4deb7 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #    Copyright (C) 2010-TODAY OpenERP S.A. (http://www.openerp.com)
@@ -17,7 +17,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ###########################################################################################
 
@@ -48,25 +48,25 @@ class email_parser(object):
             self.model = str(model)
         self.email = email
         self.email_default = email_default
-        
-        
-        
+
 
     def parse(self, message):
         try:
             res_id = self.rpc('email.server.tools', 'process_email', self.model, message)
         except Exception, e:
+            logger = logging.getLogger('mail-gateway')
+            logger.warning('Failed to process incoming email. Source of the failed mail is available at debug level.', exc_info=True)
+            logger.debug('Source of the mail that failed to parse:', message)
             res_id = False
 
 #    Reply mail
         if res_id:
             self.rpc('email.server.tools', 'email_send', self.model, res_id, message, self.email, self.email_default)
-        
         return res_id
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
-    group = optparse.OptionGroup(parser, "Note", 
+    group = optparse.OptionGroup(parser, "Note",
         "This program parse a mail from standard input and communicate "
         "with the Open ERP server for case management in the CRM module.")
     parser.add_option_group(group)
@@ -88,5 +88,5 @@ if __name__ == '__main__':
     msg_txt = sys.stdin.read()
 
     parser.parse(msg_txt)
- 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: