Merge remote-tracking branch 'upstream/9.0' into 10.0-merge-b4a3ad2

mail_attachment_popup/static/src/xml/mail_attachment_popup.xml

@@ -2,7 +2,7 @@
 <template>
     <t t-extend="mail.Attachment">
         <t t-jquery="div[t-att-title='attachment.name'] .o_image" t-operation="replace">
-            <t t-if="attachment.mimetype == 'image/png'">
+            <t t-if="attachment.mimetype and attachment.mimetype.search('image/') !== -1">
                 <span class="m-dotted" t-attf-onclick="$('#ImageModal{{ attachment.id }}').arcticmodal()">
                     <div class="o_image" target="_blank" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80">
                         <span class='o_attachment_name'><t t-esc='attachment.name'/></span>
@@ -19,7 +19,7 @@
                     </div>
                 </div>
             </t>
-            <t t-if="attachment.mimetype != 'image/png'">
+            <t t-if="! (attachment.mimetype and attachment.mimetype.search('image/') !== -1)">
                 <a class="o_image" t-att-href='attachment.url' target="_blank" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80">
                     <span class='o_attachment_name'><t t-esc='attachment.name'/></span>
                 </a>