From a2961cbdc3bc345e91057434026e804b260a41be Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 15:01:26 +0200
Subject: mail_refactor

bzr revid: fp@tinyerp.com-20120817130126-ldiw28gs13rvf2ka
---
 addons/fetchmail/fetchmail_view.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index cf651b5fd3d..7c049dedbb8 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -114,17 +114,6 @@
           </field>
       </record>
 
-      <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="inherit_id" ref="mail.view_email_message_search"/>
-          <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='Thread']" position="before">
-                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/>
-            </xpath>
-          </field>
-      </record>
-
       <act_window
             context="{'search_default_server_id': active_id, 'default_fetchmail_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
-- 
cgit v1.2.3


From ccb78bfdd9ebc528e423e1b563b19dfee701308c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 15:06:31 +0200
Subject: [FIX] fetchmail: fetchmail_server_id added to mail.mail form view.

bzr revid: tde@openerp.com-20120820130631-3kn57wnvj4ssyrjt
---
 addons/fetchmail/fetchmail_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 7c049dedbb8..bdb1ebf2fa5 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -104,11 +104,11 @@
         />
 
       <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="inherit_id" ref="mail.view_email_message_tree"/>
+          <field name="name">mail.mail.list.fetchmail</field>
+          <field name="model">mail.mail</field>
+          <field name="inherit_id" ref="mail.view_email_message_form"/>
           <field name="arch" type="xml">
-              <field name="user_id" position="after">
+              <field name="references" position="after">
                   <field name="fetchmail_server_id"/>
               </field>
           </field>
-- 
cgit v1.2.3


From bb3c9d573fec6e624c56826cc0db8eea83b82c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 17:51:24 +0200
Subject: [CLEAN] mail views: cleaned names, removed dead and not necessary
 code.

bzr revid: tde@openerp.com-20120820155124-iyve6xumamearb11
---
 addons/fetchmail/fetchmail_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index bdb1ebf2fa5..3cdc886ba2b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -104,9 +104,9 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-          <field name="name">mail.mail.list.fetchmail</field>
+          <field name="name">mail.mail.form.fetchmail</field>
           <field name="model">mail.mail</field>
-          <field name="inherit_id" ref="mail.view_email_message_form"/>
+          <field name="inherit_id" ref="mail.view_mail_form"/>
           <field name="arch" type="xml">
               <field name="references" position="after">
                   <field name="fetchmail_server_id"/>
-- 
cgit v1.2.3