Merge PR #2790 into 16.0

Signed-off-by pedrobaeza

attachment_queue/models/attachment_queue.py

@@ -20,7 +20,7 @@ class AttachmentQueue(models.Model):
     _name = "attachment.queue"
     _description = "Attachment Queue"
     _inherits = {"ir.attachment": "attachment_id"}
-    _inherit = ["mail.thread"]
+    _inherit = ["mail.thread", "mail.activity.mixin"]
 
     attachment_id = fields.Many2one(
         "ir.attachment",

attachment_queue/views/attachment_queue_view.xml

@@ -40,6 +40,11 @@
                     <field name="state_message" nolabel="1" />
                 </group>
             </group>
+            <xpath expr="//sheet" position="after">
+                <div class="oe_chatter">
+                    <field name="activity_ids" widget="mail_activity" />
+                </div>
+            </xpath>
         </field>
     </record>