diff --git a/mail_all/i18n/mail_all.pot b/mail_all/i18n/mail_all.pot index e97a3a39..5ad05d6c 100644 --- a/mail_all/i18n/mail_all.pot +++ b/mail_all/i18n/mail_all.pot @@ -61,4 +61,3 @@ msgstr "" #, python-format msgid "Open All Messages" msgstr "" - diff --git a/mail_all/i18n/sl.po b/mail_all/i18n/sl.po index 19ab3d31..ea1c4dc0 100644 --- a/mail_all/i18n/sl.po +++ b/mail_all/i18n/sl.po @@ -1,10 +1,10 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_all -# +# # Translators: # Matjaz Mozetic , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" @@ -12,12 +12,14 @@ msgstr "" "POT-Creation-Date: 2018-05-05 23:09+0000\n" "PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Matjaz Mozetic , 2019\n" -"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/teams/76080/sl/)\n" +"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/" +"teams/76080/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: mail_all #. openerp-web diff --git a/mail_archives/i18n/mail_archives.pot b/mail_archives/i18n/mail_archives.pot index 7a3c2a8b..d9d33cef 100644 --- a/mail_archives/i18n/mail_archives.pot +++ b/mail_archives/i18n/mail_archives.pot @@ -27,4 +27,3 @@ msgstr "" #, python-format msgid "Archive is empty" msgstr "" - diff --git a/mail_archives/i18n/sl.po b/mail_archives/i18n/sl.po index 0dba7198..2261e731 100644 --- a/mail_archives/i18n/sl.po +++ b/mail_archives/i18n/sl.po @@ -1,10 +1,10 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_archives -# +# # Translators: # Matjaz Mozetic , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" @@ -12,12 +12,14 @@ msgstr "" "POT-Creation-Date: 2018-05-05 23:09+0000\n" "PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Matjaz Mozetic , 2019\n" -"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/teams/76080/sl/)\n" +"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/" +"teams/76080/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: mail_archives #. openerp-web diff --git a/mail_base/README.rst b/mail_base/README.rst index d93f8c6c..2fabe3ce 100644 --- a/mail_base/README.rst +++ b/mail_base/README.rst @@ -7,7 +7,7 @@ * fixes toggling left bar * fixes Recipients field. Out-of-box this field could be empty. -One can say, that the module do this todo from `addons/mail/static/src/js/chat_manager.js `__ +One can say, that the module do this todo from `addons/mail/static/src/js/chat_manager.js `__ // to do: move this to mail.utils diff --git a/mail_base/__init__.py b/mail_base/__init__.py index 7cdad7f0..dd5379d8 100644 --- a/mail_base/__init__.py +++ b/mail_base/__init__.py @@ -1,3 +1,4 @@ +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html) from . import models from . import controllers diff --git a/mail_base/__manifest__.py b/mail_base/__manifest__.py index 8c4f0c10..a19c38e1 100644 --- a/mail_base/__manifest__.py +++ b/mail_base/__manifest__.py @@ -1,9 +1,13 @@ +# Copyright 2016 x620 +# Copyright 2018 Ruslan Ronzhin +# Copyright 2016-2019 Ivan Yelizariev +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html) { "name": "Mail Base", "summary": """Makes Mail extendable""", "category": "Discuss", "images": [], - "version": "11.0.1.0.2", + "version": "11.0.1.1.0", "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@it-projects.info", diff --git a/mail_base/controllers/main.py b/mail_base/controllers/main.py index a7d27f72..d739b56f 100644 --- a/mail_base/controllers/main.py +++ b/mail_base/controllers/main.py @@ -1,3 +1,6 @@ +# Copyright 2017 mikaelh +# Copyright 2017-2019 Ivan Yelizariev +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html) from openerp.http import request from openerp.addons.bus.controllers.main import BusController @@ -9,6 +12,7 @@ class MailChatController(BusController): def _poll(self, dbname, channels, last, options): if request.session.uid: + channels = list(channels) # do not alter original list channels.append((request.db, 'mail_base.mail_sent')) return super(MailChatController, self)._poll(dbname, channels, last, options) diff --git a/mail_base/doc/changelog.rst b/mail_base/doc/changelog.rst index dd41f409..8825558c 100644 --- a/mail_base/doc/changelog.rst +++ b/mail_base/doc/changelog.rst @@ -1,3 +1,11 @@ +`1.1.0` +------- +- **New**: added ability to select channels for private message sending. + +`1.0.5` +------- +**FIX**: polling errors on heavy server load + `1.0.4` ------- **FIX**: issue related to clear cache diff --git a/mail_base/i18n/de.po b/mail_base/i18n/de.po index a2642e41..ae7c64ef 100644 --- a/mail_base/i18n/de.po +++ b/mail_base/i18n/de.po @@ -1,11 +1,11 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_base -# +# # Translators: # Dawid Runowski , 2019 # Ermin Trevisan , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" @@ -13,11 +13,12 @@ msgstr "" "POT-Creation-Date: 2018-05-05 23:09+0000\n" "PO-Revision-Date: 2017-11-28 13:59+0000\n" "Last-Translator: Ermin Trevisan , 2019\n" -"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/de/)\n" +"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/" +"de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_base diff --git a/mail_base/i18n/es.po b/mail_base/i18n/es.po index c2e5a92a..c45af80d 100644 --- a/mail_base/i18n/es.po +++ b/mail_base/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_base -# +# # Translators: # Randall Castro , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-04-21 23:07+0000\n" "PO-Revision-Date: 2018-04-21 23:07+0000\n" "Last-Translator: Randall Castro , 2018\n" -"Language-Team: Spanish (https://www.transifex.com/it-projects-llc/teams/76080/es/)\n" +"Language-Team: Spanish (https://www.transifex.com/it-projects-llc/" +"teams/76080/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_base diff --git a/mail_base/i18n/it.po b/mail_base/i18n/it.po index 6bc51203..4984ab3a 100644 --- a/mail_base/i18n/it.po +++ b/mail_base/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_base -# +# # Translators: # Translation Bot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-17 20:20+0000\n" "PO-Revision-Date: 2017-07-17 20:20+0000\n" "Last-Translator: Translation Bot , 2017\n" -"Language-Team: Italian (https://www.transifex.com/it-projects-llc/teams/76080/it/)\n" +"Language-Team: Italian (https://www.transifex.com/it-projects-llc/" +"teams/76080/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_base diff --git a/mail_base/i18n/mail_base.pot b/mail_base/i18n/mail_base.pot new file mode 100644 index 00000000..2d467df8 --- /dev/null +++ b/mail_base/i18n/mail_base.pot @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_base +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mail_base +#: model:ir.model,name:mail_base.model_mail_compose_message +msgid "Email composition wizard" +msgstr "" + +#. module: mail_base +#: model:ir.model,name:mail_base.model_mail_message +msgid "Message" +msgstr "" + diff --git a/mail_base/i18n/pt.po b/mail_base/i18n/pt.po index cb7b24ed..cbb34677 100644 --- a/mail_base/i18n/pt.po +++ b/mail_base/i18n/pt.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_base -# +# # Translators: # Translation Bot , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-04-21 00:05+0000\n" "PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Translation Bot , 2018\n" -"Language-Team: Portuguese (https://www.transifex.com/it-projects-llc/teams/76080/pt/)\n" +"Language-Team: Portuguese (https://www.transifex.com/it-projects-llc/" +"teams/76080/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_base diff --git a/mail_base/i18n/pt_BR.po b/mail_base/i18n/pt_BR.po index 9a742708..05deb2d6 100644 --- a/mail_base/i18n/pt_BR.po +++ b/mail_base/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_base -# +# # Translators: # Translation Bot , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-04-21 00:05+0000\n" "PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Translation Bot , 2018\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/it-projects-llc/teams/76080/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/it-projects-" +"llc/teams/76080/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: mail_base diff --git a/mail_base/i18n/ru.po b/mail_base/i18n/ru.po index 246c714a..d24fafb7 100644 --- a/mail_base/i18n/ru.po +++ b/mail_base/i18n/ru.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_base -# +# # Translators: # Ivan Yelizariev , 2017 msgid "" @@ -11,12 +11,15 @@ msgstr "" "POT-Creation-Date: 2017-07-28 14:34+0000\n" "PO-Revision-Date: 2017-07-28 14:34+0000\n" "Last-Translator: Ivan Yelizariev , 2017\n" -"Language-Team: Russian (https://www.transifex.com/it-projects-llc/teams/76080/ru/)\n" +"Language-Team: Russian (https://www.transifex.com/it-projects-llc/" +"teams/76080/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ru\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" #. module: mail_base #: model:ir.model,name:mail_base.model_mail_compose_message diff --git a/mail_base/i18n/sl.po b/mail_base/i18n/sl.po index 81b06c7c..d932573e 100644 --- a/mail_base/i18n/sl.po +++ b/mail_base/i18n/sl.po @@ -1,11 +1,11 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_base -# +# # Translators: # Translation Bot , 2017 # Matjaz Mozetic , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" @@ -13,12 +13,14 @@ msgstr "" "POT-Creation-Date: 2018-05-05 23:09+0000\n" "PO-Revision-Date: 2017-11-28 13:59+0000\n" "Last-Translator: Matjaz Mozetic , 2019\n" -"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/teams/76080/sl/)\n" +"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/" +"teams/76080/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: mail_base #: model:ir.model,name:mail_base.model_mail_compose_message diff --git a/mail_base/models.py b/mail_base/models.py index 9bdf4919..5f0a3292 100644 --- a/mail_base/models.py +++ b/mail_base/models.py @@ -1,3 +1,6 @@ +# Copyright 2016 x620 +# Copyright 2017 Ivan Yelizariev +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html) from openerp import api, models @@ -12,8 +15,8 @@ def write(self, values): values['partner_ids'] = [] for triplet in values.get('needaction_partner_ids'): if triplet[0] == 6: - for id in triplet[2]: - values['partner_ids'].append((4, id, False)) + for i in triplet[2]: + values['partner_ids'].append((4, i, False)) return super(MailMessage, self).write(values) diff --git a/mail_base/static/lib/base.js b/mail_base/static/lib/base.js index 42433e79..a00f7bcc 100644 --- a/mail_base/static/lib/base.js +++ b/mail_base/static/lib/base.js @@ -1,3 +1,6 @@ +/* Copyright 2017 Artyom Losev + Copyright 2019 Artem Rafailov + License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). */ odoo.define('mail_base.base', function (require) { "use strict"; diff --git a/mail_move_message/__manifest__.py b/mail_move_message/__manifest__.py index f1230925..e77c0622 100644 --- a/mail_move_message/__manifest__.py +++ b/mail_move_message/__manifest__.py @@ -7,7 +7,7 @@ { 'name': 'Mail Relocation', - 'version': '11.0.1.0.6', + 'version': '11.0.1.0.7', 'author': 'IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko', 'license': 'LGPL-3', 'category': 'Discuss', diff --git a/mail_move_message/controllers/main.py b/mail_move_message/controllers/main.py index e0974bc6..e64968e8 100644 --- a/mail_move_message/controllers/main.py +++ b/mail_move_message/controllers/main.py @@ -14,6 +14,7 @@ class MailChatController(BusController): def _poll(self, dbname, channels, last, options): if request.session.uid: + channels = list(channels) # do not alter original list channels.append((request.db, 'mail_move_message')) channels.append((request.db, 'mail_move_message.delete_message')) return super(MailChatController, self)._poll(dbname, channels, last, options) diff --git a/mail_move_message/doc/changelog.rst b/mail_move_message/doc/changelog.rst index b3327903..12aada72 100644 --- a/mail_move_message/doc/changelog.rst +++ b/mail_move_message/doc/changelog.rst @@ -1,3 +1,8 @@ +`1.0.7` +------- + +**FIX**: polling errors on heavy server load + `1.0.6` ------- diff --git a/mail_move_message/i18n/de.po b/mail_move_message/i18n/de.po new file mode 100644 index 00000000..2b378dee --- /dev/null +++ b/mail_move_message/i18n/de.po @@ -0,0 +1,384 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_move_message +# +# Translators: +# Dawid Runowski , 2019 +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-05-05 23:11+0000\n" +"PO-Revision-Date: 2017-06-23 14:31+0000\n" +"Last-Translator: Dawid Runowski , 2019\n" +"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mail_move_message +#: code:addons/mail_move_message/controllers/main.py:40 +#, python-format +msgid "%s ID %s" +msgstr "%sID%s" + +#. module: mail_move_message +#: code:addons/mail_move_message/controllers/main.py:38 +#, python-format +msgid "%s [%s] ID %s" +msgstr "%s[%s]ID%s" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_move_followers +msgid "" +"Add followers of current record to a new record.\n" +"You must use this option, if new record has restricted access.\n" +"You can change default value for this option at Settings/System Parameters" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_all_child_ids +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_all_child_ids +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_all_child_ids +msgid "All childs" +msgstr "Alle Kinder" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +msgid "Apply" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_partner_id +msgid "Author" +msgstr "Autor" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_can_move +msgid "Can move" +msgstr "Kann verschoben werden" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +msgid "Cancel" +msgstr "Abbrechen" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Close" +msgstr "Schließen" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +msgid "Configure Mail Relocation" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Create Partner" +msgstr "Partner erstellen" + +#. module: mail_move_message +#. openerp-web +#: code:addons/mail_move_message/static/src/js/mail_move_message.js:125 +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +#, python-format +msgid "Create new record" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_create_uid +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_create_uid +msgid "Created by" +msgstr "Erstellt von" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_create_date +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_create_date +msgid "Created on" +msgstr "Erstellt am" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Delete message" +msgstr "Nachricht löschen" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_display_name +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_display_name +msgid "Display Name" +msgstr "Anzeigename" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Do you really want to delete this message?" +msgstr "Wollen Sie wirklich die Nachricht löschen?" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_message_from +msgid "" +"Email address of the sender. This field is set when no matching partner is " +"found and replaces the author_id field in the chatter." +msgstr "" +"Email-Adresse des Absenders. Dieses Feld wird eingestellt, wenn kein " +"passender Partner gefunden wird und tauscht das author_id Feld in der " +"Koversation." + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_filter_by_partner +msgid "Filter Records by partner" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_from +msgid "From" +msgstr "Von" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_id +msgid "ID" +msgstr "ID" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_is_moved +msgid "Is Moved" +msgstr "wurde versetzt" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_is_moved +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_is_moved +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_is_moved +msgid "Is moved" +msgstr "Wurde versetzt" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings___last_update +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard___last_update +msgid "Last Modified on" +msgstr "Zuletzt modifiziert am" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_write_uid +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_write_uid +msgid "Last Updated by" +msgstr "Zuletzt aktualisiert von" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_write_date +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_write_date +msgid "Last Updated on" +msgstr "Zuletzt aktualisiert am" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_move_back +msgid "MOVE TO ORIGIN" +msgstr "" + +#. module: mail_move_message +#: model:ir.actions.act_window,name:mail_move_message.action_mail_move_message_config +#: model:ir.ui.menu,name:mail_move_message.menu_mail_move_message +msgid "Mail Relocation" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Mark as read and Close" +msgstr "als gelesen markieren und schließen" + +#. module: mail_move_message +#: model:ir.model,name:mail_move_message.model_mail_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_id +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Message" +msgstr "Nachricht" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_email_from +msgid "Message email from" +msgstr "Email-Nachricht von" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_name_from +msgid "Message name from" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_body +msgid "Message to move" +msgstr "Nachricht zu verschieben" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_model +msgid "Model" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_model_ids +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +msgid "Models" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Move" +msgstr "Verschieben" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_move_back +msgid "Move message and submessages to original place" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_config_settings_move_followers +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_move_followers +msgid "Move Followers" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Move Message" +msgstr "Nachricht verschieben" + +#. module: mail_move_message +#. openerp-web +#: code:addons/mail_move_message/static/src/xml/mail_move_message_main.xml:6 +#, python-format +msgid "Move to thread" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_moved_by_user_id +msgid "Moved by" +msgstr "Verschoben von" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_by_message_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_by_message_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_by_message_id +msgid "Moved by message" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_by_user_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_by_user_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_by_user_id +msgid "Moved by user" +msgstr "Verschoben von dem Benutzer" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_moved_by_message_id +msgid "Moved with" +msgstr "Verschoben mit" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_to_read +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_message_to_read +msgid "Need Action" +msgstr "Aktion erforderlich" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Open message" +msgstr "Nachricht öffnen" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +msgid "Options" +msgstr "Optionen" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_from_parent_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_from_parent_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_from_parent_id +msgid "Parent Message (Original)" +msgstr "" + +#. module: mail_move_message +#: model:ir.model,name:mail_move_message.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: mail_move_message +#: code:addons/mail_move_message/mail_move_message_models.py:200 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_res_id +#, python-format +msgid "Record" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_from_res_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_from_res_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_from_res_id +msgid "Related Document ID (Original)" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_from_model +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_from_model +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_from_model +msgid "Related Document Model (Original)" +msgstr "" + +#. module: mail_move_message +#. openerp-web +#: code:addons/mail_move_message/static/src/js/mail_move_message.js:27 +#, python-format +msgid "Relocate Message" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_parent_id +msgid "Search by name" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_subject +msgid "Subject" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_compose_message_moved_by_message_id +#: model:ir.model.fields,help:mail_move_message.field_mail_mail_moved_by_message_id +#: model:ir.model.fields,help:mail_move_message.field_mail_message_moved_by_message_id +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_message_moved_by_message_id +msgid "Top message, that initate moving this message" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_uid +msgid "Uid" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "" +"You cannot move this message. It was already moved with a message bellow. " +"Open one and apply changes there." +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_compose_message_all_child_ids +#: model:ir.model.fields,help:mail_move_message.field_mail_mail_all_child_ids +#: model:ir.model.fields,help:mail_move_message.field_mail_message_all_child_ids +msgid "all childs, including subchilds" +msgstr "" + +#. module: mail_move_message +#: model:ir.model,name:mail_move_message.model_mail_move_message_config_settings +msgid "mail_move_message.config.settings" +msgstr "" + +#. module: mail_move_message +#: model:ir.model,name:mail_move_message.model_mail_move_message_wizard +msgid "mail_move_message.wizard" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "or" +msgstr "oder" diff --git a/mail_move_message/i18n/mail_move_message.pot b/mail_move_message/i18n/mail_move_message.pot index 4ab364b3..47bbd6f9 100644 --- a/mail_move_message/i18n/mail_move_message.pot +++ b/mail_move_message/i18n/mail_move_message.pot @@ -4,10 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-11 06:53+0000\n" -"PO-Revision-Date: 2015-08-11 06:53+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,158 +14,338 @@ msgstr "" "Plural-Forms: \n" #. module: mail_move_message -#: view:mail_move_message.wizard:mail_move_message.view_wizard -msgid "Cancel" +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_move_followers +msgid "Add followers of current record to a new record.\n" +"You must use this option, if new record has restricted access.\n" +"You can change default value for this option at Settings/System Parameters" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,create_uid:0 +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +msgid "Add models to be used for message relocation" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_all_child_ids +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_all_child_ids +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_all_child_ids +msgid "All childs" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_partner_id +msgid "Author" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_can_move +msgid "Can move" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Close" +msgstr "" + +#. module: mail_move_message +#: model:ir.model,name:mail_move_message.model_res_partner +msgid "Contact" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Create Partner" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_create_uid msgid "Created by" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,create_date:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_create_date msgid "Created on" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,id:0 +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Delete message" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_display_name +msgid "Display Name" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Do you really want to delete this message?" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_message_from +msgid "Email address of the sender. This field is set when no matching partner is found and replaces the author_id field in the chatter." +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_filter_by_partner +msgid "Filter Records by partner" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_from +msgid "From" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_id msgid "ID" msgstr "" #. module: mail_move_message -#: field:mail.message,is_moved:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_is_moved +msgid "Is Moved" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_is_moved +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_is_moved +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_is_moved msgid "Is moved" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,write_uid:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard___last_update +msgid "Last Modified on" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_write_uid msgid "Last Updated by" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,write_date:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_write_date msgid "Last Updated on" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,record_url:0 -msgid "Link to record" +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_move_back +msgid "MOVE TO ORIGIN" +msgstr "" + +#. module: mail_move_message +#: model:ir.actions.act_window,name:mail_move_message.action_mail_move_message_config +#: model:ir.ui.view,arch_db:mail_move_message.view_mail_move_message_config_settings +msgid "Mail Relocation" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Mark as read and Close" msgstr "" #. module: mail_move_message #: model:ir.model,name:mail_move_message.model_mail_message -#: view:mail_move_message.wizard:mail_move_message.view_wizard -#: field:mail_move_message.wizard,message_id:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_id +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard msgid "Message" msgstr "" #. module: mail_move_message -#: view:mail_move_message.wizard:mail_move_message.view_wizard +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_email_from +msgid "Message Email From" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_name_from +msgid "Message Name From" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_body +msgid "Message to move" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_model +msgid "Model" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_res_config_settings_model_ids +msgid "Models" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard msgid "Move" msgstr "" #. module: mail_move_message -#: help:mail_move_message.wizard,move_back:0 +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_move_back msgid "Move message and submessages to original place" msgstr "" #. module: mail_move_message -#: view:mail_move_message.wizard:mail_move_message.view_wizard -msgid "Move Message" +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_move_followers +#: model:ir.model.fields,field_description:mail_move_message.field_res_config_settings_move_followers +msgid "Move Followers" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,move_back:0 -msgid "Move to origin" +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "Move Message" msgstr "" #. module: mail_move_message #. openerp-web -#: code:addons/mail_move_message/static/src/xml/mail_move_message_main.xml:5 +#: code:addons/mail_move_message/static/src/xml/mail_move_message_main.xml:12 #, python-format msgid "Move to thread" msgstr "" #. module: mail_move_message -#: field:mail.message,moved_by_message_id:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_moved_by_user_id +msgid "Moved by" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_by_message_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_by_message_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_by_message_id msgid "Moved by message" msgstr "" #. module: mail_move_message -#: field:mail.message,moved_by_user_id:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_by_user_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_by_user_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_by_user_id msgid "Moved by user" msgstr "" #. module: mail_move_message -#: view:mail_move_message.wizard:mail_move_message.view_wizard +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_moved_by_message_id +msgid "Moved with" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard msgid "Open message" msgstr "" #. module: mail_move_message -#: field:mail.message,moved_from_parent_id:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_from_parent_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_from_parent_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_from_parent_id msgid "Parent Message (Original)" msgstr "" #. module: mail_move_message -#: code:addons/mail_move_message/mail_move_message_models.py:107 +#: code:addons/mail_move_message/mail_move_message_models.py:222 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_model_record +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_res_id #, python-format msgid "Record" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,res_id:0 -msgid "Record ID" -msgstr "" - -#. module: mail_move_message -#: field:mail_move_message.wizard,model_id:0 -msgid "Record type" +#: code:addons/mail_move_message/mail_move_message_models.py:204 +#, python-format +msgid "Record field is empty!" msgstr "" #. module: mail_move_message -#: field:mail.message,moved_from_res_id:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_from_res_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_from_res_id +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_from_res_id msgid "Related Document ID (Original)" msgstr "" #. module: mail_move_message -#: field:mail.message,moved_from_model:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_from_model +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_from_model +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_from_model msgid "Related Document Model (Original)" msgstr "" #. module: mail_move_message #. openerp-web -#: code:addons/mail_move_message/static/src/js/mail_move_message.js:17 +#: code:addons/mail_move_message/static/src/js/mail_move_message.js:43 #, python-format msgid "Relocate Message" msgstr "" #. module: mail_move_message -#: field:mail_move_message.wizard,parent_id:0 +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_parent_id msgid "Search by name" msgstr "" #. module: mail_move_message -#: help:mail.message,moved_by_message_id:0 +#: code:addons/mail_move_message/mail_move_message_models.py:204 +#, python-format +msgid "Select a record for relocation first" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_message_to_read +msgid "Service field shows that this message were unread when moved" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_subject +msgid "Subject" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,help:mail_move_message.field_mail_compose_message_moved_by_message_id +#: model:ir.model.fields,help:mail_move_message.field_mail_mail_moved_by_message_id +#: model:ir.model.fields,help:mail_move_message.field_mail_message_moved_by_message_id +#: model:ir.model.fields,help:mail_move_message.field_mail_move_message_wizard_message_moved_by_message_id msgid "Top message, that initate moving this message" msgstr "" #. module: mail_move_message -#: view:mail_move_message.wizard:mail_move_message.view_wizard +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_uid +msgid "Uid" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_move_message_wizard_message_to_read +msgid "Unread message" +msgstr "" + +#. module: mail_move_message +#: model:ir.model.fields,field_description:mail_move_message.field_mail_compose_message_moved_as_unread +#: model:ir.model.fields,field_description:mail_move_message.field_mail_mail_moved_as_unread +#: model:ir.model.fields,field_description:mail_move_message.field_mail_message_moved_as_unread +msgid "Was Unread" +msgstr "" + +#. module: mail_move_message +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard msgid "You cannot move this message. It was already moved with a message bellow. Open one and apply changes there." msgstr "" #. module: mail_move_message -#: help:mail_move_message.wizard,model_id:0 -msgid "List available Models is configured at Settings\Technical\Emails\Mail Relocation. Empty for unassigned email" +#: model:ir.model.fields,help:mail_move_message.field_mail_compose_message_all_child_ids +#: model:ir.model.fields,help:mail_move_message.field_mail_mail_all_child_ids +#: model:ir.model.fields,help:mail_move_message.field_mail_message_all_child_ids +msgid "all childs, including subchilds" +msgstr "" + +#. module: mail_move_message +#: model:ir.model,name:mail_move_message.model_mail_move_message_wizard +msgid "mail_move_message.wizard" msgstr "" #. module: mail_move_message -#: help:mail_move_message.wizard,filter_by_partner:0 -msgid "Show only records with the same partner as email author" +#: model:ir.ui.view,arch_db:mail_move_message.view_wizard +msgid "or" msgstr "" #. module: mail_move_message -#: help:mail_move_message.wizard,move_followers:0 -msgid "Add followers of current record to a new record.\nYou must use this option, if new record has restricted access.\nYou can change default value for this option at Settings/System Parameters" +#: model:ir.model,name:mail_move_message.model_res_config_settings +msgid "res.config.settings" msgstr "" + diff --git a/mail_move_message/mail_move_message_models.py b/mail_move_message/mail_move_message_models.py index 2a0601f4..52b5c972 100644 --- a/mail_move_message/mail_move_message_models.py +++ b/mail_move_message/mail_move_message_models.py @@ -274,10 +274,10 @@ class MailMessage(models.Model): @api.multi def _compute_get_all_childs(self, include_myself=True): for r in self: - r._get_all_childs_one(include_myself=include_myself) + r._compute_all_childs_one(include_myself=include_myself) @api.multi - def _get_all_childs_one(self, include_myself=True): + def _compute_all_childs_one(self, include_myself=True): self.ensure_one() ids = [] if include_myself: diff --git a/mail_multi_website/i18n/mail_multi_website.pot b/mail_multi_website/i18n/mail_multi_website.pot index 8c36244a..07f3f14e 100644 --- a/mail_multi_website/i18n/mail_multi_website.pot +++ b/mail_multi_website/i18n/mail_multi_website.pot @@ -120,4 +120,3 @@ msgstr "" #: model:ir.model.fields,field_description:mail_multi_website.field_mail_test_simple__website_id msgid "Website" msgstr "" - diff --git a/mail_private/__manifest__.py b/mail_private/__manifest__.py index 23b4371c..d06ee6a0 100644 --- a/mail_private/__manifest__.py +++ b/mail_private/__manifest__.py @@ -1,3 +1,4 @@ +# Copyright 2018 Ruslan Ronzhin # Copyright 2018 Kolushov Alexandr # Copyright 2019 Artem Rafailov # License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). @@ -7,7 +8,7 @@ "category": "Discuss", # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=12.0", "images": ['images/mail_private_image.png'], - "version": "12.0.1.1.2", + "version": "12.0.1.2.0", "application": False, "author": "IT-Projects LLC, Pavel Romanchenko", diff --git a/mail_private/doc/changelog.rst b/mail_private/doc/changelog.rst index afc6ea0f..85100f55 100644 --- a/mail_private/doc/changelog.rst +++ b/mail_private/doc/changelog.rst @@ -1,3 +1,8 @@ +`1.2.0` +------- + +- **New**: added ability to select channels for private message sending. + `1.1.2 ------- diff --git a/mail_private/i18n/de.po b/mail_private/i18n/de.po new file mode 100644 index 00000000..b80ab51a --- /dev/null +++ b/mail_private/i18n/de.po @@ -0,0 +1,115 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_private +# +# Translators: +# Dawid Runowski , 2019 +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-05-28 16:01+0000\n" +"PO-Revision-Date: 2017-07-10 14:14+0000\n" +"Last-Translator: Dawid Runowski , 2019\n" +"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:30 +#, python-format +msgid "Check the first one" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:17 +#, python-format +msgid "Click on Private mail creating button" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:22 +#, python-format +msgid "Dummy action" +msgstr "" + +#. module: mail_private +#: model:ir.model,name:mail_private.model_mail_compose_message +msgid "Email composition wizard" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:13 +#, python-format +msgid "Open Partners Form" +msgstr "" + +#. module: mail_private +#: model:ir.model.fields,field_description:mail_private.field_mail_compose_message_is_private +msgid "Send Internal Message" +msgstr "interne Nachricht senden" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:6 +#, python-format +msgid "Send a message to specified recipients only" +msgstr "Nachricht nur an spezifierte Empfänger senden" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:39 +#: code:addons/mail_private/static/src/js/test_private.js:42 +#, python-format +msgid "Send email" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:6 +#, python-format +msgid "Send internal message" +msgstr "interne Nachricht senden" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:12 +#, python-format +msgid "To: Followers of" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:23 +#, python-format +msgid "Uncheck all" +msgstr "alle unmarkieren" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:26 +#, python-format +msgid "Uncheck all Followers" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:33 +#, python-format +msgid "Write some email" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:17 +#, python-format +msgid "this document" +msgstr "dieses Dokument" diff --git a/mail_private/i18n/it.po b/mail_private/i18n/it.po index bc6584aa..3fa6ec85 100644 --- a/mail_private/i18n/it.po +++ b/mail_private/i18n/it.po @@ -81,7 +81,6 @@ msgstr "" #. module: mail_private #: model:ir.model.fields,field_description:mail_private.field_mail_compose_message__is_private #: model:ir.model.fields,field_description:mail_private.field_mail_mail__is_private -#: model:ir.model.fields,field_description:mail_private.field_mail_message__is_private msgid "Send Internal Message" msgstr "" diff --git a/mail_private/i18n/sl.po b/mail_private/i18n/sl.po new file mode 100644 index 00000000..29a225be --- /dev/null +++ b/mail_private/i18n/sl.po @@ -0,0 +1,117 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_private +# +# Translators: +# Matjaz Mozetic , 2019 +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-05-05 23:11+0000\n" +"PO-Revision-Date: 2017-07-10 14:14+0000\n" +"Last-Translator: Matjaz Mozetic , 2019\n" +"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/" +"teams/76080/sl/)\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:30 +#, python-format +msgid "Check the first one" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:17 +#, python-format +msgid "Click on Private mail creating button" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:22 +#, python-format +msgid "Dummy action" +msgstr "" + +#. module: mail_private +#: model:ir.model,name:mail_private.model_mail_compose_message +msgid "Email composition wizard" +msgstr "Čarovnik za sestavljanje e-pošte" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:13 +#, python-format +msgid "Open Partners Form" +msgstr "" + +#. module: mail_private +#: model:ir.model.fields,field_description:mail_private.field_mail_compose_message_is_private +msgid "Send Internal Message" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:6 +#, python-format +msgid "Send a message to specified recipients only" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:39 +#: code:addons/mail_private/static/src/js/test_private.js:42 +#, python-format +msgid "Send email" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:6 +#, python-format +msgid "Send internal message" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:12 +#, python-format +msgid "To: Followers of" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:23 +#, python-format +msgid "Uncheck all" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:26 +#, python-format +msgid "Uncheck all Followers" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/js/test_private.js:33 +#, python-format +msgid "Write some email" +msgstr "" + +#. module: mail_private +#. openerp-web +#: code:addons/mail_private/static/src/xml/mail_private.xml:17 +#, python-format +msgid "this document" +msgstr "" diff --git a/mail_private/models.py b/mail_private/models.py index 88a2f5de..319d5d2e 100644 --- a/mail_private/models.py +++ b/mail_private/models.py @@ -3,6 +3,7 @@ # Copyright 2018 Ivan Yelizariev # Copyright 2019 Artem Rafailov # License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). + from odoo import models, fields, api @@ -18,15 +19,15 @@ class MailMessage(models.Model): is_private = fields.Boolean(string='Send Internal Message') def send_recepients_for_internal_message(self, model, domain): - result = [] + result = {'partners': [], 'channels': []} default_resource = self.env[model].search(domain) follower_ids = default_resource.message_follower_ids recipient_ids = [r.partner_id for r in follower_ids if r.partner_id] - # channel_ids = [c.channel_id for c in follower_ids if c.channel_id] + channel_ids = [c.channel_id for c in follower_ids if c.channel_id] for recipient in recipient_ids: - result.append({ + result['partners'].append({ 'checked': recipient.user_ids.id and not any(recipient.user_ids.mapped('share')), 'partner_id': recipient.id, 'full_name': recipient.name, @@ -35,14 +36,14 @@ def send_recepients_for_internal_message(self, model, domain): 'reason': 'Recipient' }) - # for channel in channel_ids: - # result.append({ - # 'checked': True, - # 'channel_id': channel.id, - # 'full_name': channel, - # 'name': '# '+channel.name, - # 'reason': 'Channel', - # }) + for channel in channel_ids: + result['channels'].append({ + 'checked': True, + 'channel_id': channel.id, + 'full_name': channel.name, + 'name': '# '+channel.name, + 'reason': 'Channel', + }) return result @api.multi @@ -61,5 +62,26 @@ def _notify(self, record, msg_vals, force_send=False, send_after_commit=True, mo def _notify_compute_internal_recipients(self, record, msg_vals): recipient_data = super(MailMessage, self)._notify_compute_recipients(record, msg_vals) pids = [x[1] for x in msg_vals.get('partner_ids')] if 'partner_ids' in msg_vals else self.sudo().partner_ids.ids + cids = [x[1] for x in msg_vals.get('channel_ids')] if 'channel_ids' in msg_vals else self.sudo().channel_ids.ids recipient_data['partners'] = [i for i in recipient_data['partners'] if i['id'] in pids] + recipient_data['channels'] = [i for i in recipient_data['channels'] if i['id'] in cids] return recipient_data + + +class MailThread(models.AbstractModel): + _inherit = 'mail.thread' + + @api.multi + @api.returns('mail.message', lambda value: value.id) + def message_post(self, body='', subject=None, + message_type='notification', subtype=None, + parent_id=False, attachments=None, + notif_layout=False, add_sign=True, model_description=False, + mail_auto_delete=True, **kwargs): + if 'channel_ids' in kwargs: + kwargs['channel_ids'] = [(4, pid) for pid in kwargs['channel_ids']] + return super(MailThread, self).message_post(body, subject, + message_type, subtype, + parent_id, attachments, + notif_layout, add_sign, model_description, + mail_auto_delete, **kwargs) diff --git a/mail_private/static/src/css/mail_private.css b/mail_private/static/src/css/mail_private.css new file mode 100644 index 00000000..083365d8 --- /dev/null +++ b/mail_private/static/src/css/mail_private.css @@ -0,0 +1,10 @@ +.o_composer_suggested_channels{ + margin-top: -5px; +} + +.oe_composer_uncheck{ + float: bottom; + margin-top:5px; + margin-left:-5px; +} + diff --git a/mail_private/static/src/js/mail_private.js b/mail_private/static/src/js/mail_private.js index 8432807b..82bba9d3 100644 --- a/mail_private/static/src/js/mail_private.js +++ b/mail_private/static/src/js/mail_private.js @@ -11,11 +11,20 @@ var core = require('web.core'); var Chatter = require('mail.Chatter'); var ChatterComposer = require('mail.composer.Chatter'); var session = require('web.session'); +var Thread = require('mail.model.Thread'); var rpc = require('web.rpc'); var config = require('web.config'); var mailUtils = require('mail.utils'); +Thread.include({ + _postMessage: function (data) { + return this._super.apply(this, arguments).then(function (messageData) { + messageData['channel_ids'] = data['channel_ids']; + return messageData; + }); + }, +}); Chatter.include({ init: function () { @@ -29,7 +38,8 @@ Chatter.include({ this.fetch_recipients_for_internal_message().then(function (data) { self._openComposer({ is_private: true, - suggested_partners: data + suggested_partners: data["partners"], + suggested_channels: data["channels"], }); }); }, @@ -47,7 +57,8 @@ Chatter.include({ defaultBody: old_composer && old_composer.$input && old_composer.$input.val(), defaultMentionSelections: old_composer && old_composer.getMentionListenerSelections(), attachmentIds: (old_composer && old_composer.get('attachment_ids')) || [], - is_private: options.is_private + is_private: options.is_private, + suggested_channels: options.suggested_channels }); this._composer.on('input_focused', this, function () { this._composer.mentionSetPrefetchedPartners(this._mentionSuggestions || []); @@ -61,6 +72,7 @@ Chatter.include({ self._composer.on('post_message', self, function (messageData) { if (options.is_private) { self._composer.options.isLog = true; + self._composer.options.is_private = options.is_private; } self._discardOnReload(messageData).then(function () { self._disableComposer(); @@ -98,16 +110,18 @@ Chatter.include({ method: 'send_recepients_for_internal_message', args: [[], self.context.default_model, follower_ids_domain] }).then(function (res) { - return _.filter(res, function (obj) { + res["partners"] = _.filter(res["partners"], function (obj) { return obj.partner_id !== session.partner_id; }); + return res; }); - } + }, }); ChatterComposer.include({ init: function (parent, model, suggestedPartners, options) { this._super(parent, model, suggestedPartners, options); + this.suggested_channels = options.suggested_channels; this.events['click .oe_composer_uncheck'] = 'on_uncheck_recipients'; if (typeof options.is_private === 'undefined') { // otherwise it causes an error in context creating function @@ -157,6 +171,9 @@ ChatterComposer.include({ this.$('.o_composer_suggested_partners input:checked').each(function() { $(this).prop('checked', false); }); + this.$('.o_composer_suggested_channels input:checked').each(function() { + $(this).prop('checked', false); + }); }, _onOpenFullComposer: function () { @@ -220,16 +237,15 @@ ChatterComposer.include({ checked_partners = _.uniq(_.filter(checked_partners, function (obj) { return obj.reason !== 'Channel'; })); - this.get_checked_channel_ids(); return checked_partners; }, get_checked_channel_ids: function () { var self = this; var checked_channels = []; - this.$('.o_composer_suggested_partners input:checked').each(function() { + this.$('.o_composer_suggested_channels input:checked').each(function() { var full_name = $(this).data('fullname'); - checked_channels = checked_channels.concat(_.filter(self.suggested_partners, function(item) { + checked_channels = checked_channels.concat(_.filter(self.suggested_channels, function(item) { return full_name === item.full_name; })); }); diff --git a/mail_private/static/src/xml/mail_private.xml b/mail_private/static/src/xml/mail_private.xml index 0bc7f010..7a3399ec 100644 --- a/mail_private/static/src/xml/mail_private.xml +++ b/mail_private/static/src/xml/mail_private.xml @@ -23,7 +23,28 @@ - +
+ + + +
+
+ + + +
+
+ + + + +
diff --git a/mail_private/template.xml b/mail_private/template.xml index 09bc6ec3..e5a12c05 100644 --- a/mail_private/template.xml +++ b/mail_private/template.xml @@ -8,6 +8,7 @@ name="mail_private_assets_backend" inherit_id="web.assets_backend"> + diff --git a/mail_recovery/i18n/mail_recovery.pot b/mail_recovery/i18n/mail_recovery.pot new file mode 100644 index 00000000..b662aad9 --- /dev/null +++ b/mail_recovery/i18n/mail_recovery.pot @@ -0,0 +1,14 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + diff --git a/mail_reply/i18n/es.po b/mail_reply/i18n/es.po index 9150e130..dd340e14 100644 --- a/mail_reply/i18n/es.po +++ b/mail_reply/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_reply -# +# # Translators: # Randall Castro , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-12-19 16:49+0000\n" "PO-Revision-Date: 2017-12-19 16:49+0000\n" "Last-Translator: Randall Castro , 2018\n" -"Language-Team: Spanish (https://www.transifex.com/it-projects-llc/teams/76080/es/)\n" +"Language-Team: Spanish (https://www.transifex.com/it-projects-llc/" +"teams/76080/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_reply diff --git a/mail_reply/i18n/mail_reply.pot b/mail_reply/i18n/mail_reply.pot new file mode 100644 index 00000000..806fd836 --- /dev/null +++ b/mail_reply/i18n/mail_reply.pot @@ -0,0 +1,22 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_reply +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mail_reply +#. openerp-web +#: code:addons/mail_reply/static/src/xml/reply_button.xml:7 +#, python-format +msgid "Reply" +msgstr "" + diff --git a/mail_sent/i18n/mail_sent.pot b/mail_sent/i18n/mail_sent.pot index 064330fe..aa753d60 100644 --- a/mail_sent/i18n/mail_sent.pot +++ b/mail_sent/i18n/mail_sent.pot @@ -64,4 +64,3 @@ msgstr "" #: model:ir.model.fields,help:mail_sent.field_mail_compose_message__sent msgid "dummy field to fix inherit error" msgstr "" - diff --git a/mail_to/__init__.py b/mail_to/__init__.py index e69de29b..5f636fd1 100644 --- a/mail_to/__init__.py +++ b/mail_to/__init__.py @@ -0,0 +1,2 @@ +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). +from . import models \ No newline at end of file diff --git a/mail_to/__manifest__.py b/mail_to/__manifest__.py index 18a28153..0a5d2934 100644 --- a/mail_to/__manifest__.py +++ b/mail_to/__manifest__.py @@ -1,9 +1,14 @@ +# Copyright 2016 x620 +# Copyright 2016 Ivan Yelizariev +# Copyright 2018 Ruslan Ronzhin +# Copyright 2019 Artem Rafailov +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). { "name": """Show message recipients""", "summary": """Allows you be sure, that all discussion participants were notified""", "category": "Discuss", "images": ['images/1.png'], - "version": "12.0.1.0.1", + "version": "12.0.1.1.0", "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@it-projects.info", diff --git a/mail_to/doc/changelog.rst b/mail_to/doc/changelog.rst index ea27aff2..f96739c2 100644 --- a/mail_to/doc/changelog.rst +++ b/mail_to/doc/changelog.rst @@ -1,3 +1,8 @@ +`1.1.0` +------- + +- **New**: channels are displayed in recipients + `1.0.1` ------- diff --git a/mail_to/i18n/mail_to.pot b/mail_to/i18n/mail_to.pot deleted file mode 100644 index c7963c35..00000000 --- a/mail_to/i18n/mail_to.pot +++ /dev/null @@ -1,36 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_to -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: mail_to -#. openerp-web -#: code:addons/mail_to/static/src/xml/recipient.xml:10 -#, python-format -msgid "To:" -msgstr "" - -#. module: mail_to -#. openerp-web -#: code:addons/mail_to/static/src/xml/recipient.xml:19 -#, python-format -msgid "and" -msgstr "" - -#. module: mail_to -#. openerp-web -#: code:addons/mail_to/static/src/xml/recipient.xml:20 -#, python-format -msgid "more" -msgstr "" - diff --git a/mail_to/models/__init__.py b/mail_to/models/__init__.py new file mode 100644 index 00000000..a2bc21ba --- /dev/null +++ b/mail_to/models/__init__.py @@ -0,0 +1 @@ +from . import mail_message diff --git a/mail_to/models/mail_message.py b/mail_to/models/mail_message.py new file mode 100644 index 00000000..507c2191 --- /dev/null +++ b/mail_to/models/mail_message.py @@ -0,0 +1,28 @@ +# Copyright 2019 Artem Rafailov +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). +from odoo import models, api + + +class MailMessage(models.Model): + _inherit = 'mail.message' + + @api.multi + def message_format(self): + messages_values = super(MailMessage, self).message_format() + for i in messages_values: + if i['channel_ids']: + i['channel_names'] = self.env['mail.channel'].browse(i['channel_ids']).mapped( + lambda r: [r.id, '#' + r.display_name]) + else: + i['channel_names'] = [] + + partner_ids = set(i['needaction_partner_ids']) + partner_ids.update(set(map(lambda x: x[0], i['partner_ids']))) + partner_ids.update(set(map(lambda x: x[0], i['customer_email_data']))) + if partner_ids: + i['partner_names'] = self.env['res.partner'].browse(partner_ids).mapped( + lambda r: [r.id, r.name]) + else: + i['partner_names'] = [] + + return messages_values diff --git a/mail_to/static/src/js/mail_to.js b/mail_to/static/src/js/mail_to.js new file mode 100644 index 00000000..d9debd86 --- /dev/null +++ b/mail_to/static/src/js/mail_to.js @@ -0,0 +1,43 @@ +/* Copyright 2016 x620 + * Copyright 2016-2017 Ivan Yelizariev + * Copyright 2017 Artyom Losev + * Copyright 2019 Artem Rafailov + * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). */ +odoo.define('mail_to.MailTo', function (require) { + "use strict"; + + var MailManager = require("mail.Manager"); + + MailManager.include({ + _makeMessage: function(data) { + var msg = this._super(data); + msg.partner_names = data.partner_names; + msg.channel_names = data.channel_names; + msg.recipients = msg.partner_names.concat(msg.channel_names); + + if (!msg.partner_names && !msg.channel_names) { + return msg; + } + + var more_recipients = ''; + // value which define more recipients + msg.more_recipients_value = 4; + for (var i = 0; i < msg.recipients.length; i++){ + if (i >= msg.more_recipients_value){ + // append names + more_recipients += msg.recipients[i][1]; + // separate them with semicolon + if (i < msg.recipients.length - 1){ + more_recipients += ', '; + } + } + } + + msg.more_recipients = more_recipients; + + return msg; + } + }); + + return MailManager; +}); diff --git a/mail_to/static/src/xml/recipient.xml b/mail_to/static/src/xml/recipient.xml index 832deb24..74cf2afe 100644 --- a/mail_to/static/src/xml/recipient.xml +++ b/mail_to/static/src/xml/recipient.xml @@ -1,26 +1,39 @@ +