[BOT] post-merge updates

OCA · Dec 6, 2024 · 85d0b72 · 85d0b72
1 parent e1bff7b
commit 85d0b72
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,7 @@ addon | version | maintainers | summary
 [mail_attach_existing_attachment_account](mail_attach_existing_attachment_account/) | 14.0.1.0.1 |  | Module to use attach existing attachment for account module
 [mail_autogenerated_header](mail_autogenerated_header/) | 14.0.1.0.0 |  | Add headers to Odoo's mails indicating they are autogenerated
 [mail_autosubscribe](mail_autosubscribe/) | 14.0.1.0.0 |  | Automatically subscribe partners to its company's business documents
+[mail_chatter_company_tracking](mail_chatter_company_tracking/) | 14.0.1.0.0 | [![adasatorres](https://github.com/adasatorres.png?size=30px)](https://github.com/adasatorres) | This add-on includes the company name in the email chatter tracking when it is a company-dependent field.
 [mail_chatter_thread_colour](mail_chatter_thread_colour/) | 14.0.1.0.1 |  | Allow to change the colour of threads
 [mail_contact_type](mail_contact_type/) | 14.0.1.0.0 | [![petrus-v](https://github.com/petrus-v.png?size=30px)](https://github.com/petrus-v) | Mail Contact Type
 [mail_debrand](mail_debrand/) | 14.0.2.2.4 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) [![joao-p-marques](https://github.com/joao-p-marques.png?size=30px)](https://github.com/joao-p-marques) | Remove Odoo branding in sent emails Removes anchor <a href odoo.com togheder with it's parent ( for powerd by) form all the templates removes any 'odoo' that are in tempalte texts > 20characters

diff --git a/mail_chatter_company_tracking/README.rst b/mail_chatter_company_tracking/README.rst
@@ -7,7 +7,7 @@ Mail Chatter Company Tracking
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ca51bb1b96e2d7172d7613e71850bbe20451d0456244169c33db61cee68193eb
+   !! source digest: sha256:fff7d9cea1266f1ec9c88b1f0b890a189e8680db053f6399ff9c7e45f1bbe7ce
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/mail_chatter_company_tracking/static/description/index.html b/mail_chatter_company_tracking/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Mail Chatter Company Tracking</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:ca51bb1b96e2d7172d7613e71850bbe20451d0456244169c33db61cee68193eb
+!! source digest: sha256:fff7d9cea1266f1ec9c88b1f0b890a189e8680db053f6399ff9c7e45f1bbe7ce
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/14.0/mail_chatter_company_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-14-0/social-14-0-mail_chatter_company_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=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This add-on includes the company name in the email chatter

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20240916.0
+14.0.20241206.0
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
@@ -23,6 +23,7 @@
         'odoo14-addon-mail_attach_existing_attachment_account',
         'odoo14-addon-mail_autogenerated_header',
         'odoo14-addon-mail_autosubscribe',
+        'odoo14-addon-mail_chatter_company_tracking',
         'odoo14-addon-mail_chatter_thread_colour',
         'odoo14-addon-mail_contact_type',
         'odoo14-addon-mail_debrand',