[IMP] all: next pass of review/renaming for new mail API

bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q

1 files changed, 26 insertions, 15 deletions

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 4bafe893704..cbd9482b1ae 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -181,14 +181,14 @@ class XMLRpcConn(object):
             model = rec[0]

             res_id = rec[1]

             #Check if mail installed

-            object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','email.message')])

+            object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mail.message')])

             if not object_id:

             	win32ui.MessageBox("Mail is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mail not installed",win32con.MB_ICONERROR)

             	return

             object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',model)])

             object_name  = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']

             #Reading the Object ir.model Name

-            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])

+            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])

             if ext_ids:

             	name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']

             	ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)

@@ -208,14 +208,25 @@ class XMLRpcConn(object):
             context['thread_model'] = model

             if attachments:

             	result = self.MakeAttachment([rec], mail)

-            execute(conn,'execute',self._dbname,int(self._uid),self._pwd, \

-                    'email.thread','history', [res_id], 'receive', \

-                    True, msg.get('subject',False),\

-                    msg.get('to'), msg.get('body', False),\

-                    msg.get('from'), msg.get('message-id'),\

-                    msg.get('references', False), result,\

-                    msg.get('cc'), False,\

-                    msg.get('date'), context)

+            execute(conn, 'execute', self. _dbname, int(self._uid), self._pwd,

+                    'mail.thread','history',[res_id],

+                    msg.get('subject', False),

+                    msg.get('body', False),

+                    msg.get('to', False),

+                    msg.get('from', False),

+                    msg.get('cc', False),

+                    False, # BCC

+                    False, #reply-to

+                    msg.get('date', False),

+                    msg.get('message-id'),\

+                    msg.get('references', False),

+                    result, #attachments

+                    #FIXME: properly handle plaintext/html body variants?

+                    False, #body_html

+                    False, #subtype

+                    False, #headers

+                    False, #original

+                    context)

 

             new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))

             flag = True

@@ -306,7 +317,7 @@ class XMLRpcConn(object):
             endCut = message_id.find(">")

             message_id = message_id[startCut:endCut+1]

             email.replace_header('Message-Id',message_id)

-            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.thread','process_email',section, str(email))

+            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.thread','process_email',section, str(email))

             if id > 0:

             	flag = True

             	return flag

@@ -453,17 +464,17 @@ class XMLRpcConn(object):
         import win32ui

     	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')

     	res_vals = []

-    	mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'email.message', 'search', [('message_id','=',message_id)])

+    	mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('message_id','=',message_id)])

         ref_mail_id = None

     	if not mail_id:

-            ref_mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'email.message', 'search', [('references','=',message_id)])

+            ref_mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('references','like','%'+message_id+'%')])

             if ref_mail_id:

-                address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'email.message','read',ref_mail_id[0],['model','res_id'])

+                address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',ref_mail_id[0],['model','res_id'])

                 for key, vals in address.items():

                     res_vals.append([key,vals])

                 return res_vals

             return None

-    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'email.message','read',mail_id[0],['model','res_id'])

+    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',mail_id[0],['model','res_id'])

     	for key, vals in address.items():

     		res_vals.append([key,vals])

     	return res_vals