Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing from upstream OCA/hr (17.0) #1050

Merged
merged 3 commits into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ addon | version | maintainers | summary
[hr_announcement](hr_announcement/) | 17.0.1.0.0 | | Announcement
[hr_course](hr_course/) | 17.0.1.0.0 | | This module allows your to manage employee's training courses
[hr_department_code](hr_department_code/) | 17.0.1.0.0 | | HR department code
[hr_employee_calendar_planning](hr_employee_calendar_planning/) | 17.0.1.0.1 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Employee Calendar Planning
[hr_employee_calendar_planning](hr_employee_calendar_planning/) | 17.0.1.0.2 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Employee Calendar Planning
[hr_employee_document](hr_employee_document/) | 17.0.1.0.1 | | Documents attached to the employee profile
[hr_employee_firstname](hr_employee_firstname/) | 17.0.1.0.1 | [![Savoir-faire Linux](https://github.com/Savoir-faire Linux.png?size=30px)](https://github.com/Savoir-faire Linux) [![luisg123v](https://github.com/luisg123v.png?size=30px)](https://github.com/luisg123v) | Adds First Name to Employee
[hr_employee_partner_external](hr_employee_partner_external/) | 17.0.1.0.0 | | Associate an external Partner to Employee
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_calendar_planning/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Employee Calendar Planning
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:0eb2fe5fbc0c7d21a411c4b3a62f03365bee17178a54a54599d0746842110852
!! source digest: sha256:c3ea6967a8bf2e32b1d83df523df5d68b7c5ea28323528384529d0fe1b8d6c23
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_calendar_planning/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
{
"name": "Employee Calendar Planning",
"version": "17.0.1.0.1",
"version": "17.0.1.0.2",
"category": "Human Resources",
"website": "https://github.com/OCA/hr",
"author": "Tecnativa,Odoo Community Association (OCA)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Employee Calendar Planning</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:0eb2fe5fbc0c7d21a411c4b3a62f03365bee17178a54a54599d0746842110852
!! source digest: sha256:c3ea6967a8bf2e32b1d83df523df5d68b7c5ea28323528384529d0fe1b8d6c23
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/hr/tree/17.0/hr_employee_calendar_planning"><img alt="OCA/hr" src="https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-17-0/hr-17-0-hr_employee_calendar_planning"><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/hr&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>This module allows to manage employee working time with profiles by date
Expand Down
3 changes: 3 additions & 0 deletions hr_employee_calendar_planning/views/hr_employee_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<record id="view_employee_form" model="ir.ui.view">
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form" />
<!-- It is necessary to set a high priority to avoid that if hr_contract
is installed later, the calendar is still hidden. !-->
<field name="priority">99</field>
<field name="arch" type="xml">
<field name="resource_calendar_id" position="attributes">
<attribute name="invisible">1</attribute>
Expand Down
Loading