[MERGE] merge with latest stable

[odoo/odoo.git] / addons / fetchmail / fetchmail_view.xml

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 0b74b20..715f8c2 100644 (file)
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
         <record model="ir.ui.view" id="view_email_server_tree">
             <field name="name">email.server.tree</field>
             <field name="model">email.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('wating');gray:state in('done')" string="POP/IMAP Servers">
+                <tree colors="blue:state in ('draft');black:state in ('waiting');gray:state in('done')" string="POP/IMAP Servers">
                     <field name="name"/>
                     <field name="type"/>
                     <field name="user"/>
                     <field name="is_ssl"/>
+                    <field name="object_id"/>
+                    <field name="message_ids" string="# of emails"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_form">
             <field name="name">email.server.form</field>
             <field name="model">email.server</field>
@@ -46,6 +48,7 @@
                             <group col="2" colspan="2">
                                 <separator string="Auto Reply?" colspan="2"/>
                                 <field name="action_id"/>
+                                <field name="user_id"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Process Parameter" colspan="2"/>
@@ -65,7 +68,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_search">
             <field name="name">email.server.search</field>
             <field name="model">email.server</field>
@@ -88,7 +91,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_email_server_tree">
             <field name="name">Email Servers</field>
             <field name="res_model">email.server</field>
@@ -98,13 +101,13 @@
             <field name="search_view_id" ref="view_email_server_search"/>
         </record>
 
-        <menuitem 
-            parent="base.menu_mail_gateway" 
+        <menuitem
+            parent="base.menu_mail_gateway"
             id="menu_action_fetchmail_server_tree"
-            action="action_email_server_tree" 
+            action="action_email_server_tree"
             name="Email Servers"
         />
-        
+
       <record model="ir.ui.view" id="mailgate_message_tree_view">
              <field name="name">mailgate.message.tree</field>
              <field name="model">mailgate.message</field>
@@ -118,11 +121,38 @@
              </field>
       </record>
 
-        <act_window 
-            context="{'server_id': active_id}"
-            domain="[('server_id', '=', active_id)]"
-            id="act_server_history" name="Email History"
+      <record model="ir.ui.view" id="mailgate_message_search_view">
+             <field name="name">mailgate.message.inherit.search</field>
+             <field name="model">mailgate.message</field>
+             <field name="type">search</field>
+             <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/>
+             <field name="arch" type="xml">
+                       <xpath expr="/search/field[@name='name']" position="before">
+                            <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
+                            <separator orientation="vertical"/>
+                       </xpath>
+                       <xpath expr="/search/group/filter[@string='Thread']" position="before">
+                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
+            </xpath>
+             </field>
+      </record>
+
+      <record id="action_view_mail_message_emails" model="ir.actions.act_window">
+            <field name="name">Messages</field>
+            <field name="res_model">mailgate.message</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_emails': 1}</field>
+            <field name="search_view_id" ref="mailgate_message_search_view"/>
+      </record>
+
+      <menuitem id="base.menu_email_gateway_form"
+               parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
+
+      <act_window
+            context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
+            id="act_server_history" name="Emails"
             res_model="mailgate.message" src_model="email.server"/>
-            
+
     </data>
 </openerp>