From 7d9d3c5611a1e926730d054ffb57769bdec071bd Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 4 Feb 2011 12:26:27 +0530
Subject: [IMP] replace mail_gateway to email_gateway module in dependancy of
 module.

bzr revid: ysa@tinyerp.com-20110204065627-sfir225ag1bzwgay
---
 addons/thunderbird/__openerp__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index f4262ccd96d..e36b186d637 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -24,14 +24,14 @@
     "version" : "1.0",
     "author" : "OpenERP SA & Axelor",
     "website" : "http://www.openerp.com/",
-    "depends" : ["base","mail_gateway"],
+    "depends" : ["base","email_gateway"],
     "category" : "Generic Modules/Thunderbird interface",
     "description": """
       This module is required for the thuderbird plug-in to work
       properly.
-      The Plugin allows you archive email and its attachments to the selected 
+      The Plugin allows you archive email and its attachments to the selected
       OpenERP objects. You can select a partner, a task, a project, an analytical
-      account,or any other object and attach selected mail as eml file in 
+      account,or any other object and attach selected mail as eml file in
       attachment of selected record. You can create Documents for crm Lead,
       HR Applicant and project issue from selected mails.
 
-- 
cgit v1.2.3


From 0c7876ac291b720b787f97834ded983b21c30025 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 7 Feb 2011 11:21:57 +0530
Subject: [IMP] replace mailgate.message to email.message in addons module.

bzr revid: ysa@tinyerp.com-20110207055157-yr9co24w84kv0yvy
---
 addons/thunderbird/partner/partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 1eb898e527e..ff911567d92 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -152,7 +152,7 @@ class thunderbird_partner(osv.osv_memory):
         msg = self.pool.get('email.server.tools').parse_message(msg)
         server_tools_pool = self.pool.get('email.server.tools')
         message_id = msg.get('message-id', False)
-        msg_pool = self.pool.get('mailgate.message')
+        msg_pool = self.pool.get('email.message')
         msg_ids = []
         res = {}
         res_ids = []
@@ -213,7 +213,7 @@ class thunderbird_partner(osv.osv_memory):
         references = False
         if refs:
             references = refs.split()
-        msg_pool = self.pool.get('mailgate.message')
+        msg_pool = self.pool.get('email.message')
         model = ''
         res_id = 0
         if message_id:
-- 
cgit v1.2.3


From e1afe5828aa5bc65a61ee6143a2dabd2fa6c0e33 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Mar 2011 13:09:00 +0530
Subject: [IMP] change module name emails to email and related to changes in
 addons all module. move email_gateway module file in email module and also
 related changes in related module..

bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
---
 addons/thunderbird/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index e36b186d637..ddea8167743 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA & Axelor",
     "website" : "http://www.openerp.com/",
-    "depends" : ["base","email_gateway"],
+    "depends" : ["base","email"],
     "category" : "Generic Modules/Thunderbird interface",
     "description": """
       This module is required for the thuderbird plug-in to work
-- 
cgit v1.2.3


From 455fb2d6b349df99449e1b8655349be8ce2869db Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 18 Mar 2011 19:14:19 +0530
Subject: [IMP] email: email cleanup

bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz
---
 addons/thunderbird/partner/partner.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index ff911567d92..b54339dae20 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -24,8 +24,8 @@ import base64
 import email
 import tools
 import binascii
-class email_server_tools(osv.osv_memory):
-    _inherit = "email.server.tools"
+class email_thread(osv.osv):
+    _inherit = "email.thread"
     def history_message(self, cr, uid, model, res_id, message, context=None):
         #@param message: string of mail which is read from EML File
         attachment_pool = self.pool.get('ir.attachment')
@@ -127,7 +127,7 @@ class email_server_tools(osv.osv_memory):
             msg['body'] = body
             msg['attachments'] = attachments
         return msg
-email_server_tools()
+email_thread()
 
 class thunderbird_partner(osv.osv_memory):
     _name = "thunderbird.partner"
@@ -149,8 +149,8 @@ class thunderbird_partner(osv.osv_memory):
         ref_ids = str(dictcreate.get('ref_ids')).split(';')
         msg = dictcreate.get('message')
         mail = msg
-        msg = self.pool.get('email.server.tools').parse_message(msg)
-        server_tools_pool = self.pool.get('email.server.tools')
+        msg = self.pool.get('email.thread').parse_message(msg)
+        thread_pool = self.pool.get('email.thread')
         message_id = msg.get('message-id', False)
         msg_pool = self.pool.get('email.message')
         msg_ids = []
@@ -191,7 +191,7 @@ class thunderbird_partner(osv.osv_memory):
                 res['datas'] = base64.b64encode(mail)
                 res['res_id'] = res_id
                 obj_attch.create(cr, uid, res)
-            server_tools_pool.history_message(cr, uid, model, res_id, msg_new)
+            thread_pool.history_message(cr, uid, model, res_id, msg_new)
             res_ids.append(res_id)
         return len(res_ids)
 
@@ -199,7 +199,7 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate = dict(vals)
         model = str(dictcreate.get('model'))
         message = dictcreate.get('message')
-        return self.pool.get('email.server.tools').process_email(cr, uid, model, message, attach=True, context=None)
+        return self.pool.get('email.thread').process_email(cr, uid, model, message, attach=True, context=None)
 
     def search_message(self, cr, uid, message, context=None):
         #@param message: string of mail which is read from EML File
@@ -207,7 +207,7 @@ class thunderbird_partner(osv.osv_memory):
         references = []
         dictcreate = dict(message)
         msg = dictcreate.get('message')
-        msg = self.pool.get('email.server.tools').parse_message(msg)
+        msg = self.pool.get('email.thread').parse_message(msg)
         message_id = msg.get('message-id')
         refs =  msg.get('references',False)
         references = False
-- 
cgit v1.2.3


From 47a85e9f8f0fadf16d679a2f1fdbef0ef1c59440 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 4 Apr 2011 15:15:52 +0530
Subject: [IMP] mail: rename module email to mail because of parsing error

bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
---
 addons/thunderbird/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 17a3ed2bb2d..51e4153e897 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
-    "depends" : ["base","email"],
+    "depends" : ["base","mail"],
     "category" : "Tools",
     "description": """
 This module is required for the Thuderbird Plug-in to work properly.
-- 
cgit v1.2.3


From 2cfb9451d355b7ee8605165ef3057d3f42c6b2b5 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 5 Apr 2011 17:29:20 +0530
Subject: [REVIEW] mail: * email.message : add new method parse_message to
 parse message string into dict object * email.thread : refector
 process_email, message_new, message_update

bzr revid: hmo@tinyerp.com-20110405115920-10yxztp0p7vvhg2x
---
 addons/thunderbird/partner/partner.py | 91 ++---------------------------------
 1 file changed, 4 insertions(+), 87 deletions(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index b54339dae20..3d0f2937a1f 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -29,7 +29,8 @@ class email_thread(osv.osv):
     def history_message(self, cr, uid, model, res_id, message, context=None):
         #@param message: string of mail which is read from EML File
         attachment_pool = self.pool.get('ir.attachment')
-        msg = self.parse_message(message)
+        email_message_pool = self.pool.get('email.message')
+        msg = email_message_pool.parse_message(message)
         attachments = msg.get('attachments', [])
         att_ids = []
         for attachment in attachments:
@@ -43,90 +44,6 @@ class email_thread(osv.osv):
             }
             att_ids.append(attachment_pool.create(cr, uid, data_attach))
         return self.history(cr, uid, model, res_id, msg, att_ids)
-
-    def parse_message(self, message):
-        #TOCHECK: put this function in mailgateway module
-        if isinstance(message, unicode):
-            message = message.encode('utf-8')
-        msg_txt = email.message_from_string(message)
-        message_id = msg_txt.get('message-id', False)
-        msg = {}
-        fields = msg_txt.keys()
-        msg['id'] = message_id
-        msg['message-id'] = message_id
-        if 'Subject' in fields:
-            msg['subject'] = self._decode_header(msg_txt.get('Subject'))
-
-        if 'Content-Type' in fields:
-            msg['content-type'] = msg_txt.get('Content-Type')
-
-        if 'From' in fields:
-            msg['from'] = self._decode_header(msg_txt.get('From'))
-
-        if 'Delivered-To' in fields:
-            msg['to'] = self._decode_header(msg_txt.get('Delivered-To'))
-
-        if 'CC' in fields:
-            msg['cc'] = self._decode_header(msg_txt.get('CC'))
-
-        if 'Reply-to' in fields:
-            msg['reply'] = self._decode_header(msg_txt.get('Reply-To'))
-
-        if 'Date' in fields:
-            msg['date'] = self._decode_header(msg_txt.get('Date'))
-
-        if 'Content-Transfer-Encoding' in fields:
-            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-
-        if 'References' in fields:
-            msg['references'] = msg_txt.get('References')
-
-        if 'In-Reply-To' in fields:
-            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
-
-        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', ''):
-            encoding = msg_txt.get_content_charset()
-            body = msg_txt.get_payload(decode=True)
-            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 = ""
-            for part in msg_txt.walk():
-                if part.get_content_maintype() == 'multipart':
-                    continue
-
-                encoding = part.get_content_charset()
-                filename = part.get_filename()
-                if part.get_content_maintype()=='text':
-                    content = part.get_payload(decode=True)
-                    if filename:
-                        attachments[filename] = content
-                    elif not has_plain_text:
-                        # main content parts should have 'text' maintype
-                        # and no filename. we ignore the html part if
-                        # there is already a plaintext part without filename,
-                        # because presumably these are alternatives.
-                        content = tools.ustr(content, encoding)
-                        if part.get_content_subtype() == 'html':
-                            body = tools.ustr(tools.html2plaintext(content))
-                        elif part.get_content_subtype() == 'plain':
-                            body = content
-                            has_plain_text = True
-                elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
-                        attachments[filename] = part.get_payload(decode=True)
-                    else:
-                        res = part.get_payload(decode=True)
-                        body += tools.ustr(res, encoding)
-
-            msg['body'] = body
-            msg['attachments'] = attachments
-        return msg
 email_thread()
 
 class thunderbird_partner(osv.osv_memory):
@@ -149,7 +66,7 @@ class thunderbird_partner(osv.osv_memory):
         ref_ids = str(dictcreate.get('ref_ids')).split(';')
         msg = dictcreate.get('message')
         mail = msg
-        msg = self.pool.get('email.thread').parse_message(msg)
+        msg = self.pool.get('email.message').parse_message(msg)
         thread_pool = self.pool.get('email.thread')
         message_id = msg.get('message-id', False)
         msg_pool = self.pool.get('email.message')
@@ -207,7 +124,7 @@ class thunderbird_partner(osv.osv_memory):
         references = []
         dictcreate = dict(message)
         msg = dictcreate.get('message')
-        msg = self.pool.get('email.thread').parse_message(msg)
+        msg = self.pool.get('email.message').parse_message(msg)
         message_id = msg.get('message-id')
         refs =  msg.get('references',False)
         references = False
-- 
cgit v1.2.3


From b794d93e2a42eac8f3466c290b5ce7bdfc8a8547 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 21 Apr 2011 14:41:25 +0530
Subject: [FIX] thunderbird: changes in partner.py for history()

bzr revid: rha@tinyerp.com-20110421091125-nevt80ac5y1vn5jy
---
 addons/thunderbird/partner/partner.py | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 3d0f2937a1f..747625532b2 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -23,28 +23,6 @@ from osv import osv
 import base64
 import email
 import tools
-import binascii
-class email_thread(osv.osv):
-    _inherit = "email.thread"
-    def history_message(self, cr, uid, model, res_id, message, context=None):
-        #@param message: string of mail which is read from EML File
-        attachment_pool = self.pool.get('ir.attachment')
-        email_message_pool = self.pool.get('email.message')
-        msg = email_message_pool.parse_message(message)
-        attachments = msg.get('attachments', [])
-        att_ids = []
-        for attachment in attachments:
-            data_attach = {
-                'name': attachment,
-                'datas': binascii.b2a_base64(str(attachments.get(attachment))),
-                'datas_fname': attachment,
-                'description': 'Mail attachment From Thunderbird msg_id: %s' %(msg.get('message_id', '')),
-                'res_model': model,
-                'res_id': res_id,
-            }
-            att_ids.append(attachment_pool.create(cr, uid, data_attach))
-        return self.history(cr, uid, model, res_id, msg, att_ids)
-email_thread()
 
 class thunderbird_partner(osv.osv_memory):
     _name = "thunderbird.partner"
@@ -67,6 +45,7 @@ class thunderbird_partner(osv.osv_memory):
         msg = dictcreate.get('message')
         mail = msg
         msg = self.pool.get('email.message').parse_message(msg)
+        subject = msg.get('Subject', False)
         thread_pool = self.pool.get('email.thread')
         message_id = msg.get('message-id', False)
         msg_pool = self.pool.get('email.message')
@@ -75,7 +54,6 @@ class thunderbird_partner(osv.osv_memory):
         res_ids = []
         obj_list= ['crm.lead','project.issue','hr.applicant','res.partner']
         for ref_id in ref_ids:
-            msg_new = dictcreate.get('message')
             ref = ref_id.split(',')
             model = ref[0]
             res_id = int(ref[1])
@@ -108,7 +86,14 @@ class thunderbird_partner(osv.osv_memory):
                 res['datas'] = base64.b64encode(mail)
                 res['res_id'] = res_id
                 obj_attch.create(cr, uid, res)
-            thread_pool.history_message(cr, uid, model, res_id, msg_new)
+            threads = self.pool.get(model).browse(cr, uid, res_id)
+            thread_pool.history(cr, uid, [threads], subject,
+                            email=msg.get('to', False),
+                            details=msg.get('body', False),
+                            email_from=msg.get('from', False),
+                            message_id= msg.get('message-id', False),
+                            attach= msg.get('attachments', {}),
+                            email_date= msg.get('date', False))
             res_ids.append(res_id)
         return len(res_ids)
 
-- 
cgit v1.2.3


From 2c9825a07be5c6c76f488c82bda23f31c0b1d2fc Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 21 Apr 2011 15:23:16 +0530
Subject: [FIX] thunderbird: changes in history() of partner.py

bzr revid: rha@tinyerp.com-20110421095316-zccag93g4spnzeja
---
 addons/thunderbird/partner/partner.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 747625532b2..d67238db5fc 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -87,13 +87,16 @@ class thunderbird_partner(osv.osv_memory):
                 res['res_id'] = res_id
                 obj_attch.create(cr, uid, res)
             threads = self.pool.get(model).browse(cr, uid, res_id)
-            thread_pool.history(cr, uid, [threads], subject,
-                            email=msg.get('to', False),
-                            details=msg.get('body', False),
-                            email_from=msg.get('from', False),
-                            message_id= msg.get('message-id', False),
-                            attach= msg.get('attachments', {}),
-                            email_date= msg.get('date', False))
+            thread_pool.history(cr, uid, [threads], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = msg.get('attachments', {}),
+                            email_date = msg.get('date'))
             res_ids.append(res_id)
         return len(res_ids)
 
-- 
cgit v1.2.3


From 44344056d39344ddfffd6e61dbf536c76e41a077 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 27 Apr 2011 11:16:48 +0530
Subject: [FIX] thunderbird: fixed import error

bzr revid: rha@tinyerp.com-20110427054648-axfgp2dnqm63bjqv
---
 addons/thunderbird/partner/partner.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index d67238db5fc..180499ae5b7 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -23,6 +23,7 @@ from osv import osv
 import base64
 import email
 import tools
+from tools.translate import _
 
 class thunderbird_partner(osv.osv_memory):
     _name = "thunderbird.partner"
-- 
cgit v1.2.3


From 9be4b6771cc185806e34766f58f48b17cceb4b15 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 4 May 2011 17:13:22 +0530
Subject: [FIX] thunderbird: parameters of the history() of partner.py

bzr revid: rha@tinyerp.com-20110504114322-ijfo973i8ru6bxzq
---
 addons/thunderbird/partner/partner.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 180499ae5b7..21b8dd94484 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -97,7 +97,12 @@ class thunderbird_partner(osv.osv_memory):
                             message_id = msg.get('message-id'),
                             references = msg.get('references', False) or msg.get('in-reply-to', False),
                             attach = msg.get('attachments', {}),
-                            email_date = msg.get('date'))
+                            email_date = msg.get('date'),
+                            body_html= msg.get('body_html'),
+                            sub_type = msg.get('sub_type'),
+                            headers = msg.get('headers'),
+                            reply = msg.get('reply'),
+                            priority = msg.get('priority'),)
             res_ids.append(res_id)
         return len(res_ids)
 
-- 
cgit v1.2.3


From 8f9f45ea948d1ffecb79601e860d522fc6686c2d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 22 Aug 2011 19:16:59 +0200
Subject: [IMP] all: next pass of review/renaming for new mail API

bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
---
 addons/thunderbird/partner/partner.py | 37 ++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 21b8dd94484..1f79116c113 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -45,11 +45,11 @@ class thunderbird_partner(osv.osv_memory):
         ref_ids = str(dictcreate.get('ref_ids')).split(';')
         msg = dictcreate.get('message')
         mail = msg
-        msg = self.pool.get('email.message').parse_message(msg)
+        mail_message = self.pool.get('mail.message')
+        msg = mail_message.parse_message(msg)
         subject = msg.get('Subject', False)
-        thread_pool = self.pool.get('email.thread')
+        thread_pool = self.pool.get('mail.thread')
         message_id = msg.get('message-id', False)
-        msg_pool = self.pool.get('email.message')
         msg_ids = []
         res = {}
         res_ids = []
@@ -59,7 +59,7 @@ class thunderbird_partner(osv.osv_memory):
             model = ref[0]
             res_id = int(ref[1])
             if message_id:
-                msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
+                msg_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
                 if msg_ids and len(msg_ids):
                     continue
             if model not in obj_list:
@@ -88,21 +88,22 @@ class thunderbird_partner(osv.osv_memory):
                 res['res_id'] = res_id
                 obj_attch.create(cr, uid, res)
             threads = self.pool.get(model).browse(cr, uid, res_id)
-            thread_pool.history(cr, uid, [threads], _('receive'), history=True,
+
+            thread_pool.history(cr, uid,
+                            [threads],
                             subject = msg.get('subject'),
-                            email = msg.get('to'),
-                            details = msg.get('body'),
+                            details = msg.get('body_text'),
+                            email_to = msg.get('to'),
                             email_from = msg.get('from'),
                             email_cc = msg.get('cc'),
                             message_id = msg.get('message-id'),
                             references = msg.get('references', False) or msg.get('in-reply-to', False),
-                            attach = msg.get('attachments', {}),
+                            attachments = msg.get('attachments', {}),
                             email_date = msg.get('date'),
                             body_html= msg.get('body_html'),
-                            sub_type = msg.get('sub_type'),
+                            subtype = msg.get('subtype'),
                             headers = msg.get('headers'),
-                            reply = msg.get('reply'),
-                            priority = msg.get('priority'),)
+                            reply_to = msg.get('reply'))
             res_ids.append(res_id)
         return len(res_ids)
 
@@ -110,7 +111,7 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate = dict(vals)
         model = str(dictcreate.get('model'))
         message = dictcreate.get('message')
-        return self.pool.get('email.thread').process_email(cr, uid, model, message, attach=True, context=None)
+        return self.pool.get('mail.thread').process_email(cr, uid, model, message, attach=True, context=None)
 
     def search_message(self, cr, uid, message, context=None):
         #@param message: string of mail which is read from EML File
@@ -118,26 +119,26 @@ class thunderbird_partner(osv.osv_memory):
         references = []
         dictcreate = dict(message)
         msg = dictcreate.get('message')
-        msg = self.pool.get('email.message').parse_message(msg)
+        msg = self.pool.get('mail.message').parse_message(msg)
         message_id = msg.get('message-id')
         refs =  msg.get('references',False)
         references = False
         if refs:
             references = refs.split()
-        msg_pool = self.pool.get('email.message')
+        mail_message = self.pool.get('mail.message')
         model = ''
         res_id = 0
         if message_id:
-            msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id)])
+            msg_ids = mail_message.search(cr, uid, [('message_id','=',message_id)])
             if msg_ids and len(msg_ids):
-                msg = msg_pool.browse(cr, uid, msg_ids[0])
+                msg = mail_message.browse(cr, uid, msg_ids[0])
                 model = msg.model
                 res_id = msg.res_id
             else:
                 if references :
-                    msg_ids = msg_pool.search(cr, uid, [('message_id','in',references)])
+                    msg_ids = mail_message.search(cr, uid, [('message_id','in',references)])
                     if msg_ids and len(msg_ids):
-                        msg = msg_pool.browse(cr, uid, msg_ids[0])
+                        msg = mail_message.browse(cr, uid, msg_ids[0])
                         model = msg.model
                         res_id = msg.res_id
         return (model,res_id)
-- 
cgit v1.2.3


From b0bed63351956455a23cdc960292e104af53f67a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 23 Aug 2011 19:58:09 +0200
Subject: [IMP] mail.thread: renaming methods to avoid collisions with objects
 that use the mixin

bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh
---
 addons/thunderbird/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 1f79116c113..37354d6a881 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -111,7 +111,7 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate = dict(vals)
         model = str(dictcreate.get('model'))
         message = dictcreate.get('message')
-        return self.pool.get('mail.thread').process_email(cr, uid, model, message, attach=True, context=None)
+        return self.pool.get('mail.thread').message_process(cr, uid, model, message, attach=True, context=None)
 
     def search_message(self, cr, uid, message, context=None):
         #@param message: string of mail which is read from EML File
-- 
cgit v1.2.3


From 2f543db06e952991577ca659f6b9b4dfc57cf828 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 25 Aug 2011 14:27:57 +0200
Subject: [IMP] mail: cleanup/rename API + adapt dependencies (wip)

bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
---
 addons/thunderbird/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 37354d6a881..da59ea99aa5 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -89,7 +89,7 @@ class thunderbird_partner(osv.osv_memory):
                 obj_attch.create(cr, uid, res)
             threads = self.pool.get(model).browse(cr, uid, res_id)
 
-            thread_pool.history(cr, uid,
+            thread_pool.message_append(cr, uid,
                             [threads],
                             subject = msg.get('subject'),
                             details = msg.get('body_text'),
-- 
cgit v1.2.3


From da59a314e69bdfd0daa31cc90d179687fb01e0a4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Sep 2011 02:16:51 +0200
Subject: [IMP] mail.thread: support stripping attachments

bzr revid: odo@openerp.com-20110908001651-ns4nw0ri18xp7twf
---
 addons/thunderbird/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/thunderbird')

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index da59ea99aa5..80a4bfa4d98 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -111,7 +111,7 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate = dict(vals)
         model = str(dictcreate.get('model'))
         message = dictcreate.get('message')
-        return self.pool.get('mail.thread').message_process(cr, uid, model, message, attach=True, context=None)
+        return self.pool.get('mail.thread').message_process(cr, uid, model, message)
 
     def search_message(self, cr, uid, message, context=None):
         #@param message: string of mail which is read from EML File
-- 
cgit v1.2.3