[BOT] post-merge updates

README.md

@@ -58,7 +58,7 @@ addon | version | maintainers | summary
 [mail_show_follower](mail_show_follower/) | 16.0.1.2.0 | [![yajo](https://github.com/yajo.png?size=30px)](https://github.com/yajo) | Show CC document followers in mails.
 [mail_template_multi_attachment](mail_template_multi_attachment/) | 16.0.1.0.0 |  | Module who allows to generate multi attachments on an email template.
 [mail_template_substitute](mail_template_substitute/) | 16.0.1.0.1 |  | This module allows to create substitution rules for mail templates.
-[mail_tracking](mail_tracking/) | 16.0.1.0.5 |  | Email tracking system for all mails sent
+[mail_tracking](mail_tracking/) | 16.0.1.0.6 |  | Email tracking system for all mails sent
 [mail_tracking_mailgun](mail_tracking_mailgun/) | 16.0.1.0.1 |  | Mail tracking and Mailgun webhooks integration
 [mail_tracking_mass_mailing](mail_tracking_mass_mailing/) | 16.0.1.0.0 |  | Improve mass mailing email tracking
 [mass_mailing_contact_active](mass_mailing_contact_active/) | 16.0.1.0.0 |  | Adds active feature on mailing list contact and subscriptions

mail_tracking/README.rst

@@ -7,7 +7,7 @@ Email tracking
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:5f711f1725c73bc96877b16645bed6145cbc19bfa19678c87105097068492471
+   !! source digest: sha256:5a1cfa088a940c7f0354c90d6c905b0af3f401c912fa3bc1a528cc3922ef03e7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -62,6 +62,10 @@ When user sends a message in mail_thread (chatter), for instance in partner
 form, then an email tracking is created for each email notification. Then a
 status icon will appear just right to name of notified partner.
 
+For users using the internal notifications system, the status of their notifications is
+used. Note that read notifications are deleted after 180 days so old messages will
+display unknown status.
+
 These are all available status icons:
 
 .. |sent| image:: https://raw.githubusercontent.com/OCA/social/16.0/mail_tracking/static/src/img/sent.png
@@ -115,7 +119,7 @@ If you want to see all tracking emails and events you can go to
 * Settings > Technical > Email > Tracking emails
 * Settings > Technical > Email > Tracking events
 
-When the message generates an 'error' status, it will apear on discuss 'Failed'
+When the message generates an 'error' status, it will appear on discuss 'Failed'
 channel. Any view with chatter can show the failed messages
 too.
 
@@ -172,6 +176,10 @@ Contributors
   * Rafael Blasco
   * Alexandre Díaz
 
+* XCG Consulting, part of `Orbeet <https://orbeet.io>`_:
+
+  * Vincent Hatakeyama
+
 * `Eezee-IT <https://www.eezee-it.com>`_:
   * Asma Elferkhsi
 

mail_tracking/__manifest__.py

@@ -7,7 +7,7 @@
 {
     "name": "Email tracking",
     "summary": "Email tracking system for all mails sent",
-    "version": "16.0.1.0.5",
+    "version": "16.0.1.0.6",
     "category": "Social Network",
     "website": "https://github.com/OCA/social",
     "author": ("Tecnativa, " "Odoo Community Association (OCA)"),

mail_tracking/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Email tracking</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:5f711f1725c73bc96877b16645bed6145cbc19bfa19678c87105097068492471
+!! source digest: sha256:5a1cfa088a940c7f0354c90d6c905b0af3f401c912fa3bc1a528cc3922ef03e7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/16.0/mail_tracking"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_tracking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/social&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module shows email notification tracking status for any messages in
@@ -414,6 +414,9 @@ <h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
 <p>When user sends a message in mail_thread (chatter), for instance in partner
 form, then an email tracking is created for each email notification. Then a
 status icon will appear just right to name of notified partner.</p>
+<p>For users using the internal notifications system, the status of their notifications is
+used. Note that read notifications are deleted after 180 days so old messages will
+display unknown status.</p>
 <p>These are all available status icons:</p>
 <p><img alt="unknown" src="https://raw.githubusercontent.com/OCA/social/16.0/mail_tracking/static/src/img/unknown.png" style="width: 10px;" />  <strong>Unknown</strong>: No email tracking info available. Maybe this notified partner has ‘Receive Inbox Notifications by Email’ == ‘Never’</p>
 <p><img alt="waiting" src="https://raw.githubusercontent.com/OCA/social/16.0/mail_tracking/static/src/img/waiting.png" style="width: 10px;" />    <strong>Waiting</strong>: Waiting to be sent</p>
@@ -429,7 +432,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
 <li>Settings &gt; Technical &gt; Email &gt; Tracking emails</li>
 <li>Settings &gt; Technical &gt; Email &gt; Tracking events</li>
 </ul>
-<p>When the message generates an ‘error’ status, it will apear on discuss ‘Failed’
+<p>When the message generates an ‘error’ status, it will appear on discuss ‘Failed’
 channel. Any view with chatter can show the failed messages
 too.</p>
 <ul>
@@ -485,6 +488,10 @@ <h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 <li>Alexandre Díaz</li>
 </ul>
 </li>
+<li>XCG Consulting, part of <a class="reference external" href="https://orbeet.io">Orbeet</a>:<ul>
+<li>Vincent Hatakeyama</li>
+</ul>
+</li>
 <li><a class="reference external" href="https://www.eezee-it.com">Eezee-IT</a>:
 * Asma Elferkhsi</li>
 <li><a class="reference external" href="https://www.vauxoo.com">Vauxoo</a>: