[MERGE] forward port branch saas-18 up to d15a31ae6d9

8 files changed, 18 insertions, 13 deletions

diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index 716f1ceed70..a2ae24dff91 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -13,7 +13,7 @@ var _t = core._t;
 
 /**
  * Set the 'label_delay' entry in activity data according to the deadline date
- * @param {Array} list of activity Object
+ * @param {Array} activities list of activity Object
  * @return {Array} : list of modified activity Object
  */
 var setDelayLabel = function(activities){
diff --git a/addons/mail/static/src/js/chatter_composer.js b/addons/mail/static/src/js/chatter_composer.js
index 77c8834252f..908dfd8b1c5 100644
--- a/addons/mail/static/src/js/chatter_composer.js
+++ b/addons/mail/static/src/js/chatter_composer.js
@@ -89,7 +89,7 @@ var ChatterComposer = composer.BasicComposer.extend({
 
     /**
      * Get the list of selected suggested partners
-     * @returns Array() : list of 'recipient' selected partners (may not be created in db)
+     * @returns {Array} list of 'recipient' selected partners (may not be created in db)
      **/
     get_checked_suggested_partners: function () {
         var self = this;
@@ -106,8 +106,8 @@ var ChatterComposer = composer.BasicComposer.extend({
     /**
      * Check the additional partners (not necessary registered partners), and open a popup form view
      * for the ones who informations is missing.
-     * @param Array : list of 'recipient' partners to complete informations or validate
-     * @returns Deferred resolved with the list of checked suggested partners (real partner)
+     * @param {Array} checked_suggested_partners list of 'recipient' partners to complete informations or validate
+     * @returns {Deferred} resolved with the list of checked suggested partners (real partner)
      **/
     check_suggested_partners: function (checked_suggested_partners) {
         var self = this;
diff --git a/addons/mail/static/src/js/document_viewer.js b/addons/mail/static/src/js/document_viewer.js
index b3ea0e18bfc..2fa34b613ba 100644
--- a/addons/mail/static/src/js/document_viewer.js
+++ b/addons/mail/static/src/js/document_viewer.js
@@ -34,7 +34,7 @@ var DocumentViewer = Widget.extend({
      * Documents that are not of type image or video are filtered out.
      *
      * @override
-     * @param {Array[Object]} attachments list of attachments
+     * @param {Array<Object>} attachments list of attachments
      * @param {integer} activeAttachmentID
      */
     init: function (parent, attachments, activeAttachmentID) {
diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js
index c566d2a4706..96688a06dbc 100644
--- a/addons/mail/static/src/js/many2many_tags_email.js
+++ b/addons/mail/static/src/js/many2many_tags_email.js
@@ -80,6 +80,7 @@ var FieldMany2ManyTagsEmail = M2MTags.extend({
             var pop = new form_common.FormViewDialog(self, {
                 res_model: self.field.relation,
                 res_id: resID,
+                context: self.record.context,
                 title: _t("Please complete partner's informations and Email"),
                 on_saved: function (record) {
                     if (record.data.email) {
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js
index 80d4c4c8a4c..ec5ffdda1a9 100644
--- a/addons/mail/static/src/js/thread.js
+++ b/addons/mail/static/src/js/thread.js
@@ -130,11 +130,11 @@ var Thread = Widget.extend({
     },
 
     /**
-     *  Modifies $element to add the 'read more/read less' functionality
-     *  All element nodes with "data-o-mail-quote" attribute are concerned.
-     *  All text nodes after a ""#stopSpelling" element are concerned.
-     *  Those text nodes need to be wrapped in a span (toggle functionality).
-     *  All consecutive elements are joined in one 'read more/read less'.
+     * Modifies $element to add the 'read more/read less' functionality
+     * All element nodes with "data-o-mail-quote" attribute are concerned.
+     * All text nodes after a ``#stopSpelling`` element are concerned.
+     * Those text nodes need to be wrapped in a span (toggle functionality).
+     * All consecutive elements are joined in one 'read more/read less'.
      */
     insert_read_more: function ($element) {
         var self = this;
diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less
index 03bb984599a..f18643dde41 100644
--- a/addons/mail/static/src/less/thread.less
+++ b/addons/mail/static/src/less/thread.less
@@ -104,6 +104,10 @@
             max-width: 100%;
             word-wrap: break-word;
 
+            &.o_mail_note {
+                background-color: @odoo-color-silver-dark;
+            }
+
             .o_mail_subject {
                 font-style: italic;
             }
diff --git a/addons/mail/static/src/xml/chat_window.xml b/addons/mail/static/src/xml/chat_window.xml
index 525898dabd8..f21fe09991b 100644
--- a/addons/mail/static/src/xml/chat_window.xml
+++ b/addons/mail/static/src/xml/chat_window.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="mail.ChatWindow">
-        <div class="o_chat_window">
+        <div class="o_chat_window o_in_appswitcher">
             <div class="o_chat_header">
                 <t t-call="mail.ChatWindowHeaderContent">
                     <t t-set="status" t-value="widget.status"/>
@@ -19,7 +19,7 @@
     </t>
 
     <t t-name="mail.ChatWindowsDropdown">
-        <div t-attf-class="o_chat_window o_chat_window_dropdown dropup #{open ? 'open' : ''}">
+        <div t-attf-class="o_chat_window o_in_appswitcher o_chat_window_dropdown dropup #{open ? 'open' : ''}">
             <span class="o_chat_window_dropdown_toggler dropdown-toggle" data-toggle="dropdown">
                 <i class="fa fa-comments-o"/> <t t-esc="sessions.length"/>
                 <span class="o_total_unread_counter">
diff --git a/addons/mail/static/src/xml/chatter.xml b/addons/mail/static/src/xml/chatter.xml
index ef8bf100419..1d268471af2 100644
--- a/addons/mail/static/src/xml/chatter.xml
+++ b/addons/mail/static/src/xml/chatter.xml
@@ -53,7 +53,7 @@
         <button t-if="log_note_btn" class="btn btn-sm btn-link o_chatter_button_log_note" title="Log a note. Followers will not be notified.">
             Log note
         </button>
-        <button t-if="schedule_activity_btn" class="btn btn-sm btn-link o_chatter_button_schedule_activity" title="Lor or schedule an activity">
+        <button t-if="schedule_activity_btn" class="btn btn-sm btn-link o_chatter_button_schedule_activity" title="Log or schedule an activity">
             <i class="fa fa-clock-o"/> Schedule activity
         </button>
     </t>