diff --git a/mail_archives/__openerp__.py b/mail_archives/__openerp__.py index 737e949..761bb6b 100644 --- a/mail_archives/__openerp__.py +++ b/mail_archives/__openerp__.py @@ -13,7 +13,7 @@ 'currency': 'EUR', "depends": [ - "mail_sent", + "mail_base", ], "data": [ diff --git a/mail_archives/static/src/js/archives.js b/mail_archives/static/src/js/archives.js index 436e55e..3640a2c 100644 --- a/mail_archives/static/src/js/archives.js +++ b/mail_archives/static/src/js/archives.js @@ -42,10 +42,7 @@ base_obj.MailTools.include({ } // If author or recipient - if ( - (data.sent && data.author_id[0] == session.partner_id) - || (recipients_ids.indexOf(session.partner_id) != -1) - ) { + if (data.author_id[0] == session.partner_id || recipients_ids.indexOf(session.partner_id) != -1) { msg.is_archive = true; } @@ -60,7 +57,6 @@ base_obj.MailTools.include({ get_domain: function(channel){ return (channel.id === "channel_archive") ? [ '|', ['partner_ids', 'in', [openerp.session.partner_id]], - '&', ['sent', '=', true], ['author_id.user_ids', 'in', [openerp.session.uid]] ] : this._super.apply(this, arguments); }