[FIX] report_webkit: Use the parent of the root_path if we use openerp on Windows

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 4cd182c..a9fb945 100644 (file)
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -32,9 +32,9 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Server &amp; Login">
-                            <group col="4" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}">
+                            <group col="2" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}">
                                 <separator string="Server Information" colspan="2"/>
-                                <field name="server" colspan="4" attrs="{'required' : [('type', '!=', 'local')]}" />
+                                <field name="server" colspan="2" attrs="{'required' : [('type', '!=', 'local')]}" />
                                 <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" />
                                 <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                             </group>
@@ -100,11 +100,11 @@
         </record>
 
         <menuitem
-            parent="base.next_id_15"
+            parent="base.menu_email"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
             name="Incoming Mail Servers"
-            sequence="40"
+            sequence="14"
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
@@ -132,7 +132,7 @@
       </record>
 
       <act_window
-            context="{'search_default_server_id': active_id, 'default_server_id': active_id}"
+            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)]"
             res_model="mail.message" src_model="fetchmail.server"/>