diff --git a/mail_tracking/README.rst b/mail_tracking/README.rst index 5c2d05960..f4ff09fc5 100644 --- a/mail_tracking/README.rst +++ b/mail_tracking/README.rst @@ -23,7 +23,7 @@ Email tracking :target: https://runbot.odoo-community.org/runbot/205/12.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module shows email notification tracking status for any messages in mail thread (chatter). Each notified partner will have an intuitive icon just @@ -70,6 +70,9 @@ These are all available status icons: .. |unknown| image:: mail_tracking/static/src/img/unknown.png :width: 10px +.. |cc| image:: static/src/img/cc.png + :width: 10px + |unknown| **Unknown**: No email tracking info available. Maybe this notified partner has 'Receive Inbox Notifications by Email' == 'Never' |waiting| **Waiting**: Waiting to be sent @@ -82,12 +85,14 @@ These are all available status icons: |opened| **Opened**: Opened by partner +|cc| **Cc**: It's a Carbon-Copy recipient. Can't know the status so is 'Unknown' + + If you want to see all tracking emails and events you can go to * Settings > Technical > Email > Tracking emails * Settings > Technical > Email > Tracking events - Bug Tracker =========== @@ -116,6 +121,7 @@ Contributors * David Vidal * Ernesto Tejeda * Rafael Blasco + * Alexandre Díaz Other credits ~~~~~~~~~~~~~ diff --git a/mail_tracking/i18n/mail_tracking.pot b/mail_tracking/i18n/mail_tracking.pot index 2a53f76a2..1506ab501 100644 --- a/mail_tracking/i18n/mail_tracking.pot +++ b/mail_tracking/i18n/mail_tracking.pot @@ -27,6 +27,12 @@ msgid " * The 'Error' status indicates that there was an error when trying to se "" msgstr "" +#. module: mail_tracking +#: model:ir.model.fields,help:mail_tracking.field_mail_compose_message__email_cc +#: model:ir.model.fields,help:mail_tracking.field_mail_message__email_cc +msgid "Additional recipients that receive a \"Carbon Copy\" of the e-mail" +msgstr "" + #. module: mail_tracking #: model_terms:ir.ui.view,arch_db:mail_tracking.view_mail_tracking_event_search msgid "Bounce" @@ -47,6 +53,15 @@ msgstr "" msgid "Bounced" msgstr "" +#. module: mail_tracking +#: code:addons/mail_tracking/models/mail_thread.py:36 +#: code:addons/mail_tracking/models/mail_thread.py:41 +#: model:ir.model.fields,field_description:mail_tracking.field_mail_compose_message__email_cc +#: model:ir.model.fields,field_description:mail_tracking.field_mail_message__email_cc +#, python-format +msgid "Cc" +msgstr "" + #. module: mail_tracking #: model_terms:ir.ui.view,arch_db:mail_tracking.view_mail_tracking_event_search msgid "Click" @@ -143,6 +158,11 @@ msgstr "" msgid "Email Score" msgstr "" +#. module: mail_tracking +#: model:ir.model,name:mail_tracking.model_mail_thread +msgid "Email Thread" +msgstr "" + #. module: mail_tracking #: model_terms:ir.ui.view,arch_db:mail_tracking.view_res_partner_filter msgid "Email bounced" @@ -288,7 +308,7 @@ msgstr "" #. module: mail_tracking #. openerp-web -#: code:addons/mail_tracking/static/src/js/mail_tracking.js:88 +#: code:addons/mail_tracking/static/src/js/mail_tracking.js:126 #, python-format msgid "Message tracking" msgstr "" @@ -403,6 +423,13 @@ msgstr "" msgid "State" msgstr "" +#. module: mail_tracking +#. openerp-web +#: code:addons/mail_tracking/static/src/xml/mail_tracking.xml:96 +#, python-format +msgid "Status: unknown" +msgstr "" + #. module: mail_tracking #: model:ir.model.fields,field_description:mail_tracking.field_mail_tracking_email__name #: model_terms:ir.ui.view,arch_db:mail_tracking.view_mail_tracking_email_search @@ -419,7 +446,7 @@ msgstr "" #. module: mail_tracking #. openerp-web -#: code:addons/mail_tracking/static/src/xml/mail_tracking.xml:47 +#: code:addons/mail_tracking/static/src/xml/mail_tracking.xml:53 #, python-format msgid "To:" msgstr "" @@ -445,7 +472,7 @@ msgstr "" #. module: mail_tracking #. openerp-web -#: code:addons/mail_tracking/static/src/js/mail_tracking.js:68 +#: code:addons/mail_tracking/static/src/js/mail_tracking.js:106 #, python-format msgid "Tracking partner" msgstr "" diff --git a/mail_tracking/models/mail_mail.py b/mail_tracking/models/mail_mail.py index 37edb9786..2342d1c89 100644 --- a/mail_tracking/models/mail_mail.py +++ b/mail_tracking/models/mail_mail.py @@ -4,6 +4,7 @@ import time from datetime import datetime from email.utils import COMMASPACE + from odoo import models, fields diff --git a/mail_tracking/models/mail_message.py b/mail_tracking/models/mail_message.py index 38d10e063..7492021e6 100644 --- a/mail_tracking/models/mail_message.py +++ b/mail_tracking/models/mail_message.py @@ -106,7 +106,8 @@ class MailMessage(models.Model): for message_dict in messages: mail_message_id = message_dict.get('id', False) if mail_message_id: - message_dict['partner_trackings'] = \ - partner_trackings[mail_message_id] - message_dict['email_cc'] = email_cc[mail_message_id] + message_dict.update({ + 'partner_trackings': partner_trackings[mail_message_id], + 'email_cc': email_cc[mail_message_id], + }) return res diff --git a/mail_tracking/readme/CONTRIBUTORS.rst b/mail_tracking/readme/CONTRIBUTORS.rst index 81d195371..78a16cba0 100644 --- a/mail_tracking/readme/CONTRIBUTORS.rst +++ b/mail_tracking/readme/CONTRIBUTORS.rst @@ -5,3 +5,4 @@ * David Vidal * Ernesto Tejeda * Rafael Blasco + * Alexandre Díaz diff --git a/mail_tracking/readme/USAGE.rst b/mail_tracking/readme/USAGE.rst index 87df760bd..4bf4a0745 100644 --- a/mail_tracking/readme/USAGE.rst +++ b/mail_tracking/readme/USAGE.rst @@ -22,6 +22,9 @@ These are all available status icons: .. |unknown| image:: mail_tracking/static/src/img/unknown.png :width: 10px +.. |cc| image:: static/src/img/cc.png + :width: 10px + |unknown| **Unknown**: No email tracking info available. Maybe this notified partner has 'Receive Inbox Notifications by Email' == 'Never' |waiting| **Waiting**: Waiting to be sent @@ -34,8 +37,10 @@ These are all available status icons: |opened| **Opened**: Opened by partner +|cc| **Cc**: It's a Carbon-Copy recipient. Can't know the status so is 'Unknown' + + If you want to see all tracking emails and events you can go to * Settings > Technical > Email > Tracking emails * Settings > Technical > Email > Tracking events - diff --git a/mail_tracking/static/description/index.html b/mail_tracking/static/description/index.html index 90220f00e..dfddbbbed 100644 --- a/mail_tracking/static/description/index.html +++ b/mail_tracking/static/description/index.html @@ -409,6 +409,7 @@ status icon will appear just right to name of notified partner.
Sent: Sent to SMTP server configured
Delivered: Delivered to final MX server
Opened: Opened by partner
Cc: It’s a Carbon-Copy recipient. Can’t know the status so is ‘Unknown’
If you want to see all tracking emails and events you can go to
To: