From c83bf40b63037ee661e78052b4a3f4a62f0a84b8 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 15 May 2017 16:52:27 +0200 Subject: [PATCH 01/21] [MIG] mail_debrand There's no commits preservation, as the module doesn't serve as is on v9. --- mail_debrand/README.rst | 73 +++++++ mail_debrand/__init__.py | 4 + mail_debrand/__openerp__.py | 21 ++ mail_debrand/i18n/es.po | 34 ++++ mail_debrand/models/__init__.py | 4 + mail_debrand/models/mail_template.py | 43 ++++ mail_debrand/static/description/icon.png | Bin 0 -> 5367 bytes mail_debrand/static/description/icon.svg | 248 +++++++++++++++++++++++ mail_debrand/tests/__init__.py | 4 + mail_debrand/tests/test_mail_debrand.py | 26 +++ 10 files changed, 457 insertions(+) create mode 100644 mail_debrand/README.rst create mode 100644 mail_debrand/__init__.py create mode 100644 mail_debrand/__openerp__.py create mode 100644 mail_debrand/i18n/es.po create mode 100644 mail_debrand/models/__init__.py create mode 100644 mail_debrand/models/mail_template.py create mode 100644 mail_debrand/static/description/icon.png create mode 100644 mail_debrand/static/description/icon.svg create mode 100644 mail_debrand/tests/__init__.py create mode 100644 mail_debrand/tests/test_mail_debrand.py diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst new file mode 100644 index 000000000..d9f21516b --- /dev/null +++ b/mail_debrand/README.rst @@ -0,0 +1,73 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============ +Mail Debrand +============ + +This module modifies the functionality of emails to remove the Odoo branding. + +It also allows some context options to remove user and company signatures too. + +Usage +===== + +To use this module, you need to: + +* Install it. +* Send an email. +* Nobody will know it comes from Odoo. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/205/10.0 + + +Known issues / Roadmap +====================== + +* This module relies on the translation of the strings here in this module that + must match the mail notification template translation on Odoo core, + specifically the words "using" and "Odoo". + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Contributors +------------ + +* Rafael Blasco +* Jairo Llopis +* Jordi Ballester Alomar +* Darshan Patel +* Pedro M. Baeza + +Images +------ + +* https://openclipart.org/detail/29117/unread-mail-icon +* https://openclipart.org/detail/147961/panneau-interdit-forbidden-road-sign-basic + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/mail_debrand/__init__.py b/mail_debrand/__init__.py new file mode 100644 index 000000000..a77a6fcbc --- /dev/null +++ b/mail_debrand/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/mail_debrand/__openerp__.py b/mail_debrand/__openerp__.py new file mode 100644 index 000000000..9445ac5d7 --- /dev/null +++ b/mail_debrand/__openerp__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Tecnativa - Jairo Llopis +# Copyright 2017 SerpentCS - Darshan Patel +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Mail Debrand", + "summary": "Remove Odoo branding in sent emails", + "version": "10.0.1.0.0", + "category": "Social Network", + "website": "https://www.tecnativa.com", + "author": "Tecnativa, " + "Eficent, " + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": [ + "mail", + ], +} diff --git a/mail_debrand/i18n/es.po b/mail_debrand/i18n/es.po new file mode 100644 index 000000000..d0eb1d65c --- /dev/null +++ b/mail_debrand/i18n/es.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 14:50+0000\n" +"PO-Revision-Date: 2017-05-15 14:50+0000\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_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "Plantillas de correo electrónico" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "Odoo" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "usando" + diff --git a/mail_debrand/models/__init__.py b/mail_debrand/models/__init__.py new file mode 100644 index 000000000..c290298c9 --- /dev/null +++ b/mail_debrand/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import mail_template diff --git a/mail_debrand/models/mail_template.py b/mail_debrand/models/mail_template.py new file mode 100644 index 000000000..d4b984db0 --- /dev/null +++ b/mail_debrand/models/mail_template.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import re +from odoo import _, api, models + + +class MailTemplate(models.Model): + _inherit = 'mail.template' + + @api.multi + def generate_email(self, res_ids, fields=None): + mail_template = self.env.ref( + 'mail.mail_template_data_notification_email_default' + ) + if self == mail_template: + obj = self.with_context(mail_debrand=True) + else: + obj = self + return super(MailTemplate, obj).generate_email(res_ids, fields=fields) + + @api.model + def _debrand_body(self, body): + using_word = _('using') + odoo_word = _('Odoo') + return re.sub( + using_word + "(.*)[\r\n]*(.*)>" + odoo_word + r"", "", body, + ) + + @api.model + def render_template(self, template_txt, model, res_ids, + post_process=False): + res = super(MailTemplate, self).render_template( + template_txt, model, res_ids, post_process=post_process, + ) + if post_process and self.env.context.get('mail_debrand'): + if isinstance(res, basestring): + res = self._debrand_body(res) + else: + for res_id, body in res.iteritems(): + res[res_id] = self._debrand_body(body) + return res diff --git a/mail_debrand/static/description/icon.png b/mail_debrand/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..06a30af91980c5ae9d1dd04fb396e0bb723cdfc3 GIT binary patch literal 5367 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 literal 0 HcmV?d00001 diff --git a/mail_debrand/static/description/icon.svg b/mail_debrand/static/description/icon.svg new file mode 100644 index 000000000..6609694df --- /dev/null +++ b/mail_debrand/static/description/icon.svg @@ -0,0 +1,248 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mail_debrand/tests/__init__.py b/mail_debrand/tests/__init__.py new file mode 100644 index 000000000..62fe23ea8 --- /dev/null +++ b/mail_debrand/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_mail_debrand diff --git a/mail_debrand/tests/test_mail_debrand.py b/mail_debrand/tests/test_mail_debrand.py new file mode 100644 index 000000000..4878adf93 --- /dev/null +++ b/mail_debrand/tests/test_mail_debrand.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests import common + + +class TestMailDebrand(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestMailDebrand, cls).setUpClass() + cls.template = cls.env.ref( + 'mail.mail_template_data_notification_email_default' + ) + + def test_generate_email_simple(self): + res = self.template.generate_email( + self.env.user.id, fields=['body_html'], + ) + self.assertNotIn('using', res) + + def test_generate_email_multi(self): + res = self.template.generate_email( + self.env.user.ids, fields=['body_html'], + ) + self.assertNotIn('using', res[res.keys()[0]]) From dcc908f3efca1d88af42a9355679a6b3471aba41 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 27 Jan 2018 14:34:59 +0100 Subject: [PATCH 02/21] OCA Transbot updated translations from Transifex --- mail_debrand/i18n/de.po | 36 ++++++++++++++++++++++++++++++++++++ mail_debrand/i18n/es_MX.po | 36 ++++++++++++++++++++++++++++++++++++ mail_debrand/i18n/fr.po | 36 ++++++++++++++++++++++++++++++++++++ mail_debrand/i18n/hr.po | 36 ++++++++++++++++++++++++++++++++++++ mail_debrand/i18n/it.po | 36 ++++++++++++++++++++++++++++++++++++ mail_debrand/i18n/nl_NL.po | 36 ++++++++++++++++++++++++++++++++++++ mail_debrand/i18n/zh_CN.po | 36 ++++++++++++++++++++++++++++++++++++ 7 files changed, 252 insertions(+) create mode 100644 mail_debrand/i18n/de.po create mode 100644 mail_debrand/i18n/es_MX.po create mode 100644 mail_debrand/i18n/fr.po create mode 100644 mail_debrand/i18n/hr.po create mode 100644 mail_debrand/i18n/it.po create mode 100644 mail_debrand/i18n/nl_NL.po create mode 100644 mail_debrand/i18n/zh_CN.po diff --git a/mail_debrand/i18n/de.po b/mail_debrand/i18n/de.po new file mode 100644 index 000000000..de8cfc660 --- /dev/null +++ b/mail_debrand/i18n/de.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +# Translators: +# Niki Waibel, 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-24 03:51+0000\n" +"PO-Revision-Date: 2018-01-24 03:51+0000\n" +"Last-Translator: Niki Waibel, 2018\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/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_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "E-Mail Vorlagen" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "" diff --git a/mail_debrand/i18n/es_MX.po b/mail_debrand/i18n/es_MX.po new file mode 100644 index 000000000..a3fe54652 --- /dev/null +++ b/mail_debrand/i18n/es_MX.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +# Translators: +# OCA Transbot , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-24 03:51+0000\n" +"PO-Revision-Date: 2018-01-24 03:51+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mail_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "Plantillas de Correo Electrónico" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "" diff --git a/mail_debrand/i18n/fr.po b/mail_debrand/i18n/fr.po new file mode 100644 index 000000000..0de790ba6 --- /dev/null +++ b/mail_debrand/i18n/fr.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +# Translators: +# Quentin THEURET , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-26 01:46+0000\n" +"PO-Revision-Date: 2018-02-26 01:46+0000\n" +"Last-Translator: Quentin THEURET , 2018\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: mail_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "Modèles de courriel" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "Odoo" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "utilisant" diff --git a/mail_debrand/i18n/hr.po b/mail_debrand/i18n/hr.po new file mode 100644 index 000000000..cd64b9c54 --- /dev/null +++ b/mail_debrand/i18n/hr.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +# Translators: +# OCA Transbot , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-24 03:51+0000\n" +"PO-Revision-Date: 2018-01-24 03:51+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: mail_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "Predlošci mailova" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "" diff --git a/mail_debrand/i18n/it.po b/mail_debrand/i18n/it.po new file mode 100644 index 000000000..2174c0bbf --- /dev/null +++ b/mail_debrand/i18n/it.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +# Translators: +# Marius Marolla , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-24 03:51+0000\n" +"PO-Revision-Date: 2018-01-24 03:51+0000\n" +"Last-Translator: Marius Marolla , 2018\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/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_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "Modelli Email" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "" diff --git a/mail_debrand/i18n/nl_NL.po b/mail_debrand/i18n/nl_NL.po new file mode 100644 index 000000000..ed30ddaec --- /dev/null +++ b/mail_debrand/i18n/nl_NL.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +# Translators: +# Peter Hageman , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-24 03:51+0000\n" +"PO-Revision-Date: 2018-01-24 03:51+0000\n" +"Last-Translator: Peter Hageman , 2018\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mail_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "E-mailsjablonen" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "" diff --git a/mail_debrand/i18n/zh_CN.po b/mail_debrand/i18n/zh_CN.po new file mode 100644 index 000000000..60344b8ab --- /dev/null +++ b/mail_debrand/i18n/zh_CN.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +# Translators: +# OCA Transbot , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-24 03:51+0000\n" +"PO-Revision-Date: 2018-01-24 03:51+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: mail_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "Email 模板" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:26 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "using" +msgstr "" From ccb68601602ac7d04519d54cb3ae6694d2b18b75 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Wed, 25 Apr 2018 16:35:54 +0200 Subject: [PATCH 03/21] [11.0][MIG] mail_debrand --- mail_debrand/README.rst | 5 +++-- mail_debrand/__init__.py | 1 - mail_debrand/{__openerp__.py => __manifest__.py} | 3 +-- mail_debrand/models/__init__.py | 1 - mail_debrand/models/mail_template.py | 5 ++--- mail_debrand/tests/__init__.py | 1 - mail_debrand/tests/test_mail_debrand.py | 3 +-- 7 files changed, 7 insertions(+), 12 deletions(-) rename mail_debrand/{__openerp__.py => __manifest__.py} (91%) diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst index d9f21516b..be9de7de3 100644 --- a/mail_debrand/README.rst +++ b/mail_debrand/README.rst @@ -1,4 +1,4 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 @@ -21,7 +21,7 @@ To use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/205/10.0 + :target: https://runbot.odoo-community.org/runbot/205/11.0 Known issues / Roadmap @@ -50,6 +50,7 @@ Contributors * Jordi Ballester Alomar * Darshan Patel * Pedro M. Baeza +* Lois Rilo Images ------ diff --git a/mail_debrand/__init__.py b/mail_debrand/__init__.py index a77a6fcbc..83e553ac4 100644 --- a/mail_debrand/__init__.py +++ b/mail_debrand/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/mail_debrand/__openerp__.py b/mail_debrand/__manifest__.py similarity index 91% rename from mail_debrand/__openerp__.py rename to mail_debrand/__manifest__.py index 9445ac5d7..e60d41f07 100644 --- a/mail_debrand/__openerp__.py +++ b/mail_debrand/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Tecnativa - Jairo Llopis # Copyright 2017 SerpentCS - Darshan Patel # Copyright 2017 Tecnativa - Pedro M. Baeza @@ -7,7 +6,7 @@ { "name": "Mail Debrand", "summary": "Remove Odoo branding in sent emails", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "category": "Social Network", "website": "https://www.tecnativa.com", "author": "Tecnativa, " diff --git a/mail_debrand/models/__init__.py b/mail_debrand/models/__init__.py index c290298c9..74b313100 100644 --- a/mail_debrand/models/__init__.py +++ b/mail_debrand/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import mail_template diff --git a/mail_debrand/models/mail_template.py b/mail_debrand/models/mail_template.py index d4b984db0..974a4180b 100644 --- a/mail_debrand/models/mail_template.py +++ b/mail_debrand/models/mail_template.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -35,9 +34,9 @@ class MailTemplate(models.Model): template_txt, model, res_ids, post_process=post_process, ) if post_process and self.env.context.get('mail_debrand'): - if isinstance(res, basestring): + if isinstance(res, str): res = self._debrand_body(res) else: - for res_id, body in res.iteritems(): + for res_id, body in res.items(): res[res_id] = self._debrand_body(body) return res diff --git a/mail_debrand/tests/__init__.py b/mail_debrand/tests/__init__.py index 62fe23ea8..df7180274 100644 --- a/mail_debrand/tests/__init__.py +++ b/mail_debrand/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_mail_debrand diff --git a/mail_debrand/tests/test_mail_debrand.py b/mail_debrand/tests/test_mail_debrand.py index 4878adf93..116b8b79b 100644 --- a/mail_debrand/tests/test_mail_debrand.py +++ b/mail_debrand/tests/test_mail_debrand.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -23,4 +22,4 @@ class TestMailDebrand(common.SavepointCase): res = self.template.generate_email( self.env.user.ids, fields=['body_html'], ) - self.assertNotIn('using', res[res.keys()[0]]) + self.assertNotIn('using', res[[*res.keys()][0]]) From 33f12fdcd2c42af2ae3317495fdc80f191785c9a Mon Sep 17 00:00:00 2001 From: oca-travis Date: Sun, 17 Jun 2018 19:58:28 +0000 Subject: [PATCH 04/21] [UPD] Update mail_debrand.pot --- mail_debrand/i18n/de.po | 8 ++++---- mail_debrand/i18n/es.po | 8 ++++---- mail_debrand/i18n/es_MX.po | 11 +++++----- mail_debrand/i18n/fr.po | 8 ++++---- mail_debrand/i18n/hr.po | 11 +++++----- mail_debrand/i18n/it.po | 8 ++++---- mail_debrand/i18n/mail_debrand.pot | 32 ++++++++++++++++++++++++++++++ mail_debrand/i18n/nl_NL.po | 11 +++++----- mail_debrand/i18n/zh_CN.po | 11 +++++----- 9 files changed, 72 insertions(+), 36 deletions(-) create mode 100644 mail_debrand/i18n/mail_debrand.pot diff --git a/mail_debrand/i18n/de.po b/mail_debrand/i18n/de.po index de8cfc660..d11dfe4d4 100644 --- a/mail_debrand/i18n/de.po +++ b/mail_debrand/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_debrand -# +# # Translators: # Niki Waibel, 2018 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2018-01-24 03:51+0000\n" "Last-Translator: Niki Waibel, 2018\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/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_debrand @@ -24,13 +24,13 @@ msgid "Email Templates" msgstr "E-Mail Vorlagen" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "" diff --git a/mail_debrand/i18n/es.po b/mail_debrand/i18n/es.po index d0eb1d65c..8b9959756 100644 --- a/mail_debrand/i18n/es.po +++ b/mail_debrand/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * mail_debrand +# * mail_debrand # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2017-05-15 14:50+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -21,14 +22,13 @@ msgid "Email Templates" msgstr "Plantillas de correo electrónico" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "Odoo" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "usando" - diff --git a/mail_debrand/i18n/es_MX.po b/mail_debrand/i18n/es_MX.po index a3fe54652..0500f615c 100644 --- a/mail_debrand/i18n/es_MX.po +++ b/mail_debrand/i18n/es_MX.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_debrand -# +# # Translators: # OCA Transbot , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-01-24 03:51+0000\n" "PO-Revision-Date: 2018-01-24 03:51+0000\n" "Last-Translator: OCA Transbot , 2018\n" -"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n" +"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/" +"es_MX/)\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_debrand @@ -24,13 +25,13 @@ msgid "Email Templates" msgstr "Plantillas de Correo Electrónico" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "" diff --git a/mail_debrand/i18n/fr.po b/mail_debrand/i18n/fr.po index 0de790ba6..a66dada79 100644 --- a/mail_debrand/i18n/fr.po +++ b/mail_debrand/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_debrand -# +# # Translators: # Quentin THEURET , 2018 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2018-02-26 01:46+0000\n" "Last-Translator: Quentin THEURET , 2018\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: mail_debrand @@ -24,13 +24,13 @@ msgid "Email Templates" msgstr "Modèles de courriel" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "Odoo" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "utilisant" diff --git a/mail_debrand/i18n/hr.po b/mail_debrand/i18n/hr.po index cd64b9c54..104f3f168 100644 --- a/mail_debrand/i18n/hr.po +++ b/mail_debrand/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_debrand -# +# # Translators: # OCA Transbot , 2018 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2018-01-24 03:51+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: mail_debrand #: model:ir.model,name:mail_debrand.model_mail_template @@ -24,13 +25,13 @@ msgid "Email Templates" msgstr "Predlošci mailova" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "" diff --git a/mail_debrand/i18n/it.po b/mail_debrand/i18n/it.po index 2174c0bbf..9b4a86308 100644 --- a/mail_debrand/i18n/it.po +++ b/mail_debrand/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_debrand -# +# # Translators: # Marius Marolla , 2018 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2018-01-24 03:51+0000\n" "Last-Translator: Marius Marolla , 2018\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/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_debrand @@ -24,13 +24,13 @@ msgid "Email Templates" msgstr "Modelli Email" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "" diff --git a/mail_debrand/i18n/mail_debrand.pot b/mail_debrand/i18n/mail_debrand.pot new file mode 100644 index 000000000..22a54835d --- /dev/null +++ b/mail_debrand/i18n/mail_debrand.pot @@ -0,0 +1,32 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_debrand +# +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_debrand +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:25 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:24 +#, python-format +msgid "using" +msgstr "" + diff --git a/mail_debrand/i18n/nl_NL.po b/mail_debrand/i18n/nl_NL.po index ed30ddaec..b7ed499b6 100644 --- a/mail_debrand/i18n/nl_NL.po +++ b/mail_debrand/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_debrand -# +# # Translators: # Peter Hageman , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-01-24 03:51+0000\n" "PO-Revision-Date: 2018-01-24 03:51+0000\n" "Last-Translator: Peter Hageman , 2018\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_debrand @@ -24,13 +25,13 @@ msgid "Email Templates" msgstr "E-mailsjablonen" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "" diff --git a/mail_debrand/i18n/zh_CN.po b/mail_debrand/i18n/zh_CN.po index 60344b8ab..bb1f5a6fe 100644 --- a/mail_debrand/i18n/zh_CN.po +++ b/mail_debrand/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_debrand -# +# # Translators: # OCA Transbot , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-01-24 03:51+0000\n" "PO-Revision-Date: 2018-01-24 03:51+0000\n" "Last-Translator: OCA Transbot , 2018\n" -"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" +"zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: mail_debrand @@ -24,13 +25,13 @@ msgid "Email Templates" msgstr "Email 模板" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:26 +#: code:addons/mail_debrand/models/mail_template.py:25 #, python-format msgid "Odoo" msgstr "" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 +#: code:addons/mail_debrand/models/mail_template.py:24 #, python-format msgid "using" msgstr "" From 682379abc220ecebe594aca1161e38bb4e071f64 Mon Sep 17 00:00:00 2001 From: Graeme Gellatly Date: Wed, 7 Nov 2018 18:12:38 +1300 Subject: [PATCH 05/21] Rewrite mail_debrand for v12 --- mail_debrand/README.rst | 84 ++-- mail_debrand/__init__.py | 3 - mail_debrand/__manifest__.py | 14 +- mail_debrand/i18n/de.po | 36 -- mail_debrand/i18n/es.po | 34 -- mail_debrand/i18n/es_MX.po | 37 -- mail_debrand/i18n/fr.po | 36 -- mail_debrand/i18n/hr.po | 37 -- mail_debrand/i18n/it.po | 36 -- mail_debrand/i18n/mail_debrand.pot | 19 +- mail_debrand/i18n/nl_NL.po | 37 -- mail_debrand/i18n/zh_CN.po | 37 -- mail_debrand/models/__init__.py | 3 - mail_debrand/models/mail_template.py | 42 -- mail_debrand/readme/CONTRIBUTORS.rst | 1 + mail_debrand/readme/DESCRIPTION.rst | 2 + mail_debrand/readme/HISTORY.rst | 4 + mail_debrand/readme/USAGE.rst | 5 + mail_debrand/static/description/index.html | 436 ++++++++++++++++++ mail_debrand/tests/__init__.py | 3 - mail_debrand/tests/test_mail_debrand.py | 25 - mail_debrand/views/mail_notification_view.xml | 29 ++ 22 files changed, 537 insertions(+), 423 deletions(-) delete mode 100644 mail_debrand/i18n/de.po delete mode 100644 mail_debrand/i18n/es.po delete mode 100644 mail_debrand/i18n/es_MX.po delete mode 100644 mail_debrand/i18n/fr.po delete mode 100644 mail_debrand/i18n/hr.po delete mode 100644 mail_debrand/i18n/it.po delete mode 100644 mail_debrand/i18n/nl_NL.po delete mode 100644 mail_debrand/i18n/zh_CN.po delete mode 100644 mail_debrand/models/__init__.py delete mode 100644 mail_debrand/models/mail_template.py create mode 100644 mail_debrand/readme/CONTRIBUTORS.rst create mode 100644 mail_debrand/readme/DESCRIPTION.rst create mode 100644 mail_debrand/readme/HISTORY.rst create mode 100644 mail_debrand/readme/USAGE.rst create mode 100644 mail_debrand/static/description/index.html delete mode 100644 mail_debrand/tests/__init__.py delete mode 100644 mail_debrand/tests/test_mail_debrand.py create mode 100644 mail_debrand/views/mail_notification_view.xml diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst index be9de7de3..993ba42b7 100644 --- a/mail_debrand/README.rst +++ b/mail_debrand/README.rst @@ -1,14 +1,37 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ============ Mail Debrand ============ -This module modifies the functionality of emails to remove the Odoo branding. +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -It also allows some context options to remove user and company signatures too. +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github + :target: https://github.com/OCA/social/tree/12.0/mail_debrand + :alt: OCA/social +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_debrand + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/205/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module modifies the functionality of emails to remove the Odoo branding, +specifically the 'using Odoo' of notifications or the 'Powered by Odoo' + +**Table of contents** + +.. contents:: + :local: Usage ===== @@ -19,56 +42,45 @@ To use this module, you need to: * Send an email. * Nobody will know it comes from Odoo. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/205/11.0 +Changelog +========= +12.0.1.0.0 (2018-11-06) +~~~~~~~~~~~~~~~~~~~~~~~ -Known issues / Roadmap -====================== - -* This module relies on the translation of the strings here in this module that - must match the mail notification template translation on Odoo core, - specifically the words "using" and "Odoo". +* [NEW] Initial V12 version. Complete rewrite from v11. Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= Contributors ------------- +~~~~~~~~~~~~ -* Rafael Blasco -* Jairo Llopis -* Jordi Ballester Alomar -* Darshan Patel -* Pedro M. Baeza -* Lois Rilo +* Graeme Gellatly -Images ------- +Maintainers +~~~~~~~~~~~ -* https://openclipart.org/detail/29117/unread-mail-icon -* https://openclipart.org/detail/147961/panneau-interdit-forbidden-road-sign-basic - -Maintainer ----------- +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/social `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_debrand/__init__.py b/mail_debrand/__init__.py index 83e553ac4..e69de29bb 100644 --- a/mail_debrand/__init__.py +++ b/mail_debrand/__init__.py @@ -1,3 +0,0 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import models diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py index e60d41f07..9d5f58eec 100644 --- a/mail_debrand/__manifest__.py +++ b/mail_debrand/__manifest__.py @@ -1,20 +1,18 @@ -# Copyright 2016 Tecnativa - Jairo Llopis -# Copyright 2017 SerpentCS - Darshan Patel -# Copyright 2017 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Mail Debrand", "summary": "Remove Odoo branding in sent emails", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "category": "Social Network", - "website": "https://www.tecnativa.com", - "author": "Tecnativa, " - "Eficent, " - "Odoo Community Association (OCA)", + "website": "https://odoo-community.org/", + "author": "Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, "depends": [ "mail", ], + "data": [ + 'views/mail_notification_view.xml' + ] } diff --git a/mail_debrand/i18n/de.po b/mail_debrand/i18n/de.po deleted file mode 100644 index d11dfe4d4..000000000 --- a/mail_debrand/i18n/de.po +++ /dev/null @@ -1,36 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -# Translators: -# Niki Waibel, 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 03:51+0000\n" -"PO-Revision-Date: 2018-01-24 03:51+0000\n" -"Last-Translator: Niki Waibel, 2018\n" -"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "E-Mail Vorlagen" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "" diff --git a/mail_debrand/i18n/es.po b/mail_debrand/i18n/es.po deleted file mode 100644 index 8b9959756..000000000 --- a/mail_debrand/i18n/es.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-15 14:50+0000\n" -"PO-Revision-Date: 2017-05-15 14:50+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "Plantillas de correo electrónico" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "Odoo" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "usando" diff --git a/mail_debrand/i18n/es_MX.po b/mail_debrand/i18n/es_MX.po deleted file mode 100644 index 0500f615c..000000000 --- a/mail_debrand/i18n/es_MX.po +++ /dev/null @@ -1,37 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -# Translators: -# OCA Transbot , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 03:51+0000\n" -"PO-Revision-Date: 2018-01-24 03:51+0000\n" -"Last-Translator: OCA Transbot , 2018\n" -"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/" -"es_MX/)\n" -"Language: es_MX\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "Plantillas de Correo Electrónico" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "" diff --git a/mail_debrand/i18n/fr.po b/mail_debrand/i18n/fr.po deleted file mode 100644 index a66dada79..000000000 --- a/mail_debrand/i18n/fr.po +++ /dev/null @@ -1,36 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -# Translators: -# Quentin THEURET , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-26 01:46+0000\n" -"PO-Revision-Date: 2018-02-26 01:46+0000\n" -"Last-Translator: Quentin THEURET , 2018\n" -"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "Modèles de courriel" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "Odoo" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "utilisant" diff --git a/mail_debrand/i18n/hr.po b/mail_debrand/i18n/hr.po deleted file mode 100644 index 104f3f168..000000000 --- a/mail_debrand/i18n/hr.po +++ /dev/null @@ -1,37 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -# Translators: -# OCA Transbot , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 03:51+0000\n" -"PO-Revision-Date: 2018-01-24 03:51+0000\n" -"Last-Translator: OCA Transbot , 2018\n" -"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" -"Language: hr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "Predlošci mailova" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "" diff --git a/mail_debrand/i18n/it.po b/mail_debrand/i18n/it.po deleted file mode 100644 index 9b4a86308..000000000 --- a/mail_debrand/i18n/it.po +++ /dev/null @@ -1,36 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -# Translators: -# Marius Marolla , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 03:51+0000\n" -"PO-Revision-Date: 2018-01-24 03:51+0000\n" -"Last-Translator: Marius Marolla , 2018\n" -"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "Modelli Email" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "" diff --git a/mail_debrand/i18n/mail_debrand.pot b/mail_debrand/i18n/mail_debrand.pot index 22a54835d..27b591403 100644 --- a/mail_debrand/i18n/mail_debrand.pot +++ b/mail_debrand/i18n/mail_debrand.pot @@ -1,11 +1,12 @@ -# Translation of Odoo Server. # This file contains the translation of the following modules: -# * mail_debrand +# * mail_debrand # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-07 07:23+0000\n" +"PO-Revision-Date: 2018-11-07 07:23+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -19,14 +20,6 @@ msgid "Email Templates" msgstr "" #. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" +#: model_terms:ir.ui.view,arch_db:mail_debrand.message_notification_email +msgid "Sent by" msgstr "" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "" - diff --git a/mail_debrand/i18n/nl_NL.po b/mail_debrand/i18n/nl_NL.po deleted file mode 100644 index b7ed499b6..000000000 --- a/mail_debrand/i18n/nl_NL.po +++ /dev/null @@ -1,37 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -# Translators: -# Peter Hageman , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 03:51+0000\n" -"PO-Revision-Date: 2018-01-24 03:51+0000\n" -"Last-Translator: Peter Hageman , 2018\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" -"teams/23907/nl_NL/)\n" -"Language: nl_NL\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "E-mailsjablonen" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "" diff --git a/mail_debrand/i18n/zh_CN.po b/mail_debrand/i18n/zh_CN.po deleted file mode 100644 index bb1f5a6fe..000000000 --- a/mail_debrand/i18n/zh_CN.po +++ /dev/null @@ -1,37 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_debrand -# -# Translators: -# OCA Transbot , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 03:51+0000\n" -"PO-Revision-Date: 2018-01-24 03:51+0000\n" -"Last-Translator: OCA Transbot , 2018\n" -"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" -"zh_CN/)\n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "Email 模板" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:25 -#, python-format -msgid "Odoo" -msgstr "" - -#. module: mail_debrand -#: code:addons/mail_debrand/models/mail_template.py:24 -#, python-format -msgid "using" -msgstr "" diff --git a/mail_debrand/models/__init__.py b/mail_debrand/models/__init__.py deleted file mode 100644 index 74b313100..000000000 --- a/mail_debrand/models/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import mail_template diff --git a/mail_debrand/models/mail_template.py b/mail_debrand/models/mail_template.py deleted file mode 100644 index 974a4180b..000000000 --- a/mail_debrand/models/mail_template.py +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2017 Tecnativa - Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -import re -from odoo import _, api, models - - -class MailTemplate(models.Model): - _inherit = 'mail.template' - - @api.multi - def generate_email(self, res_ids, fields=None): - mail_template = self.env.ref( - 'mail.mail_template_data_notification_email_default' - ) - if self == mail_template: - obj = self.with_context(mail_debrand=True) - else: - obj = self - return super(MailTemplate, obj).generate_email(res_ids, fields=fields) - - @api.model - def _debrand_body(self, body): - using_word = _('using') - odoo_word = _('Odoo') - return re.sub( - using_word + "(.*)[\r\n]*(.*)>" + odoo_word + r"", "", body, - ) - - @api.model - def render_template(self, template_txt, model, res_ids, - post_process=False): - res = super(MailTemplate, self).render_template( - template_txt, model, res_ids, post_process=post_process, - ) - if post_process and self.env.context.get('mail_debrand'): - if isinstance(res, str): - res = self._debrand_body(res) - else: - for res_id, body in res.items(): - res[res_id] = self._debrand_body(body) - return res diff --git a/mail_debrand/readme/CONTRIBUTORS.rst b/mail_debrand/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..0e4d96ea5 --- /dev/null +++ b/mail_debrand/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Graeme Gellatly diff --git a/mail_debrand/readme/DESCRIPTION.rst b/mail_debrand/readme/DESCRIPTION.rst new file mode 100644 index 000000000..51b2b495d --- /dev/null +++ b/mail_debrand/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module modifies the functionality of emails to remove the Odoo branding, +specifically the 'using Odoo' of notifications or the 'Powered by Odoo' diff --git a/mail_debrand/readme/HISTORY.rst b/mail_debrand/readme/HISTORY.rst new file mode 100644 index 000000000..ad209cc2e --- /dev/null +++ b/mail_debrand/readme/HISTORY.rst @@ -0,0 +1,4 @@ +12.0.1.0.0 (2018-11-06) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [NEW] Initial V12 version. Complete rewrite from v11. diff --git a/mail_debrand/readme/USAGE.rst b/mail_debrand/readme/USAGE.rst new file mode 100644 index 000000000..2a57dc018 --- /dev/null +++ b/mail_debrand/readme/USAGE.rst @@ -0,0 +1,5 @@ +To use this module, you need to: + +* Install it. +* Send an email. +* Nobody will know it comes from Odoo. diff --git a/mail_debrand/static/description/index.html b/mail_debrand/static/description/index.html new file mode 100644 index 000000000..41766dddf --- /dev/null +++ b/mail_debrand/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +Mail Debrand + + + +
+

Mail Debrand

+ + +

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

This module modifies the functionality of emails to remove the Odoo branding, +specifically the ‘using Odoo’ of notifications or the ‘Powered by Odoo’

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  • Install it.
    • +
  • Send an email.
    • +
  • Nobody will know it comes from Odoo.
    • +
+
+
+

Changelog

+
+

12.0.1.0.0 (2018-11-06)

+
    +
  • [NEW] Initial V12 version. Complete rewrite from v11.
    • +
+
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/social project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/mail_debrand/tests/__init__.py b/mail_debrand/tests/__init__.py deleted file mode 100644 index df7180274..000000000 --- a/mail_debrand/tests/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import test_mail_debrand diff --git a/mail_debrand/tests/test_mail_debrand.py b/mail_debrand/tests/test_mail_debrand.py deleted file mode 100644 index 116b8b79b..000000000 --- a/mail_debrand/tests/test_mail_debrand.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2017 Tecnativa - Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo.tests import common - - -class TestMailDebrand(common.SavepointCase): - @classmethod - def setUpClass(cls): - super(TestMailDebrand, cls).setUpClass() - cls.template = cls.env.ref( - 'mail.mail_template_data_notification_email_default' - ) - - def test_generate_email_simple(self): - res = self.template.generate_email( - self.env.user.id, fields=['body_html'], - ) - self.assertNotIn('using', res) - - def test_generate_email_multi(self): - res = self.template.generate_email( - self.env.user.ids, fields=['body_html'], - ) - self.assertNotIn('using', res[[*res.keys()][0]]) diff --git a/mail_debrand/views/mail_notification_view.xml b/mail_debrand/views/mail_notification_view.xml new file mode 100644 index 000000000..5a3a9476d --- /dev/null +++ b/mail_debrand/views/mail_notification_view.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + From 0c441868f4a6cb68b5b8ebc9982cefb68e3c66d7 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 8 Nov 2018 11:25:43 +0000 Subject: [PATCH 06/21] [UPD] Update mail_debrand.pot --- mail_debrand/i18n/mail_debrand.pot | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/mail_debrand/i18n/mail_debrand.pot b/mail_debrand/i18n/mail_debrand.pot index 27b591403..ebf7180fc 100644 --- a/mail_debrand/i18n/mail_debrand.pot +++ b/mail_debrand/i18n/mail_debrand.pot @@ -1,12 +1,11 @@ +# Translation of Odoo Server. # This file contains the translation of the following modules: -# * mail_debrand +# * mail_debrand # msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-07 07:23+0000\n" -"PO-Revision-Date: 2018-11-07 07:23+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -14,12 +13,8 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: mail_debrand -#: model:ir.model,name:mail_debrand.model_mail_template -msgid "Email Templates" -msgstr "" - #. module: mail_debrand #: model_terms:ir.ui.view,arch_db:mail_debrand.message_notification_email msgid "Sent by" msgstr "" + From dfbff9e7c37429be660de04b6b0c65fb696c3569 Mon Sep 17 00:00:00 2001 From: Graeme Gellatly Date: Thu, 27 Dec 2018 21:26:36 +1300 Subject: [PATCH 07/21] [FIX] Parse generated html to remove to remove Odoo branding messages --- mail_debrand/__init__.py | 1 + mail_debrand/__manifest__.py | 7 +--- mail_debrand/models/__init__.py | 1 + mail_debrand/models/mail_template.py | 42 +++++++++++++++++++ mail_debrand/tests/__init__.py | 1 + mail_debrand/tests/test_mail_debrand.py | 25 +++++++++++ mail_debrand/views/mail_notification_view.xml | 29 ------------- 7 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 mail_debrand/models/__init__.py create mode 100644 mail_debrand/models/mail_template.py create mode 100644 mail_debrand/tests/__init__.py create mode 100644 mail_debrand/tests/test_mail_debrand.py delete mode 100644 mail_debrand/views/mail_notification_view.xml diff --git a/mail_debrand/__init__.py b/mail_debrand/__init__.py index e69de29bb..0650744f6 100644 --- a/mail_debrand/__init__.py +++ b/mail_debrand/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py index 9d5f58eec..66d465d22 100644 --- a/mail_debrand/__manifest__.py +++ b/mail_debrand/__manifest__.py @@ -3,16 +3,13 @@ { "name": "Mail Debrand", "summary": "Remove Odoo branding in sent emails", - "version": "12.0.1.0.0", + "version": "12.0.2.0.0", "category": "Social Network", - "website": "https://odoo-community.org/", + "website": "https://github.com/OCA/social/", "author": "Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, "depends": [ "mail", ], - "data": [ - 'views/mail_notification_view.xml' - ] } diff --git a/mail_debrand/models/__init__.py b/mail_debrand/models/__init__.py new file mode 100644 index 000000000..44e83956e --- /dev/null +++ b/mail_debrand/models/__init__.py @@ -0,0 +1 @@ +from . import mail_template diff --git a/mail_debrand/models/mail_template.py b/mail_debrand/models/mail_template.py new file mode 100644 index 000000000..0525f4f18 --- /dev/null +++ b/mail_debrand/models/mail_template.py @@ -0,0 +1,42 @@ +# Copyright 2019 O4SB - Graeme Gellatly +# Copyright 2019 Tecnativa - Ernesto Tejeda +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from lxml import html as htmltree +import re +from odoo import _, api, models + + +class MailTemplate(models.Model): + _inherit = "mail.template" + + @api.model + def _debrand_body(self, html): + using_word = _('using') + odoo_word = _('Odoo') + html = re.sub( + using_word + "(.*)[\r\n]*(.*)>" + odoo_word + r"", "", html, + ) + powered_by = _("Powered by") + if powered_by not in html: + return html + root = htmltree.fromstring(html) + powered_by_elements = root.xpath( + "//*[text()[contains(.,'%s')]]" % powered_by + ) + for elem in powered_by_elements: + # make sure it isn't a spurious powered by + if any( + [ + "www.odoo.com" in child.get("href", "") + for child in elem.getchildren() + ] + ): + for child in elem.getchildren(): + elem.remove(child) + elem.text = None + return htmltree.tostring(root).decode("utf-8") + + @api.model + def render_post_process(self, html): + html = super().render_post_process(html) + return self._debrand_body(html) diff --git a/mail_debrand/tests/__init__.py b/mail_debrand/tests/__init__.py new file mode 100644 index 000000000..e7ef9cb49 --- /dev/null +++ b/mail_debrand/tests/__init__.py @@ -0,0 +1 @@ +from . import test_mail_debrand diff --git a/mail_debrand/tests/test_mail_debrand.py b/mail_debrand/tests/test_mail_debrand.py new file mode 100644 index 000000000..517d3f339 --- /dev/null +++ b/mail_debrand/tests/test_mail_debrand.py @@ -0,0 +1,25 @@ +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests import common + + +class TestMailDebrand(common.TransactionCase): + def setUp(self): + super().setUp() + self.default_arch = self.env.ref( + 'mail.message_notification_email' + ).arch + self.paynow_arch = self.env.ref( + 'mail.mail_notification_paynow' + ).arch + + def test_default_debrand(self): + self.assertIn('using', self.default_arch) + res = self.env["mail.template"]._debrand_body(self.default_arch) + self.assertNotIn('using', res) + + def test_paynow_debrand(self): + self.assertIn('Powered by', self.paynow_arch) + res = self.env["mail.template"]._debrand_body(self.paynow_arch) + self.assertNotIn('Powered by', res) diff --git a/mail_debrand/views/mail_notification_view.xml b/mail_debrand/views/mail_notification_view.xml deleted file mode 100644 index 5a3a9476d..000000000 --- a/mail_debrand/views/mail_notification_view.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - From 5d7da6bbd87e5b80f33a015891c69197ca8aa1fa Mon Sep 17 00:00:00 2001 From: oca-travis Date: Mon, 10 Jun 2019 13:50:07 +0000 Subject: [PATCH 08/21] [UPD] Update mail_debrand.pot --- mail_debrand/i18n/mail_debrand.pot | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/mail_debrand/i18n/mail_debrand.pot b/mail_debrand/i18n/mail_debrand.pot index ebf7180fc..f938b7c70 100644 --- a/mail_debrand/i18n/mail_debrand.pot +++ b/mail_debrand/i18n/mail_debrand.pot @@ -14,7 +14,25 @@ msgstr "" "Plural-Forms: \n" #. module: mail_debrand -#: model_terms:ir.ui.view,arch_db:mail_debrand.message_notification_email -msgid "Sent by" +#: model:ir.model,name:mail_debrand.model_mail_template +msgid "Email Templates" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:15 +#, python-format +msgid "Odoo" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:19 +#, python-format +msgid "Powered by" +msgstr "" + +#. module: mail_debrand +#: code:addons/mail_debrand/models/mail_template.py:14 +#, python-format +msgid "using" msgstr "" From 95eaa12e33ee392fadc028eeee4456356d3fdb11 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 11 Jul 2019 09:13:15 -0500 Subject: [PATCH 09/21] [FIX] mail_debrand: Add development_status (#408) --- mail_debrand/__manifest__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py index 66d465d22..9e090665b 100644 --- a/mail_debrand/__manifest__.py +++ b/mail_debrand/__manifest__.py @@ -12,4 +12,6 @@ "depends": [ "mail", ], + "development_status": "Stable", + "maintainers": ["pedrobaeza"], } From 8c9dc316492daed3816d26e0238f66026fc5e0dc Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 11 Jul 2019 14:13:22 +0000 Subject: [PATCH 10/21] [UPD] README.rst --- mail_debrand/README.rst | 21 +++++++++++++-------- mail_debrand/static/description/index.html | 4 +++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst index 993ba42b7..7d5789512 100644 --- a/mail_debrand/README.rst +++ b/mail_debrand/README.rst @@ -7,23 +7,20 @@ Mail Debrand !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png - :target: https://odoo-community.org/page/development-status - :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png +.. |badge1| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github +.. |badge2| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github :target: https://github.com/OCA/social/tree/12.0/mail_debrand :alt: OCA/social -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png +.. |badge3| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_debrand :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png +.. |badge4| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png :target: https://runbot.odoo-community.org/runbot/205/12.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| This module modifies the functionality of emails to remove the Odoo branding, specifically the 'using Odoo' of notifications or the 'Powered by Odoo' @@ -81,6 +78,14 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. +.. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px + :target: https://github.com/pedrobaeza + :alt: pedrobaeza + +Current `maintainer `__: + +|maintainer-pedrobaeza| + This module is part of the `OCA/social `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_debrand/static/description/index.html b/mail_debrand/static/description/index.html index 41766dddf..6843c3ed9 100644 --- a/mail_debrand/static/description/index.html +++ b/mail_debrand/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

This module modifies the functionality of emails to remove the Odoo branding, specifically the ‘using Odoo’ of notifications or the ‘Powered by Odoo’

Table of contents

@@ -427,6 +427,8 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

+

Current maintainer:

+

pedrobaeza

This module is part of the OCA/social project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

From 0490987967599a8a3289278e972a97a211edda47 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Tue, 16 Jul 2019 15:49:41 +0200 Subject: [PATCH 11/21] [12.0][FIX] mail_debrand: debrand regular notifications. without this fix, any regular notification (added as follower, thread notifications...) were not parsed at all and as a consequence also not debranded. --- mail_debrand/README.rst | 8 ++++++++ mail_debrand/__manifest__.py | 6 +++++- mail_debrand/models/__init__.py | 1 + mail_debrand/models/mail_thread.py | 14 ++++++++++++++ mail_debrand/readme/CONTRIBUTORS.rst | 2 ++ mail_debrand/static/description/index.html | 20 +++++++++++++++----- 6 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 mail_debrand/models/mail_thread.py diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst index 7d5789512..cdbf04b00 100644 --- a/mail_debrand/README.rst +++ b/mail_debrand/README.rst @@ -60,9 +60,17 @@ Do not contact contributors directly about support or help with technical issues Credits ======= +Authors +~~~~~~~ + +* Tecnativa +* Eficent + Contributors ~~~~~~~~~~~~ +* Pedro M. Baeza +* Lois Rilo * Graeme Gellatly Maintainers diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py index 9e090665b..216a834bd 100644 --- a/mail_debrand/__manifest__.py +++ b/mail_debrand/__manifest__.py @@ -1,3 +1,7 @@ +# Copyright 2016 Tecnativa - Jairo Llopis +# Copyright 2017 Tecnativa - Pedro M. Baeza +# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# - Lois Rilo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { @@ -6,7 +10,7 @@ "version": "12.0.2.0.0", "category": "Social Network", "website": "https://github.com/OCA/social/", - "author": "Odoo Community Association (OCA)", + "author": "Tecnativa, Eficent, Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, "depends": [ diff --git a/mail_debrand/models/__init__.py b/mail_debrand/models/__init__.py index 44e83956e..89e090b24 100644 --- a/mail_debrand/models/__init__.py +++ b/mail_debrand/models/__init__.py @@ -1 +1,2 @@ from . import mail_template +from . import mail_thread diff --git a/mail_debrand/models/mail_thread.py b/mail_debrand/models/mail_thread.py new file mode 100644 index 000000000..7fc6f0a2a --- /dev/null +++ b/mail_debrand/models/mail_thread.py @@ -0,0 +1,14 @@ +# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# Lois Rilo +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class MailThread(models.AbstractModel): + _inherit = "mail.thread" + + def _replace_local_links(self, html, base_url=None): + html = super()._replace_local_links(html, base_url=base_url) + html_debranded = self.env["mail.template"]._debrand_body(html) + return html_debranded diff --git a/mail_debrand/readme/CONTRIBUTORS.rst b/mail_debrand/readme/CONTRIBUTORS.rst index 0e4d96ea5..b5f7ce79c 100644 --- a/mail_debrand/readme/CONTRIBUTORS.rst +++ b/mail_debrand/readme/CONTRIBUTORS.rst @@ -1 +1,3 @@ +* Pedro M. Baeza +* Lois Rilo * Graeme Gellatly diff --git a/mail_debrand/static/description/index.html b/mail_debrand/static/description/index.html index 6843c3ed9..67804edc7 100644 --- a/mail_debrand/static/description/index.html +++ b/mail_debrand/static/description/index.html @@ -380,8 +380,9 @@ specifically the ‘using Odoo’ of notifications or the ‘Powered by Odoo’<
  • Bug Tracker
  • Credits
    • @@ -414,14 +415,23 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    Credits

    -
    -

    Contributors

    +
    +

    Authors

      +
    • Tecnativa
      • +
    • Eficent
      • +
    +
    +
    +

    Contributors

    +
    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association

    OCA, or the Odoo Community Association, is a nonprofit organization whose From b4f62b76db35d0414ad37fa8a4f7b0632fb045a6 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Sat, 20 Jul 2019 07:56:34 +0000 Subject: [PATCH 12/21] [UPD] Update mail_debrand.pot --- mail_debrand/i18n/mail_debrand.pot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mail_debrand/i18n/mail_debrand.pot b/mail_debrand/i18n/mail_debrand.pot index f938b7c70..c4440e3a4 100644 --- a/mail_debrand/i18n/mail_debrand.pot +++ b/mail_debrand/i18n/mail_debrand.pot @@ -18,6 +18,11 @@ msgstr "" msgid "Email Templates" msgstr "" +#. module: mail_debrand +#: model:ir.model,name:mail_debrand.model_mail_thread +msgid "Email Thread" +msgstr "" + #. module: mail_debrand #: code:addons/mail_debrand/models/mail_template.py:15 #, python-format From a282a73b54f85a49ee7b6d70da12b308ad904c17 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sat, 20 Jul 2019 08:15:33 +0000 Subject: [PATCH 13/21] mail_debrand 12.0.2.0.1 --- mail_debrand/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py index 216a834bd..f0cd93d42 100644 --- a/mail_debrand/__manifest__.py +++ b/mail_debrand/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Mail Debrand", "summary": "Remove Odoo branding in sent emails", - "version": "12.0.2.0.0", + "version": "12.0.2.0.1", "category": "Social Network", "website": "https://github.com/OCA/social/", "author": "Tecnativa, Eficent, Odoo Community Association (OCA)", From 274a120cd425aca3adaf5adb69ce4ffe4b51651a Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 03:40:40 +0000 Subject: [PATCH 14/21] [UPD] README.rst --- mail_debrand/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_debrand/static/description/index.html b/mail_debrand/static/description/index.html index 67804edc7..314a7756e 100644 --- a/mail_debrand/static/description/index.html +++ b/mail_debrand/static/description/index.html @@ -3,7 +3,7 @@ - + Mail Debrand