Skip to content

Commit

Permalink
Merge PR #176 into 17.0
Browse files Browse the repository at this point in the history
Signed-off-by dreispt
  • Loading branch information
OCA-git-bot committed Jan 5, 2025
2 parents 5c7d91d + 984d500 commit a094dd2
Show file tree
Hide file tree
Showing 23 changed files with 913 additions and 22 deletions.
20 changes: 11 additions & 9 deletions payroll/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ Payroll

Manage your employee payroll records.

This module is a backport from Odoo SA and as such, it is not included in the OCA CLA. That means we do not have a copy of the copyright on it like all other OCA modules.
This module is a backport from Odoo SA and as such, it is not included
in the OCA CLA. That means we do not have a copy of the copyright on it
like all other OCA modules.

**Table of contents**

Expand All @@ -51,21 +53,21 @@ Credits
=======

Authors
~~~~~~~
-------

* Odoo SA

Contributors
~~~~~~~~~~~~
------------

* Odoo SA <[email protected]>
* David James <[email protected]>
* Hilar AK <[email protected]>
* Nimarosa (Nicolas Rodriguez) <[email protected]>
* Henrik Norlin (@appstogrow)
- Odoo SA <[email protected]>
- David James <[email protected]>
- Hilar AK <[email protected]>
- Nimarosa (Nicolas Rodriguez) <[email protected]>
- Henrik Norlin (@appstogrow)

Maintainers
~~~~~~~~~~~
-----------

This module is maintained by the OCA.

Expand Down
5 changes: 5 additions & 0 deletions payroll/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Odoo SA \<<[email protected]>\>
- David James \<<[email protected]>\>
- Hilar AK \<<[email protected]>\>
- Nimarosa (Nicolas Rodriguez) \<<[email protected]>\>
- Henrik Norlin (@appstogrow)
5 changes: 0 additions & 5 deletions payroll/readme/CONTRIBUTORS.rst

This file was deleted.

5 changes: 5 additions & 0 deletions payroll/readme/DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Manage your employee payroll records.

This module is a backport from Odoo SA and as such, it is not included
in the OCA CLA. That means we do not have a copy of the copyright on it
like all other OCA modules.
3 changes: 0 additions & 3 deletions payroll/readme/DESCRIPTION.rst

This file was deleted.

15 changes: 10 additions & 5 deletions payroll/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -370,7 +371,9 @@ <h1 class="title">Payroll</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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>
<p>This module is a backport from Odoo SA and as such, it is not included in the OCA CLA. That means we do not have a copy of the copyright on it like all other OCA modules.</p>
<p>This module is a backport from Odoo SA and as such, it is not included
in the OCA CLA. That means we do not have a copy of the copyright on it
like all other OCA modules.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
Expand Down Expand Up @@ -412,7 +415,9 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down
97 changes: 97 additions & 0 deletions payroll_hr_public_holidays/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
=======================
Payroll Public Holidays
=======================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:d4bbf806b444b000369ac4399b83f44a49eb2c47c918b3d7f4e94cfd3a4d1b9f
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpayroll-lightgray.png?logo=github
:target: https://github.com/OCA/payroll/tree/17.0/payroll_hr_public_holidays
:alt: OCA/payroll
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/payroll-17-0/payroll-17-0-payroll_hr_public_holidays
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/payroll&target_branch=17.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

Allows to link hr_holidays_public module with payroll.

With this module installed, public holidats will automatically be
fetched and displayed in worked days table for payslip computation. This
is useful to countries that need to make salary rules with public
holidays data.

**Table of contents**

.. contents::
:local:

Usage
=====

- Set public holidays in holidays module
- Create a payslip
- Public holidays will be fetched automatically to the worked days table

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/payroll/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/payroll/issues/new?body=module:%20payroll_hr_public_holidays%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
-------

* Nimarosa

Contributors
------------

- Nimarosa (Nicolas Rodriguez) <[email protected]>
- ``Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>``\ \_

Maintainers
-----------

This module is maintained by the OCA.

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

.. |maintainer-nimarosa| image:: https://github.com/nimarosa.png?size=40px
:target: https://github.com/nimarosa
:alt: nimarosa

Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-nimarosa|

This module is part of the `OCA/payroll <https://github.com/OCA/payroll/tree/17.0/payroll_hr_public_holidays>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
4 changes: 4 additions & 0 deletions payroll_hr_public_holidays/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Copyright (C) 2021 Nimarosa (Nicolas Rodriguez) (<[email protected]>).
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from . import models
16 changes: 16 additions & 0 deletions payroll_hr_public_holidays/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright (C) 2021 Nimarosa (Nicolas Rodriguez) (<[email protected]>).
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

{
"name": "Payroll Public Holidays",
"version": "17.0.1.0.0",
"category": "Payroll",
"website": "https://github.com/OCA/payroll",
"summary": "Integration between payroll and hr_public_holidays",
"license": "AGPL-3",
"author": "Nimarosa, Odoo Community Association (OCA)",
"depends": ["payroll", "hr_holidays", "hr_holidays_public"],
"data": [],
"installable": True,
"maintainers": ["nimarosa"],
}
43 changes: 43 additions & 0 deletions payroll_hr_public_holidays/i18n/es_AR.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * payroll_hr_public_holidays
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2022-10-24 23:44+0000\n"
"Last-Translator: Nicolas Rodriguez Sande <[email protected]>\n"
"Language-Team: none\n"
"Language: es_AR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.14.1\n"

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip__display_name
msgid "Display Name"
msgstr "Nombre para mostrar"

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip__id
msgid "ID"
msgstr "ID"

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip____last_update
msgid "Last Modified on"
msgstr "Última modificación en"

#. module: payroll_hr_public_holidays
#: model:ir.model,name:payroll_hr_public_holidays.model_hr_payslip
msgid "Payslip"
msgstr "Liquidacion"

#. module: payroll_hr_public_holidays
#: code:addons/payroll_hr_public_holidays/models/hr_payslip.py:0
#, python-format
msgid "Public Holidays Leaves"
msgstr "Ausencias por feriados"
41 changes: 41 additions & 0 deletions payroll_hr_public_holidays/i18n/it.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * payroll_hr_public_holidays
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip__display_name
msgid "Display Name"
msgstr ""

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip__id
msgid "ID"
msgstr ""

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip____last_update
msgid "Last Modified on"
msgstr ""

#. module: payroll_hr_public_holidays
#: model:ir.model,name:payroll_hr_public_holidays.model_hr_payslip
msgid "Payslip"
msgstr ""

#. module: payroll_hr_public_holidays
#: code:addons/payroll_hr_public_holidays/models/hr_payslip.py:0
#, python-format
msgid "Public Holidays Leaves"
msgstr ""
40 changes: 40 additions & 0 deletions payroll_hr_public_holidays/i18n/payroll_hr_public_holidays.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * payroll_hr_public_holidays
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \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: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip__display_name
msgid "Display Name"
msgstr ""

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip__id
msgid "ID"
msgstr ""

#. module: payroll_hr_public_holidays
#: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip____last_update
msgid "Last Modified on"
msgstr ""

#. module: payroll_hr_public_holidays
#: model:ir.model,name:payroll_hr_public_holidays.model_hr_payslip
msgid "Payslip"
msgstr ""

#. module: payroll_hr_public_holidays
#: code:addons/payroll_hr_public_holidays/models/hr_payslip.py:0
#, python-format
msgid "Public Holidays Leaves"
msgstr ""
Loading

0 comments on commit a094dd2

Please sign in to comment.