fixup! [ADD] mass_mailing_resend

OCA · Nov 22, 2017 · e9a49cc · e9a49cc
1 parent d7f022b
commit e9a49cc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/mass_mailing_resend/__init__.py b/mass_mailing_resend/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-
 from . import models
diff --git a/mass_mailing_resend/i18n/es.po b/mass_mailing_resend/i18n/es.po
@@ -6,15 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-07 19:32+0000\n"
-"PO-Revision-Date: 2017-11-07 19:32+0000\n"
+"POT-Creation-Date: 2017-11-22 10:42+0000\n"
+"PO-Revision-Date: 2017-11-22 10:42+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: mass_mailing_resend
+#: model:ir.ui.view,arch_db:mass_mailing_resend.view_mail_mass_mailing_form
+msgid "<i class=\"fa fa-info-circle\"/> New sending will be done only to not sent/new recipients. If you want to resend again the mass mailing to already sent recipients, click on <b>Emails Sent</b> smart-button for removing the existing record(s)."
+msgstr "<i class=\"fa fa-info-circle\"/> El nuevo envío se realizará solo a los destinatarios no enviados/nuevos. Si quiere reenviar otra vez el correo masivo a destinatarios ya enviados, pulse en el botón <b>Correos enviados</b> para eliminar el/los registro/s existentes."
+
 #. module: mass_mailing_resend
 #: model:ir.model,name:mass_mailing_resend.model_mail_mass_mailing
 msgid "Mass Mailing"
@@ -26,7 +31,7 @@ msgid "Resend"
 msgstr "Reenviar"
 
 #. module: mass_mailing_resend
-#: code:addons/mass_mailing_resend/models/mass_mailing.py:17
+#: code:addons/mass_mailing_resend/models/mass_mailing.py:16
 #, python-format
 msgid "You can't resend a mass mailing that is being sent or in draft state."
 msgstr "No puede reenviar un correo masivo que está siendo enviado en estado borrador."

diff --git a/mass_mailing_resend/models/__init__.py b/mass_mailing_resend/models/__init__.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis
-# Copyright 2016 Tecnativa - Vicent Cubells
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-
 from . import mass_mailing
diff --git a/mass_mailing_resend/models/mass_mailing.py b/mass_mailing_resend/models/mass_mailing.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis
-# Copyright 2016 Tecnativa - Vicent Cubells
+# Copyright 2017 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 

diff --git a/mass_mailing_resend/views/mass_mailing_views.xml b/mass_mailing_resend/views/mass_mailing_views.xml
@@ -12,6 +12,16 @@
                         type="object"
                 />
             </field>
+            <header position="after">
+                <div class="alert alert-warning oe_text_center" attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('sent', '=', '0')]}">
+                    <p>
+                        <i class="fa fa-info-circle"/> New sending will be done only to not sent/new recipients. If you want to resend again the mass mailing to already sent recipients, click on <b>Emails Sent</b> smart-button for removing the existing record(s).
+                    </p>
+                </div>
+            </header>
+            <div name="button_box" position="attributes">
+                <attribute name="attrs">{'invisible': [('sent', '=', 0)]}</attribute>
+            </div>
         </field>
     </record>