From b0aa6f654b7d8a8796d4a82d87f19727ac9a67b8 Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Mon, 11 Feb 2019 13:33:09 +0000
Subject: [PATCH] [MOV] gamification, website_forum : move karma data and demo
 in gamification

As gamification karma-based features can be used outside of forum let us
move demo and data directly in gamification. It will be used notably for
eLearning.
---
 addons/gamification/data/gamification_karma_rank_data.xml | 8 ++++++++
 addons/gamification/data/gamification_karma_rank_demo.xml | 8 ++++++++
 addons/website_forum/data/forum_data.xml                  | 8 --------
 addons/website_forum/data/forum_demo.xml                  | 8 +-------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/gamification/data/gamification_karma_rank_data.xml b/addons/gamification/data/gamification_karma_rank_data.xml
index cb0e5a3e41b..25d94ca3739 100644
--- a/addons/gamification/data/gamification_karma_rank_data.xml
+++ b/addons/gamification/data/gamification_karma_rank_data.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
+        <!--Karma-->
+        <record id="base.user_root" model="res.users">
+            <field name="karma">2500</field>
+        </record>
+        <record id="base.user_admin" model="res.users">
+            <field name="karma">2500</field>
+        </record>
+
         <!--Ranks-->
         <record id="rank_newbie" model="gamification.karma.rank">
             <field name="name">Newbie</field>
diff --git a/addons/gamification/data/gamification_karma_rank_demo.xml b/addons/gamification/data/gamification_karma_rank_demo.xml
index 5b1f7f9661a..52b1f2c1f50 100644
--- a/addons/gamification/data/gamification_karma_rank_demo.xml
+++ b/addons/gamification/data/gamification_karma_rank_demo.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo><data>
+    <!-- Set demo karma for test tour as demo user-->
+    <record id="base.user_demo" model="res.users">
+        <field name="karma">20</field>
+    </record>
+    <record id="base.demo_user0" model="res.users">
+        <field name="karma">10</field>
+    </record>
+
     <!--Ranks-->
     <record id="rank_student" model="gamification.karma.rank">
         <field name="name">Student</field>
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index bcf9b79e7cb..fe5fb2b8ea2 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -22,14 +22,6 @@
             <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))"/>
         </record>
 
-        <!-- Set Admin karma -->
-        <record id="base.user_root" model="res.users">
-            <field name="karma">2500</field>
-        </record>
-        <record id="base.user_admin" model="res.users">
-            <field name="karma">2500</field>
-        </record>
-
         <!-- Answers subtypes -->
         <record id="mt_answer_new" model="mail.message.subtype">
             <field name="name">New Answer</field>
diff --git a/addons/website_forum/data/forum_demo.xml b/addons/website_forum/data/forum_demo.xml
index 0091d8d71d6..2884cab5c76 100644
--- a/addons/website_forum/data/forum_demo.xml
+++ b/addons/website_forum/data/forum_demo.xml
@@ -2,13 +2,7 @@
 <odoo>
     <data>
 
-        <!-- Set demo karma for test tour as demo user-->
-        <record id="base.user_demo" model="res.users">
-            <field name="karma">20</field>
-        </record>
-        <record id="base.demo_user0" model="res.users">
-            <field name="karma">10</field>
-        </record>
+
 
         <!-- Tag -->
         <record id="tags_0" model="forum.tag">