diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 65cbe360598..804b45c2efd 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -16,10 +16,8 @@
                            </div>
                        </group>
                        <group>
-                           <separator string="Journals" colspan="4"/>
-                           <field name="journal_ids" colspan="4" nolabel="1"/>
-                           <separator string="Users" colspan="4"/>
-                           <field name="employee_ids" colspan="4" nolabel="1"/>
+                           <field name="journal_ids" widget="many2many_tags"/>
+                           <field name="employee_ids" widget="many2many_tags"/>
                        </group>
                    </sheet>
                    <footer>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index a0d51c87713..6e5bf24ea6e 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -281,7 +281,7 @@
             groups="stock.group_stock_user"/>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
-        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="stock.group_stock_manager"/>
             <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
             <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index d9f6cb9d2f6..a7cf4618993 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -17,6 +17,7 @@ access_project_project_sale_user,project.project salesman,model_project_project,
 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1
 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
+access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_user,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
 access_project_category,project.project_category,model_project_category,,1,0,0,0
 access_project_category_manager,project.project_category,model_project_category,project.group_project_manager,1,1,1,1
diff --git a/addons/saas_demo/demo/fr_FR.xml b/addons/saas_demo/demo/fr_FR.xml
index 3425c58f0c4..f71b059c01e 100644
--- a/addons/saas_demo/demo/fr_FR.xml
+++ b/addons/saas_demo/demo/fr_FR.xml
@@ -37,7 +37,7 @@ Mr Jean Pierre
                 (4, ref('stock.group_stock_user')),
                 (4, ref('lunch.group_lunch_user')),
                 (4, ref('point_of_sale.group_pos_user')),
-                (4, ref('base.group_tool_user')),
+                (4, ref('base.group_hr_user')),
                 ]"/>
             <field name="lang">fr_FR</field> <!-- change -->
             <field name="partner_id" ref="partner_demo_fr"/> <!-- change -->
@@ -356,6 +356,81 @@ AElFTkSuQmCC
             </field>
         </record>
 
+        <!-- SALE -->
+        <record id="sale_order_1_demo_fr" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_15"/>
+            <field name="partner_invoice_id" ref="base.res_partner_address_25"/>
+            <field name="partner_shipping_id" ref="base.res_partner_address_25"/>
+            <field name="shop_id" ref="sale.sale_shop_1"/>
+            <field name="user_id" ref="user_demo_fr"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">manual</field>
+        </record>
+        <record id="sale_order_line_1_demo_fr" model="sale.order.line">
+            <field name="order_id" ref="sale_order_1_demo_fr"/>
+            <field name="name">Laptop Customized</field>
+            <field name="product_id" ref="product.product_product_27"/>
+            <field name="product_uom_qty">2</field>
+            <field name="product_uos_qty">2</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">3645.00</field>
+        </record>
+        <record id="sale_order_line_2_demo_fr" model="sale.order.line">
+            <field name="order_id" ref="sale_order_1_demo_fr"/>
+            <field name="name">Mouse, Wireless</field>
+            <field name="product_id" ref="product.product_product_12"/>
+            <field name="product_uom_qty">2</field>
+            <field name="product_uos_qty">2</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">12.50</field>
+        </record>
+
+
+        <record id="sale_order_2_demo_fr" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_11"/>
+            <field name="partner_invoice_id" ref="base.res_partner_address_20"/>
+            <field name="partner_shipping_id" ref="base.res_partner_address_20"/>
+            <field name="user_id" ref="user_demo_fr"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">manual</field>
+        </record>
+        <record id="sale_order_line_3_demo_fr" model="sale.order.line">
+            <field name="order_id" ref="sale_order_2_demo_fr"/>
+            <field name="name">Laptop E5023</field>
+            <field name="product_id" ref="product.product_product_25"/>
+            <field name="product_uom_qty">5</field>
+            <field name="product_uos_qty">5</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">2950.00</field>
+        </record>
+        <record id="sale_order_line_4_demo_fr" model="sale.order.line">
+            <field name="order_id" ref="sale_order_2_demo_fr"/>
+            <field name="name">GrapWorks Software</field>
+            <field name="product_id" ref="product.product_product_44"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">173.00</field>
+        </record>
+        <record id="sale_order_line_5_demo_fr" model="sale.order.line">
+            <field name="order_id" ref="sale_order_2_demo_fr"/>
+            <field name="name">Datacard</field>
+            <field name="product_id" ref="product.product_product_46"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">40.00</field>
+        </record>
+        <record id="sale_order_line_6_demo_fr" model="sale.order.line">
+            <field name="order_id" ref="sale_order_2_demo_fr"/>
+            <field name="name">USB Adapter</field>
+            <field name="product_id" ref="product.product_product_48"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">18.00</field>
+        </record>
+
         <!-- POINT OF SALE -->
         <record id="pos_config_demo_fr" model="pos.config">
             <field name="name">Jean Pierre</field>
@@ -708,6 +783,39 @@ AElFTkSuQmCC
             </field>
         </record>
 
+        <!-- HR Holidays -->
+        <record model="hr.holidays" id="hr_holidays_1_demo_fr">
+          <field name="name">Doctor Appointment</field>
+          <field name="holiday_status_id" ref="hr_holidays.holiday_status_sl"/>
+          <field eval="time.strftime('%Y-%m-20')" name="date_from"/>
+          <field eval="time.strftime('%Y-%m-22')" name="date_to"/>
+          <field name="type">remove</field>
+          <field name="state">draft</field>
+          <field name="number_of_days_temp">3</field>
+          <field name="employee_id" ref="hr.employee_demo_fr"/>
+        </record>
+
+        <record model="hr.holidays" id="hr_holidays_2_demo_fr">
+          <field name="name">Summer Vacation</field>
+          <field name="holiday_status_id" ref="hr_holidays.holiday_status_unpaid"/>
+          <field eval="time.strftime('%Y-%m-23')" name="date_from"/>
+          <field eval="time.strftime('%Y-%m-25')" name="date_to"/>
+          <field name="type">add</field>
+          <field name="state">draft</field>
+          <field name="number_of_days_temp">7</field>
+          <field name="employee_id" ref="hr.employee_demo_fr"/>
+        </record>
+
+        <record model="hr.holidays" id="hr_holidays_3_demo_fr">
+          <field name="name">International Tour</field>
+          <field name="holiday_status_id" ref="hr_holidays.holiday_status_comp"/>
+          <field eval="time.strftime('%Y-%m-26')" name="date_from"/>
+          <field eval="time.strftime('%Y-%m-28')" name="date_to"/>
+          <field name="type">add</field>
+          <field name="number_of_days_temp">7</field>
+          <field name="employee_id" ref="hr.employee_demo_fr"/>
+        </record>
+
         <!-- MAIL -->
         <record id="mail.msg_discus3" model="mail.message">
             <field name="partner_ids" eval="[(4, ref('partner_demo_fr'))]"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 22589244a53..7da3f26fc2f 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -9,7 +9,7 @@
         <menuitem name="Reporting" parent="base.menu_tools"
             id="base.menu_lunch_reporting" sequence="6"/>
         <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
-        <menuitem id="base.next_id_10" name="Survey" parent="base.menu_reporting" sequence="1" />
+        <menuitem id="base.next_id_10" name="Survey" parent="base.menu_reporting" sequence="1" groups="base.group_survey_user"/>
 
         <!--
             Survey