diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 99898f5a703..61b7fbc4c1d 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -14,9 +14,13 @@
                         <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
                     </separator>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
+                        <button name="action_next" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
+                        <label string="or" invisible="context.get('menu',False)" class="oe_inline"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Skip']" position="replace">
+                        <button string="Ok" class="oe_highlight" special="cancel" invisible="context.get('active_model',False)"/>
+                        <button string="Skip" class="oe_link" special="cancel" invisible="context.get('menu',False)"/>
                     </xpath>
-                    
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" invisible="1"/>
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 02ac7f16fd9..fbd01761f39 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -23,5 +23,6 @@ import hr_department
 import hr
 
 import res_config
+import res_users
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b4b8e982845..b074a80aa88 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -59,6 +59,8 @@ You can manage:
         'hr_installer.xml',
         'hr_data.xml',
         'res_config_view.xml',
+        'mail_hr_view.xml',
+        'res_users_view.xml',
     ],
     'demo': ['hr_demo.xml'],
     'test': [
@@ -69,5 +71,7 @@ You can manage:
     'application': True,
     'auto_install': False,
     'css': [ 'static/src/css/hr.css' ],
+    'js': [ 'static/src/js/suggestions.js' ],
+    'qweb': [ 'static/src/xml/suggestions.xml' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 7f704e42e5e..4849d3a7d8b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -25,9 +25,11 @@ from openerp.modules.module import get_module_resource
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp import tools
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+
 class hr_employee_category(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
@@ -150,6 +152,7 @@ class hr_job(osv.osv):
 class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
+    _order = 'name_related'
     _inherits = {'resource.resource': "resource_id"}
     _inherit = ['mail.thread']
 
@@ -158,10 +161,10 @@ class hr_employee(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-    
+
     _columns = {
         #we need a related field in order to be able to sort the employee by name
         'name_related': fields.related('resource_id', 'name', type='char', string='Name', readonly=True, store=True),
@@ -171,12 +174,12 @@ class hr_employee(osv.osv):
         'sinid': fields.char('SIN No', size=32, help="Social Insurance Number"),
         'identification_id': fields.char('Identification No', size=32),
         'otherid': fields.char('Other Id', size=64),
-        'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
+        'gender': fields.selection([('male', 'Male'), ('female', 'Female')], 'Gender'),
         'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
-        'department_id':fields.many2one('hr.department', 'Department'),
+        'department_id': fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner', 'Working Address'),
         'address_home_id': fields.many2one('res.partner', 'Home Address'),
-        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
+        'bank_account_id': fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
         'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
         'work_email': fields.char('Work Email', size=240),
@@ -207,25 +210,42 @@ class hr_employee(osv.osv):
             help="Small-sized photo of the employee. It is automatically "\
                  "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'passport_id':fields.char('Passport No', size=64),
+        'passport_id': fields.char('Passport No', size=64),
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
         'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
         'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
     }
 
-    _order='name_related'
+    def _get_default_image(self, cr, uid, context=None):
+        image_path = get_module_resource('hr', 'static/src/img', 'default_image.png')
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+
+    defaults = {
+        'active': 1,
+        'image': _get_default_image,
+        'color': 0,
+    }
 
     def create(self, cr, uid, data, context=None):
-        employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
-        try:
-            (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
-            employee = self.browse(cr, uid, employee_id, context=context)
-            self.pool.get('mail.group').message_post(cr, uid, [mail_group_id],
-                body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
-                subtype='mail.mt_comment', context=context)
-        except:
-            pass # group deleted: do not push a message
+        if context is None:
+            context = {}
+        create_ctx = dict(context, mail_create_nolog=True)
+        employee_id = super(hr_employee, self).create(cr, uid, data, context=create_ctx)
+        employee = self.browse(cr, uid, employee_id, context=context)
+        if employee.user_id:
+            # send a copy to every user of the company
+            company_id = employee.user_id.partner_id.company_id.id
+            partner_ids = self.pool.get('res.partner').search(cr, uid, [
+                ('company_id', '=', company_id),
+                ('user_ids', '!=', False)], context=context)
+        else:
+            partner_ids = []
+        self.message_post(cr, uid, [employee_id],
+            body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
+            partner_ids=partner_ids,
+            subtype='mail.mt_comment', context=context
+        )
         return employee_id
 
     def unlink(self, cr, uid, ids, context=None):
@@ -246,7 +266,7 @@ class hr_employee(osv.osv):
             company_id = self.pool.get('res.company').browse(cr, uid, company, context=context)
             address = self.pool.get('res.partner').address_get(cr, uid, [company_id.partner_id.id], ['default'])
             address_id = address and address['default'] or False
-        return {'value': {'address_id' : address_id}}
+        return {'value': {'address_id': address_id}}
 
     def onchange_department_id(self, cr, uid, ids, department_id, context=None):
         value = {'parent_id': False}
@@ -259,17 +279,36 @@ class hr_employee(osv.osv):
         work_email = False
         if user_id:
             work_email = self.pool.get('res.users').browse(cr, uid, user_id, context=context).email
-        return {'value': {'work_email' : work_email}}
+        return {'value': {'work_email': work_email}}
 
-    def _get_default_image(self, cr, uid, context=None):
-        image_path = get_module_resource('hr', 'static/src/img', 'default_image.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+    def action_follow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_subscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_subscribe_users(cr, uid, ids, context=context)
 
-    _defaults = {
-        'active': 1,
-        'image': _get_default_image,
-        'color': 0,
-    }
+    def action_unfollow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_unsubscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_unsubscribe_users(cr, uid, ids, context=context)
+
+    def get_suggested_thread(self, cr, uid, removed_suggested_threads=None, context=None):
+        """Show the suggestion of employees if display_employees_suggestions if the
+        user perference allows it. """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.display_employees_suggestions:
+            return []
+        else:
+            return super(hr_employee, self).get_suggested_thread(cr, uid, removed_suggested_threads, context)
+
+    def _message_get_auto_subscribe_fields(self, cr, uid, updated_fields, auto_follow_fields=['user_id'], context=None):
+        """ Overwrite of the original method to always follow user_id field,
+        even when not track_visibility so that a user will follow it's employee
+        """
+        user_field_lst = []
+        for name, column_info in self._all_columns.items():
+            if name in auto_follow_fields and name in updated_fields and column_info.column._obj == 'res.users':
+                user_field_lst.append(name)
+        return user_field_lst
 
     def _check_recursion(self, cr, uid, ids, context=None):
         level = 100
@@ -285,6 +324,22 @@ class hr_employee(osv.osv):
         (_check_recursion, 'Error! You cannot create recursive hierarchy of Employee(s).', ['parent_id']),
     ]
 
+    # ---------------------------------------------------
+    # Mail gateway
+    # ---------------------------------------------------
+
+    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
+        """ mail.message document permission rule: can post a new message if can read
+            because of portal document. """
+        if not model_obj:
+            model_obj = self
+        employee_ids = model_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if employee_ids and operation == 'create':
+            model_obj.check_access_rights(cr, uid, 'read')
+            model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
+        else:
+            return super(hr_employee, self).check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
+
 
 class hr_department(osv.osv):
     _description = "Department"
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ccd11bc0dc2..19a6d70839f 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,6 +27,10 @@
                             </h1>
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
+                            <label for="work_email" class="oe_edit_only"/>
+                            <field name="work_email" widget="email"/>
+                            <label for="work_phone" class="oe_edit_only"/>
+                            <field name="work_phone"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
@@ -36,8 +40,6 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="work_email" widget="email"/>
-                                        <field name="work_phone"/>
                                         <field name="mobile_phone"/>
                                         <field name="work_location"/>
                                     </group>
@@ -136,6 +138,9 @@
         <field name="arch" type="xml">
             <kanban>
                 <field name="last_login"/>
+                <field name="message_is_follower"/>
+                <field name="message_follower_ids"/>
+                <field name="message_ids"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -154,10 +159,19 @@
                                     </li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
-                                    <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
-                                    <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
                                     <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
                                 </ul>
+                                <div class="oe_kanban_footer_left">
+                                    <span title='Messages'><span class='oe_e'>9</span><t t-esc="record.message_ids.raw_value.length"/></span>
+                                    <span title='Followers'><span class='oe_e'>+</span><t t-esc="record.message_follower_ids.raw_value.length"/></span>
+                                </div>
+                                <div class="oe_followers" groups="base.group_user">
+                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_follower oe_following">
+                                        <span class="oe_unfollow">Unfollow</span>
+                                        <span class="oe_following">Following</span>
+                                    </button>
+                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object" class="oe_follower oe_notfollow">Follow</button>
+                                </div>
                             </div>
                         </div>
                         <script>
diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
new file mode 100644
index 00000000000..203878c7a77
--- /dev/null
+++ b/addons/hr/mail_hr_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('to_read', '=', True),
+                  ('starred', '=', False),
+                ],
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read',
+                'show_compose_message': True
+            }&quot;"/>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr/res_users.py b/addons/hr/res_users.py
new file mode 100644
index 00000000000..c3550596281
--- /dev/null
+++ b/addons/hr/res_users.py
@@ -0,0 +1,65 @@
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+
+class res_users(osv.Model):
+    """ Update of res.users class
+        - if adding groups to an user, check if base.group_user is in it
+        (member of 'Employee'), create an employee form linked to it.
+    """
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    _columns = {
+        'display_employees_suggestions': fields.boolean("Display Employees Suggestions"),
+    }
+
+    _defaults = {
+        'display_employees_suggestions': True,
+    }
+
+    def __init__(self, pool, cr):
+        """ Override of __init__ to add access rights on
+        display_employees_suggestions fields. Access rights are disabled by
+        default, but allowed on some specific fields defined in
+        self.SELF_{READ/WRITE}ABLE_FIELDS.
+        """
+        init_res = super(res_users, self).__init__(pool, cr)
+        # duplicate list to avoid modifying the original reference
+        self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
+        self.SELF_WRITEABLE_FIELDS.append('display_employees_suggestions')
+        # duplicate list to avoid modifying the original reference
+        self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS)
+        self.SELF_READABLE_FIELDS.append('display_employees_suggestions')
+        return init_res
+
+    def stop_showing_employees_suggestions(self, cr, uid, user_id, context=None):
+        """Update display_employees_suggestions value to False"""
+        if context is None:
+            context = {}
+        self.write(cr, uid, user_id, {"display_employees_suggestions": False}, context)
+
+    def _create_welcome_message(self, cr, uid, user, context=None):
+        """Do not welcome new users anymore, welcome new employees instead"""
+        return True
+
+    def _message_post_get_eid(self, cr, uid, thread_id, context=None):
+        assert thread_id, "res.users does not support posting global messages"
+        if context and 'thread_model' in context:
+            context['thread_model'] = 'hr.employee'
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        return self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', thread_id)], context=context)
+
+    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
+        """ Redirect the posting of message on res.users to the related employee.
+            This is done because when giving the context of Chatter on the
+            various mailboxes, we do not have access to the current partner_id. """
+        if kwargs.get('type') == 'email':
+            return super(res_users, self).message_post(cr, uid, thread_id, context=context, **kwargs)
+        employee_ids = self._message_post_get_eid(cr, uid, thread_id, context=context)
+        if not employee_ids:
+            pass  # dpo something
+        for employee_id in employee_ids:
+            res = self.pool.get('hr.employee').message_post(cr, uid, employee_id, context=context, **kwargs)
+        return res
diff --git a/addons/hr/res_users_view.xml b/addons/hr/res_users_view.xml
new file mode 100644
index 00000000000..0843269e716
--- /dev/null
+++ b/addons/hr/res_users_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- Update user form !-->
+        <record id="view_users_form_mail" model="ir.ui.view">
+            <field name="name">res.users.form.hr</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="mail.view_users_form_mail"/>
+            <field name="arch" type="xml">
+            <data>
+                <field name="display_groups_suggestions" position="after">
+                    <field name="display_employees_suggestions"/>
+                </field>
+            </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 16657394736..951ec4d02e3 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -68,3 +68,8 @@
   margin: 2px 0;
   padding: 0;
 }
+
+.openerp .oe_employee_vignette .oe_followers {
+  width: auto;
+  float: none;
+}
diff --git a/addons/hr/static/src/js/suggestions.js b/addons/hr/static/src/js/suggestions.js
new file mode 100644
index 00000000000..3bc37e71344
--- /dev/null
+++ b/addons/hr/static/src/js/suggestions.js
@@ -0,0 +1,78 @@
+openerp.hr = function(session) {
+    var _t = session.web._t;
+    var QWeb = session.web.qweb;
+
+    var suggestions = session.suggestions;
+    var removed_suggested_employee = session.suggestions.removed_suggested_employee = [];
+
+    suggestions.Employees = session.web.Widget.extend({
+        events: {
+            'click .oe_suggestion_remove.oe_suggestion_employee': 'stop_employee_suggestion',
+            'click .oe_suggestion_remove_item.oe_suggestion_employee': 'remove_employee_suggestion',
+            'click .oe_suggestion_follow': 'follow_employee',
+        },
+
+        init: function () {
+            this._super(this, arguments);
+            this.hr_employee = new session.web.DataSetSearch(this, 'hr.employee');
+            this.res_users = new session.web.DataSetSearch(this, 'res.users');
+            this.employees = [];
+        },
+
+        start: function () {
+            this._super.apply(this, arguments);
+            return this.fetch_suggested_employee();
+        },
+
+        fetch_suggested_employee: function () {
+            var self = this;
+            var employee = self.hr_employee.call('get_suggested_thread', {'removed_suggested_threads': removed_suggested_employee}).then(function (res) {
+                _(res).each(function (result) {
+                    result['image']=self.session.url('/web/binary/image', {model: 'hr.employee', field: 'image_small', id: result.id});
+                });
+                self.employees = res;
+            });
+            return $.when(employee).done(this.proxy('display_suggested_employees'));
+        },
+
+        display_suggested_employees: function () {
+            var suggested_employees = this.$('.oe_sidebar_suggestion.oe_suggestion_employee');
+            if (suggested_employees) {
+                suggested_employees.remove();
+            }
+            if (this.employees.length === 0) {
+                return this.$el.empty();
+            }
+            return this.$el.empty().html(QWeb.render('hr.suggestions.employees', {'widget': this}));
+        },
+
+        follow_employee: function (event) {
+            var self = this;
+            var employee_id = parseInt($(event.currentTarget).attr('id'), 10);
+            return this.hr_employee.call('message_subscribe_users', [[employee_id], [this.session.uid], undefined]).then(function(res) {
+                self.fetch_suggested_employee();
+            });
+        },
+
+        remove_employee_suggestion: function (event) {
+            removed_suggested_employee.push($(event.currentTarget).attr('id'));
+            return this.fetch_suggested_employee();
+        },
+
+        stop_employee_suggestion: function (event) {
+            var self = this;
+            return this.res_users.call('stop_showing_employees_suggestions', [this.session.uid]).then(function(res) {
+                self.$(".oe_sidebar_suggestion.oe_suggestion_employee").hide();
+            });
+        }
+    });
+
+    session.mail.WallSidebar.include({
+        start: function () {
+            this._super.apply(this, arguments);
+            var sug_employees = new suggestions.Employees(this);
+            return sug_employees.appendTo(this.$('.oe_suggestions_employees'));
+        },
+    });
+
+};
diff --git a/addons/hr/static/src/xml/suggestions.xml b/addons/hr/static/src/xml/suggestions.xml
new file mode 100644
index 00000000000..f3095627bae
--- /dev/null
+++ b/addons/hr/static/src/xml/suggestions.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+
+    <!-- Employees placeholder in sidebar -->
+    <t t-extend="mail.wall.sidebar">
+        <t t-jquery=".oe_mail_wall_sidebar" t-operation="append">
+            <div class="oe_suggestions_employees"></div>
+        </t>
+    </t>
+
+    <!-- Suggested employees -->
+    <div t-name="hr.suggestions.employees" class="oe_sidebar_suggestion oe_suggestion_employee">
+        <div class="oe_suggest_title">
+            <a class="oe_suggestion_remove oe_suggestion_employee oe_e">X</a>
+            <h2>Suggested Employees</h2>
+        </div>
+        <div class="oe_suggest_items">
+            <t t-foreach="widget.employees" t-as="result">
+                <div class="oe_suggested_item">
+                    <div class="oe_suggested_item_image">
+                        <a t-attf-href="#model=hr.employee&amp;id=#{result.id}">
+                            <img t-attf-src="{result.image}" t-attf-alt="{result.name}"/>
+                        </a>
+                    </div>
+                    <div class="oe_suggested_item_content">
+                        <a class="oe_suggestion_item_name" t-attf-href="#model=hr.employee&amp;id=#{result.id}"><t t-esc="result.name"/></a>
+                        <a class="oe_suggestion_remove_item oe_suggestion_employee oe_e" t-attf-id="{result.id}">X</a>
+                        <br/>
+                        <button class="oe_suggestion_follow" t-att-id="result.id">Follow</button>
+                    </div>
+                </div>
+            </t>
+        </div>
+    </div>
+
+</template>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2462daa6301..f76f8236b4d 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -165,9 +165,14 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
+                    <h1><field name="employee_id" class="oe_inline"
+                                attrs="{'readonly': [('state', '=', 'done')]}"
+                                on_change="onchange_employee_id(employee_id)"/>,
+                        <field name="date"
+                                attrs="{'readonly': [('state', '=', 'done')]}"/>
+                    </h1>
                     <label for="plan_id" class="oe_edit_only"/>
-                    <h2><field name="plan_id"/></h2>
+                    <h2><field name="plan_id" attrs="{'readonly': [('state', '=', 'done')]}"/></h2>
                     <group>
                         <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                             <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
@@ -175,7 +180,7 @@
                         </group>
                     </group>
                     <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
-                        <field nolabel="1" name="survey_request_ids">
+                        <field nolabel="1" name="survey_request_ids" attrs="{'readonly': [('state', '=', 'done')]}">
                             <form string="Interview Appraisal" version="7.0">
                                 <div class="oe_right oe_button_box">
                                     <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 9079735aaae..3603809990b 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -11,7 +11,7 @@
                     <group colspan="4">
                         <field name="month"/>
                         <field name="year"/>
-                        <field name="employee_id" colspan="3"/>
+                        <field name="employee_id" />
                     </group>
                     <footer>
                         <button string="Print" name="print_report" type="object" class="oe_highlight"/>
@@ -33,7 +33,7 @@
 
         <menuitem action="action_hr_timesheet_employee"
             id="menu_hr_timesheet_employee"
-            parent="hr.menu_hr_reporting"
+            parent="hr.menu_hr_reporting_timesheet"
             sequence="2" icon="STOCK_PRINT"/>
 
     </data>
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 63cd0888986..8f072dd9082 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -87,10 +87,12 @@ Main Features
         'static/src/js/mail.js',
         'static/src/js/mail_followers.js',
         'static/src/js/many2many_tags_email.js',
+        'static/src/js/suggestions.js',
     ],
     'qweb': [
         'static/src/xml/mail.xml',
         'static/src/xml/mail_followers.xml',
+        'static/src/xml/suggestions.xml',
     ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index a9d1d80240b..515be85132a 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -66,11 +66,11 @@
 
         <!-- Add followers related menu entries in Settings/Email -->
         <menuitem name="Followers" id="menu_email_followers" parent="base.menu_email"
-                    action="action_view_followers" sequence="30" groups="base.group_no_one"/> -->
+                    action="action_view_followers" sequence="30" groups="base.group_no_one"/>
         
         <!-- Add notifications related menu entry in Settings/Email -->
         <menuitem name="Notifications" id="menu_email_notifications" parent="base.menu_email"
-                    action="action_view_notifications" sequence="35" groups="base.group_no_one"/>
+                    action="action_view_notifications" sequence="13" groups="base.group_no_one"/>
 
     </data>
 </openerp>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 977608f487e..9ca3738bcb2 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -208,3 +208,12 @@ class mail_group(osv.Model):
         """ Wrapper because message_unsubscribe_users take a user_ids=None
             that receive the context without the wrapper. """
         return self.message_unsubscribe_users(cr, uid, ids, context=context)
+
+    def get_suggested_thread(self, cr, uid, removed_suggested_threads=None, context=None):
+        """Show the suggestion of groups if display_groups_suggestions if the
+        user perference allows it."""
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.display_groups_suggestions:
+            return []
+        else:
+            return super(mail_group, self).get_suggested_thread(cr, uid, removed_suggested_threads, context)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a46f416f44b..ead9eee8ce4 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -240,21 +240,42 @@ class mail_thread(osv.AbstractModel):
             fol_obj.create(cr, SUPERUSER_ID, {'res_model': self._name, 'res_id': id, 'partner_id': partner_id})
 
     def _search_followers(self, cr, uid, obj, name, args, context):
+        """Search function for message_follower_ids
+
+        Do not use with operator 'not in'. Use instead message_is_followers
+        """
         fol_obj = self.pool.get('mail.followers')
         res = []
         for field, operator, value in args:
             assert field == name
+            # TOFIX make it work with not in
+            assert operator != "not in", "Do not search message_follower_ids with 'not in'"
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('partner_id', operator, value)])
             res_ids = [fol.res_id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids)]
             res.append(('id', 'in', res_ids))
         return res
 
+    def _search_is_follower(self, cr, uid, obj, name, args, context):
+        """Search function for message_is_follower"""
+        fol_obj = self.pool.get('mail.followers')
+        res = []
+        for field, operator, value in args:
+            assert field == name
+            partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+            if (operator == '=' and value) or (operator == '!=' and not value):  # is a follower
+                res_ids = self.search(cr, uid, [('message_follower_ids', 'in', [partner_id])], context=context)
+            else:  # is not a follower or unknown domain
+                mail_ids = self.search(cr, uid, [('message_follower_ids', 'in', [partner_id])], context=context)
+                res_ids = self.search(cr, uid, [('id', 'not in', mail_ids)], context=context)
+            res.append(('id', 'in', res_ids))
+        return res
+
     _columns = {
-        'message_is_follower': fields.function(_get_followers,
-            type='boolean', string='Is a Follower', multi='_get_followers,'),
+        'message_is_follower': fields.function(_get_followers, type='boolean',
+            fnct_search=_search_is_follower, string='Is a Follower', multi='_get_followers,'),
         'message_follower_ids': fields.function(_get_followers, fnct_inv=_set_followers,
-                fnct_search=_search_followers, type='many2many',
-                obj='res.partner', string='Followers', multi='_get_followers'),
+            fnct_search=_search_followers, type='many2many',
+            obj='res.partner', string='Followers', multi='_get_followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model', '=', self._name)],
             auto_join=True,
@@ -1454,4 +1475,33 @@ class mail_thread(osv.AbstractModel):
         ''', (ids, self._name, partner_id))
         return True
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    #------------------------------------------------------
+    # Thread suggestion
+    #------------------------------------------------------
+
+    def get_suggested_thread(self, cr, uid, removed_suggested_threads=None, context=None):
+        """Return a list of suggested threads, sorted by the numbers of followers"""
+        if context is None:
+            context = {}
+
+        # TDE HACK: originally by MAT from portal/mail_mail.py but not working until the inheritance graph bug is not solved in trunk
+        # TDE FIXME: relocate in portal when it won't be necessary to reload the hr.employee model in an additional bridge module
+        if self.pool['res.groups']._all_columns.get('is_portal'):
+            user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+            if any(group.is_portal for group in user.groups_id):
+                return []
+
+        threads = []
+        if removed_suggested_threads is None:
+            removed_suggested_threads = []
+
+        thread_ids = self.search(cr, uid, [('id', 'not in', removed_suggested_threads), ('message_is_follower', '=', False)], context=context)
+        for thread in self.browse(cr, uid, thread_ids, context=context):
+            data = {
+                'id': thread.id,
+                'popularity': len(thread.message_follower_ids),
+                'name': thread.name,
+                'image_small': thread.image_small
+            }
+            threads.append(data)
+        return sorted(threads, key=lambda x: (x['popularity'], x['id']), reverse=True)[:3]
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index c9c5141d303..7b5e7f299f6 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -17,7 +17,8 @@
                 ],
                 'view_mailbox': True,
                 'view_inbox': True,
-                'read_action': 'read'
+                'read_action': 'read',
+                'show_compose_message': False
             }&quot;"/>
             <field name="help" type="html">
                 <p>
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 8527e60aba0..8da2441f3bc 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 
@@ -52,21 +53,4 @@ class res_partner_mail(osv.Model):
             self._message_add_suggested_recipient(cr, uid, recipients, partner, partner=partner, reason=_('Partner Profile'))
         return recipients
 
-    def message_post(self, cr, uid, thread_id, **kwargs):
-        """ Override related to res.partner. In case of email message, set it as
-            private:
-            - add the target partner in the message partner_ids
-            - set thread_id as None, because this will trigger the 'private'
-                aspect of the message (model=False, res_id=False)
-        """
-        if isinstance(thread_id, (list, tuple)):
-            thread_id = thread_id[0]
-        if kwargs.get('type') == 'email':
-            partner_ids = kwargs.get('partner_ids', [])
-            if thread_id not in [command[1] for command in partner_ids]:
-                partner_ids.append((4, thread_id))
-            kwargs['partner_ids'] = partner_ids
-            thread_id = False
-        return super(res_partner_mail, self).message_post(cr, uid, thread_id, **kwargs)
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 5545745b235..b9883489ca6 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -28,6 +28,7 @@ class res_users(osv.Model):
         - add a preference about sending emails about notifications
         - make a new user follow itself
         - add a welcome message
+        - add suggestion preference
     """
     _name = 'res.users'
     _inherit = ['res.users']
@@ -37,10 +38,12 @@ class res_users(osv.Model):
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
             help="Email address internally associated with this user. Incoming "\
                  "emails will appear in the user's notifications."),
+        'display_groups_suggestions': fields.boolean("Display Groups Suggestions"),
     }
 
     _defaults = {
         'alias_domain': False,  # always hide alias during creation
+        'display_groups_suggestions': True,
     }
 
     def __init__(self, pool, cr):
@@ -51,10 +54,10 @@ class res_users(osv.Model):
         init_res = super(res_users, self).__init__(pool, cr)
         # duplicate list to avoid modifying the original reference
         self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
-        self.SELF_WRITEABLE_FIELDS.append('notification_email_send')
+        self.SELF_WRITEABLE_FIELDS.extend(['notification_email_send', 'display_groups_suggestions'])
         # duplicate list to avoid modifying the original reference
         self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS)
-        self.SELF_READABLE_FIELDS.extend(['notification_email_send', 'alias_domain', 'alias_name'])
+        self.SELF_READABLE_FIELDS.extend(['notification_email_send', 'alias_domain', 'alias_name', 'display_groups_suggestions'])
         return init_res
 
     def _auto_init(self, cr, context=None):
@@ -109,7 +112,7 @@ class res_users(osv.Model):
     def _message_post_get_pid(self, cr, uid, thread_id, context=None):
         assert thread_id, "res.users does not support posting global messages"
         if context and 'thread_model' in context:
-            context['thread_model'] = 'res.partner'
+            context['thread_model'] = 'res.users'
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id[0]
         return self.browse(cr, SUPERUSER_ID, thread_id).partner_id.id
@@ -118,44 +121,32 @@ class res_users(osv.Model):
         """ Redirect the posting of message on res.users to the related partner.
             This is done because when giving the context of Chatter on the
             various mailboxes, we do not have access to the current partner_id. """
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        partner_ids = kwargs.get('partner_ids', [])
         partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
-        return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs)
+        if partner_id not in [command[1] for command in partner_ids]:
+            partner_ids.append(partner_id)
+        kwargs['partner_ids'] = partner_ids
+        return self.pool.get('mail.thread').message_post(cr, uid, False, **kwargs)
 
     def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
-        for id in ids:
-            partner_id = self.browse(cr, SUPERUSER_ID, id).partner_id.id
-            self.pool.get('res.partner').message_update(cr, uid, [partner_id], msg_dict, update_vals=update_vals, context=context)
         return True
 
     def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
-        for id in ids:
-            partner_id = self.browse(cr, SUPERUSER_ID, id).partner_id.id
-            self.pool.get('res.partner').message_subscribe(cr, uid, [partner_id], partner_ids, subtype_ids=subtype_ids, context=context)
         return True
 
     def message_get_partner_info_from_emails(self, cr, uid, emails, link_mail=False, context=None):
-        return self.pool.get('res.partner').message_get_partner_info_from_emails(cr, uid, emails, link_mail=link_mail, context=context)
+        return self.pool.get('mail.thread').message_get_partner_info_from_emails(cr, uid, emails, link_mail=link_mail, context=context)
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
-        partner_ids = []
-        for id in ids:
-            partner_ids.append(self.browse(cr, SUPERUSER_ID, id).partner_id.id)
-        return self.pool.get('res.partner').message_get_suggested_recipients(cr, uid, partner_ids, context=context)
+        return dict.fromkeys(ids, list())
 
-    #------------------------------------------------------
-    # Compatibility methods: do not use
-    # TDE TODO: remove me in 8.0
-    #------------------------------------------------------
-
-    def message_post_user_api(self, cr, uid, thread_id, context=None, **kwargs):
-        """ Redirect the posting of message on res.users to the related partner.
-            This is done because when giving the context of Chatter on the
-            various mailboxes, we do not have access to the current partner_id. """
-        partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
-        return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, context=context, **kwargs)
-
-    def message_create_partners_from_emails(self, cr, uid, emails, context=None):
-        return self.pool.get('res.partner').message_create_partners_from_emails(cr, uid, emails, context=context)
+    def stop_showing_groups_suggestions(self, cr, uid, user_id, context=None):
+        """Update display_groups_suggestions value to False"""
+        if context is None:
+            context = {}
+        self.write(cr, uid, user_id, {"display_groups_suggestions": False}, context)
 
 
 class res_users_mail_group(osv.Model):
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 1cacadfc898..babe922d975 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -30,6 +30,12 @@
                     <field name="alias_domain" invisible="1"/>
                     <field name="alias_id" readonly="1" required="0" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                 </field>
+                <group string="Email preferences" position="after">
+                    <group name="misc" string="Miscellaneous"
+                            groups="base.group_no_one">
+                        <field name="display_groups_suggestions"/>
+                    </group>
+                </group>
             </data>
             </field>
         </record>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 958c2bccd5f..c969d3f3b16 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -22,7 +22,7 @@
     width: 32px;
     height: 32px;
     padding: 0px;
-    margin: 0px
+    margin: 0px;
     border-radius: 0px;
 }
 
@@ -665,8 +665,72 @@
 .openerp .oe_mail_wall .oe_mail{
     margin: 16px;
     width: 600px;
+    display: inline-block;
 }
 
 .openerp .oe_mail .oe_view_nocontent > p {
     padding-left: 15px;
 }
+
+
+/* ------------- WALL SIDEBAR ------------- */
+
+.openerp .oe_mail_wall .oe_mail_wall_aside {
+    margin: 16px;
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    width: 260px;
+}
+.openerp .oe_mail_wall_aside .oe_sidebar_suggestion {
+    background-color: #EDEDF6;
+    border-radius: 2px;
+    padding-top: 1px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_title h2 {
+    font-size: 14px;
+    font-weight: bold;
+    margin-left: 10px;
+    padding: 0px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item {
+    border-radius: 2px;
+    width: 100%;
+    margin-left: 10px;
+    min-height: 67px;  /* image_small 66x66px */
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image {
+    float: left;
+    padding-right: 10px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image img {
+    border-radius: 2px;
+    border: solid 1px rgba(0,0,0,0.03);
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content button {
+    margin-top: 10px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_item_name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    width: 90%;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_title a.oe_suggestion_remove {
+    line-height: 15px;
+    margin-top: -2px;
+    float: right;
+    visibility: hidden;
+    margin-right: 7px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_remove_item {
+    line-height: 15px;
+    margin-top: -2px;
+    float: right;
+    visibility: hidden;
+    margin-right: 16px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_title:hover a.oe_suggestion_remove,
+.openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item {
+    visibility: visible;
+}
+
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 4f2b8a16dd0..9560a4765d0 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -48,7 +48,6 @@
   text-align: center;
   overflow: hidden;
   -moz-border-radius: 3px;
-  border-collapse: separate;
   -webkit-border-radius: 3px;
   -o-border-radius: 3px;
   -ms-border-radius: 3px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7df6cdbef0d..0bc24ac4264 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -4,8 +4,8 @@ openerp.mail = function (session) {
 
     var mail = session.mail = {};
 
-    openerp_mail_followers(session, mail);        // import mail_followers.js
-    openerp_FieldMany2ManyTagsEmail(session);      // import manyy2many_tags_email.js
+    openerp_mail_followers(session, mail);          // import mail_followers.js
+    openerp_FieldMany2ManyTagsEmail(session);       // import manyy2many_tags_email.js
 
     /**
      * ------------------------------------------------------------
@@ -237,8 +237,15 @@ openerp.mail = function (session) {
 
             this.format_data();
 
+            // update record_name: Partner profile
+            if (this.model == 'res.partner') {
+                this.record_name = 'Partner Profile of ' + this.record_name;
+            }
+            else if (this.model == 'hr.employee') {
+                this.record_name = 'News from ' + this.record_name;
+            }
             // record options and data
-            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level && this.model != 'res.partner';
+            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level;
             this.options.show_read = false;
             this.options.show_unread = false;
             if (this.options.show_read_unread_button) {
@@ -257,6 +264,7 @@ openerp.mail = function (session) {
 
         /* Convert date, timerelative and avatar in displayable data. */
         format_data: function () {
+
             //formating and add some fields for render
             this.date = this.date ? session.web.str_to_datetime(this.date) : false;
             if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
@@ -745,7 +753,7 @@ openerp.mail = function (session) {
                 }
                 // create object and attach to the thread object
                 thread.message_fetch([["id", "=", message_id]], false, [message_id], function (arg, data) {
-                    var message = thread.create_message_object( data[0] );
+                    var message = thread.create_message_object( data.slice(-1)[0] );
                     // insert the message on dom
                     thread.insert_message( message, root ? undefined : self.$el, root );
                 });
@@ -1840,6 +1848,19 @@ openerp.mail = function (session) {
     });
 
 
+    /**
+     * ------------------------------------------------------------
+     * Aside Widget
+     * ------------------------------------------------------------
+     * 
+     * This widget handles the display of a sidebar on the Wall. Its main use
+     * is to display group and employees suggestion (if hr is installed).
+     */
+    mail.WallSidebar = session.web.Widget.extend({
+        template: 'mail.wall.sidebar',
+    });
+
+
     /**
      * ------------------------------------------------------------
      * Wall Widget
@@ -1901,6 +1922,9 @@ openerp.mail = function (session) {
             if (! this.searchview.has_defaults) {
                 this.message_render();
             }
+            // render sidebar
+            var wall_sidebar = new mail.WallSidebar(this);
+            wall_sidebar.appendTo(this.$el.find('.oe_mail_wall_aside'));
         },
 
         /**
@@ -2018,4 +2042,16 @@ openerp.mail = function (session) {
             });
         },
     });
+
+
+    /**
+     * ------------------------------------------------------------
+     * Sub-widgets loading
+     * ------------------------------------------------------------
+     * 
+     * Load here widgets that could depend on widgets defined in mail.js
+     */
+
+    openerp.mail.suggestions(session, mail);        // import suggestion.js (suggestion widget)
+
 };
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
new file mode 100644
index 00000000000..4d0fcec32bf
--- /dev/null
+++ b/addons/mail/static/src/js/suggestions.js
@@ -0,0 +1,77 @@
+openerp.mail.suggestions = function(session, mail) {
+    var _t = session.web._t;
+    var QWeb = session.web.qweb;
+
+    var suggestions = session.suggestions = {};
+    var removed_suggested_group = session.suggestions.removed_suggested_group = [];
+
+    suggestions.Groups = session.web.Widget.extend({
+        events: {
+            'click .oe_suggestion_remove.oe_suggestion_group': 'stop_group_suggestion',
+            'click .oe_suggestion_remove_item.oe_suggestion_group': 'remove_group_suggestion',
+            'click .oe_suggestion_join': 'join_group',
+        },
+
+        init: function () {
+            this._super.apply(this, arguments);
+            this.mail_group = new session.web.DataSetSearch(this, 'mail.group');
+            this.res_users = new session.web.DataSetSearch(this, 'res.users');
+            this.groups = [];
+        },
+
+        start: function () {
+            this._super.apply(this, arguments);
+            return this.fetch_suggested_groups();
+        },
+
+        fetch_suggested_groups: function () {
+            var self = this;
+            var group = self.mail_group.call('get_suggested_thread', {'removed_suggested_threads': removed_suggested_group}).then(function (res) {
+                _(res).each(function (result) {
+                    result['image']=self.session.url('/web/binary/image', {model: 'mail.group', field: 'image_small', id: result.id});
+                });
+                self.groups = res;
+            });
+            return $.when(group).then(this.proxy('display_suggested_groups'));
+        },
+
+        display_suggested_groups: function () {
+            var suggested_groups = this.$('.oe_sidebar_suggestion.oe_suggestion_group');
+            if (suggested_groups) {
+                suggested_groups.empty();
+            }
+            if (this.groups.length === 0) {
+                return this.$el.empty();
+            }
+            return this.$el.empty().html(QWeb.render('mail.suggestions.groups', {'widget': this}));
+        },
+
+        join_group: function (event) {
+            var self = this;
+            return this.mail_group.call('message_subscribe_users', [[$(event.currentTarget).attr('id')],[this.session.uid]]).then(function(res) {
+                self.fetch_suggested_groups();
+            });
+        },
+
+        remove_group_suggestion: function (event) {
+            removed_suggested_group.push($(event.currentTarget).attr('id'));
+            return this.fetch_suggested_groups();
+        },
+
+        stop_group_suggestion: function (event) {
+            var self = this;
+            return this.res_users.call('stop_showing_groups_suggestions', [this.session.uid]).then(function(res) {
+                self.$(".oe_sidebar_suggestion.oe_suggestion_group").hide();
+            });
+        }
+    });
+
+    session.mail.WallSidebar.include({
+        start: function () {
+            this._super.apply(this, arguments);
+            var sug_groups = new suggestions.Groups(this);
+            return sug_groups.appendTo(this.$('.oe_suggestions_groups'));
+        },
+    });
+
+};
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f5004941a8d..5062491ecbb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -121,9 +121,11 @@
             To:
             <t t-if="!widget.is_private">
                 <span class="oe_all_follower">
-                    Followers of
-                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
-                    <t t-if="!widget.parent_thread.parent_message.record_name">this document</t>
+                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'">
+                        Followers of <t t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
+                    </t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and widget.options.view_inbox">My Followers</t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
@@ -197,8 +199,16 @@
           </tbody>
         </table>
         <div class="oe_mail-placeholder"></div>
+        <aside class="oe_mail_wall_aside"></aside>
     </div>
 
+    <!--
+        Empty template that holds the sidebar of the Wall
+        -->
+    <t t-name="mail.wall.sidebar">
+        <div class="oe_mail_wall_sidebar"></div>
+    </t>
+
     <!--
         display message on the wall when there are no message
         -->
@@ -339,7 +349,4 @@
         </a>
     </span>
 
-    <!-- mail.thread.message.star
-        Template used to display stared/unstared message in a mail.message
-    -->
 </template>
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
new file mode 100644
index 00000000000..9157dcbe32e
--- /dev/null
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+
+    <!-- Groups placeholder in sidebar -->
+    <t t-extend="mail.wall.sidebar">
+        <t t-jquery=".oe_mail_wall_sidebar" t-operation="append">
+            <div class="oe_suggestions_groups"></div>
+        </t>
+    </t>
+
+
+    <!-- Suggested groups -->
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_suggestion_group">
+        <div class="oe_suggest_title">
+            <a class="oe_suggestion_remove oe_suggestion_group oe_e">X</a>
+            <h2>Suggested Groups</h2>
+        </div>
+        <div class="oe_suggest_items">
+            <t t-foreach="widget.groups" t-as="result">
+                <div class="oe_suggested_item">
+                    <div class="oe_suggested_item_image">
+                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <img t-attf-src="{result.image}" t-attf-alt="{result.name}"/>
+                        </a>
+                    </div>
+                    <div class="oe_suggested_item_content">
+                        <a class="oe_suggestion_item_name" t-attf-href="#model=mail.group&amp;id=#{result.id}"><t t-esc="result.name"/></a>
+                        <a class="oe_suggestion_remove_item oe_suggestion_group oe_e" t-attf-id="{result.id}">X</a>
+                        <br/>
+                        <button t-att-id="result.id" class="oe_suggestion_join">Join Group</button>
+                    </div>
+                </div>
+            </t>
+        </div>
+    </div>
+
+
+</template>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2af1e876c70..992ff4be602 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -440,7 +440,7 @@
             <field name="model">mrp.bom</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree string="Bill of Materials" colors="blue:method">
+                <tree string="Bill of Materials">
                     <field name="sequence" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="product_id"/>
@@ -448,7 +448,6 @@
                     <field name="product_uom" groups="product.group_uom"/>
                     <field name="code"/>
                     <field name="type"/>
-                    <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
@@ -460,19 +459,18 @@
             <field name="model">mrp.bom</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree string="BoM Structure" colors="blue:method">
+                <tree string="BoM Structure">
                     <field name="sequence" invisible="1"/>
                     <field name="name" groups="base.group_no_one"/>
                     <field name="code"/>
                     <field name="product_id"/>
-                    <field name="bom_id"/>
+                    <field name="bom_id" groups="product.group_mrp_properties"/>
                     <field name="product_qty"/>
                     <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
-                    <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
+                    <field name="date_start" groups="product.group_mrp_properties"/>
+                    <field name="date_stop" groups="product.group_mrp_properties"/>
                 </tree>
             </field>
         </record>
@@ -545,6 +543,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="domain">[('bom_id', '=',active_ids)]</field>
+            <field name="view_type">tree</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 49362e380f4..91d78722d14 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -5,7 +5,7 @@
     Resource: product.uom.categ
     -->
         <record id="product_category_all" model="product.category">
-            <field name="name">All products</field>
+            <field name="name">All</field>
         </record>
         <record id="product_category_1" model="product.category">
             <field name="parent_id" ref="product_category_all"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b87fb6dc12a..d0931e4bbc6 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -186,7 +186,7 @@ class purchase_order(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse'),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
-        'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency",readonly=True, required=True),
+        'currency_id': fields.many2one('res.currency','Currency', readonly=True, required=True,states={'draft': [('readonly', False)],'sent': [('readonly', False)]}),
         'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
@@ -237,6 +237,7 @@ class purchase_order(osv.osv):
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
         'journal_id': _get_journal,
+        'currency_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
     }
     _sql_constraints = [
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
@@ -544,7 +545,7 @@ class purchase_order(osv.osv):
                 'account_id': pay_acc_id,
                 'type': 'in_invoice',
                 'partner_id': order.partner_id.id,
-                'currency_id': order.pricelist_id.currency_id.id,
+                'currency_id': order.currency_id.id,
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
                 'invoice_line': [(6, 0, inv_lines)],
                 'origin': order.name,
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4432d2b3200..91fb2525be6 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -191,7 +191,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" domain="[('supplier','=',True)]"/>
                             <field name="partner_ref"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist" on_change="onchange_pricelist(pricelist_id, context)"/>
-                            <field name="currency_id" invisible='1'/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                             <field name="journal_id" invisible='1'/>
                         </group>
                         <group>
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index e64c12a2359..be4169c4624 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -70,7 +70,7 @@ class stock_picking(osv.osv):
 
     def get_currency_id(self, cursor, user, picking):
         if picking.purchase_id:
-            return picking.purchase_id.pricelist_id.currency_id.id
+            return picking.purchase_id.currency_id.id
         else:
             return super(stock_picking, self).get_currency_id(cursor, user, picking)
 
@@ -129,7 +129,7 @@ class stock_partial_picking(osv.osv_memory):
     def _product_cost_for_average_update(self, cr, uid, move):
         if move.picking_id.purchase_id:
             return {'cost': move.purchase_line_id.price_unit,
-                    'currency': move.picking_id.purchase_id.pricelist_id.currency_id.id}
+                    'currency': move.picking_id.purchase_id.currency_id.id}
         return super(stock_partial_picking, self)._product_cost_for_average_update(cr, uid, move)
 
 # Redefinition of the new field in order to update the model stock.picking.in in the orm
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index f97d82a8456..b8ee4b69a32 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -83,7 +83,7 @@ class purchase_line_invoice(osv.osv_memory):
                     'account_id': a,
                     'partner_id': partner.id,
                     'invoice_line': [(6,0,lines_ids)],
-                    'currency_id' : orders[0].pricelist_id.currency_id.id,
+                    'currency_id' : orders[0].currency_id.id,
                     'comment': multiple_order_invoice_notes(orders),
                     'payment_term': orders[0].payment_term_id.id,
                     'fiscal_position': partner.property_account_position.id
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f34137f8231..d304c45b9e0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -697,7 +697,7 @@ class sale_order_line(osv.osv):
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.text('Description', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
-        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True, readonly=True, states={'draft': [('readonly', False)]}),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.function(_fnct_line_invoiced, string='Invoiced', type='boolean',
             store={
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 4cb00245ade..c3f1d6cade4 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -31,7 +31,7 @@ class sale_advance_payment_inv(osv.osv_memory):
             [('all', 'Invoice the whole sales order'), ('percentage','Percentage'), ('fixed','Fixed price (deposit)'),
                 ('lines', 'Some order lines')],
             'What do you want to invoice?', required=True,
-            help="""Use All to create the final invoice.
+            help="""Use Invoice the whole sale order to create the final invoice.
                 Use Percentage to invoice a percentage of the total amount.
                 Use Fixed Price to invoice a specific amound in advance.
                 Use Some Order Lines to invoice a selection of the sales order lines."""),
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index cb50eb955bb..4f2adb85743 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -11,15 +11,15 @@
             <field name="model">survey.browse.answer</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
-                    <header>
-                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 40056234fe8..b539b844654 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.print</field>
             <field name="arch" type="xml">
                 <form string="Survey Print" version="7.0">
-                    <header>
-                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Survey" colspan="4"/>
                         <field name="survey_ids" nolabel="1" colspan="4" />
@@ -23,6 +18,11 @@
                         <field name="page_number" colspan="4"/>
                         <field name="without_pagebreak" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index c2363695292..f3c8d01a62c 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.print.answer</field>
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
-                    <header>
-                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>
                         <field name="response_ids" nolabel="1" colspan="4" />
@@ -23,6 +18,11 @@
                         <field name="page_number" colspan="4"/>
                         <field name="without_pagebreak" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 97d976b98f6..6d63cf8b9bf 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -9,12 +9,12 @@
             <field name="model">survey.print.statistics</field>
             <field name="arch" type="xml">
                 <form string="Survey Print Statistics" version="7.0">
-                    <header>
+                    <field name="survey_ids"/>
+                    <footer>
                         <button name="action_next" string="Print" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <field name="survey_ids"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index de1231b53fb..56f5f5cda33 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -10,15 +10,15 @@
             <field name="model">survey.name.wiz</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
-                    <header>
-                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
                     <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                    <footer>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index a611973d772..fb3d7edf856 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.send.invitation</field>
             <field name="arch" type="xml">
                 <form string="Send Invitation" version="7.0">
-                    <header>
-                        <button name="action_send" string="_Send" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Select Partner" colspan="4"/>
                         <field name="partner_ids" nolabel="1" colspan="4" widget="many2many_tags"/>
@@ -28,6 +23,11 @@
                         <separator string="Message" colspan="4"/>
                         <field name="mail" nolabel="1" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_send" string="_Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>