Merge remote-tracking branch 'origin/8.0' into 8.0-mail_read_new_window

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

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,

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,

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 <https://github.com/OCA/social/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 <https://github.com/OCA/social/issues/new?body=module:%20marketing_security_group%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Rafael Blasco <rafabn@antiun.com>
+* Antonio Espinosa <antonioea@antiun.com>
+
+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.

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

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,
+}

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

marketing_security_group/security/mail_mass_mailing_security.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+<record id="mass_mailing_marketing_user_access" model="ir.rule">
+    <field name="name">Marketing user - Delete own unsent mass mailings</field>
+    <field name="model_id" ref="mass_mailing.model_mail_mass_mailing"/>
+    <field name="domain_force">[('create_uid', '=', user.id), ('state', 'in', ('draft', 'test'))]</field>
+    <field name="groups" eval="[(4, ref('marketing.group_marketing_user'))]"/>
+    <field eval="0" name="perm_read"/>
+    <field eval="0" name="perm_write"/>
+    <field eval="0" name="perm_create"/>
+    <field eval="1" name="perm_unlink"/>
+</record>
+
+<record id="mass_mailing_marketing_manager_access" model="ir.rule">
+    <field name="name">Marketing manager - Delete all unsent mass mailings</field>
+    <field name="model_id" ref="mass_mailing.model_mail_mass_mailing"/>
+    <field name="domain_force">[('state', 'in', ('draft', 'test'))]</field>
+    <field name="groups" eval="[(4, ref('marketing.group_marketing_manager'))]"/>
+    <field eval="0" name="perm_read"/>
+    <field eval="0" name="perm_write"/>
+    <field eval="0" name="perm_create"/>
+    <field eval="1" name="perm_unlink"/>
+</record>
+
+</data>
+</openerp>

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

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')

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',

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 <transbot@odoo-community.org>\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"

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 ""

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 ""

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č <m.mozetic@matmoz.si>, 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č <m.mozetic@matmoz.si>\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"

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