diff --git a/README.md b/README.md index efb81a07..36a3b26c 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ addon | version | summary [mail_read_new_window](mail_read_new_window/) | 8.0.1.0.0 | Open mail in a new window [mail_restrict_follower_selection](mail_restrict_follower_selection/) | 8.0.1.0.0 | Define a domain from which followers can be selected [mail_sent](mail_sent/) | 8.0.1.0.0 | Provide a view of sent mails +[marketing_security_group](marketing_security_group/) | 8.0.1.0.0 | Marketing extra security rules [mass_mailing_custom_unsubscribe](mass_mailing_custom_unsubscribe/) | 8.0.1.1.0 | Customizable unsubscription process on mass mailing emails [mass_mailing_statistic_extra](mass_mailing_statistic_extra/) | 8.0.1.0.0 | Mail statistics extra info [social_media_dribbble](social_media_dribbble/) | 8.0.1.0.0 | Dribbble Extension for the social media icons from the odoo core diff --git a/mail_forward/__openerp__.py b/mail_forward/__openerp__.py index c5ac0df7..302a8e1f 100644 --- a/mail_forward/__openerp__.py +++ b/mail_forward/__openerp__.py @@ -7,8 +7,9 @@ "summary": "Add option to forward messages", "version": "8.0.7.0.0", "category": "Social Network", - "website": "https://odoo-community.org/", - "author": "Grupo ESOC, Odoo Community Association (OCA)", + "website": "https://grupoesoc.es", + "author": "Grupo ESOC Ingeniería de Servicios, " + "Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, diff --git a/mail_full_expand/__openerp__.py b/mail_full_expand/__openerp__.py index 75b6c125..414337c6 100644 --- a/mail_full_expand/__openerp__.py +++ b/mail_full_expand/__openerp__.py @@ -7,8 +7,9 @@ "summary": "Expand mail in a big window", "version": "8.0.3.0.0", "category": "Social Network", - "website": "http://www.grupoesoc.es, https://odoo-community.org/", - "author": "Grupo ESOC, Odoo Community Association (OCA)", + "website": "https://grupoesoc.es", + "author": "Grupo ESOC Ingeniería de Servicios, " + "Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, diff --git a/marketing_security_group/README.rst b/marketing_security_group/README.rst new file mode 100644 index 00000000..1c815e51 --- /dev/null +++ b/marketing_security_group/README.rst @@ -0,0 +1,62 @@ +.. 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 + +============================== +Marketing extra security rules +============================== + +This module add a these security features: + +* ACL for allowing marketing user group to remove mass.mailing objects +* Security rule to allow marketing user to delete only his unsent mail.mass_mailing objects +* Security rule to allow marketing manager to delete all unsent mail.mass_mailing objects + +For sent mail.mass_mailing objects, only an user in Administration / Settings group +could remove them, like Odoo standard defines + + +Usage +===== + +.. 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/8.0 + +For further information, please visit: + +* https://www.odoo.com/forum/help-1 + + +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 +`here `_. + + +Credits +======= + +Contributors +------------ + +* Rafael Blasco +* Antonio Espinosa + +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 http://odoo-community.org. diff --git a/marketing_security_group/__init__.py b/marketing_security_group/__init__.py new file mode 100644 index 00000000..32f0b5c2 --- /dev/null +++ b/marketing_security_group/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +from . import wizards diff --git a/marketing_security_group/__openerp__.py b/marketing_security_group/__openerp__.py new file mode 100644 index 00000000..7921c7b6 --- /dev/null +++ b/marketing_security_group/__openerp__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +{ + 'name': "Marketing extra security rules", + 'category': 'Marketing', + 'version': '8.0.1.0.0', + 'depends': [ + 'mass_mailing', + ], + 'external_dependencies': {}, + 'data': [ + 'security/ir.model.access.csv', + 'security/mail_mass_mailing_security.xml', + ], + 'author': 'Antiun Ingeniería S.L., ' + 'Odoo Community Association (OCA)', + 'website': 'http://www.antiun.com', + 'license': 'AGPL-3', + 'installable': True, +} diff --git a/marketing_security_group/security/ir.model.access.csv b/marketing_security_group/security/ir.model.access.csv new file mode 100644 index 00000000..50ee10e6 --- /dev/null +++ b/marketing_security_group/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_mass_mailing_user,mail.mass_mailing.user,mass_mailing.model_mail_mass_mailing,marketing.group_marketing_user,1,1,1,1 diff --git a/marketing_security_group/security/mail_mass_mailing_security.xml b/marketing_security_group/security/mail_mass_mailing_security.xml new file mode 100644 index 00000000..ba488193 --- /dev/null +++ b/marketing_security_group/security/mail_mass_mailing_security.xml @@ -0,0 +1,28 @@ + + + + + + Marketing user - Delete own unsent mass mailings + + [('create_uid', '=', user.id), ('state', 'in', ('draft', 'test'))] + + + + + + + + + Marketing manager - Delete all unsent mass mailings + + [('state', 'in', ('draft', 'test'))] + + + + + + + + + diff --git a/marketing_security_group/static/description/icon.png b/marketing_security_group/static/description/icon.png new file mode 100644 index 00000000..3a0328b5 Binary files /dev/null and b/marketing_security_group/static/description/icon.png differ diff --git a/marketing_security_group/wizards/__init__.py b/marketing_security_group/wizards/__init__.py new file mode 100644 index 00000000..d1793cf2 --- /dev/null +++ b/marketing_security_group/wizards/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +from . import test_mailing diff --git a/marketing_security_group/wizards/test_mailing.py b/marketing_security_group/wizards/test_mailing.py new file mode 100644 index 00000000..ecf7a49d --- /dev/null +++ b/marketing_security_group/wizards/test_mailing.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +from openerp import models, fields + + +class MailMassMailingTest(models.TransientModel): + _inherit = 'mail.mass_mailing.test' + + mass_mailing_id = fields.Many2one(ondelete='cascade') diff --git a/mass_mailing_statistic_extra/__openerp__.py b/mass_mailing_statistic_extra/__openerp__.py index c71b80ad..fd7a910a 100644 --- a/mass_mailing_statistic_extra/__openerp__.py +++ b/mass_mailing_statistic_extra/__openerp__.py @@ -13,7 +13,7 @@ 'data': [ 'views/mass_mailing.xml', ], - 'author': 'Antiun Ingeniería, ' + 'author': 'Antiun Ingeniería S.L., ' 'Odoo Community Association (OCA)', 'website': 'http://www.antiun.com', 'license': 'AGPL-3', diff --git a/mass_mailing_statistic_extra/i18n/en.po b/mass_mailing_statistic_extra/i18n/en.po new file mode 100644 index 00000000..30089edd --- /dev/null +++ b/mass_mailing_statistic_extra/i18n/en.po @@ -0,0 +1,43 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_statistic_extra +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: social (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-15 02:00+0000\n" +"PO-Revision-Date: 2015-12-14 11:29+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: English (http://www.transifex.com/oca/OCA-social-8-0/language/en/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail_statistics +msgid "Email Statistics" +msgstr "Email Statistics" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_from:0 +msgid "From" +msgstr "From" + +#. module: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail +msgid "Outgoing Mails" +msgstr "Outgoing Mails" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,subject:0 +msgid "Subject" +msgstr "Subject" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_to:0 +msgid "To" +msgstr "To" diff --git a/mass_mailing_statistic_extra/i18n/es_CO.po b/mass_mailing_statistic_extra/i18n/es_CO.po new file mode 100644 index 00000000..e2d481a5 --- /dev/null +++ b/mass_mailing_statistic_extra/i18n/es_CO.po @@ -0,0 +1,43 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_statistic_extra +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: social (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-15 02:00+0000\n" +"PO-Revision-Date: 2015-12-14 11:29+0000\n" +"Last-Translator: <>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/oca/OCA-social-8-0/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail_statistics +msgid "Email Statistics" +msgstr "" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_from:0 +msgid "From" +msgstr "" + +#. module: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail +msgid "Outgoing Mails" +msgstr "Correos Salientes" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,subject:0 +msgid "Subject" +msgstr "" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_to:0 +msgid "To" +msgstr "" diff --git a/mass_mailing_statistic_extra/i18n/pt_BR.po b/mass_mailing_statistic_extra/i18n/pt_BR.po new file mode 100644 index 00000000..6bff3a42 --- /dev/null +++ b/mass_mailing_statistic_extra/i18n/pt_BR.po @@ -0,0 +1,43 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_statistic_extra +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: social (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-15 02:00+0000\n" +"PO-Revision-Date: 2015-12-14 11:29+0000\n" +"Last-Translator: <>\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-social-8-0/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: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail_statistics +msgid "Email Statistics" +msgstr "" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_from:0 +msgid "From" +msgstr "" + +#. module: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail +msgid "Outgoing Mails" +msgstr "Mails de Saída" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,subject:0 +msgid "Subject" +msgstr "" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_to:0 +msgid "To" +msgstr "" diff --git a/mass_mailing_statistic_extra/i18n/sl.po b/mass_mailing_statistic_extra/i18n/sl.po new file mode 100644 index 00000000..d1ceaf9f --- /dev/null +++ b/mass_mailing_statistic_extra/i18n/sl.po @@ -0,0 +1,44 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_statistic_extra +# +# Translators: +# Matjaž Mozetič , 2015 +msgid "" +msgstr "" +"Project-Id-Version: social (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-15 02:00+0000\n" +"PO-Revision-Date: 2015-12-15 05:50+0000\n" +"Last-Translator: Matjaž Mozetič \n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-social-8-0/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" + +#. module: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail_statistics +msgid "Email Statistics" +msgstr "Statistika e-pošte" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_from:0 +msgid "From" +msgstr "Od" + +#. module: mass_mailing_statistic_extra +#: model:ir.model,name:mass_mailing_statistic_extra.model_mail_mail +msgid "Outgoing Mails" +msgstr "Izhodna pošta" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,subject:0 +msgid "Subject" +msgstr "Zadeva" + +#. module: mass_mailing_statistic_extra +#: field:mail.mail.statistics,email_to:0 +msgid "To" +msgstr "Za" diff --git a/mass_mailing_statistic_extra/models/mail_mail.py b/mass_mailing_statistic_extra/models/mail_mail.py index 08e1d718..87796d42 100644 --- a/mass_mailing_statistic_extra/models/mail_mail.py +++ b/mass_mailing_statistic_extra/models/mail_mail.py @@ -19,7 +19,7 @@ class MailMail(models.Model): email_list += email_to return email_list - @api.multi + @api.model def create(self, vals): mail = super(MailMail, self).create(vals) if vals.get('statistics_ids'): @@ -30,4 +30,4 @@ class MailMail(models.Model): 'email_to': ';'.join(email_list), 'subject': mail.subject, }) - return mail + return mail_id