[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 7d55f9f..715f8c2 100644 (file)
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -1,7 +1,7 @@
 <?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>
@@ -18,7 +18,7 @@
                 </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>
@@ -68,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>
@@ -91,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>
@@ -101,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>
@@ -120,7 +120,7 @@
                  </field>
              </field>
       </record>
-      
+
       <record model="ir.ui.view" id="mailgate_message_search_view">
              <field name="name">mailgate.message.inherit.search</field>
              <field name="model">mailgate.message</field>
@@ -136,7 +136,7 @@
             </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>
@@ -145,15 +145,14 @@
             <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="{'server_id': active_id}"
-            domain="[('server_id', '=', active_id)]"
+      <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>