Merge remote-tracking branch 'origin/8.0' into 9.0

mail_move_message_models.py

@@ -57,6 +57,7 @@ class wizard(models.TransientModel):
     message_id = fields.Many2one('mail.message', string='Message')
     message_body = fields.Html(related='message_id.body', string='Message to move', readonly=True)
     message_from = fields.Char(related='message_id.email_from', string='From', readonly=True)
+    message_subject = fields.Char(related='message_id.subject', string='Subject', readonly=True)
     message_moved_by_message_id = fields.Many2one('mail.message', related='message_id.moved_by_message_id', string='Moved with', readonly=True)
     message_moved_by_user_id = fields.Many2one('res.users', related='message_id.moved_by_user_id', string='Moved by', readonly=True)
     message_is_moved = fields.Boolean(string='Is Moved', related='message_id.is_moved', readonly=True)

mail_move_message_views.xml

@@ -53,6 +53,7 @@
             <button string="Close" class="" special="cancel" />
             <separator string="Message"/>
             <group>
+                <field name="message_subject"/>
                 <field name="message_from"/>
                 <field name="message_id" invisible="1"/>
             </group>

static/description/index.html

@@ -103,11 +103,23 @@
             <div class="oe_demo oe_picture oe_screenshot">
                 <img src="html-message.png?1"/>
             </div>
-            <p class="oe_mt32">
+           	<p class="oe_mt32">
                 Check message and then close window.
             </p>
+            <div class="oe_demo oe_picture oe_screenshot">
+                <img src="html-message-viewer1.png"/>
+            </div>
+			 <p class="oe_mt32">
+                Also, you can mark as read and close
+            </p>
             <div class="oe_demo oe_picture oe_screenshot">
                 <img src="html-message-viewer.png?2"/>
+            </div>
+			<p class="oe_mt32">
+                In addition, the module can be used to delete a message (it's available for superuser only)
+            </p>
+            <div class="oe_demo oe_picture oe_screenshot">
+                <img src="delete-message.png"/>
             </div>
         </div>
     </div>