From 42a402bf0ec788667c1bd6d8a3c378ec8f7cd41f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 7 Nov 2017 16:27:03 +0100
Subject: [PATCH] [FIX] calendar: move event type to demo data

Event type is dependant of the business time

Partially fixes #20634
---
 addons/calendar/data/calendar_data.xml | 20 --------------------
 addons/calendar/data/calendar_demo.xml | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/calendar/data/calendar_data.xml b/addons/calendar/data/calendar_data.xml
index 5c0e79da9eb..65ecaacc2f5 100644
--- a/addons/calendar/data/calendar_data.xml
+++ b/addons/calendar/data/calendar_data.xml
@@ -52,26 +52,6 @@
             <field name="type">email</field>
         </record>
 
-        <record id="categ_meet1" model="calendar.event.type">
-            <field name="name">Customer Meeting</field>
-        </record>
-
-        <record id="categ_meet2" model="calendar.event.type">
-            <field name="name">Internal Meeting</field>
-        </record>
-
-        <record id="categ_meet3" model="calendar.event.type">
-            <field name="name">Off-site Meeting</field>
-        </record>
-
-        <record id="categ_meet4" model="calendar.event.type">
-            <field name="name">Open Discussion</field>
-        </record>
-
-        <record id="categ_meet5" model="calendar.event.type">
-            <field name="name">Feedback Meeting</field>
-        </record>
-
         <record id="calendar_template_meeting_invitation" model="mail.template">
             <field name="name">Calendar: Meeting Invitation</field>
             <field name="email_from">${object.event_id.user_id.email or ''}</field>
diff --git a/addons/calendar/data/calendar_demo.xml b/addons/calendar/data/calendar_demo.xml
index 08ca1ec137e..5b233d38a77 100644
--- a/addons/calendar/data/calendar_demo.xml
+++ b/addons/calendar/data/calendar_demo.xml
@@ -14,6 +14,26 @@
             <field name="partner_id" ref="base.partner_demo"/>
         </record>
 
+        <record id="categ_meet1" model="calendar.event.type">
+            <field name="name">Customer Meeting</field>
+        </record>
+
+        <record id="categ_meet2" model="calendar.event.type">
+            <field name="name">Internal Meeting</field>
+        </record>
+
+        <record id="categ_meet3" model="calendar.event.type">
+            <field name="name">Off-site Meeting</field>
+        </record>
+
+        <record id="categ_meet4" model="calendar.event.type">
+            <field name="name">Open Discussion</field>
+        </record>
+
+        <record id="categ_meet5" model="calendar.event.type">
+            <field name="name">Feedback Meeting</field>
+        </record>
+
         <record id="calendar_event_1" model="calendar.event">
             <field name="active" eval="True"/>
             <field name="user_id" ref="base.user_root"/>