[BOT] post-merge updates

OCA · Jan 5, 2025 · 16feaff · 16feaff
1 parent 95f95d0
commit 16feaff
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [payroll](payroll/) | 17.0.1.0.0 | [![appstogrow](https://github.com/appstogrow.png?size=30px)](https://github.com/appstogrow) [![nimarosa](https://github.com/nimarosa.png?size=30px)](https://github.com/nimarosa) | Manage your employee payroll records
+[payroll_hr_public_holidays](payroll_hr_public_holidays/) | 17.0.1.0.0 | [![nimarosa](https://github.com/nimarosa.png?size=30px)](https://github.com/nimarosa) | Integration between payroll and hr_public_holidays
 
 [//]: # (end addons)
 

diff --git a/payroll/README.rst b/payroll/README.rst
@@ -7,7 +7,7 @@ Payroll
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:def4f708faf4767d5767c515426c572391d63f2a30ffde152f86d3a019c0b920
+   !! source digest: sha256:6810370c89fb4cdc1a104aa2801dc6c98d010e53c1d4fe6063e4aa7e7f80f858
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/payroll/static/description/index.html b/payroll/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Payroll</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:def4f708faf4767d5767c515426c572391d63f2a30ffde152f86d3a019c0b920
+!! source digest: sha256:6810370c89fb4cdc1a104aa2801dc6c98d010e53c1d4fe6063e4aa7e7f80f858
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/payroll/tree/17.0/payroll"><img alt="OCA/payroll" src="https://img.shields.io/badge/github-OCA%2Fpayroll-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/payroll-17-0/payroll-17-0-payroll"><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/payroll&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Manage your employee payroll records.</p>

diff --git a/payroll_hr_public_holidays/README.rst b/payroll_hr_public_holidays/README.rst
@@ -7,7 +7,7 @@ Payroll Public Holidays
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d4bbf806b444b000369ac4399b83f44a49eb2c47c918b3d7f4e94cfd3a4d1b9f
+   !! source digest: sha256:9626246040af3f079fa4b82d4fe5555b571b289ddc26a4240d78d40b3fac75c3
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/payroll_hr_public_holidays/static/description/index.html b/payroll_hr_public_holidays/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Payroll Public Holidays</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d4bbf806b444b000369ac4399b83f44a49eb2c47c918b3d7f4e94cfd3a4d1b9f
+!! source digest: sha256:9626246040af3f079fa4b82d4fe5555b571b289ddc26a4240d78d40b3fac75c3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/payroll/tree/17.0/payroll_hr_public_holidays"><img alt="OCA/payroll" src="https://img.shields.io/badge/github-OCA%2Fpayroll-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/payroll-17-0/payroll-17-0-payroll_hr_public_holidays"><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/payroll&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Allows to link hr_holidays_public module with payroll.</p>

diff --git a/setup/_metapackage/pyproject.toml b/setup/_metapackage/pyproject.toml
@@ -1,8 +1,9 @@
 [project]
 name = "odoo-addons-oca-payroll"
-version = "17.0.20240516.0"
+version = "17.0.20250105.0"
 dependencies = [
     "odoo-addon-payroll>=17.0dev,<17.1dev",
+    "odoo-addon-payroll_hr_public_holidays>=17.0dev,<17.1dev",
 ]
 classifiers=[
     "Programming Language :: Python",