diff --git a/addons/hr_contract/__manifest__.py b/addons/hr_contract/__manifest__.py
index e07f3975ff7..1e29b42238a 100644
--- a/addons/hr_contract/__manifest__.py
+++ b/addons/hr_contract/__manifest__.py
@@ -24,7 +24,7 @@ You can assign several contracts per employee.
         'data/hr_contract_data.xml',
         'views/hr_contract_views.xml',
     ],
-    'demo': [],
+    'demo': ['data/hr_contract_demo.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/hr_contract/data/hr_contract_demo.xml b/addons/hr_contract/data/hr_contract_demo.xml
new file mode 100644
index 00000000000..6e8326a0203
--- /dev/null
+++ b/addons/hr_contract/data/hr_contract_demo.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_contract_admin" model="hr.contract">
+        <field name="name">Mitchell Admin Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y')+'-1-1'"/>
+        <field name="employee_id" ref="hr.employee_admin"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_admin').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_admin').department_id.id"/>
+        <field eval="7540.0" name="wage"/>
+        <field name="state">open</field>
+    </record>
+
+    <record id="hr_contract_al" model="hr.contract">
+        <field name="name">Ronnie Hart Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y')+'-1-1'"/>
+        <field name="employee_id" ref="hr.employee_al"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_al').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_al').department_id.id"/>
+        <field eval="4000.0" name="wage"/>
+        <field name="state">open</field>
+    </record>
+
+    <record id="hr_contract_mit" model="hr.contract">
+        <field name="name">Marketing Executive Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y')+'-3-1'"/>
+        <field name="employee_id" ref="hr.employee_mit"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_mit').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_mit').department_id.id"/>
+        <field eval="4500.0" name="wage"/>
+        <field name="state">open</field>
+    </record>
+
+    <record id="hr_contract_stw" model="hr.contract">
+        <field name="name">Randall Lewis Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y')+'-2-1'"/>
+        <field name="date_end" eval="time.strftime('%Y')+'-12-1'"/>
+        <field name="employee_id" ref="hr.employee_stw"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_stw').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_stw').department_id.id"/>
+        <field eval="4500.0" name="wage"/>
+        <field name="state">open</field>
+    </record>
+
+    <record id="hr_contract_qdp" model="hr.contract">
+        <field name="name">Demo Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y')+'-3-1'"/>
+        <field name="employee_id" ref="hr.employee_qdp"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_qdp').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_qdp').department_id.id"/>
+        <field eval="3750.0" name="wage"/>
+        <field name="state">open</field>
+    </record>
+
+    <record id="hr_contract_han" model="hr.contract">
+        <field name="name">Walter Horton Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y')+'-3-1'"/>
+        <field name="employee_id" ref="hr.employee_han"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_han').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_han').department_id.id"/>
+        <field eval="4600.0" name="wage"/>
+        <field name="state">open</field>
+    </record>
+
+    <record id="hr_contract_niv" model="hr.contract">
+        <field name="name">Sharlene Rhodes Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+        <field name="date_end" eval="time.strftime('%Y')+'-12-1'"/>
+        <field name="employee_id" ref="hr.employee_niv"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_niv').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_niv').department_id.id"/>
+        <field eval="4000.0" name="wage"/>
+        <field name="state">draft</field>
+    </record>
+
+    <record id="hr_contract_jth" model="hr.contract">
+        <field name="name">Toni Jimenez</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+        <field name="date_end" eval="time.strftime('%Y')+'-12-1'"/>
+        <field name="employee_id" ref="hr.employee_jth"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_jth').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_jth').department_id.id"/>
+        <field eval="4200.0" name="wage"/>
+        <field name="state">draft</field>
+    </record>
+
+    <record id="hr_contract_chs" model="hr.contract">
+        <field name="name">Jennie Fletcher Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+        <field name="employee_id" ref="hr.employee_chs"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_chs').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_chs').department_id.id"/>
+        <field eval="3750.0" name="wage"/>
+        <field name="state">cancel</field>
+    </record>
+
+    <record id="hr_contract_jve" model="hr.contract">
+        <field name="name">Paul Williams Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+        <field name="employee_id" ref="hr.employee_jve"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_jve').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_jve').department_id.id"/>
+        <field eval="3950.0" name="wage"/>
+        <field name="state">cancel</field>
+    </record>
+
+    <record id="hr_contract_fme" model="hr.contract">
+        <field name="name">Keith Byrd Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="'2015-1-1'"/>
+        <field name="date_end" eval="time.strftime('%Y-%m-%d')"/>
+        <field name="employee_id" ref="hr.employee_fme"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_fme').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_fme').department_id.id"/>
+        <field eval="3650.0" name="wage"/>
+        <field name="state">pending</field>
+    </record>
+
+    <record id="hr_contract_fpi" model="hr.contract">
+        <field name="name">Audrey Peterson Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="'2015-1-1'"/>
+        <field name="date_end" eval="'2017-12-1'"/>
+        <field name="employee_id" ref="hr.employee_fpi"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_fpi').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_fpi').department_id.id"/>
+        <field eval="3750.0" name="wage"/>
+        <field name="state">close</field>
+    </record>
+
+    <record id="hr_contract_vad" model="hr.contract">
+        <field name="name">Tina Williamson Contract</field>
+        <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+        <field name="date_start" eval="'2015-1-1'"/>
+        <field name="date_end" eval="'2018-2-1'"/>
+        <field name="employee_id" ref="hr.employee_vad"/>
+        <field name="job_id" model="hr.job"
+            eval="obj().env.ref('hr.employee_vad').job_id.id"/>
+        <field name="department_id" model="hr.department"
+            eval="obj().env.ref('hr.employee_vad').department_id.id"/>
+        <field eval="3750.0" name="wage"/>
+        <field name="state">close</field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml
index 3411073ab0f..975013c13db 100644
--- a/addons/hr_expense/data/hr_expense_demo.xml
+++ b/addons/hr_expense/data/hr_expense_demo.xml
@@ -49,6 +49,44 @@
             <field name="can_be_expensed" eval="True" />
         </record>
 
+        <record id="product.product_delivery_01" model="product.product">
+            <field name="can_be_expensed" eval="True" />
+        </record>
+
+        <record id="product.product_delivery_02" model="product.product">
+            <field name="can_be_expensed" eval="True" />
+        </record>
+
+        <!-- ++++++++++++++ Expense sheet for Admin ++++++++++++++-->
+
+        <record id="screen_expense" model="hr.expense">
+            <field name="name">Screen</field>
+            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="analytic_account_id" ref="analytic.analytic_our_super_product"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field eval="289.0" name="unit_amount"/>
+            <field name="product_uom_id" ref="uom.product_uom_unit"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="date" eval="time.strftime('%Y')+'-4-3'"/>
+        </record>
+
+        <record id="laptop_expense" model="hr.expense">
+            <field name="name">Laptop</field>
+            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="analytic_account_id" ref="analytic.analytic_our_super_product"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field eval="889.0" name="unit_amount"/>
+            <field name="product_uom_id" ref="uom.product_uom_unit"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="date" eval="time.strftime('%Y')+'-4-3'"/>
+        </record>
+
+        <record id="travel_ny_sheet" model="hr.expense.sheet">
+            <field name="name">Commercial Travel at New York</field>
+            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="state">approve</field>
+        </record>
+
         <record id="travel_by_air_expense" model="hr.expense">
             <field name="name">Travel by Air</field>
             <field name="employee_id" ref="hr.employee_admin"/>
@@ -57,6 +95,8 @@
             <field eval="700.0" name="unit_amount"/>
             <field name="product_uom_id" ref="uom.product_uom_unit"/>
             <field eval="1.0" name="quantity"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-12'"/>
+            <field name="sheet_id" ref="travel_ny_sheet"/>
         </record>
 
         <record id="hotel_bill_expense" model="hr.expense">
@@ -67,6 +107,140 @@
             <field eval="400.0" name="unit_amount"/>
             <field name="product_uom_id" ref="uom.product_uom_day"/>
             <field eval="5.0" name="quantity"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-17'"/>
+            <field name="sheet_id" ref="travel_ny_sheet"/>
+        </record>
+
+        <record id="lunch_customer_bill_expense" model="hr.expense">
+            <field name="name">Lunch with Customer</field>
+            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field eval="152.8" name="unit_amount"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-13'"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="sheet_id" ref="travel_ny_sheet"/>
+        </record>
+
+        <record id="lunch_bill_expense" model="hr.expense">
+            <field name="name">Lunch</field>
+            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-15'"/>
+            <field eval="56.8" name="unit_amount"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="sheet_id" ref="travel_ny_sheet"/>
+        </record>
+
+        <!-- ++++++++++++++ Expense sheet for Demo ++++++++++++++-->
+        <record id="customer_meeting_sheet" model="hr.expense.sheet">
+            <field name="name">Customer meeting</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="state">submit</field>
+        </record>
+
+        <record id="travel_demo_by_car_expense" model="hr.expense">
+            <field name="name">Travel by Car</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="analytic_account_id" ref="analytic.analytic_our_super_product"/>
+            <field name="product_id" ref="car_travel"/>
+            <field eval="0.52" name="unit_amount"/>
+            <field name="product_uom_id" ref="uom.product_uom_unit"/>
+            <field name="date" eval="time.strftime('%Y')+'-1-15'"/>
+            <field eval="152.0" name="quantity"/>
+            <field name="sheet_id" ref="customer_meeting_sheet"/>
+        </record>
+
+        <record id="lunch_demo_customer_bill_expense" model="hr.expense">
+            <field name="name">Lunch with Customer</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field name="date" eval="time.strftime('%Y')+'-1-15'"/>
+            <field eval="152.8" name="unit_amount"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="sheet_id" ref="customer_meeting_sheet"/>
+        </record>
+
+        <!-- ++++++++++++++ Expense sheet for Keith Byrd ++++++++++++++-->
+        <record id="team_building_sheet" model="hr.expense.sheet">
+            <field name="name">Team Building</field>
+            <field name="employee_id" ref="hr.employee_fme"/>
+            <field name="state">submit</field>
+        </record>
+
+        <record id="pizzas_bill_expense" model="hr.expense">
+            <field name="name">Pizzas</field>
+            <field name="employee_id" ref="hr.employee_fme"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-5'"/>
+            <field eval="12.5" name="unit_amount"/>
+            <field eval="12.0" name="quantity"/>
+            <field name="sheet_id" ref="team_building_sheet"/>
+        </record>
+
+        <record id="drinks_bill_expense" model="hr.expense">
+            <field name="name">Drinks</field>
+            <field name="employee_id" ref="hr.employee_fme"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-5'"/>
+            <field eval="2.5" name="unit_amount"/>
+            <field eval="17.0" name="quantity"/>
+            <field name="sheet_id" ref="team_building_sheet"/>
+        </record>
+
+        <record id="paintball_bill_expense" model="hr.expense">
+            <field name="name">Paintball</field>
+            <field name="employee_id" ref="hr.employee_fme"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-5'"/>
+            <field eval="25" name="unit_amount"/>
+            <field eval="12.0" name="quantity"/>
+            <field name="sheet_id" ref="team_building_sheet"/>
+        </record>
+
+        <!-- ++++++++++++++ Expense sheet for Ronnie Hart ++++++++++++++-->
+        <record id="office_furniture_sheet" model="hr.expense.sheet">
+            <field name="name">Office furniture</field>
+            <field name="employee_id" ref="hr.employee_al"/>
+            <field name="state">submit</field>
+        </record>
+
+        <record id="chair_bill_expense" model="hr.expense">
+            <field name="name">Chairs</field>
+            <field name="employee_id" ref="hr.employee_al"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product.product_delivery_01"/>
+            <field name="date" eval="time.strftime('%Y')+'-6-2'"/>
+            <field eval="55.75" name="unit_amount"/>
+            <field eval="6.0" name="quantity"/>
+            <field name="sheet_id" ref="office_furniture_sheet"/>
+        </record>
+
+        <record id="lamp_bill_expense" model="hr.expense">
+            <field name="name">Lamp</field>
+            <field name="employee_id" ref="hr.employee_al"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product.product_delivery_02"/>
+            <field name="date" eval="time.strftime('%Y')+'-6-2'"/>
+            <field eval="28.99" name="unit_amount"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="sheet_id" ref="office_furniture_sheet"/>
+        </record>
+
+        <!-- ++++++++++++++ Expense for Randall Lewis ++++++++++++++-->
+        <record id="afterwork_bill_expense" model="hr.expense">
+            <field name="name">Car tyres</field>
+            <field name="employee_id" ref="hr.employee_stw"/>
+            <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
+            <field name="product_id" ref="product_product_fixed_cost"/>
+            <field name="date" eval="time.strftime('%Y-')+'-3-15'"/>
+            <field eval="112.58" name="unit_amount"/>
+            <field eval="4.0" name="quantity"/>
         </record>
 
     </data>
diff --git a/addons/hr_payroll/data/hr_payroll_demo.xml b/addons/hr_payroll/data/hr_payroll_demo.xml
index 43c4bbaf6a9..b8914e79d85 100644
--- a/addons/hr_payroll/data/hr_payroll_demo.xml
+++ b/addons/hr_payroll/data/hr_payroll_demo.xml
@@ -205,3 +205,4 @@
         </record>
 
 </odoo>
+
diff --git a/addons/hr_recruitment/data/hr_recruitment_demo.xml b/addons/hr_recruitment/data/hr_recruitment_demo.xml
index 189ae4e5d75..82c6165549e 100644
--- a/addons/hr_recruitment/data/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_demo.xml
@@ -6,18 +6,30 @@
     <record id="hr.job_developer" model="hr.job">
         <field name="state">recruit</field>
         <field name="no_of_recruitment">4</field>
+        <field name="no_of_hired_employee">56</field>
+    </record>
+    <record id="hr.job_ceo" model="hr.job">
+        <field name="state">open</field>
+        <field name="no_of_hired_employee">1</field>
+    </record>
+    <record id="hr.job_cto" model="hr.job">
+        <field name="state">open</field>
+        <field name="no_of_hired_employee">1</field>
     </record>
     <record id="hr.job_consultant" model="hr.job">
         <field name="state">recruit</field>
         <field name="no_of_recruitment">1</field>
+        <field name="no_of_hired_employee">17</field>
     </record>
     <record id="hr.job_hrm" model="hr.job">
         <field name="no_of_recruitment">1</field>
         <field name="state">recruit</field>
+        <field name="no_of_hired_employee">5</field>
     </record>
     <record id="hr.job_marketing" model="hr.job">
         <field name="state">recruit</field>
         <field name="no_of_recruitment">3</field>
+        <field name="no_of_hired_employee">2</field>
     </record>
     <record id="hr.job_trainee" model="hr.job">
         <field name="state">recruit</field>
@@ -36,6 +48,66 @@
         <field name="partner_mobile">9963214587</field>
         <field name="stage_id" ref="stage_job1"/>
     </record>
+    <record id="hr_case_salesman1" model="hr.applicant">
+        <field name="name">Sales</field>
+        <field name="job_id" ref="hr.job_marketing"/>
+        <field name="department_id" ref="hr.dep_sales"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="priority">1</field>
+        <field name="partner_name">Meldona Thang</field>
+        <field name="partner_mobile">998655451</field>
+        <field name="stage_id" ref="stage_job1"/>
+    </record>
+    <record id="hr_case_dev0" model="hr.applicant">
+        <field name="name">Developer PHP</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="department_id" ref="hr.dep_rd"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="priority">3</field>
+        <field name="partner_name">Johan Duck</field>
+        <field name="partner_mobile">8955545</field>
+        <field name="stage_id" ref="stage_job1"/>
+    </record>
+    <record id="hr_case_dev1" model="hr.applicant">
+        <field name="name">Developer Fullstack</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="department_id" ref="hr.dep_rd"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="priority">0</field>
+        <field name="partner_name">Kelly Wallant</field>
+        <field name="partner_mobile">879895515</field>
+        <field name="stage_id" ref="stage_job1"/>
+    </record>
+    <record id="hr_case_dev2" model="hr.applicant">
+        <field name="name">Developer Python</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="department_id" ref="hr.dep_rd"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="priority">0</field>
+        <field name="partner_name">Cécile Donth</field>
+        <field name="partner_mobile">98765411</field>
+        <field name="stage_id" ref="stage_job1"/>
+    </record>
+    <record id="hr_case_dev3" model="hr.applicant">
+        <field name="name">Developer C/C++</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="department_id" ref="hr.dep_rd"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="priority">0</field>
+        <field name="partner_name">Ohen Rizome</field>
+        <field name="partner_mobile">654687987654</field>
+        <field name="stage_id" ref="stage_job1"/>
+    </record>
     <record id="hr_case_traineemca0" model="hr.applicant">
         <field name="name">Trainee - MCA</field>
         <field name="job_id" ref="hr.job_trainee"/>
@@ -61,6 +133,27 @@
         <field name="stage_id" ref="stage_job3"/>
         <field name="partner_phone">999666735</field>
     </record>
+    <record id="hr_case_mkt0" model="hr.applicant">
+        <field name="name">Marketing</field>
+        <field name="job_id" ref="hr.job_marketing"/>
+        <field name="department_id" ref="hr.dep_sales"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="partner_name">Yin Lee</field>
+        <field name="stage_id" ref="stage_job1"/>
+    </record>
+    <record id="hr_case_mkt1" model="hr.applicant">
+        <field name="name">Marketing 2 Year Experience</field>
+        <field name="job_id" ref="hr.job_marketing"/>
+        <field name="department_id" ref="hr.dep_sales"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="partner_name">Hubert Blank</field>
+        <field name="priority">3</field>
+        <field name="stage_id" ref="stage_job3"/>
+    </record>
     <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
         <field name="name">Marketing Job</field>
         <field name="job_id" ref="hr.job_marketing"/>
@@ -93,6 +186,17 @@
         <field name="stage_id" ref="stage_job2"/>
         <field name="partner_phone">33968745</field>
     </record>
+    <record id="hr_case_financejob1" model="hr.applicant">
+        <field name="name">Finance</field>
+        <field name="job_id" ref="hr.job_hrm"/>
+        <field name="department_id" ref="hr.dep_administration"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="priority">1</field>
+        <field name="partner_name">Joren Jacob</field>
+        <field name="stage_id" ref="stage_job2"/>
+    </record>
     <record id="hr_case_traineemca1" model="hr.applicant">
         <field name="name">Trainee - MCA</field>
         <field name="job_id" ref="hr.job_trainee"/>
@@ -122,7 +226,7 @@
         <field name="department_id" ref="hr.dep_ps"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
-        <field name="partner_name">David Armstrong</field>
+        <field name="partner_name">David Billy</field>
         <field name="partner_mobile">9988774455</field>
         <field name="stage_id" ref="stage_job2"/>
         <field name="salary_expected">11000.0</field>
@@ -161,10 +265,12 @@
         <field name="subject">Regarding reference</field>
         <field name="model">hr.applicant</field>
         <field name="res_id" ref="hr_case_advertisement"/>
-        <field name="body"><![CDATA[<p>Hello!<br />
+        <field name="body" type="xml">
+            <p>Hello!<br />
             I will surely refer to this application as it is by your reference and <br />
             will try to conduct an interview within a very short time<br />
-            Thanks,</p>]]></field>
+            Thanks,</p>
+        </field>
         <field name="message_type">comment</field>
         <field name="subtype_id" ref="mail.mt_comment"/>
         <field name="author_id" ref="base.partner_demo"/>
@@ -176,9 +282,24 @@
         <field name="subject">Refuse Application</field>
         <field name="model">hr.applicant</field>
         <field name="res_id" ref="hr_case_salesman0"/>
-        <field name="body"><![CDATA[<p>Hello,</p>
-        <p>I have checked this application but it does not match with our requirements. We don't need to proceed further and we should refuse this application.</p>
-        <p>Kind regards,</p>]]></field>
+        <field name="body" type="xml">
+            <p>Hello,</p>
+            <p>I have checked this application but it does not match with our requirements. We don't need to proceed further and we should refuse this application.</p>
+            <p>Kind regards,</p>
+        </field>
+        <field name="message_type">comment</field>
+        <field name="subtype_id" ref="mail.mt_comment"/>
+        <field name="author_id" ref="base.partner_demo"/>
+    </record>
+    <record id="msg_case_dev0_aplicant" model="mail.message">
+        <field name="subject">Refuse Application</field>
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_dev0"/>
+        <field name="body" type="xml">
+            <p>Hello,</p>
+            <p>This applicant has excellent skills and would greatly fit in the RD Team!</p>
+            <p>Kind regards,</p>
+        </field>
         <field name="message_type">comment</field>
         <field name="subtype_id" ref="mail.mt_comment"/>
         <field name="author_id" ref="base.partner_demo"/>
@@ -186,15 +307,71 @@
     <record id="msg_case_fresher0_aplicant" model="mail.message">
         <field name="model">hr.applicant</field>
         <field name="res_id" ref="hr_case_fresher0"/>
-        <field name="body"><![CDATA[<p>Hello,</p>
-        <p>We should move further for this application as early as possible.</p>
-        <p>Kind regards,</p>]]></field>
+        <field name="body" type="xml">
+            <p>Hello,</p>
+            <p>We should move further for this application as early as possible.</p>
+            <p>Kind regards,</p>
+        </field>
         <field name="message_type">comment</field>
         <field name="subtype_id" ref="mail.mt_comment"/>
         <field name="author_id" ref="base.partner_demo"/>
     </record>
-
+    <record id="msg_case_advertisement_aplicant" model="mail.message">
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_advertisement"/>
+        <field name="body" type="xml">
+            <p>Hello,</p>
+            <p>The first interview was good. Skilled and open minded applicant.</p>
+            <p>I think we should consider hiring him.</p>
+            <p>Kind regards,</p>
+        </field>
+        <field name="message_type">comment</field>
+        <field name="subtype_id" ref="mail.mt_comment"/>
+        <field name="author_id" ref="base.partner_demo"/>
+    </record>
+    <record id="msg_case_mkt1_1" model="mail.message">
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_mkt1"/>
+        <field name="body" type="xml">
+            <p>Hello,</p>
+            <p>The first interview was good. I will propose a second interview</p>
+            <p>Kind regards,</p>
+        </field>
+        <field name="message_type">comment</field>
+        <field name="subtype_id" ref="mail.mt_comment"/>
+        <field name="author_id" ref="base.partner_demo"/>
+    </record>
+    <record id="msg_case_mkt1_2" model="mail.message">
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_mkt1"/>
+        <field name="body" type="xml">
+            <p>Hello,</p>
+            <p>After the second interview, I think we should consider hiring him.</p>
+            <p>Kind regards,</p>
+        </field>
+        <field name="message_type">comment</field>
+        <field name="subtype_id" ref="mail.mt_comment"/>
+        <field name="author_id" ref="base.partner_admin"/>
+    </record>
     <record id="mail_activity_0" model="mail.activity">
+        <field name="res_id" ref="hr_recruitment.hr_case_dev0" />
+        <field name="res_model_id" ref="model_hr_applicant"/>
+        <field name="activity_type_id" ref="mail.mail_activity_data_email" />
+        <field name="date_deadline" eval="time.strftime('%Y-%m-27 18:15:00')"/>
+        <field name="summary">Send mail regarding our interview</field>
+        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_admin"/>
+    </record>
+    <record id="mail_activity_1" model="mail.activity">
+        <field name="res_id" ref="hr_recruitment.hr_case_dev1" />
+        <field name="res_model_id" ref="model_hr_applicant"/>
+        <field name="activity_type_id" ref="mail.mail_activity_data_email" />
+        <field name="date_deadline" eval="time.strftime('%Y-%m-%d')"/>
+        <field name="summary">Send mail for first interview</field>
+        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_admin"/>
+    </record>
+    <record id="mail_activity_2" model="mail.activity">
         <field name="res_id" ref="hr_recruitment.hr_case_salesman0" />
         <field name="res_model_id" ref="model_hr_applicant"/>
         <field name="activity_type_id" ref="mail.mail_activity_data_email" />
@@ -203,7 +380,7 @@
         <field name="create_user_id" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
-    <record id="mail_activity_1" model="mail.activity">
+    <record id="mail_activity_3" model="mail.activity">
         <field name="res_id" ref="hr_recruitment.hr_case_traineemca0" />
         <field name="res_model_id" ref="model_hr_applicant"/>
         <field name="activity_type_id" ref="mail.mail_activity_data_call" />
@@ -212,7 +389,7 @@
         <field name="create_user_id" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
-    <record id="mail_activity_2" model="mail.activity">
+    <record id="mail_activity_4" model="mail.activity">
         <field name="res_id" ref="hr_recruitment.hr_case_yrsexperienceinphp0" />
         <field name="res_model_id" ref="model_hr_applicant"/>
         <field name="activity_type_id" ref="mail.mail_activity_data_call" />
@@ -221,6 +398,24 @@
         <field name="create_user_id" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
+    <record id="mail_activity_5" model="mail.activity">
+        <field name="res_id" ref="hr_recruitment.hr_case_advertisement" />
+        <field name="res_model_id" ref="model_hr_applicant"/>
+        <field name="activity_type_id" ref="mail.mail_activity_data_call" />
+        <field name="date_deadline" eval="time.strftime('%Y-%m-26 18:15:00')"/>
+        <field name="summary">Call to schedule a second interview</field>
+        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_admin"/>
+    </record>
+    <record id="mail_activity_6" model="mail.activity">
+        <field name="res_id" ref="hr_recruitment.hr_case_mkt1" />
+        <field name="res_model_id" ref="model_hr_applicant"/>
+        <field name="activity_type_id" ref="mail.mail_activity_data_call" />
+        <field name="date_deadline" eval="time.strftime('%Y-%m-18 17:15:00')"/>
+        <field name="summary">Call to propose a contract</field>
+        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_admin"/>
+    </record>
 
   </data>
 </odoo>
diff --git a/addons/l10n_be_hr_payroll_account/__manifest__.py b/addons/l10n_be_hr_payroll_account/__manifest__.py
index a079b9e3ef0..d260de535e1 100644
--- a/addons/l10n_be_hr_payroll_account/__manifest__.py
+++ b/addons/l10n_be_hr_payroll_account/__manifest__.py
@@ -14,5 +14,6 @@ Accounting Data for Belgian Payroll Rules.
     'data':[
         'data/l10n_be_hr_payroll_account_data.xml',
     ],
+    'demo':['data/l10n_be_hr_payroll_account_demo.xml'],
     'post_init_hook': '_set_accounts',
 }
diff --git a/addons/l10n_be_hr_payroll_account/data/l10n_be_hr_payroll_account_demo.xml b/addons/l10n_be_hr_payroll_account/data/l10n_be_hr_payroll_account_demo.xml
new file mode 100644
index 00000000000..bbdf147e957
--- /dev/null
+++ b/addons/l10n_be_hr_payroll_account/data/l10n_be_hr_payroll_account_demo.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+        <!-- Employee Contract -->
+
+        <record id="hr_contract.hr_contract_admin" model="hr.contract">
+            <field name="struct_id" ref="hr_payroll.structure_001"/>
+        </record>
+
+        <record id="hr_contract.hr_contract_qdp" model="hr.contract">
+            <field name="struct_id" ref="hr_payroll.structure_002"/>
+        </record>
+
+        <!-- ++++++++++++++ June ++++++++++++++ -->
+
+        <!-- Payslip batch -->
+        <record id="hr_payslip_batch" model="hr.payslip.run">
+            <field name="name" eval="time.strftime('June %Y')"/>
+            <field name="date_start" eval="time.strftime('%Y-6-1')"/>
+            <field name="date_end" eval="time.strftime('%Y-6-30')"/>
+        </record>
+
+        <!-- Payslip Admin  -->
+        <record id="hr_payslip_admin" model="hr.payslip">
+            <field name="name" eval="'Mitchell Admin ' + time.strftime('June %Y')"/>
+            <field name="contract_id" ref="hr_contract.hr_contract_admin"/>
+            <field name="date_from" eval="time.strftime('%Y-6-1')"/>
+            <field name="date_to" eval="time.strftime('%Y-6-30')"/>
+            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="struct_id" ref="hr_payroll.structure_001"/>
+            <field name="number">SLIP601</field>
+            <field name="payslip_run_id" ref="hr_payslip_batch"/>
+        </record>
+        <record id="hr_line_admin1" model="hr.payslip.worked_days">
+            <field name="name">Normal working days</field>
+            <field name="code">WORK100</field>
+            <field name="number_of_days">20</field>
+            <field name="number_of_hours">160</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_admin"/>
+            <field name="payslip_id" ref="hr_payslip_admin"/>
+        </record>
+        <record id="hr_line_admin2" model="hr.payslip.worked_days">
+            <field name="name">Sick keave</field>
+            <field name="code">LEAVE200</field>
+            <field name="number_of_days">2</field>
+            <field name="number_of_hours">16</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_admin"/>
+            <field name="payslip_id" ref="hr_payslip_admin"/>
+        </record>
+
+        <!-- Payslip Demo  -->
+        <record id="hr_payslip_demo" model="hr.payslip">
+            <field name="name" eval="'Marc Demo ' + time.strftime('June %Y')"/>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="date_from" eval="time.strftime('%Y-6-1')"/>
+            <field name="date_to" eval="time.strftime('%Y-6-30')"/>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="struct_id" ref="hr_payroll.structure_002"/>
+            <field name="number">SLIP602</field>
+            <field name="payslip_run_id" ref="hr_payslip_batch"/>
+        </record>
+        <record id="hr_line_demo1" model="hr.payslip.worked_days">
+            <field name="name">Normal working days</field>
+            <field name="code">WORK100</field>
+            <field name="number_of_days">18</field>
+            <field name="number_of_hours">144</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="payslip_id" ref="hr_payslip_demo"/>
+        </record>
+        <record id="hr_line_demo2" model="hr.payslip.worked_days">
+            <field name="name">Extra work</field>
+            <field name="code">WORK200</field>
+            <field name="number_of_days">1.5</field>
+            <field name="number_of_hours">12</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="payslip_id" ref="hr_payslip_demo"/>
+        </record>
+        <record id="hr_line_demo3" model="hr.payslip.worked_days">
+            <field name="name">Legal leave</field>
+            <field name="code">LEAVE100</field>
+            <field name="number_of_days">4</field>
+            <field name="number_of_hours">32</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="payslip_id" ref="hr_payslip_demo"/>
+        </record>
+
+        <!-- ++++++++++++++ May ++++++++++++++ -->
+
+        <!-- Payslip batch -->
+        <record id="hr_payslip_batch_may" model="hr.payslip.run">
+            <field name="name" eval="time.strftime('May %Y')"/>
+            <field name="date_start" eval="time.strftime('%Y-5-1')"/>
+            <field name="date_end" eval="time.strftime('%Y-5-31')"/>
+        </record>
+
+        <!-- Payslip Admin  -->
+        <record id="hr_payslip_admin_may" model="hr.payslip">
+            <field name="name" eval="'Mitchell Admin ' + time.strftime('May %Y')"/>
+            <field name="contract_id" ref="hr_contract.hr_contract_admin"/>
+            <field name="date_from" eval="time.strftime('%Y-5-1')"/>
+            <field name="date_to" eval="time.strftime('%Y-5-31')"/>
+            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="struct_id" ref="hr_payroll.structure_001"/>
+            <field name="number">SLIP501</field>
+            <field name="payslip_run_id" ref="hr_payslip_batch_may"/>
+        </record>
+        <record id="hr_line_admin1_may" model="hr.payslip.worked_days">
+            <field name="name">Normal working days</field>
+            <field name="code">WORK100</field>
+            <field name="number_of_days">22</field>
+            <field name="number_of_hours">175</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_admin"/>
+            <field name="payslip_id" ref="hr_payslip_admin_may"/>
+        </record>
+
+        <!-- Payslip Demo  -->
+        <record id="hr_payslip_demo_may" model="hr.payslip">
+            <field name="name" eval="'Marc Demo ' + time.strftime('May %Y')"/>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="date_from" eval="time.strftime('%Y-5-1')"/>
+            <field name="date_to" eval="time.strftime('%Y-5-31')"/>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="struct_id" ref="hr_payroll.structure_002"/>
+            <field name="number">SLIP502</field>
+            <field name="payslip_run_id" ref="hr_payslip_batch_may"/>
+        </record>
+        <record id="hr_line_demo1_may" model="hr.payslip.worked_days">
+            <field name="name">Normal working days</field>
+            <field name="code">WORK100</field>
+            <field name="number_of_days">20</field>
+            <field name="number_of_hours">16</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="payslip_id" ref="hr_payslip_demo_may"/>
+        </record>
+        <record id="hr_line_demo2_may" model="hr.payslip.worked_days">
+            <field name="name">Extra work</field>
+            <field name="code">WORK200</field>
+            <field name="number_of_days">0.5</field>
+            <field name="number_of_hours">4</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="payslip_id" ref="hr_payslip_demo_may"/>
+        </record>
+        <record id="hr_line_demo3_may" model="hr.payslip.worked_days">
+            <field name="name">Sick Leave</field>
+            <field name="code">LEAVE200</field>
+            <field name="number_of_days">1</field>
+            <field name="number_of_hours">8</field>
+            <field name="contract_id" ref="hr_contract.hr_contract_qdp"/>
+            <field name="payslip_id" ref="hr_payslip_demo_may"/>
+        </record>
+</odoo>
+
diff --git a/addons/lunch/data/lunch_demo.xml b/addons/lunch/data/lunch_demo.xml
index 469c01afab3..bd36db1f0af 100644
--- a/addons/lunch/data/lunch_demo.xml
+++ b/addons/lunch/data/lunch_demo.xml
@@ -15,6 +15,18 @@
         <record model="lunch.product.category" id="categ_pasta">
             <field name="name">Pasta</field>
         </record>
+        <record model="lunch.product.category" id="categ_burger">
+            <field name="name">Burger</field>
+        </record>
+        <record model="lunch.product.category" id="categ_sushi">
+            <field name="name">Sushi</field>
+        </record>
+        <record model="lunch.product.category" id="categ_temaki">
+            <field name="name">Temaki</field>
+        </record>
+        <record model="lunch.product.category" id="categ_chirashi">
+            <field name="name">Chirashi</field>
+        </record>
 
         <record model="res.partner" id="partner_coin_gourmand">
             <field name="name">Coin gourmand</field>
@@ -28,13 +40,109 @@
         <record model="res.partner" id="partner_pizza_inn">
             <field name="name">Pizza Inn</field>
             <field name="city">New Delhi TN</field>
-            <field name="country_id" ref="base.in"/>
+            <field name="country_id" ref="base.us"/>
             <field name="street">#8, 1 st Floor,iscore complex</field>
             <field name="street2">Gandhi Gramam,Gandhi Nagar</field>
             <field name="zip">607308</field>
             <field name="email">pizza.inn@yourcompany.example.com</field>
         </record>
 
+        <record model="res.partner" id="partner_corner">
+            <field name="name">The Corner</field>
+            <field name="city">Atlanta</field>
+            <field name="country_id" ref="base.us"/>
+            <field name="street">Genessee Ave SW</field>
+            <field name="zip">607409</field>
+            <field name="email">info@corner.com</field>
+        </record>
+
+        <record model="res.partner" id="partner_sushi_shop">
+            <field name="name">Sushi Shop</field>
+            <field name="city">Paris</field>
+            <field name="country_id" ref="base.fr"/>
+            <field name="street">Boulevard Saint-Germain</field>
+            <field name="zip">486624</field>
+            <field name="email">order@sushi.com</field>
+        </record>
+
+        <record model="lunch.product" id="product_bacon">
+            <field name="name">Bacon</field>
+            <field name="category_id" eval="str(ref('categ_burger'))"/>
+            <field name="price">7.5</field>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
+            <field name="description">Beef, Bacon, Salad, Cheddar, Fried Onion, BBQ Sauce</field>
+        </record>
+
+        <record model="lunch.product" id="product_cheeseburger">
+            <field name="name">Cheese Burger</field>
+            <field name="category_id" eval="str(ref('categ_burger'))"/>
+            <field name="price">7.0</field>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
+            <field name="description">Beef, Cheddar, Salad, Fried Onions, BBQ Sauce</field>
+        </record>
+
+        <record model="lunch.product" id="product_chicken_curry">
+            <field name="name">Chicken Curry</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">3.0</field>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
+        </record>
+
+        <record model="lunch.product" id="product_spicy_tuna">
+            <field name="name">Spicy Tuna</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">3.0</field>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
+        </record>
+
+        <record model="lunch.product" id="product_mozzarella">
+            <field name="name">Mozzarella</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">3.9</field>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
+            <field name="description">Mozzarella, Pesto, Tomatoes</field>
+        </record>
+
+        <record model="lunch.product" id="product_club">
+            <field name="name">Club</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">3.4</field>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
+            <field name="description">Ham, Cheese, Vegetables</field>
+        </record>
+
+        <record model="lunch.product" id="product_maki">
+            <field name="name">Lunch Maki 18pc</field>
+            <field name="category_id" eval="str(ref('categ_sushi'))"/>
+            <field name="price">12.0</field>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
+            <field name="description">6 Maki Salmon - 6 Maki Tuna - 6 Maki Shrimp/Avocado</field>
+        </record>
+
+        <record model="lunch.product" id="product_salmon">
+            <field name="name">Lunch Salmon 20pc</field>
+            <field name="category_id" eval="str(ref('categ_sushi'))"/>
+            <field name="price">13.80</field>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
+            <field name="description">4 Sushi Salmon - 6 Maki Salmon - 4 Sashimi Salmon </field>
+        </record>
+
+        <record model="lunch.product" id="product_temaki">
+            <field name="name">Lunch Temaki mix 3pc</field>
+            <field name="category_id" eval="str(ref('categ_temaki'))"/>
+            <field name="price">14.0</field>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
+            <field name="description">1 Avocado/Cooked Tuna - 1 Salmon/Eggs - 1 Salmon/Avocado - 1 Tuna/Mango</field>
+        </record>
+
+        <record model="lunch.product" id="product_chirashi">
+            <field name="name">Salmon and Avocado</field>
+            <field name="category_id" eval="str(ref('categ_chirashi'))"/>
+            <field name="price">9.25</field>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
+            <field name="description">Shrimp Tempura, Yam Tempura, Chinese Cabbage, Pickled Onions, Sesame Sauce</field>
+        </record>
+
         <record model="lunch.product" id="product_cheese_ham">
             <field name="name">Cheese And Ham</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
@@ -83,6 +191,22 @@
             <field name="description">Tomatoes, Mozzarella</field>
         </record>
 
+        <record model="lunch.product" id="product_funghi">
+            <field name="name">Pizza Funghi</field>
+            <field name="category_id" eval="str(ref('categ_pizza'))"/>
+            <field name="price">7.00</field>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
+            <field name="description">Tomatoes, Mushrooms, Mozzarella</field>
+        </record>
+
+        <record model="lunch.product" id="product_vege">
+            <field name="name">Pizza Vegetarian</field>
+            <field name="category_id" eval="str(ref('categ_pizza'))"/>
+            <field name="price">7.00</field>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
+            <field name="description">Tomatoes, Mozzarella, Mushrooms, Peppers, Olives</field>
+        </record>
+
         <record model="lunch.product" id="product_italiana">
             <field name="name">Pizza Italiana</field>
             <field name="category_id" eval="str(ref('categ_pizza'))"/>
@@ -107,6 +231,14 @@
             <field name="description">Tomatoes, Basil</field>
         </record>
 
+         <record model="lunch.product" id="product_4formaggi">
+            <field name="name">4 Formaggi</field>
+            <field name="category_id" eval="str(ref('categ_pasta'))"/>
+            <field name="price">5.50</field>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
+            <field name="description">Tomato sauce, Olive oil, Fresh Tomatoes, Onions, Vegetables, Parmesan</field>
+        </record>
+
         <record model="lunch.order" id="order_1">
             <field name="user_id" ref="base.user_demo"/>
             <field name="date" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d')"/>
@@ -128,6 +260,13 @@
             <field name="state">confirmed</field>
         </record>
 
+        <record model="lunch.order" id="order_4">
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
+            <field name="order_line_ids" eval="[]"/>
+            <field name="state">confirmed</field>
+        </record>
+
         <record model="lunch.order.line" id="order_line_1">
             <field name="user_id" ref="base.user_demo"/>
             <field name="product_id" ref="product_Bolognese"/>
@@ -172,6 +311,16 @@
             <field name="order_id" ref="order_3"/>
         </record>
 
+        <record model="lunch.order.line" id="order_line_5">
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="product_id" ref="product_4formaggi"/>
+            <field name="price">5.50</field>
+            <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
+            <field name="state">confirmed</field>
+            <field name="supplier" ref="partner_pizza_inn"/>
+            <field name="order_id" ref="order_4"/>
+        </record>
+
         <record model="lunch.cashmove" id="cashmove_1">
             <field name="user_id" ref="base.user_demo"/>
             <field name="date" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d')"/>
@@ -198,6 +347,23 @@
             <field name="state">payment</field>
         </record>
 
+        <record model="lunch.cashmove" id="cashmove_4">
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="date" eval="(DateTime.now() - timedelta(days=3)).strftime('%Y-%m-%d')"/>
+            <field name="description">Cash given to HR manager</field>
+            <field name="amount">40</field>
+            <field name="state">payment</field>
+        </record>
+
+        <record model="lunch.cashmove" id="cashmove_5">
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
+            <field name="description">Pasta 4 Formaggi</field>
+            <field name="amount">-5.50</field>
+            <field name="order_id" ref="order_4"/>
+            <field name="state">order</field>
+        </record>
+
         <record model="lunch.alert" id="alert_1">
             <field name="alert_type">week</field>
             <field name="monday" eval="True"/>
diff --git a/addons/point_of_sale/data/point_of_sale_demo.xml b/addons/point_of_sale/data/point_of_sale_demo.xml
index 2525a561481..eb792a82102 100644
--- a/addons/point_of_sale/data/point_of_sale_demo.xml
+++ b/addons/point_of_sale/data/point_of_sale_demo.xml
@@ -22,6 +22,7 @@
             <field name="groups_id" eval="[(4, ref('group_pos_user'))]"/>
         </record>
 
+
         <!-- Resource: pos.category -->
         <record id="pos_category_miscellaneous" model="pos.category">
           <field name="name">Miscellaneous</field>
@@ -33,6 +34,11 @@
           <field name="name">Chairs</field>
         </record>
 
+        <record model="pos.config" id="pos_config_main">
+            <field name="iface_start_categ_id" ref="pos_category_chairs"/>
+            <field name="start_category">True</field>
+        </record>
+
         <!-- Resource: product.product -->
         <record id="stock.product_cable_management_box" model="product.product">
           <field name="pos_categ_id" ref="point_of_sale.pos_category_miscellaneous"/>
diff --git a/addons/point_of_sale/static/src/js/tests.js b/addons/point_of_sale/static/src/js/tests.js
index 59738e08179..f8626cab1bd 100644
--- a/addons/point_of_sale/static/src/js/tests.js
+++ b/addons/point_of_sale/static/src/js/tests.js
@@ -44,7 +44,11 @@ odoo.define('point_of_sale.tour.pricelist', function (require) {
         };
     }
 
-    var steps = [{
+    var steps = [{ // Leave category displayed by default
+        content: "click category switch",
+        trigger: ".js-category-switch",
+        run: 'click',
+    }, {
         content: 'waiting for loading to finish',
         trigger: '.o_main_content:has(.loader:hidden)',
         run: function () {
@@ -209,6 +213,7 @@ shelf have not (their price was manually overriden)",
     }, {
         content: "confirm closing the frontend",
         trigger: ".header-button",
+        run: function() {}, //it's a check,
     }]);
 
     Tour.register('pos_pricelist', { test: true, url: '/pos/web' }, steps);
@@ -298,6 +303,10 @@ odoo.define('point_of_sale.tour.acceptance', function (require) {
         }, {
             content: "next order",
             trigger: '.button.next:visible',
+        }, { // Leave category displayed by default
+            content: "click category switch",
+            trigger: ".js-category-switch",
+            run: 'click',
         }];
     }
 
@@ -305,6 +314,10 @@ odoo.define('point_of_sale.tour.acceptance', function (require) {
             content: 'waiting for loading to finish',
             trigger: '.o_main_content:has(.loader:hidden)',
             run: function () {}, // it's a check
+        }, { // Leave category displayed by default
+            content: "click category switch",
+            trigger: ".js-category-switch",
+            run: 'click',
         }];
 
     steps = steps.concat(add_product_to_order('Desk Organizer'));
diff --git a/addons/pos_restaurant/data/pos_restaurant_demo.xml b/addons/pos_restaurant/data/pos_restaurant_demo.xml
index 55a20022b25..82e236da7b4 100644
--- a/addons/pos_restaurant/data/pos_restaurant_demo.xml
+++ b/addons/pos_restaurant/data/pos_restaurant_demo.xml
@@ -11,21 +11,148 @@
             <field name="product_categories_ids" eval="[(6, 0, [ref('point_of_sale.pos_category_miscellaneous')])]" />
         </record>
 
-        <record id="product_category_pos" model="product.category">
-            <field name="parent_id" ref="product.product_category_1"/>
-            <field name="name">PoS</field>
-        </record>
-
         <record id="drinks" model="pos.category">
               <field name="name">Drinks</field>
         </record>
 
+        <record id="product_category_pos_food" model="product.category">
+            <field name="parent_id" ref="point_of_sale.product_category_pos"/>
+            <field name="name">Food</field>
+        </record>
+
+        <record id="food" model="pos.category">
+              <field name="name">Food</field>
+        </record>
+
+        <!-- Food -->
+        <record id="pos_food_margherita" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">7.0</field>
+            <field name="name">Margherita</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-pizza.png"/>
+        </record>
+        <record id="pos_food_funghi" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">7.0</field>
+            <field name="name">Funghi</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-pizza.png"/>
+        </record>
+        <record id="pos_food_vege" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">7.0</field>
+            <field name="name">Vegetarian</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-pizza.png"/>
+        </record>
+        <record id="pos_food_bolo" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">4.5</field>
+            <field name="name">Pasta Bolognese</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-pasta.jpg"/>
+        </record>
+        <record id="pos_food_4formaggi" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">5.5</field>
+            <field name="name">Pasta 4 formaggi </field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-pasta-4f.jpg"/>
+        </record>
+        <record id="pos_food_bacon" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">7.5</field>
+            <field name="name">Bacon Burger</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-burger.jpg"/>
+        </record>
+        <record id="pos_food_cheeseburger" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">7.0</field>
+            <field name="name">Cheese Burger</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-cheeseburger.jpg"/>
+        </record>
+        <record id="pos_food_chicken" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">3.0</field>
+            <field name="name">Chicken Curry Sandwich</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-sandwich.jpg"/>
+        </record>
+        <record id="pos_food_tuna" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">3.0</field>
+            <field name="name">Spicy Tuna Sandwich</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-tuna.jpg"/>
+        </record>
+        <record id="pos_food_mozza" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">3.9</field>
+            <field name="name">Mozzarella Sandwich</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-mozza.jpg"/>
+        </record>
+        <record id="pos_food_club" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">3.4</field>
+            <field name="name">Club Sandwich</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-club.jpg"/>
+        </record>
+        <record id="pos_food_maki" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">12.0</field>
+            <field name="name">Lunch Maki 18pc</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-maki.jpg"/>
+        </record>
+        <record id="pos_food_salmon" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">13.80</field>
+            <field name="name">Lunch Salmon 20pc</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-salmon.jpg"/>
+        </record>
+        <record id="pos_food_temaki" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">14.0</field>
+            <field name="name">Lunch Temaki mix 3pc</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-temaki.jpg"/>
+        </record>
+        <record id="pos_food_chirashi" model="product.product">
+            <field name="available_in_pos">True</field>
+            <field name="list_price">9.25</field>
+            <field name="name">Salmon and Avocado</field>
+            <field name="pos_categ_id" ref="food"/>
+            <field name="categ_id" ref="pos_restaurant.product_category_pos_food"/>
+            <field name="image" type="base64" file="pos_restaurant/static/img/th-salmon-avocado.jpg"/>
+        </record>
+
+        <!-- Drinks -->
         <record id="coke" model="product.product">
             <field name="available_in_pos">True</field>
             <field name="list_price">2.20</field>
             <field name="name">Coca-Cola</field>
             <field name="pos_categ_id" ref="drinks"/>
-            <field name="categ_id" ref="pos_restaurant.product_category_pos"/>
+            <field name="categ_id" ref="point_of_sale.product_category_pos"/>
             <field name="image" type="base64" file="pos_restaurant/static/img/th-coke.jpg"/>
         </record>
 
@@ -34,7 +161,7 @@
             <field name="list_price">2.20</field>
             <field name="name">Water</field>
             <field name="pos_categ_id" ref="drinks"/>
-            <field name="categ_id" ref="pos_restaurant.product_category_pos"/>
+            <field name="categ_id" ref="point_of_sale.product_category_pos"/>
             <field name="image" type="base64" file="pos_restaurant/static/img/th-water.jpg"/>
         </record>
 
@@ -43,7 +170,7 @@
             <field name="list_price">2.20</field>
             <field name="name">Minute Maid</field>
             <field name="pos_categ_id" ref="drinks"/>
-            <field name="categ_id" ref="pos_restaurant.product_category_pos"/>
+            <field name="categ_id" ref="point_of_sale.product_category_pos"/>
             <field name="image" type="base64" file="pos_restaurant/static/img/th-minute_maid.jpg"/>
         </record>
 
@@ -58,6 +185,8 @@
             <field name="iface_printbill">True</field>
             <field name="iface_orderline_notes">True</field>
             <field name="printer_ids" eval="[(6, 0, [ref('pos_restaurant.kitchen_printer')])]" />
+            <field name="iface_start_categ_id" ref="drinks"/>
+            <field name="start_category">True</field>
         </record>
 
         <!-- Floors: Main Floor -->
diff --git a/addons/pos_restaurant/static/img/th-burger.jpg b/addons/pos_restaurant/static/img/th-burger.jpg
new file mode 100644
index 00000000000..b8919a896ff
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-burger.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-cheeseburger.jpg b/addons/pos_restaurant/static/img/th-cheeseburger.jpg
new file mode 100644
index 00000000000..11852a6c972
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-cheeseburger.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-club.jpg b/addons/pos_restaurant/static/img/th-club.jpg
new file mode 100644
index 00000000000..c12676eac43
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-club.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-maki.jpg b/addons/pos_restaurant/static/img/th-maki.jpg
new file mode 100644
index 00000000000..b90c00fc873
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-maki.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-mozza.jpg b/addons/pos_restaurant/static/img/th-mozza.jpg
new file mode 100644
index 00000000000..81d0b937baf
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-mozza.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-pasta-4f.jpg b/addons/pos_restaurant/static/img/th-pasta-4f.jpg
new file mode 100644
index 00000000000..137c6eb14b1
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-pasta-4f.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-pasta.jpg b/addons/pos_restaurant/static/img/th-pasta.jpg
new file mode 100644
index 00000000000..ff16850a179
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-pasta.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-pizza.png b/addons/pos_restaurant/static/img/th-pizza.png
new file mode 100644
index 00000000000..91b5021ed73
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-pizza.png differ
diff --git a/addons/pos_restaurant/static/img/th-salmon-avocado.jpg b/addons/pos_restaurant/static/img/th-salmon-avocado.jpg
new file mode 100644
index 00000000000..442ee8ddc11
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-salmon-avocado.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-salmon.jpg b/addons/pos_restaurant/static/img/th-salmon.jpg
new file mode 100644
index 00000000000..b84c6989162
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-salmon.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-sandwich.jpg b/addons/pos_restaurant/static/img/th-sandwich.jpg
new file mode 100644
index 00000000000..4d17f726bba
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-sandwich.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-temaki.jpg b/addons/pos_restaurant/static/img/th-temaki.jpg
new file mode 100644
index 00000000000..01a9865643a
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-temaki.jpg differ
diff --git a/addons/pos_restaurant/static/img/th-tuna.jpg b/addons/pos_restaurant/static/img/th-tuna.jpg
new file mode 100644
index 00000000000..acbe2d96b6a
Binary files /dev/null and b/addons/pos_restaurant/static/img/th-tuna.jpg differ
diff --git a/addons/stock/data/stock_demo.xml b/addons/stock/data/stock_demo.xml
index f274a335fa7..e01fbbfa4af 100644
--- a/addons/stock/data/stock_demo.xml
+++ b/addons/stock/data/stock_demo.xml
@@ -123,7 +123,11 @@
             <field name="currency_id" ref="base.USD"/>
             <field name="partner_id" ref="res_partner_company_1"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field name="name">My Company, Chicago</field>
+            <field name="name">My Company (Chicago)</field>
+        </record>
+
+        <record id="base.main_company" model="res.company">
+            <field name="name">My Company (San Fransisco)</field>
         </record>
 
         <record id="stock_warehouse_shop0" model="stock.warehouse">
diff --git a/addons/test_mail/tests/test_mail_message.py b/addons/test_mail/tests/test_mail_message.py
index ac38d2d00e1..3b7cf25da46 100644
--- a/addons/test_mail/tests/test_mail_message.py
+++ b/addons/test_mail/tests/test_mail_message.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 import base64
+from email.utils import formataddr
 
 from odoo.addons.test_mail.tests import common
 from odoo.addons.test_mail.tests.common import mail_new_test_user
@@ -61,8 +62,10 @@ class TestMessageValues(common.BaseFunctionalTest, common.MockEmails):
 
         msg = self.Message.create({})
         self.assertIn('-private', msg.message_id, 'mail_message: message_id for a void message should be a "private" one')
-        self.assertEqual(msg.reply_to, '%s <%s@%s>' % (self.env.user.company_id.name, alias_catchall, alias_domain))
-        self.assertEqual(msg.email_from, '%s <%s>' % (self.user_employee.name, self.user_employee.email))
+        reply_to_name = self.env.user.company_id.name
+        reply_to_email = '%s@%s' % (alias_catchall, alias_domain)
+        self.assertEqual(msg.reply_to, formataddr((reply_to_name, reply_to_email)))
+        self.assertEqual(msg.email_from, formataddr((self.user_employee.name, self.user_employee.email)))
 
     def test_mail_message_values_document_no_alias(self):
         self.env['ir.config_parameter'].search([('key', '=', 'mail.catchall.domain')]).unlink()
@@ -86,7 +89,9 @@ class TestMessageValues(common.BaseFunctionalTest, common.MockEmails):
             'res_id': self.alias_record.id
         })
         self.assertIn('-openerp-%d-mail.test' % self.alias_record.id, msg.message_id)
-        self.assertEqual(msg.reply_to, '%s %s <%s@%s>' % (self.env.user.company_id.name, self.alias_record.name, self.alias_record.alias_name, alias_domain))
+        reply_to_name = '%s %s' % (self.env.user.company_id.name, self.alias_record.name)
+        reply_to_email = '%s@%s' % (self.alias_record.alias_name, alias_domain)
+        self.assertEqual(msg.reply_to, formataddr((reply_to_name, reply_to_email)))
         self.assertEqual(msg.email_from, '%s <%s>' % (self.user_employee.name, self.user_employee.email))
 
     def test_mail_message_values_document_alias_catchall(self):
@@ -100,7 +105,9 @@ class TestMessageValues(common.BaseFunctionalTest, common.MockEmails):
             'res_id': self.alias_record.id
         })
         self.assertIn('-openerp-%d-mail.test' % self.alias_record.id, msg.message_id)
-        self.assertEqual(msg.reply_to, '%s %s <%s@%s>' % (self.env.user.company_id.name, self.alias_record.name, self.alias_record.alias_name, alias_domain))
+        reply_to_name = '%s %s' % (self.env.user.company_id.name, self.alias_record.name)
+        reply_to_email = '%s@%s' % (self.alias_record.alias_name, alias_domain)
+        self.assertEqual(msg.reply_to, formataddr((reply_to_name, reply_to_email)))
         self.assertEqual(msg.email_from, '%s <%s>' % (self.user_employee.name, self.user_employee.email))
 
     def test_mail_message_values_no_auto_thread(self):
diff --git a/odoo/addons/base/data/res_users_demo.xml b/odoo/addons/base/data/res_users_demo.xml
index 608438cea7c..e9580c22299 100644
--- a/odoo/addons/base/data/res_users_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -20,12 +20,11 @@
         <record id="main_partner" model="res.partner">
             <field name="name">YourCompany</field>
             <field name="company_name">YourCompany</field>
-            <field name="street">1725 Slough Ave.</field>
-            <field name="city">Scranton</field>
-            <field name="zip">18540</field>
+            <field name="street">250 Executive Park Blvd, Suite 3400</field>
+            <field name="city">San Francisco</field>
+            <field name="zip">CA 94134</field>
             <field name='country_id' ref='base.us'/>
-            <field name='state_id' ref='state_us_39'/>
-            <field name="phone">+1 555 123 8069</field>
+            <field name="phone">+1 (650) 691-3277 </field>
             <field name="email">info@yourcompany.example.com</field>
             <field name="website">www.example.com</field>
         </record>