diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-01 16:51:37 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-01 16:51:37 +0100 |
| commit | 153ae5e8b834345673a1fa23e0724e4c67a66df2 (patch) | |
| tree | 6eb015b9a49a7ef055345870dbeb0ba77091f694 /odoo/addons/base/base_data.xml | |
| parent | 6d25671bb3bdaebfcbc108229b5531a313777d5a (diff) | |
| parent | a6855b31c98407171ff670a4c0d1bcbd1e1bbde2 (diff) | |
[MERGE] forward port branch 10.0 up to a6855b31c98
Diffstat (limited to 'odoo/addons/base/base_data.xml')
| -rw-r--r-- | odoo/addons/base/base_data.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/addons/base/base_data.xml b/odoo/addons/base/base_data.xml index 322cd3ae324..f2f6ae363c0 100644 --- a/odoo/addons/base/base_data.xml +++ b/odoo/addons/base/base_data.xml @@ -60,7 +60,7 @@ Administrator</span>]]></field> <field name="company_id" ref="main_company"/> </record> - <record id="ir_mail_server_localhost0" model="ir.mail_server"> + <record id="ir_mail_server_localhost0" model="ir.mail_server" forcecreate="0"> <field name="name">localhost</field> <field name="smtp_host">localhost</field> <field eval="25" name="smtp_port"/> |