diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index b728609c53d..4797ef14044 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -54,7 +54,7 @@ system to store and search in your CV base.
         'hr_recruitment_data.xml'
     ],
     'demo_xml': [
-        'hr_recruitment_demo.xml',
+        'hr_recruitment_demo.yml',
     ],
     'test':['test/test_hr_recruitment.yml'],
     'installable': True,
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index e1172f0b075..d6cb5952d38 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -19,19 +19,6 @@
     </record>
 
 
-
-        <!--    CASE CATEGORY(categ_id)        -->
-
-    <record model="crm.case.categ" id="categ_job1">
-        <field name="name">Salesman</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
-    </record>
-
-    <record model="crm.case.categ" id="categ_job2">
-        <field name="name">Junior Developer</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
-    </record>
-
         <!--    Resource(type_id)        -->
 
     <record model="hr.recruitment.degree" id="degree_graduate">
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
deleted file mode 100644
index 0fc2c94f034..00000000000
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">
-    <!--
-        ((((((((((( Demo Cases )))))))))))
-    -->
-
-    <!--For Jobs Requests-->
-    <record id="hr_case_salesman0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
-        <field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-        <field name="type_id" ref="degree_graduate"/>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field eval="'2'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Enrique Jones'" name="partner_name"/>
-        <field eval="'draft'" name="state"/>
-        <field eval="'enrique@rediff.com'" name="partner_name2"/>
-        <field eval="'9963214587'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field eval="9.0" name="duration"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job1"/>
-        <field eval="'Salesman'" name="name"/>
-        <field eval="'1236547890'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_traineemca0" model="hr.applicant">
-        <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Marie Justine'" name="partner_name"/>
-        <field eval="'open'" name="state"/>
-        <field eval="5.15" name="duration"/>
-        <field eval="'marie@gmail.com'" name="partner_name2"/>
-        <field eval="'9988774455'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="stage_id" ref="stage_job4"/>
-        <field eval="'Trainee - MCA'" name="name"/>
-        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-        <field eval="'6633225'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_fresher0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
-        <field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_5"/>
-        <field eval="'1'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="1.45" name="duration"/>
-        <field eval="'Jose'" name="partner_name"/>
-        <field eval="'pending'" name="state"/>
-        <field eval="'jose@timesgroup.com'" name="partner_name2"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job3"/>
-        <field eval="'Fresher'" name="name"/>
-        <field eval="'999666735'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_10"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="1.35" name="duration"/>
-        <field eval="'Sandra Elvis'" name="partner_name"/>
-        <field eval="'sandra@example.com'" name="partner_name2"/>
-        <field eval="'cancel'" name="state"/>
-        <field eval="1" name="active"/>
-        <field name="stage_id" ref="stage_job6"/>
-        <field eval="'More than 5 yrs Experience in PHP'" name="name"/>
-    </record>
-    <record id="hr_case_marketingjob0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field eval="'4'" name="priority"/>
-        <field name="user_id" ref="base.user_demo"/>
-        <field eval="2.0" name="duration"/>
-        <field eval="'John Bruno'" name="partner_name"/>
-        <field eval="'done'" name="state"/>
-        <field eval="'john@market.edu'" name="partner_name2"/>
-        <field eval="'9966332214'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job5"/>
-        <field eval="'Marketing Job'" name="name"/>
-        <field eval="'33968745'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_financejob0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field eval="'4'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'David Armstrong'" name="partner_name"/>
-        <field eval="'done'" name="state"/>
-        <field eval="'david@market.edu'" name="partner_name2"/>
-        <field eval="'9966332214'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field eval="2.20" name="duration"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job5"/>
-        <field eval="'Finance Job'" name="name"/>
-        <field eval="'33968745'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_traineemca1" model="hr.applicant">
-        <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Tina Augustie'" name="partner_name"/>
-        <field eval="'open'" name="state"/>
-        <field eval="1.15" name="duration"/>
-        <field eval="'tina_augustie@example.com'" name="partner_name2"/>
-        <field eval="'9898745745'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="stage_id" ref="stage_job4"/>
-        <field eval="'Trainee - MCA'" name="name"/>
-        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-        <field eval="'6630125'" name="partner_phone"/>
-    </record>
-
-    <record id="hr_case_programmer" model="hr.applicant">
-        <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Shane Williams'" name="partner_name"/>
-        <field eval="'open'" name="state"/>
-        <field eval="1.15" name="duration"/>
-        <field eval="'tina_augustie@example.com'" name="partner_name2"/>
-        <field eval="'9812398524'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="stage_id" ref="stage_job4"/>
-        <field eval="'Programmer'" name="name"/>
-        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-        <field eval="'6630125'" name="partner_phone"/>
-        <field name="job_id" ref="hr.job_jr_appli"/>
-        <field name="department_id" ref="hr.dep_it"/>
-	    <field eval="11000.0" name="salary_expected"/>
-    </record>
-
-    <record id="hr_case_advertisement" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field eval="'4'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'David Armstrong'" name="partner_name"/>
-        <field eval="'done'" name="state"/>
-        <field eval="'david@market.edu'" name="partner_name2"/>
-        <field eval="'9925741564'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field eval="2.20" name="duration"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job5"/>
-        <field eval="'Advertisement'" name="name"/>
-        <field eval="'25968745'" name="partner_phone"/>
-	    <field eval="11000.0" name="salary_expected"/>
-    </record>
-</data>
-</openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
new file mode 100644
index 00000000000..bcf2248fc40
--- /dev/null
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -0,0 +1,109 @@
+-
+  !record {model: hr.applicant, id: hr_case_salesman0}:
+    date: !eval time.strftime('%Y-%m-01 10:35:50')
+    type_id: degree_graduate
+    priority: '2'
+    partner_name: 'Enrique Jones'
+    partner_mobile: '9963214587'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job1
+    name: 'Salesman'
+    partner_phone: '1236547890'
+
+-
+  !record {model: hr.applicant, id: hr_case_traineemca0}:
+    partner_address_id: base.res_partner_address_14
+    date: !eval time.strftime('%Y-%m-10 18:15:00')
+    type_id: degree_bac5
+    priority: '3'
+    user_id: base.user_demo
+    partner_name: 'Marie Justine'
+    state: 'open'
+    partner_mobile: '9988774455'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job4
+    name: 'Trainee - MCA'
+    partner_phone: '6633225'
+-
+  !record {model: hr.applicant, id: hr_case_fresher0}:
+    date: !eval time.strftime('%Y-%m-15 16:10:00')
+    type_id: degree_licenced
+    priority: '1'
+    user_id: base.user_root
+    partner_name: 'Jose'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job3
+    name: 'Fresher'
+    partner_phone: '999666735'
+-
+  !record {model: hr.applicant, id: hr_case_yrsexperienceinphp0}:
+    date: !eval time.strftime('%Y-%m-25 16:25:52')
+    job_id: hr.job_jr_appli
+    type_id: degree_bac5
+    user_id: base.user_root
+    partner_name: 'Sandra Elvis'
+    state: 'cancel'
+    stage_id: stage_job6
+    name: 'More than 5 yrs Experience in PHP'
+-
+  !record {model: hr.applicant, id: hr_case_marketingjob0}:
+    date: !eval time.strftime('%Y-%m-26 17:15:32')
+    type_id: degree_licenced
+    user_id: base.user_demo
+    partner_name: 'John Bruno'
+    state: 'done'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job5
+    name: 'Marketing Job'
+-
+  !record {model: hr.applicant, id: hr_case_financejob0}:
+    date: !eval time.strftime('%Y-%m-26 17:39:42')
+    type_id: degree_licenced
+    priority: '4'
+    partner_name: 'David Armstrong'
+    state: 'pending'
+    state: open
+    partner_mobile: '9966332214'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job2
+    name: 'Finance Job'
+    partner_phone: '33968745'
+-
+  !record {model: hr.applicant, id: hr_case_traineemca1}:
+    partner_address_id: base.res_partner_address_14
+    date: !eval time.strftime('%Y-%m-12 17:49:19')
+    type_id: degree_bac5
+    partner_name: 'Tina Augustie'
+    state: 'open'
+    partner_mobile: '9898745745'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job4
+    name: 'Trainee - MCA'
+    partner_phone: '6630125'
+
+-
+  !record {model: hr.applicant, id: hr_case_programmer}:
+    partner_address_id: base.res_partner_address_14
+    date: !eval time.strftime('%Y-%m-12 17:49:19')
+    type_id: degree_bac5
+    partner_name: 'Shane Williams'
+    state: 'open'
+    partner_mobile: '9812398524'
+    stage_id: stage_job4
+    name: 'Programmer'
+    partner_phone: '6630125'
+    job_id: hr.job_jr_appli
+    department_id: hr.dep_it
+    salary_expected: 11000.0
+
+-
+  !record {model: hr.applicant, id: hr_case_advertisement}:
+    date: !eval time.strftime('%Y-%m-26 17:39:42')
+    type_id: degree_licenced
+    partner_id: base.res_partner_11
+    partner_name: 'David Armstrong'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job2
+    name: 'Advertisement'
+    salary_expected: 11000.0
+