[MERGE] forward port of branch 8.0 up to 19b5ba2

This commit is contained in:
Christophe Simonis
2015-08-14 17:26:04 +02:00
13 changed files with 92 additions and 70 deletions
+2 -2
View File
@@ -24,7 +24,7 @@
<record id="menu_contactus" model="website.menu">
<field name="name">Contact us</field>
<field name="url">/page/website.contactus</field>
<field name="url">/page/contactus</field>
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence" type="int">60</field>
<field name="website_id" ref="default_website"/>
@@ -79,7 +79,7 @@
</record>
<record id="action_website_homepage" model="ir.actions.act_url">
<field name="name">Website Homepage</field>
<field name="url">/page/website.homepage</field>
<field name="url">/page/homepage</field>
<field name="target">self</field>
</record>