diff --git a/addons/hr_timesheet/data/hr_timesheet_demo.xml b/addons/hr_timesheet/data/hr_timesheet_demo.xml
index de071563315..d1bbf0c3f19 100644
--- a/addons/hr_timesheet/data/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/data/hr_timesheet_demo.xml
@@ -104,6 +104,7 @@
         <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2.00</field>
         <field name="project_id" ref='project.project_project_2'/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-60.00</field>
     </record>
 
@@ -131,6 +132,7 @@
         <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1.00</field>
         <field name="project_id" ref='project.project_project_2'/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.00</field>
     </record>
 
@@ -150,6 +152,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_1"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -170,6 +173,7 @@
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_1"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-90.0</field>
     </record>
 
@@ -200,6 +204,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_1"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
@@ -260,6 +265,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_1"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -320,6 +326,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_1"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
@@ -380,6 +387,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_1"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -470,6 +478,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_2"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -490,6 +499,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_2"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -520,6 +530,7 @@
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_2"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-90.0</field>
     </record>
 
@@ -550,6 +561,7 @@
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_2"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-90.0</field>
     </record>
 
@@ -570,6 +582,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_2"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -580,6 +593,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_2"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -620,6 +634,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_2"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
@@ -690,6 +705,7 @@
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-90.0</field>
     </record>
 
@@ -710,6 +726,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -720,6 +737,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -750,6 +768,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -760,6 +779,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -770,6 +790,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
@@ -790,6 +811,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -810,6 +832,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -830,6 +853,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_5"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -950,6 +974,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -960,6 +985,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1010,6 +1036,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1050,6 +1077,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
@@ -1080,6 +1108,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1090,6 +1119,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1110,6 +1140,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1141,6 +1172,7 @@
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_6"/>
         <field name="amount">-60.0</field>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
     </record>
 
     <record id="project_1_task_6_account_analytic_line_21" model="account.analytic.line">
@@ -1220,6 +1252,7 @@
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_7"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-90.0</field>
     </record>
 
@@ -1240,6 +1273,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_7"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
@@ -1250,6 +1284,7 @@
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_7"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-90.0</field>
     </record>
 
@@ -1260,6 +1295,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_7"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1310,6 +1346,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_7"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_analysis'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
@@ -1480,6 +1517,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_8"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1610,6 +1648,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_8"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1690,6 +1729,7 @@
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_8"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-30.0</field>
     </record>
 
@@ -1730,6 +1770,7 @@
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_1"/>
         <field name="task_id" ref="project.project_1_task_8"/>
+        <field name="tag_ids" eval="[Command.link(ref('project.tag_training'))]"/>
         <field name="amount">-60.0</field>
     </record>
 
diff --git a/addons/project/data/project_demo.xml b/addons/project/data/project_demo.xml
index f8b0a6ddb0a..dbaf4e51e9a 100644
--- a/addons/project/data/project_demo.xml
+++ b/addons/project/data/project_demo.xml
@@ -50,6 +50,42 @@
             <field name="name">Renovations</field>
         </record>
 
+        <!-- Analytic Tags -->
+        <record id="tag_analysis" model="account.analytic.tag">
+            <field name="name">Analysis</field>
+            <field name="color">1</field>
+        </record>
+
+        <record id="tag_design" model="account.analytic.tag">
+            <field name="name">Design</field>
+            <field name="color">2</field>
+        </record>
+
+        <record id="tag_training" model="account.analytic.tag">
+            <field name="name">Training</field>
+            <field name="color">3</field>
+        </record>
+
+        <record id="tag_research" model="account.analytic.tag">
+            <field name="name">Research</field>
+            <field name="color">4</field>
+        </record>
+
+        <record id="tag_development" model="account.analytic.tag">
+            <field name="name">Development</field>
+            <field name="color">5</field>
+        </record>
+
+        <record id="tag_modification" model="account.analytic.tag">
+            <field name="name">Modification</field>
+            <field name="color">6</field>
+        </record>
+
+        <record id="tag_decoration" model="account.analytic.tag">
+            <field name="name">Decoration</field>
+            <field name="color">7</field>
+        </record>
+
         <!-- Stage templates -->
         <record id="project.project_project_stage_2" model="project.project.stage">
             <field name="mail_template_id" ref="project.project_done_email_template"/>
@@ -93,6 +129,7 @@
             <field name="tag_ids" eval="[Command.link(ref('project.project_tags_05'))]"/>
             <field name="stage_id" ref="project.project_project_stage_1"/>
             <field name="analytic_account_id" ref="project.analytic_office_design"/>
+            <field name="analytic_tag_ids" eval="[Command.link(ref('tag_design'))]"/>
         </record>
         <record id="project_1_follower_admin" model="mail.followers">
             <field name="res_model">project.project</field>
@@ -109,6 +146,7 @@
             <field name="tag_ids" eval="[Command.link(ref('project.project_tags_04'))]"/>
             <field name="stage_id" ref="project.project_project_stage_1"/>
             <field name="analytic_account_id" ref="project.analytic_research_development"/>
+            <field name="analytic_tag_ids" eval="[Command.link(ref('tag_research')), Command.link(ref('tag_development'))]"/>
         </record>
         <record id="project_2_activity_1" model="mail.activity">
             <field name="res_id" ref="project_project_2"/>
@@ -356,6 +394,7 @@
             <field name="tag_ids" eval="[Command.set([ref('project_tags_00')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
             <field name="milestone_id" ref="project.project_1_milestone_2" />
+            <field name="analytic_tag_ids" eval="[Command.link(ref('tag_modification'))]"/>
         </record>
         <record id="project_1_task_4_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
@@ -449,6 +488,7 @@
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
             <field name="color">11</field>
             <field name="milestone_id" ref="project.project_1_milestone_3" />
+            <field name="analytic_tag_ids" eval="[Command.link(ref('tag_modification'))]"/>
         </record>
         <record id="project_1_task_6_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
@@ -489,6 +529,7 @@
             <field name="date_deadline" eval="DateTime.now() + relativedelta(days=6)"/>
             <field name="color">9</field>
             <field name="milestone_id" ref="project.project_1_milestone_3" />
+            <field name="analytic_tag_ids" eval="[Command.link(ref('tag_modification'))]"/>
         </record>
         <record id="project_1_task_7_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
@@ -660,6 +701,7 @@
             <field name="parent_id" ref="project.project_1_task_12"/>
             <field name="name">Preparation</field>
             <field name="stage_id" ref="project_stage_1"/>
+            <field name="analytic_tag_ids" eval="[Command.link(ref('tag_analysis'))]"/>
         </record>
         <record id="project_1_task_15" model="project.task">
             <field name="sequence">30</field>
@@ -683,6 +725,7 @@
             <field name="name">Customer analysis + Architecture</field>
             <field name="color">7</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="analytic_tag_ids" eval="[Command.link(ref('tag_analysis')), Command.link(ref('tag_design'))]"/>
         </record>
         <record id="project_2_task_1_mail_message_1" model="mail.message">
             <field name="model">project.task</field>