[MERGE] forward port of branch saas-7 up to 5be43b8

2016-02-17 18:01:11 +01:00
parent d70fde0330 5be43b8d9a
commit 87a01c75ef
1159 changed files with 35271 additions and 10478 deletions
@@ -2,7 +2,7 @@
 <openerp>
    <data noupdate="1">
        <record id="default_website" model="website">
-            <field name="name">localhost</field>
+            <field name="name">Website localhost</field>
            <field name="domain">localhost</field>
            <field name="company_id" ref="base.main_company"/>
            <field name="user_id" ref="base.public_user"/>