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/description/index.html b/mail_archives/static/description/index.html index 77abc4e..50900fa 100644 --- a/mail_archives/static/description/index.html +++ b/mail_archives/static/description/index.html @@ -21,7 +21,7 @@

-This menu shows all messages. +This menu shows archive messages, i.e. ones you sent or received.

diff --git a/mail_archives/static/src/js/archives.js b/mail_archives/static/src/js/archives.js index 436e55e..a494961 100644 --- a/mail_archives/static/src/js/archives.js +++ b/mail_archives/static/src/js/archives.js @@ -18,10 +18,11 @@ var _lt = core._lt; var ChatAction = core.action_registry.get('mail.chat.instant_messaging'); ChatAction.include({ - get_thread_rendering_options: function (messages) { - var options = this._super.apply(this, arguments); - options.display_subject = options.display_subject || this.channel.id === "channel_archive"; - return options; + init: function(parent, action, options) { + this._super.apply(this, arguments); + var channel_name = 'channel_archive'; + // Add channel Archive for enable "display_subject" option + this.channels_display_subject.push(channel_name); } }); @@ -42,10 +43,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 +58,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); } diff --git a/mail_base/__openerp__.py b/mail_base/__openerp__.py index 3ddb6d3..b9c9b6d 100644 --- a/mail_base/__openerp__.py +++ b/mail_base/__openerp__.py @@ -9,6 +9,8 @@ "author": "IT-Projects LLC, Pavel Romanchenko", "website": "https://it-projects.info", "license": "LGPL-3", + 'price': 9.00, + 'currency': 'EUR', "depends": [ "base", diff --git a/mail_base/static/src/js/base.js b/mail_base/static/src/js/base.js index 12f1111..332fe34 100644 --- a/mail_base/static/src/js/base.js +++ b/mail_base/static/src/js/base.js @@ -65,7 +65,8 @@ var ChatAction = core.action_registry.get('mail.chat.instant_messaging'); ChatAction.include({ init: function(parent, action, options) { this._super.apply(this, arguments); - this.show_send_message_button = ['channel_inbox']; + this.channels_show_send_button = ['channel_inbox']; + this.channels_display_subject = []; }, start: function() { var result = this._super.apply(this, arguments); @@ -104,8 +105,13 @@ ChatAction.include({ return $.when(result).done(function() { self.$buttons .find('.o_mail_chat_button_new_message') - .toggle(self.show_send_message_button.indexOf(channel.id) != -1); + .toggle(self.channels_show_send_button.indexOf(channel.id) != -1); }); + }, + get_thread_rendering_options: function (messages) { + var options = this._super.apply(this, arguments); + options.display_subject = options.display_subject || this.channels_display_subject.indexOf(this.channel.id) != -1; + return options; } }); diff --git a/mail_fix_553/README.rst b/mail_fix_553/README.rst index bfb1799..a1cc034 100644 --- a/mail_fix_553/README.rst +++ b/mail_fix_553/README.rst @@ -19,6 +19,8 @@ Configuration You can configure default alias at Settings -> System Parameters -> mail.catchall.alias_from +You can configure name for default alias at Settings -> System Parameters -> mail.catchall.name_alias_from + Known issues / Roadmap ====================== diff --git a/mail_fix_553/data.xml b/mail_fix_553/data.xml index 411d614..e9dc78d 100644 --- a/mail_fix_553/data.xml +++ b/mail_fix_553/data.xml @@ -6,5 +6,10 @@ mail.catchall.alias_from portal + + + mail.catchall.name_alias_from + Odoo + diff --git a/mail_fix_553/mail_fix_553.py b/mail_fix_553/mail_fix_553.py index 167435a..70af917 100644 --- a/mail_fix_553/mail_fix_553.py +++ b/mail_fix_553/mail_fix_553.py @@ -38,6 +38,7 @@ class mail_mail(osv.Model): # NEW STUFF catchall_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.alias_from", context=context) + catchall_alias_name = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.name_alias_from", context=context) catchall_domain = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.domain", context=context) correct_email_from = '@%s>?\s*$'%catchall_domain @@ -101,6 +102,8 @@ class mail_mail(osv.Model): email_from = mail.email_from if re.search(correct_email_from, email_from) is None: email_from = default_email_from + if catchall_alias_name: + email_from = formataddr((catchall_alias_name, email_from)) msg = ir_mail_server.build_email( email_from=email_from, # NEW STUFF diff --git a/mail_sent/__openerp__.py b/mail_sent/__openerp__.py index 2390dc7..7e3895b 100644 --- a/mail_sent/__openerp__.py +++ b/mail_sent/__openerp__.py @@ -9,7 +9,7 @@ "author": "IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko", "website": "https://it-projects.info", "license": "LGPL-3", - 'price': 9.00, + 'price': 40.00, 'currency': 'EUR', "depends": [ diff --git a/mail_sent/static/src/js/sent.js b/mail_sent/static/src/js/sent.js index b5490ea..1a3c298 100644 --- a/mail_sent/static/src/js/sent.js +++ b/mail_sent/static/src/js/sent.js @@ -20,13 +20,11 @@ var ChatAction = core.action_registry.get('mail.chat.instant_messaging'); ChatAction.include({ init: function(parent, action, options) { this._super.apply(this, arguments); + var channel_name = 'channel_sent'; // Add channel Sent for show "Send message" button - this.show_send_message_button.push('channel_sent'); - }, - get_thread_rendering_options: function (messages) { - var options = this._super.apply(this, arguments); - options.display_subject = options.display_subject || this.channel.id === "channel_sent"; - return options; + this.channels_show_send_button.push(channel_name); + // Add channel Sent for enable "display_subject" option + this.channels_display_subject.push(channel_name); } }); diff --git a/mail_to/__openerp__.py b/mail_to/__openerp__.py index 664adc5..37f15d0 100644 --- a/mail_to/__openerp__.py +++ b/mail_to/__openerp__.py @@ -9,8 +9,8 @@ "author": "IT-Projects LLC, Pavel Romanchenko", "website": "https://it-projects.info", "license": "LGPL-3", - #"price": 9.00, - #"currency": "EUR", + "price": 40.00, + "currency": "EUR", "depends": [ 'mail_base', diff --git a/res_partner_mails_count/static/src/js/res_partner_mails_count_tour.js b/res_partner_mails_count/static/src/js/res_partner_mails_count_tour.js index 63ae3b1..9eabf7c 100644 --- a/res_partner_mails_count/static/src/js/res_partner_mails_count_tour.js +++ b/res_partner_mails_count/static/src/js/res_partner_mails_count_tour.js @@ -8,7 +8,7 @@ odoo.define('res_partner_mails_count.res_partner_mails_count_tour', function (re id: 'mails_count_tour', name: _t("Mails count Tour"), mode: 'test', - path: '/web?&res_partner_mails_count=tutorial#id=3&view_type=form&model=res.partner', + path: '/web?res_partner_mails_count=tutorial#id=3&view_type=form&model=res.partner', steps: [ { title: _t("Mails count tutorial"),