Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

12.0 mail addons merge #246

Open
wants to merge 83 commits into
base: 12.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
87505d6
:handshake: New Translations! We need your help ...
i18n-bot Jan 13, 2019
0eb2406
:ambulance: polling error on database concurrency error
Feb 16, 2019
2043561
:green_heart:
Feb 16, 2019
07a9248
:green_heart:
Feb 16, 2019
56281d9
Merge pull request #179 from yelizariev/10.0-fix-only-string-channels…
Feb 16, 2019
a2ce780
:handshake: New Translations! We need your help ...
i18n-bot Mar 17, 2019
ce1f072
:zap: shows messages from channels
KolushovAlexandr Apr 23, 2019
a5c8dac
:book: index.rst
KolushovAlexandr Apr 23, 2019
c018e3a
Merge pull request #186 from KolushovAlexandr/10.0-mail_sent-add_chan…
Apr 29, 2019
9c3110e
:shield: services postgresql 10.0
May 27, 2019
4a46c27
:shield: services postgresql 11.0
May 27, 2019
e6a8fc1
Merge pull request #195 from kaadevelop/10.0
May 28, 2019
de13419
Merge pull request #196 from kaadevelop/11.0
May 28, 2019
2562579
:shield: postgres 10
May 28, 2019
532bcb5
Merge pull request #198 from kaadevelop/10.0
May 28, 2019
365d3ac
[UPD] Update mail_all.pot
i18n-bot May 28, 2019
962052c
[UPD] Update mail_archives.pot
i18n-bot May 28, 2019
cbf0dbb
[UPD] Update mail_attachment_popup.pot
i18n-bot May 28, 2019
28bef6d
[UPD] Update mail_base.pot
i18n-bot May 28, 2019
c89bb3f
[UPD] Update mailgun.pot
i18n-bot May 28, 2019
5272ef3
[UPD] Update mail_move_message.pot
i18n-bot May 28, 2019
a8b04d3
[UPD] Update mail_private.pot
i18n-bot May 28, 2019
fb9db96
[UPD] Update mail_recovery.pot
i18n-bot May 28, 2019
7dfafc3
[UPD] Update mail_reply.pot
i18n-bot May 28, 2019
6cc85b7
[UPD] Update mail_sent.pot
i18n-bot May 28, 2019
769e9ed
[UPD] Update mail_to.pot
i18n-bot May 28, 2019
3d890bc
[UPD] Update res_partner_company_messages.pot
i18n-bot May 28, 2019
6a298dc
[UPD] Update res_partner_mails_count.pot
i18n-bot May 28, 2019
7cff7db
:shield: postgres 11
May 28, 2019
baaa150
Merge pull request #199 from kaadevelop/11.0_v2
May 28, 2019
2dbf239
[UPD] Update mail_all.pot
i18n-bot May 28, 2019
b9426f4
[UPD] Update mail_archives.pot
i18n-bot May 28, 2019
edf2c24
[UPD] Update mail_base.pot
i18n-bot May 28, 2019
e88a9a3
[UPD] Update mailgun.pot
i18n-bot May 28, 2019
090a78b
[UPD] Update mail_move_message.pot
i18n-bot May 28, 2019
603c05f
[UPD] Update mail_multi_website.pot
i18n-bot May 28, 2019
4d577d7
[UPD] Update mail_private.pot
i18n-bot May 28, 2019
5bb3e0e
[UPD] Update mail_sent.pot
i18n-bot May 28, 2019
5ed62f2
[UPD] Update mail_to.pot
i18n-bot May 28, 2019
6513d97
:shield: transifex settings are moved to travis admin panel
May 28, 2019
31a6169
Merge pull request #200 from yelizariev/10.0-fix-transifex
May 28, 2019
c690bac
:shield: auto creating *.pot files
May 29, 2019
8b3a9a3
:handshake: New Translations! We need your help ...
i18n-bot May 29, 2019
28398eb
:shield: remove transifex settings
May 30, 2019
b476ac6
Merge pull request #201 from kaadevelop/10.0
May 30, 2019
51232f8
:shield: postges 9.5; remove transifex settings; auto creating *.pot …
May 30, 2019
07c38e8
Merge pull request #202 from kaadevelop/11.0
May 30, 2019
c2f9dee
:book: mail_private 10.0 previous version in docs
Ramil-Mukhametzyanov Jun 10, 2019
e8dcf0e
Merge pull request #205 from Ramil-Mukhametzyanov/10.0-mail_private-d…
Jun 11, 2019
959864c
:shield: travis.yml notifications webhook travis
Jun 24, 2019
fa4bedc
:shield: travis.yml notifications webhook travis
Jun 24, 2019
31b4ffc
Merge pull request #208 from kaadevelop/11.0
Jun 24, 2019
7cb04f8
Merge pull request #207 from kaadevelop/10.0
Jun 24, 2019
657df9b
Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11…
KolushovAlexandr Jul 11, 2019
42fec2a
Merge pull request #213 from KolushovAlexandr/11.0-7cb04f82eb05c5b303…
itpp-bot Jul 29, 2019
9675b03
:shield: travis.yml enable check tags
Aug 2, 2019
98f704c
:shield: travis.yml enable check tags
Aug 2, 2019
3e3ab4c
:zap: mail_base New: added ability to select channels for private mes…
Ommo73 Mar 19, 2019
1ccc657
:zap: mail_private New: added ability to select channels for private …
Ommo73 Mar 19, 2019
7da7cca
Merge pull request #218 from kaadevelop/11.0
itpp-bot Aug 7, 2019
df22626
Merge pull request #217 from kaadevelop/10.0
itpp-bot Aug 7, 2019
da9dc54
Merge remote-tracking branch 'upstream/10.0' into 11.0-automerge-df22…
Aug 7, 2019
cc429a5
Merge pull request #221 from TestMergeBot/11.0-automerge-df226262ec68…
itpp-bot Aug 7, 2019
c045b3d
Merge branch '10.0' into 10.0-mail_private-add_channels
Ommo73 Aug 8, 2019
5a610a4
Merge pull request #182 from Ommo73/10.0-mail_private-add_channels
itpp-bot Aug 11, 2019
32ba6a0
:zap: mail_to New: channels are displayed in recipients
Ommo73 Jul 18, 2019
ad8ea0f
Merge pull request #214 from Ommo73/10.0-mail_to_channels_add
em230418 Sep 10, 2019
e79c1e5
:alien: Update mail_private.pot
i18n-bot Sep 10, 2019
8e05ef8
:alien: Update mail_to.pot
i18n-bot Sep 10, 2019
033f248
:shield: shield make separate run for makepot
Oct 2, 2019
a090316
Merge pull request #230 from yelizariev/10.0-separate-makepot
itpp-bot Oct 2, 2019
570c37c
Merge remote-tracking branch 'upstream/10.0' into 11.0-mail_addons-me…
Ommo73 Oct 11, 2019
7d12f03
:ambulance: mail_to: clean up excess code
Ommo73 Oct 16, 2019
2d3c710
:ambulance: mail_private: fixing errors
Ommo73 Oct 16, 2019
980effc
:rainbow: mail_to: UTF-8 coding is not necessary
Ommo73 Oct 17, 2019
c04e4a0
:rainbow: mail_private: UTF-8 coding is not necessary
Ommo73 Oct 17, 2019
c7f3f8a
:book: mail_base: Wrong version in module's README.rst
Ommo73 Oct 17, 2019
1914b4a
:book: mail_multi_website: too long module name
Ommo73 Oct 17, 2019
0407ce3
Merge pull request #235 from Ommo73/11.0-mail_addons-merge2
itpp-bot Oct 25, 2019
5e41d32
:alien: Update mail_private.pot
i18n-bot Oct 25, 2019
ae52da7
Merge remote-tracking branch 'upstream/11.0' into 12.0-mail_addons-merge
Ommo73 Oct 26, 2019
1d415a2
:ambulance: mail_to: fixing errors
Ommo73 Oct 26, 2019
2df5ddb
:ambulance: mail_private: fixing errors
Ommo73 Oct 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mail_all/i18n/mail_all.pot
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,3 @@ msgstr ""
#, python-format
msgid "Open All Messages"
msgstr ""

12 changes: 7 additions & 5 deletions mail_all/i18n/sl.po
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_all
#
#
# Translators:
# Matjaz Mozetic <[email protected]>, 2019
#
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-05 23:09+0000\n"
"PO-Revision-Date: 2018-04-21 00:05+0000\n"
"Last-Translator: Matjaz Mozetic <[email protected]>, 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
Expand Down
1 change: 0 additions & 1 deletion mail_archives/i18n/mail_archives.pot
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ msgstr ""
#, python-format
msgid "Archive is empty"
msgstr ""

12 changes: 7 additions & 5 deletions mail_archives/i18n/sl.po
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_archives
#
#
# Translators:
# Matjaz Mozetic <[email protected]>, 2019
#
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-05 23:09+0000\n"
"PO-Revision-Date: 2018-04-21 00:05+0000\n"
"Last-Translator: Matjaz Mozetic <[email protected]>, 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
Expand Down
2 changes: 1 addition & 1 deletion mail_base/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/odoo/odoo/blob/9.0/addons/mail/static/src/js/chat_manager.js#L57>`__
One can say, that the module do this todo from `addons/mail/static/src/js/chat_manager.js <https://github.com/odoo/odoo/blob/11.0/addons/mail/static/src/js/chat_manager.js#L57>`__

// to do: move this to mail.utils

Expand Down
1 change: 1 addition & 0 deletions mail_base/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html)

from . import models
from . import controllers
6 changes: 5 additions & 1 deletion mail_base/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# Copyright 2016 x620 <https://github.com/x620>
# Copyright 2018 Ruslan Ronzhin <https://it-projects.info/team/rusllan/>
# Copyright 2016-2019 Ivan Yelizariev <https://it-projects.info/team/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": "[email protected]",
Expand Down
4 changes: 4 additions & 0 deletions mail_base/controllers/main.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright 2017 mikaelh <https://github.com/mikaelh>
# Copyright 2017-2019 Ivan Yelizariev <https://it-projects.info/team/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

Expand All @@ -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)
8 changes: 8 additions & 0 deletions mail_base/doc/changelog.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions mail_base/i18n/de.po
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_base
#
#
# Translators:
# Dawid Runowski <[email protected]>, 2019
# Ermin Trevisan <[email protected]>, 2019
#
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-05 23:09+0000\n"
"PO-Revision-Date: 2017-11-28 13:59+0000\n"
"Last-Translator: Ermin Trevisan <[email protected]>, 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
Expand Down
7 changes: 4 additions & 3 deletions mail_base/i18n/es.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_base
#
#
# Translators:
# Randall Castro <[email protected]>, 2018
msgid ""
Expand All @@ -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 <[email protected]>, 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
Expand Down
7 changes: 4 additions & 3 deletions mail_base/i18n/it.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_base
#
#
# Translators:
# Translation Bot <[email protected]>, 2017
msgid ""
Expand All @@ -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 <[email protected]>, 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
Expand Down
25 changes: 25 additions & 0 deletions mail_base/i18n/mail_base.pot
Original file line number Diff line number Diff line change
@@ -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 ""

7 changes: 4 additions & 3 deletions mail_base/i18n/pt.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_base
#
#
# Translators:
# Translation Bot <[email protected]>, 2018
msgid ""
Expand All @@ -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 <[email protected]>, 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
Expand Down
7 changes: 4 additions & 3 deletions mail_base/i18n/pt_BR.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_base
#
#
# Translators:
# Translation Bot <[email protected]>, 2018
msgid ""
Expand All @@ -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 <[email protected]>, 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
Expand Down
11 changes: 7 additions & 4 deletions mail_base/i18n/ru.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_base
#
#
# Translators:
# Ivan Yelizariev <[email protected]>, 2017
msgid ""
Expand All @@ -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 <[email protected]>, 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
Expand Down
12 changes: 7 additions & 5 deletions mail_base/i18n/sl.po
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mail_base
#
#
# Translators:
# Translation Bot <[email protected]>, 2017
# Matjaz Mozetic <[email protected]>, 2019
#
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-05 23:09+0000\n"
"PO-Revision-Date: 2017-11-28 13:59+0000\n"
"Last-Translator: Matjaz Mozetic <[email protected]>, 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
Expand Down
7 changes: 5 additions & 2 deletions mail_base/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright 2016 x620 <https://github.com/x620>
# Copyright 2017 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html)

from openerp import api, models

Expand All @@ -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)


Expand Down
3 changes: 3 additions & 0 deletions mail_base/static/lib/base.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* Copyright 2017 Artyom Losev <https://github.com/ArtyomLosev>
Copyright 2019 Artem Rafailov <https://github.com/Ommo73>
License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). */
odoo.define('mail_base.base', function (require) {
"use strict";

Expand Down
2 changes: 1 addition & 1 deletion mail_move_message/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions mail_move_message/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 5 additions & 0 deletions mail_move_message/doc/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
`1.0.7`
-------

**FIX**: polling errors on heavy server load

`1.0.6`
-------

Expand Down
Loading