From f2d45b43c7501b32d2a5b926fdcf5113328167d5 Mon Sep 17 00:00:00 2001 From: regispirard Date: Sat, 16 Nov 2024 15:32:33 +0100 Subject: [PATCH] [IMP] payroll: pre-commit execution --- payroll/README.rst | 30 ++++++++------- payroll/readme/CONTRIBUTORS.md | 5 +++ payroll/readme/CONTRIBUTORS.rst | 5 --- payroll/readme/DESCRIPTION.md | 5 +++ payroll/readme/DESCRIPTION.rst | 3 -- payroll/static/description/index.html | 21 ++++++---- payroll/views/hr_payslip_line_views.xml | 1 - payroll/views/hr_salary_rule_views.xml | 38 +++++++++---------- payroll/views/res_config_settings_views.xml | 1 - payroll/wizard/hr_payroll_send_email.xml | 10 ++--- .../wizard/hr_payslip_change_state_view.xml | 6 +-- 11 files changed, 66 insertions(+), 59 deletions(-) create mode 100644 payroll/readme/CONTRIBUTORS.md delete mode 100644 payroll/readme/CONTRIBUTORS.rst create mode 100644 payroll/readme/DESCRIPTION.md delete mode 100644 payroll/readme/DESCRIPTION.rst diff --git a/payroll/README.rst b/payroll/README.rst index 9a868d87..68138ba7 100644 --- a/payroll/README.rst +++ b/payroll/README.rst @@ -17,20 +17,22 @@ Payroll :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-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 + :target: https://github.com/OCA/payroll/tree/18.0/payroll :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 + :target: https://translation.odoo-community.org/projects/payroll-18-0/payroll-18-0-payroll :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 + :target: https://runboat.odoo-community.org/builds?repo=OCA/payroll&target_branch=18.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| 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** @@ -43,7 +45,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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -51,21 +53,21 @@ Credits ======= Authors -~~~~~~~ +------- * Odoo SA Contributors -~~~~~~~~~~~~ +------------ -* Odoo SA -* David James -* Hilar AK -* Nimarosa (Nicolas Rodriguez) -* Henrik Norlin (@appstogrow) +- Odoo SA +- David James +- Hilar AK +- Nimarosa (Nicolas Rodriguez) +- Henrik Norlin (@appstogrow) Maintainers -~~~~~~~~~~~ +----------- This module is maintained by the OCA. @@ -88,6 +90,6 @@ Current `maintainers `__: |maintainer-appstogrow| |maintainer-nimarosa| -This module is part of the `OCA/payroll `_ project on GitHub. +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/readme/CONTRIBUTORS.md b/payroll/readme/CONTRIBUTORS.md new file mode 100644 index 00000000..0bc8d15e --- /dev/null +++ b/payroll/readme/CONTRIBUTORS.md @@ -0,0 +1,5 @@ +- Odoo SA \<\> +- David James \<\> +- Hilar AK \<\> +- Nimarosa (Nicolas Rodriguez) \<\> +- Henrik Norlin (@appstogrow) diff --git a/payroll/readme/CONTRIBUTORS.rst b/payroll/readme/CONTRIBUTORS.rst deleted file mode 100644 index 8a0b8ac8..00000000 --- a/payroll/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,5 +0,0 @@ -* Odoo SA -* David James -* Hilar AK -* Nimarosa (Nicolas Rodriguez) -* Henrik Norlin (@appstogrow) diff --git a/payroll/readme/DESCRIPTION.md b/payroll/readme/DESCRIPTION.md new file mode 100644 index 00000000..4fc60e5e --- /dev/null +++ b/payroll/readme/DESCRIPTION.md @@ -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. diff --git a/payroll/readme/DESCRIPTION.rst b/payroll/readme/DESCRIPTION.rst deleted file mode 100644 index ce96b5f2..00000000 --- a/payroll/readme/DESCRIPTION.rst +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/payroll/static/description/index.html b/payroll/static/description/index.html index a4e1ef3f..30db5c6f 100644 --- a/payroll/static/description/index.html +++ b/payroll/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -: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. @@ -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 } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -368,9 +369,11 @@

Payroll

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:def4f708faf4767d5767c515426c572391d63f2a30ffde152f86d3a019c0b920 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 OCA/payroll Translate me on Weblate Try me on Runboat

+

Beta License: LGPL-3 OCA/payroll Translate me on Weblate Try me on Runboat

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

    @@ -388,7 +391,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 to smash it by providing a detailed and welcomed -feedback.

    +feedback.

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

@@ -412,13 +415,15 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +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 maintainers:

appstogrow nimarosa

-

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

+

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/views/hr_payslip_line_views.xml b/payroll/views/hr_payslip_line_views.xml index 1ca80480..1afb226b 100644 --- a/payroll/views/hr_payslip_line_views.xml +++ b/payroll/views/hr_payslip_line_views.xml @@ -5,7 +5,6 @@ hr.payslip.line - diff --git a/payroll/views/hr_salary_rule_views.xml b/payroll/views/hr_salary_rule_views.xml index c91a7692..acd4c33c 100644 --- a/payroll/views/hr_salary_rule_views.xml +++ b/payroll/views/hr_salary_rule_views.xml @@ -75,10 +75,10 @@ role="alert" invisible="amount_select != 'code'" > -

+

If you have doubts about coding salary rules, check the "Help" tab in this form.

- +