[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20120816052021-igdj7knaimwg9x7z

2 files changed, 10 insertions, 21 deletions

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 62b2775a056..544a4f81b96 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -189,14 +189,11 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                     result, data = imap_server.search(None, '(UNSEEN)')
                     for num in data[0].split():
                         result, data = imap_server.fetch(num, '(RFC822)')
-                        if server.object_id:
-                            res_id = mail_thread.message_process(cr, uid, server.object_id.model, 
-                                                                 data[0][1],
-                                                                 save_original=server.original,
-                                                                 strip_attachments=(not server.attach),
-                                                                 context=context)
-                        else:
-                            res_id = mail_thread.message_catchall(cr, uid, data[0][1])
+                        res_id = mail_thread.message_process(cr, uid, server.object_id.model, 
+                                                             data[0][1],
+                                                             save_original=server.original,
+                                                             strip_attachments=(not server.attach),
+                                                             context=context)
                         if res_id and server.action_id:
                             action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
                             imap_server.store(num, '+FLAGS', '\\Seen')
@@ -217,14 +214,11 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                     for num in range(1, numMsgs + 1):
                         (header, msges, octets) = pop_server.retr(num)
                         msg = '\n'.join(msges)
-                        if server.object_id:
-                            res_id = mail_thread.message_process(cr, uid, server.object_id.model,
-                                                                 msg,
-                                                                 save_original=server.original,
-                                                                 strip_attachments=(not server.attach),
-                                                                 context=context)
-                        else:
-                            res_id = mail_thread.message_catchall(cr, uid, data[0][1])
+                        res_id = mail_thread.message_process(cr, uid, server.object_id.model,
+                                                             msg,
+                                                             save_original=server.original,
+                                                             strip_attachments=(not server.attach),
+                                                             context=context)
                         if res_id and server.action_id:
                             action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
                         pop_server.dele(num)
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 3325ae38c0b..cf651b5fd3d 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_email_server_tree">
             <field name="name">fetchmail.server.list</field>
             <field name="model">fetchmail.server</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft'" string="POP/IMAP Servers">
                     <field name="name"/>
@@ -22,7 +21,6 @@
         <record model="ir.ui.view" id="view_email_server_form">
             <field name="name">fetchmail.server.form</field>
             <field name="model">fetchmail.server</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Incoming Mail Server" version="7.0">
                     <header attrs="{'invisible' : [('type', '=', 'local')]}">
@@ -76,7 +74,6 @@
         <record model="ir.ui.view" id="view_email_server_search">
             <field name="name">fetchmail.server.search</field>
             <field name="model">fetchmail.server</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
                     <field name="name" string="Incoming Mail Server"/>
@@ -109,7 +106,6 @@
       <record model="ir.ui.view" id="email_message_tree_view">
           <field name="name">mail.message.list.fetchmail</field>
           <field name="model">mail.message</field>
-          <field name="type">tree</field>
           <field name="inherit_id" ref="mail.view_email_message_tree"/>
           <field name="arch" type="xml">
               <field name="user_id" position="after">
@@ -121,7 +117,6 @@
       <record model="ir.ui.view" id="email_message_search_view">
           <field name="name">mail.message.inherit.search</field>
           <field name="model">mail.message</field>
-          <field name="type">search</field>
           <field name="inherit_id" ref="mail.view_email_message_search"/>
           <field name="arch" type="xml">
             <xpath expr="/search/group/filter[@string='Thread']" position="before">