From ca9a5934a8f96751e8a1201e583ef2d5a731045a Mon Sep 17 00:00:00 2001 From: ilyasProgrammer Date: Tue, 26 Apr 2016 19:55:13 +0500 Subject: [PATCH 01/16] [FIX] incorrect title --- .../static/src/js/res_partner_mails_count_tour.js | 4 ++-- res_partner_mails_count/templates.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) 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 b64e84b..7057c74 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 @@ -25,8 +25,8 @@ waitNot: '.mails_to:visible', title: _t("Send message from here"), placement: 'left', - content: _t("Now you can see corresponding mails. You can send mail to this partner right from here. Press 'Send a mesage'."), - element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', + content: "Now you can see corresponding mails. You can send mail to this partner right from here. Press 'Send a mesage'.", + element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact', }, { title: "New message", diff --git a/res_partner_mails_count/templates.xml b/res_partner_mails_count/templates.xml index 0541d56..1ed7e5c 100644 --- a/res_partner_mails_count/templates.xml +++ b/res_partner_mails_count/templates.xml @@ -48,13 +48,14 @@ res_partner_mails_count Tutorial - + self open 200 + automatic From 0f7572a159547f85f237cd34f0acde79a788323a Mon Sep 17 00:00:00 2001 From: ilyasProgrammer Date: Wed, 27 Apr 2016 11:35:50 +0500 Subject: [PATCH 02/16] [IMP] tour steps --- .../src/js/res_partner_mails_count_tour.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) 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 7057c74..eb1f202 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 @@ -29,16 +29,12 @@ element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact', }, { - title: "New message", - placement: 'left', - content: _t("You can type message here."), - element: 'div.oe_msg_content>textarea.field_text', - }, - { - wait: '7000', - title: "That's it", - content: _t("Enjoy your day!

IT-Projects LLC team "), - popover: { next: _t("Close Tutorial") }, + title: _t("Done"), + placement: 'top', + waitNot: '.mails_to:visible', + element: 'div.oe_msg_content>textarea.field_text', + content: _t("Message are found.
Enjoy your day!

IT-Projects LLC team "), + popover: {next: _t("Close Tutorial")}, }, ] }); From ce8ad6fe19bc69ea19751d0493eccf11ce6a68e9 Mon Sep 17 00:00:00 2001 From: ilyasProgrammer Date: Wed, 27 Apr 2016 12:04:21 +0500 Subject: [PATCH 03/16] [FIX[ lame space --- .../static/src/js/res_partner_mails_count_tour.js | 1 - 1 file changed, 1 deletion(-) 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 d2c264d..1ec9cfd 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 @@ -19,7 +19,6 @@ title: _t("New fields"), content: _t("Here is new fields with mails counters. Press one of it."), element: '.mails_to', - }, { waitNot: '.mails_to:visible', From 48d8252e56bd237be419ea25fb8fa49e6453fee9 Mon Sep 17 00:00:00 2001 From: ilyasProgrammer Date: Wed, 27 Apr 2016 12:58:13 +0500 Subject: [PATCH 04/16] [FIX] tour element --- .../static/src/js/res_partner_mails_count_tour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1ec9cfd..f63bd99 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 @@ -25,7 +25,7 @@ title: _t("Check messages or send new one"), placement: 'left', content: _t("Click 'Send a mesage' to continue the Tour"), - element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', + element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact', }, { title: _t("Done"), From cf98ad68dfff9f25190626617e175239a787e2e1 Mon Sep 17 00:00:00 2001 From: ilyasProgrammer Date: Wed, 27 Apr 2016 17:16:29 +0500 Subject: [PATCH 05/16] [IMP] comment, readme --- .../static/src/js/res_partner_mails_count_tour.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 f63bd99..fa65515 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,6 @@ name: _t("Mails count Tour"), mode: 'test', path: '/web?res_partner_mails_count=tutorial#id=3&view_type=form&model=res.partner', - // mode: 'tutorial', steps: [ { title: _t("Mails count tutorial"), @@ -25,8 +24,12 @@ title: _t("Check messages or send new one"), placement: 'left', content: _t("Click 'Send a mesage' to continue the Tour"), - element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact', + // element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact', + element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', }, + // { + // element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', + // }, { title: _t("Done"), placement: 'top', From f453d193a1659b25fc7cb8bf43045f4e1753e8e1 Mon Sep 17 00:00:00 2001 From: Denis Baranov Date: Thu, 28 Apr 2016 19:46:41 +0300 Subject: [PATCH 06/16] mail_fix_553: add name in from alias email --- mail_fix_553/README.rst | 1 + mail_fix_553/data.xml | 5 +++++ mail_fix_553/mail_fix_553.py | 3 +++ 3 files changed, 9 insertions(+) diff --git a/mail_fix_553/README.rst b/mail_fix_553/README.rst index bfb1799..f8a430f 100644 --- a/mail_fix_553/README.rst +++ b/mail_fix_553/README.rst @@ -18,6 +18,7 @@ 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 From 4cf02bf282820e27ff263e09946d45fd0e6fc17e Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Fri, 29 Apr 2016 12:57:32 +0500 Subject: [PATCH 07/16] [DOC] fix format --- mail_fix_553/README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/mail_fix_553/README.rst b/mail_fix_553/README.rst index f8a430f..a1cc034 100644 --- a/mail_fix_553/README.rst +++ b/mail_fix_553/README.rst @@ -18,6 +18,7 @@ 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 From 75700dd86ddb33eecdce8fbf1a7b3f60b069b0f0 Mon Sep 17 00:00:00 2001 From: ilyasProgrammer Date: Wed, 4 May 2016 12:12:39 +0500 Subject: [PATCH 08/16] [IMP] remove comments --- .../static/src/js/res_partner_mails_count_tour.js | 4 ---- 1 file changed, 4 deletions(-) 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 fa65515..2f061fa 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 @@ -24,12 +24,8 @@ title: _t("Check messages or send new one"), placement: 'left', content: _t("Click 'Send a mesage' to continue the Tour"), - // element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact', element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', }, - // { - // element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', - // }, { title: _t("Done"), placement: 'top', From 4004e007c1c8236b8b96f67a4298a3a55b9e57c8 Mon Sep 17 00:00:00 2001 From: x620 Date: Fri, 6 May 2016 13:54:08 +0500 Subject: [PATCH 09/16] [FIX] remove depends on the mail_sent --- mail_archives/__openerp__.py | 2 +- mail_archives/static/src/js/archives.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) 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); } From 723b3cd6e6f68796873c4285a35ee0ec527316c2 Mon Sep 17 00:00:00 2001 From: x620 Date: Fri, 6 May 2016 17:33:45 +0500 Subject: [PATCH 10/16] [REF] Create channels_display_subject array which will contain channels name for subject display. get_thread_rendering_options() method moved in base.js. In new modules append channel name to channels_display_subject variable for enable subject display. --- mail_archives/static/src/js/archives.js | 9 +++++---- mail_base/static/src/js/base.js | 6 ++++++ mail_sent/static/src/js/sent.js | 10 ++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/mail_archives/static/src/js/archives.js b/mail_archives/static/src/js/archives.js index 3640a2c..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); } }); diff --git a/mail_base/static/src/js/base.js b/mail_base/static/src/js/base.js index 12f1111..653a810 100644 --- a/mail_base/static/src/js/base.js +++ b/mail_base/static/src/js/base.js @@ -66,6 +66,7 @@ ChatAction.include({ init: function(parent, action, options) { this._super.apply(this, arguments); this.show_send_message_button = ['channel_inbox']; + this.channels_display_subject = []; }, start: function() { var result = this._super.apply(this, arguments); @@ -106,6 +107,11 @@ ChatAction.include({ .find('.o_mail_chat_button_new_message') .toggle(self.show_send_message_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_sent/static/src/js/sent.js b/mail_sent/static/src/js/sent.js index b5490ea..7eadfa3 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.show_send_message_button.push(channel_name); + // Add channel Sent for enable "display_subject" option + this.channels_display_subject.push(channel_name); } }); From 3218b251cc3ce3437bebb89a86db83663bfa96e9 Mon Sep 17 00:00:00 2001 From: x620 Date: Fri, 6 May 2016 17:58:17 +0500 Subject: [PATCH 11/16] [REF] rename show_send_message_button variable to channels_show_send_button --- mail_base/static/src/js/base.js | 4 ++-- mail_sent/static/src/js/sent.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mail_base/static/src/js/base.js b/mail_base/static/src/js/base.js index 653a810..332fe34 100644 --- a/mail_base/static/src/js/base.js +++ b/mail_base/static/src/js/base.js @@ -65,7 +65,7 @@ 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() { @@ -105,7 +105,7 @@ 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) { diff --git a/mail_sent/static/src/js/sent.js b/mail_sent/static/src/js/sent.js index 7eadfa3..1a3c298 100644 --- a/mail_sent/static/src/js/sent.js +++ b/mail_sent/static/src/js/sent.js @@ -22,7 +22,7 @@ ChatAction.include({ 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_name); + this.channels_show_send_button.push(channel_name); // Add channel Sent for enable "display_subject" option this.channels_display_subject.push(channel_name); } From aaa794d1c417493c66d471d65d82169b4c0146d2 Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Mon, 9 May 2016 15:58:06 +0500 Subject: [PATCH 12/16] [DOC] update tour messages --- .../static/src/js/res_partner_mails_count_tour.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2f061fa..7c34538 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 @@ -27,11 +27,11 @@ element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', }, { - title: _t("Done"), + title: _t("That's it"), placement: 'top', waitNot: '.mails_to:visible', element: 'div.oe_msg_content>textarea.field_text', - content: _t("Message are found.
Enjoy your day!

IT-Projects LLC team "), + content: _t("Enjoy your day!

IT-Projects LLC team "), popover: {next: _t("Close Tutorial")}, }, ] From 6e5f92c7b31c15265d911eef340f4aec971b215d Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Mon, 9 May 2016 16:06:43 +0500 Subject: [PATCH 13/16] [DOC] remove last step --- .../static/src/js/res_partner_mails_count_tour.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 7c34538..2749fc7 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 @@ -23,16 +23,10 @@ waitNot: '.mails_to:visible', title: _t("Check messages or send new one"), placement: 'left', - content: _t("Click 'Send a mesage' to continue the Tour"), + content: _t("Thank you!

IT-Projects LLC team "), element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', - }, - { - title: _t("That's it"), - placement: 'top', - waitNot: '.mails_to:visible', - element: 'div.oe_msg_content>textarea.field_text', - content: _t("Enjoy your day!

IT-Projects LLC team "), popover: {next: _t("Close Tutorial")}, + }, ] }); From 420d28e2dfa208b257665dacfa32b77c56110376 Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Mon, 9 May 2016 16:19:39 +0500 Subject: [PATCH 14/16] [DOC] delete popover from last steps seems like it incompatible with element field --- .../static/src/js/res_partner_mails_count_tour.js | 2 -- 1 file changed, 2 deletions(-) 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 2749fc7..1ed1125 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 @@ -25,8 +25,6 @@ placement: 'left', content: _t("Thank you!

IT-Projects LLC team "), element: '.oe_mail_wall .oe_msg.oe_msg_composer_compact>div>.oe_compose_post', - popover: {next: _t("Close Tutorial")}, - }, ] }); From 7bf9e4ab62f366c398dbf9ca9e9982008c6d213c Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Mon, 9 May 2016 16:23:47 +0500 Subject: [PATCH 15/16] [DOC] mail_sent: new price --- mail_sent/__openerp__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail_sent/__openerp__.py b/mail_sent/__openerp__.py index 90e1701..f92d3ed 100644 --- a/mail_sent/__openerp__.py +++ b/mail_sent/__openerp__.py @@ -3,9 +3,9 @@ 'version' : '1.0.2', 'author' : 'IT-Projects LLC, Ivan Yelizariev', 'license': 'GPL-3', - 'category' : 'Social Network', + 'category' : 'Discuss', 'website' : 'https://twitter.com/yelizariev', - 'price': 9.00, + 'price': 40.00, 'currency': 'EUR', 'depends' : ['mail'], 'data':[ From 40a6b1f2c0bb4b1a475e01bc73195461c963c98e Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Mon, 9 May 2016 16:27:27 +0500 Subject: [PATCH 16/16] [DOC] price + tiny updates --- mail_archives/static/description/index.html | 2 +- mail_base/__openerp__.py | 2 ++ mail_to/__openerp__.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) 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_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_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',