From 1cfd02f66d1321a92bb7a5350ff40e2d6c1f59e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 17 May 2013 12:55:29 +0200
Subject: [PATCH] =?UTF-8?q?[IMP]=20mail:=20default=20catchall=20alias:=20i?=
 =?UTF-8?q?mproved=20settings=20form=20view=20and=20help=20messages.=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: tde@openerp.com-20130517105529-16semc1ng1jbwmzq
---
 addons/base_setup/res_config_view.xml |  2 +-
 addons/fetchmail/fetchmail_view.xml   | 20 +++++++++++---------
 addons/mail/res_config.py             |  7 ++++---
 addons/mail/res_config_view.xml       |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 9e026184c9d..8c48f5d7a6b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -31,7 +31,7 @@
                     <group>
                         <label for="id" string="Email"/>
                         <div name="email">
-                            <div>
+                            <div name="email.outgoing_server">
                                 <button type="action"
                                     name="%(base.action_ir_mail_server_list)d"
                                     string="Configure outgoing email servers" class="oe_link"/>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 4e653adce28..5ee17c61b6f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -97,15 +97,17 @@
         <record id="inherit_view_general_configuration" model="ir.ui.view">
             <field name="name">General Settings</field>
             <field name="model">base.config.settings</field>
-              <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-              <field name="arch" type="xml">
-                  <div name="email" position="inside">
-                      <button type="action"
-                            name="%(action_email_server_tree)d"
-                            string="Configure the incoming email gateway" class="oe_link"/>
-                  </div>
-              </field>
-      </record>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <div name="email.outgoing_server" position="after">
+                    <div name="email.incoming_server">
+                        <button type="action"
+                                name="%(action_email_server_tree)d"
+                                string="Configure the incoming email gateway" class="oe_link"/>
+                    </div>
+                </div>
+            </field>
+        </record>
 
 
         <menuitem
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index b0aef50e76e..358bb73b3cb 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -32,9 +32,10 @@ class project_configuration(osv.TransientModel):
                                      help="If you have setup a catch-all email domain redirected to "
                                           "the OpenERP server, enter the domain name here."),
         'alias_catchall': fields.char('Catchall Email Alias',
-            help="Define the default email that will handle replies to document "
-                    "not having their specific email alias defined. Only the left "
-                    "part is required.")
+            help="Define the default email that will be used as reply_to address "
+                    "with the mailgateway to handle replies to the document "
+                    "discussions not having their specific email alias defined. "
+                    "Only the left part is required.")
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index 6cbcf569067..32cb218330e 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -13,7 +13,7 @@
                     </div>
                     <div>
                         <label for="alias_catchall" class="oe_inline"/>
-                        <field name="alias_catchall" placeholder="gateway" class="oe_inline"/>
+                        <field name="alias_catchall" placeholder="mailgateway" class="oe_inline"/>
                     </div>
                 </xpath>
             </field>