odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mail: default catchall alias: improved settings form view and help messages.é 

bzr revid: tde@openerp.com-20130517105529-16semc1ng1jbwmzq
This commit is contained in:
Thibault Delavallée 2013-05-17 12:55:29 +02:00
parent 4741c305dd
commit 1cfd02f66d
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base_setup/res_config_view.xml
View File

@ -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"/>

20
addons/fetchmail/fetchmail_view.xml
View File

@ -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

7
addons/mail/res_config.py
View File

@ -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):

2
addons/mail/res_config_view.xml
View File

@ -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>