summaryrefslogtreecommitdiff
path: root/odoo/addons/base/base_data.xml
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-03-01 17:26:43 +0100
committerChristophe Simonis <chs@odoo.com>2018-03-01 17:26:43 +0100
commitb04c8eae6bf8a0da4df734ac8db36cb04aec9802 (patch)
tree5f75f4c32e6f2a770cb0de62271d521880dfacca /odoo/addons/base/base_data.xml
parent9a1d71ce95fd3c0476aee358b37e29fd7cd8edc7 (diff)
parent153ae5e8b834345673a1fa23e0724e4c67a66df2 (diff)
[MERGE] forward port branch saas-14 up to 153ae5e8b83
Diffstat (limited to 'odoo/addons/base/base_data.xml')
-rw-r--r--odoo/addons/base/base_data.xml2
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"/>