From a3b2858b1426d096d89fa99db6e8e28f984cfd91 Mon Sep 17 00:00:00 2001 From: nicolasrsande Date: Thu, 13 Oct 2022 01:09:08 -0300 Subject: [PATCH 01/20] [14.0] [ADD] payroll_hr_public_holidays [14.0] [ADD] payroll_hr_public_holidays --- payroll_hr_public_holidays/__init__.py | 4 ++ payroll_hr_public_holidays/__manifest__.py | 16 +++++++ payroll_hr_public_holidays/models/__init__.py | 4 ++ .../models/hr_payslip.py | 47 +++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 4 ++ payroll_hr_public_holidays/readme/USAGE.rst | 3 ++ 7 files changed, 79 insertions(+) create mode 100644 payroll_hr_public_holidays/__init__.py create mode 100644 payroll_hr_public_holidays/__manifest__.py create mode 100644 payroll_hr_public_holidays/models/__init__.py create mode 100644 payroll_hr_public_holidays/models/hr_payslip.py create mode 100644 payroll_hr_public_holidays/readme/CONTRIBUTORS.rst create mode 100644 payroll_hr_public_holidays/readme/DESCRIPTION.rst create mode 100644 payroll_hr_public_holidays/readme/USAGE.rst diff --git a/payroll_hr_public_holidays/__init__.py b/payroll_hr_public_holidays/__init__.py new file mode 100644 index 000000000..1ec1c0f42 --- /dev/null +++ b/payroll_hr_public_holidays/__init__.py @@ -0,0 +1,4 @@ +# Copyright (C) 2021 Nimarosa (Nicolas Rodriguez) (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/payroll_hr_public_holidays/__manifest__.py b/payroll_hr_public_holidays/__manifest__.py new file mode 100644 index 000000000..0d0ecd133 --- /dev/null +++ b/payroll_hr_public_holidays/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright (C) 2021 Nimarosa (Nicolas Rodriguez) (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Payroll Public Holidays", + "version": "14.0.1.0.0", + "category": "Human Resources", + "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"], +} diff --git a/payroll_hr_public_holidays/models/__init__.py b/payroll_hr_public_holidays/models/__init__.py new file mode 100644 index 000000000..9fbdccaff --- /dev/null +++ b/payroll_hr_public_holidays/models/__init__.py @@ -0,0 +1,4 @@ +# Copyright (C) 2021 Nimarosa (Nicolas Rodriguez) (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import hr_payslip diff --git a/payroll_hr_public_holidays/models/hr_payslip.py b/payroll_hr_public_holidays/models/hr_payslip.py new file mode 100644 index 000000000..9721761b9 --- /dev/null +++ b/payroll_hr_public_holidays/models/hr_payslip.py @@ -0,0 +1,47 @@ +# Copyright (C) 2021 Nimarosa (Nicolas Rodriguez) (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime, time + +from odoo import _, api, models + + +class HrPayslip(models.Model): + _inherit = "hr.payslip" + + @api.model + def get_worked_day_lines(self, contracts, date_from, date_to): + res = super().get_worked_day_lines(contracts, date_from, date_to) + for contract in contracts.filtered( + lambda contract: contract.resource_calendar_id + ): + day_from = datetime.combine(date_from, time.min) + day_to = datetime.combine(date_to, time.max) + day_contract_start = datetime.combine(contract.date_start, time.min) + # only use payslip day_from if it's greather than contract start date + if day_from < day_contract_start: + day_from = day_contract_start + # == compute public holidays == # + pholidays = self._compute_public_holidays_days(contract, day_from, day_to) + if pholidays["number_of_days"] > 0: + res.append(pholidays) + return res + + def _compute_public_holidays_days(self, contract, day_from, day_to): + # get public holidays list + public_holidays = self.env["hr.holidays.public"].get_holidays_list( + year=day_from.year, + start_dt=day_from, + end_dt=day_to, + employee_id=contract.employee_id.id, + ) + ph_days = len(public_holidays) + ph_hours = ph_days * contract.employee_id.resource_calendar_id.hours_per_day + return { + "name": _("Public Holidays Leaves"), + "sequence": 10, + "code": "PHOL", + "number_of_days": ph_days, + "number_of_hours": ph_hours, + "contract_id": contract.id, + } diff --git a/payroll_hr_public_holidays/readme/CONTRIBUTORS.rst b/payroll_hr_public_holidays/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..8dc5b27d5 --- /dev/null +++ b/payroll_hr_public_holidays/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Nimarosa (Nicolas Rodriguez) diff --git a/payroll_hr_public_holidays/readme/DESCRIPTION.rst b/payroll_hr_public_holidays/readme/DESCRIPTION.rst new file mode 100644 index 000000000..51bf05ff6 --- /dev/null +++ b/payroll_hr_public_holidays/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +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. diff --git a/payroll_hr_public_holidays/readme/USAGE.rst b/payroll_hr_public_holidays/readme/USAGE.rst new file mode 100644 index 000000000..9336d2a65 --- /dev/null +++ b/payroll_hr_public_holidays/readme/USAGE.rst @@ -0,0 +1,3 @@ +- Set public holidays in holidays module +- Create a payslip +- Public holidays will be fetched automatically to the worked days table From d7d159c1911dd36a8913c1efbb1a829463a69fbd Mon Sep 17 00:00:00 2001 From: nicolasrsande Date: Thu, 13 Oct 2022 19:11:44 -0300 Subject: [PATCH 02/20] [14.0] [ADD] payroll_hr_public_holidays --- .../models/hr_payslip.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/payroll_hr_public_holidays/models/hr_payslip.py b/payroll_hr_public_holidays/models/hr_payslip.py index 9721761b9..acdac6b65 100644 --- a/payroll_hr_public_holidays/models/hr_payslip.py +++ b/payroll_hr_public_holidays/models/hr_payslip.py @@ -1,7 +1,6 @@ # Copyright (C) 2021 Nimarosa (Nicolas Rodriguez) (). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from datetime import datetime, time from odoo import _, api, models @@ -15,28 +14,29 @@ def get_worked_day_lines(self, contracts, date_from, date_to): for contract in contracts.filtered( lambda contract: contract.resource_calendar_id ): - day_from = datetime.combine(date_from, time.min) - day_to = datetime.combine(date_to, time.max) - day_contract_start = datetime.combine(contract.date_start, time.min) # only use payslip day_from if it's greather than contract start date - if day_from < day_contract_start: - day_from = day_contract_start + if date_from < contract.date_start: + date_from = contract.date_start # == compute public holidays == # - pholidays = self._compute_public_holidays_days(contract, day_from, day_to) + pholidays = self._compute_public_holidays_days(contract, date_from, date_to) if pholidays["number_of_days"] > 0: res.append(pholidays) return res - def _compute_public_holidays_days(self, contract, day_from, day_to): + def _compute_public_holidays_days(self, contract, date_from, date_to): # get public holidays list public_holidays = self.env["hr.holidays.public"].get_holidays_list( - year=day_from.year, - start_dt=day_from, - end_dt=day_to, + year=date_from.year, + start_dt=date_from, + end_dt=date_to, employee_id=contract.employee_id.id, ) ph_days = len(public_holidays) - ph_hours = ph_days * contract.employee_id.resource_calendar_id.hours_per_day + ph_hours = ( + ph_days * 8 + ) # Use 8 as default value if employee has no resource_calendar + if contract.employee_id.resource_calendar_id: + ph_hours = ph_days * contract.employee_id.resource_calendar_id.hours_per_day return { "name": _("Public Holidays Leaves"), "sequence": 10, From aab5db4afdc00a72fb6a68f97d97224dfe4064a1 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 14 Oct 2022 09:49:04 +0000 Subject: [PATCH 03/20] [UPD] Update payroll_hr_public_holidays.pot --- .../i18n/payroll_hr_public_holidays.pot | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 payroll_hr_public_holidays/i18n/payroll_hr_public_holidays.pot diff --git a/payroll_hr_public_holidays/i18n/payroll_hr_public_holidays.pot b/payroll_hr_public_holidays/i18n/payroll_hr_public_holidays.pot new file mode 100644 index 000000000..f22a80582 --- /dev/null +++ b/payroll_hr_public_holidays/i18n/payroll_hr_public_holidays.pot @@ -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 "" From 30bac9688aa37d3119cf50d446f0c3f847580726 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 14 Oct 2022 09:51:57 +0000 Subject: [PATCH 04/20] [UPD] README.rst --- payroll_hr_public_holidays/README.rst | 91 ++++ .../static/description/index.html | 432 ++++++++++++++++++ 2 files changed, 523 insertions(+) create mode 100644 payroll_hr_public_holidays/README.rst create mode 100644 payroll_hr_public_holidays/static/description/index.html diff --git a/payroll_hr_public_holidays/README.rst b/payroll_hr_public_holidays/README.rst new file mode 100644 index 000000000..8be9c35f6 --- /dev/null +++ b/payroll_hr_public_holidays/README.rst @@ -0,0 +1,91 @@ +======================= +Payroll Public Holidays +======================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/14.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-14-0/payroll-14-0-payroll_hr_public_holidays + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/281/14.0 + :alt: Try me on Runbot + +|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 `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Nimarosa + +Contributors +~~~~~~~~~~~~ + +* Nimarosa (Nicolas Rodriguez) + +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 `__: + +|maintainer-nimarosa| + +This module is part of the `OCA/payroll `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/payroll_hr_public_holidays/static/description/index.html b/payroll_hr_public_holidays/static/description/index.html new file mode 100644 index 000000000..6bc69dce6 --- /dev/null +++ b/payroll_hr_public_holidays/static/description/index.html @@ -0,0 +1,432 @@ + + + + + + +Payroll Public Holidays + + + +
+

Payroll Public Holidays

+ + +

Beta License: AGPL-3 OCA/payroll Translate me on Weblate Try me on Runbot

+

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

+ +
+

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. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Nimarosa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

Current maintainer:

+

nimarosa

+

This module is part of the OCA/payroll project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From a93e1e21c89693d0ce55b0097f57e263174c1c61 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 14 Oct 2022 09:51:57 +0000 Subject: [PATCH 05/20] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 payroll_hr_public_holidays/static/description/icon.png diff --git a/payroll_hr_public_holidays/static/description/icon.png b/payroll_hr_public_holidays/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 7b7acb3275ec71977f219a52cf0f0c8305c5e964 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Sande Date: Mon, 24 Oct 2022 21:37:23 +0000 Subject: [PATCH 06/20] Added translation using Weblate (Spanish (Argentina)) --- payroll_hr_public_holidays/i18n/es_AR.po | 41 ++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 payroll_hr_public_holidays/i18n/es_AR.po diff --git a/payroll_hr_public_holidays/i18n/es_AR.po b/payroll_hr_public_holidays/i18n/es_AR.po new file mode 100644 index 000000000..d81055d26 --- /dev/null +++ b/payroll_hr_public_holidays/i18n/es_AR.po @@ -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: 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" + +#. 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 "" From 15683ae84d272927bf7248bc105ab412886a4326 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Sande Date: Mon, 24 Oct 2022 21:37:34 +0000 Subject: [PATCH 07/20] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (5 of 5 strings) Translation: payroll-14.0/payroll-14.0-payroll_hr_public_holidays Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll_hr_public_holidays/es_AR/ --- payroll_hr_public_holidays/i18n/es_AR.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/payroll_hr_public_holidays/i18n/es_AR.po b/payroll_hr_public_holidays/i18n/es_AR.po index d81055d26..430eaa0fd 100644 --- a/payroll_hr_public_holidays/i18n/es_AR.po +++ b/payroll_hr_public_holidays/i18n/es_AR.po @@ -6,36 +6,38 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2022-10-24 23:44+0000\n" +"Last-Translator: Nicolas Rodriguez Sande \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 "" +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 "" +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 "" +msgstr "Última modificación en" #. module: payroll_hr_public_holidays #: model:ir.model,name:payroll_hr_public_holidays.model_hr_payslip msgid "Payslip" -msgstr "" +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 "" +msgstr "Ausencias por feriados" From 218aa6828e36d43c03d0a237563da81fadedac67 Mon Sep 17 00:00:00 2001 From: nicolasrsande Date: Tue, 8 Nov 2022 02:37:01 -0300 Subject: [PATCH 08/20] [14.0] [IMP] payroll: change manifest category [14.0] [IMP] payroll: change manifest category [14.0] [IMP] payroll: add migration for new payslip and payslips objects [14.0] [IMP] payroll: add migration for new payslip and payslips objects [14.0] [IMP] payroll: add migration for new payslip and payslips objects --- payroll_hr_public_holidays/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payroll_hr_public_holidays/__manifest__.py b/payroll_hr_public_holidays/__manifest__.py index 0d0ecd133..2f959c741 100644 --- a/payroll_hr_public_holidays/__manifest__.py +++ b/payroll_hr_public_holidays/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Payroll Public Holidays", "version": "14.0.1.0.0", - "category": "Human Resources", + "category": "Payroll", "website": "https://github.com/OCA/payroll", "summary": "Integration between payroll and hr_public_holidays", "license": "AGPL-3", From 873d73a01e02d01340b773176ac10b94e71f74f6 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 9 Nov 2022 13:27:53 +0000 Subject: [PATCH 09/20] payroll_hr_public_holidays 14.0.2.0.0 --- payroll_hr_public_holidays/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payroll_hr_public_holidays/__manifest__.py b/payroll_hr_public_holidays/__manifest__.py index 2f959c741..643231919 100644 --- a/payroll_hr_public_holidays/__manifest__.py +++ b/payroll_hr_public_holidays/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Payroll Public Holidays", - "version": "14.0.1.0.0", + "version": "14.0.2.0.0", "category": "Payroll", "website": "https://github.com/OCA/payroll", "summary": "Integration between payroll and hr_public_holidays", From 2456767c34afa293c32ff94c638cba9a00280c2f Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Sat, 7 Jan 2023 16:56:42 +0000 Subject: [PATCH 10/20] Added translation using Weblate (Portuguese) --- payroll_hr_public_holidays/i18n/pt.po | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 payroll_hr_public_holidays/i18n/pt.po diff --git a/payroll_hr_public_holidays/i18n/pt.po b/payroll_hr_public_holidays/i18n/pt.po new file mode 100644 index 000000000..9586e7616 --- /dev/null +++ b/payroll_hr_public_holidays/i18n/pt.po @@ -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: pt\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 "" From 7e31a38e770d9cbb85b7c4bc9e52e1a5366d7348 Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Sat, 7 Jan 2023 16:56:50 +0000 Subject: [PATCH 11/20] Translated using Weblate (Portuguese) Currently translated at 80.0% (4 of 5 strings) Translation: payroll-14.0/payroll-14.0-payroll_hr_public_holidays Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll_hr_public_holidays/pt/ --- payroll_hr_public_holidays/i18n/pt.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/payroll_hr_public_holidays/i18n/pt.po b/payroll_hr_public_holidays/i18n/pt.po index 9586e7616..c48773a80 100644 --- a/payroll_hr_public_holidays/i18n/pt.po +++ b/payroll_hr_public_holidays/i18n/pt.po @@ -6,18 +6,20 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2023-01-07 17:01+0000\n" +"Last-Translator: Pedro Castro Silva \n" "Language-Team: none\n" "Language: pt\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 "" +msgstr "Nome a Exibir" #. module: payroll_hr_public_holidays #: model:ir.model.fields,field_description:payroll_hr_public_holidays.field_hr_payslip__id @@ -27,15 +29,15 @@ 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 "" +msgstr "Última Modificação em" #. module: payroll_hr_public_holidays #: model:ir.model,name:payroll_hr_public_holidays.model_hr_payslip msgid "Payslip" -msgstr "" +msgstr "Recibo de Vencimento" #. module: payroll_hr_public_holidays #: code:addons/payroll_hr_public_holidays/models/hr_payslip.py:0 #, python-format msgid "Public Holidays Leaves" -msgstr "" +msgstr "Ausências em Feriados Públicos" From 964e392687755d93a288f26002c4714652ab3da1 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 3 Sep 2023 15:05:40 +0000 Subject: [PATCH 12/20] [UPD] README.rst --- payroll_hr_public_holidays/README.rst | 15 ++++--- .../static/description/index.html | 40 ++++++++++--------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/payroll_hr_public_holidays/README.rst b/payroll_hr_public_holidays/README.rst index 8be9c35f6..935600089 100644 --- a/payroll_hr_public_holidays/README.rst +++ b/payroll_hr_public_holidays/README.rst @@ -2,10 +2,13 @@ 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 @@ -19,11 +22,11 @@ Payroll Public Holidays .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll_hr_public_holidays :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/281/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/payroll&target_branch=14.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Allows to link hr_holidays_public module with payroll. @@ -47,7 +50,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed +If you spotted it first, help us to smash it by providing a detailed and welcomed `feedback `_. Do not contact contributors directly about support or help with technical issues. diff --git a/payroll_hr_public_holidays/static/description/index.html b/payroll_hr_public_holidays/static/description/index.html index 6bc69dce6..bd46d137b 100644 --- a/payroll_hr_public_holidays/static/description/index.html +++ b/payroll_hr_public_holidays/static/description/index.html @@ -1,20 +1,20 @@ - + - + Payroll Public Holidays