[17.0][MIG] hr_employee_calendar_planning #1355

pedro-evaristo-pegon · 2024-05-23T05:44:29Z

Work done:

Adapting manifest.py version
Adapt employee public view as resource_calendar_id is not present on it anymore
On tests assert on number of attendances changed slightly because of the lunch break
On create redefinition adapted the employee calendar regeneration to avoid a singleton Value Error
Fix ruff B023, UP008, E501

This module allows to manage employee working time with profiles by date intervals. The profiles are regular working time calendars, but they are treated as master ones here, allowing you to compose complexes working times by dates. Under the hook, a unique working time is created for each employee with the proper composition for not affecting the rest of the functionality linked to this model. Installation ============ During the installation of the module, current working times are split by start/end dates for having consistent data, and the potential new composed calendar planning is saved instead on the employee. Configuration ============= 1. Go to *Employees > Employees*. 2. Open or create a new one. 3. On the "Public Information" page, fill the section "Calendar planning" with: * Starting date (optional). * Ending date (optional). * Working time to apply during that date interval. Known issues / Roadmap ====================== * Add a wizard for generating next year calendar planning based on current one in batch. * Add constraint for avoiding planning lines overlapping. * Avoid the regeneration of whole private calendars each time a change is detected. [UPD] README.rst

[UPD] README.rst

[UPD] Update hr_employee_calendar_planning.pot

Add _description for model hr.employee.calendar to make it pass runbot. [UPD] Update hr_employee_calendar_planning.pot

[UPD] Update hr_employee_calendar_planning.pot [UPD] README.rst Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-13.0/hr-13.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-13-0/hr-13-0-hr_employee_calendar_planning/

- On the module init, existing employee calendar leaves should be linked to the employee's new autocalendar. hr_employee_calendar_planning 13.0.1.0.1

[UPD] README.rst

[UPD] Update hr_employee_calendar_planning.pot [UPD] README.rst

Currently translated at 94.4% (17 of 18 strings) Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/fr/

…r when is related to some employee [UPD] Update hr_employee_calendar_planning.pot hr_employee_calendar_planning 14.0.1.0.2 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/

… field in to show only allowed records according to company. Add constraint to prevent change avoid changing the company when the calendar is linked to an employee of another company. [UPD] Update hr_employee_calendar_planning.pot hr_employee_calendar_planning 14.0.1.1.0 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/

…even when calendar is not active. TT31606 [UPD] Update hr_employee_calendar_planning.pot [UPD] README.rst Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/

…weeks. Regenerate automatic calendar correctly when calendars are 2 weeks old (or any of them are 2 weeks old). TT32425

…r if calendars have been defined in employee creation. TT32425 [UPD] README.rst

Currently translated at 100.0% (22 of 22 strings) Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/ca/

…void create employees without calendar planing. TT35897

hr_employee_calendar_planning 14.0.1.3.1 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/

Parent is not necessary on context, this returns the next error when you try to select a calendar planning on the employee: ``Uncaught Error: NameError: name 'parent' is not defined`` hr_employee_calendar_planning 14.0.1.4.0

…to autogenerated calendar

Currently translated at 100.0% (23 of 23 strings) Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/es_AR/ hr_employee_calendar_planning 14.0.1.4.1

TT36463

… by linking new leaves to auto-generated calendars on creation

…sheet in employee view

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-16.0/hr-16.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_employee_calendar_planning/

Currently translated at 100.0% (24 of 24 strings) Translation: hr-16.0/hr-16.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_employee_calendar_planning/es/

Currently translated at 100.0% (24 of 24 strings) Translation: hr-16.0/hr-16.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_employee_calendar_planning/it/

Only create and unlink necessary resource_calendar_leaves

juanjosesegui-tecnativa · 2024-08-07T08:38:37Z

@pedrobaeza

juanjosesegui-tecnativa

TT50117

hr_employee_calendar_planning/models/hr_employee.py

pedrobaeza · 2024-08-12T07:51:55Z

hr_employee_calendar_planning/tests/test_hr_employee_calendar_planning.py

        self.assertEqual(
-            len(self.employee.resource_calendar_id.attendance_ids), 20 + 6 * 2 + 2
+            len(self.employee.resource_calendar_id.attendance_ids), 30 + 6 * 2 + 2


Why all these number changings? Can you please avoid change them? The test should be immutable as a check of the functionality is preserved (unless something involved with data initialization itself).

Absolutely. The idea of a unitary test is to protect the technical evolution of the module. In this case the attendance_ids was changed because of the inclusion of the breaks... I do come back to you on Wednesday with concrete details of it as I did this work some time ago.

I see that we are creating the calendar deterministically, so the number should be fixed. Maybe this version is adding calendar attendances entries automatically that changes this number, that you should remove or prevent to be created, or maybe you need to filter according the criteria to get the same number.

@pedrobaeza did a pre-filtering of those attendances

pedrobaeza · 2024-08-12T09:18:26Z

/ocabot migration hr_employee_calendar_planning

pedrobaeza · 2024-08-12T09:39:44Z

pandoc-3.2-1-amd64.deb

Please remove this file. This can't be merged with this file here.

And please remove it in the commit that is adding it (the "pre-commit auto fixes" one).

@pedrobaeza removed

pedrobaeza

Great, I think the tests and the diff is clearer now for knowing why the changes.

Thanks for all.

/ocabot merge nobump

OCA-git-bot · 2024-08-14T15:56:39Z

This PR looks fantastic, let's merge it!
Prepared branch 17.0-ocabot-merge-pr-1355-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot · 2024-08-14T16:00:01Z

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

OCA-git-bot · 2024-08-14T16:01:16Z

Congratulations, your PR was merged at f9bbfa2. Thanks a lot for contributing to OCA. ❤️

pedro-evaristo-pegon mentioned this pull request May 23, 2024

Migration to version 17.0 #1291

Open

20 tasks

pedro-evaristo-pegon force-pushed the 17.0-mig-hr_employee_calendar_planning branch from f7c23de to 145eb2b Compare August 6, 2024 15:56

pedrobaeza and others added 28 commits August 6, 2024 17:58

[MIG] hr_employee_calendar_planning

ea1b486

[UPD] README.rst

[12.0][MIG] hr_employee_calendar_planning

c23d10b

[UPD] Update hr_employee_calendar_planning.pot

[12.0][IMP] hr_employee_calendar_planning

1925d68

Add _description for model hr.employee.calendar to make it pass runbot. [UPD] Update hr_employee_calendar_planning.pot

[IMP] hr_employee_calendar_planning: black, isort, prettier

58b1d17

[13.0][MIG] hr_employee_calendar_planning

297e87b

[FIX] hr_employee_calendar_planning: link leaves

341fa15

- On the module init, existing employee calendar leaves should be linked to the employee's new autocalendar. hr_employee_calendar_planning 13.0.1.0.1

[UPD] Eficent -> ForgeFlow

c444aad

[UPD] README.rst

[14.0][MIG] hr_employee_calendar_planning

2e11314

[UPD] Update hr_employee_calendar_planning.pot [UPD] README.rst

Added translation using Weblate (French)

dc1edab

Translated using Weblate (French)

a750833

Currently translated at 94.4% (17 of 18 strings) Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/fr/

[FIX] hr_employee_calendar_planning: Regenerate automatic calendar 2 …

f592f3d

…weeks. Regenerate automatic calendar correctly when calendars are 2 weeks old (or any of them are 2 weeks old). TT32425

[FIX] hr_employee_calendar_planning: Regenerate the automatic calenda…

668f9ae

…r if calendars have been defined in employee creation. TT32425 [UPD] README.rst

Translated using Weblate (Catalan)

d2b7deb

Currently translated at 100.0% (22 of 22 strings) Translation: hr-14.0/hr-14.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_calendar_planning/ca/

[FIX] hr_employee_calendar_planning: Prevent inconsistent company + A…

f994ec9

…void create employees without calendar planing. TT35897

[FIX] hr_employee_calendar_planning: Avoid error with parent

c359e23

Parent is not necessary on context, this returns the next error when you try to select a calendar planning on the employee: ``Uncaught Error: NameError: name 'parent' is not defined`` hr_employee_calendar_planning 14.0.1.4.0

Added translation using Weblate (German)

4c4a3dd

[IMP] hr_employee_calendar_planning: add global leaves and time zone …

b29a08c

…to autogenerated calendar

Added translation using Weblate (Spanish (Argentina))

0090daa

[MIG] hr_employee_calendar_planning: Migration to 15.0

b0ae873

TT36463

[UPD] Update hr_employee_calendar_planning.pot

47f56dd

[UPD] README.rst

87d1d79

jonasbuchholz and others added 10 commits August 6, 2024 17:58

[FIX] hr_employee_calendar_planning: avoid constrain on global leaves…

ab01d5f

… by linking new leaves to auto-generated calendars on creation

[IMP] hr_employee_calendar_planning: display working schedule inside …

deadf2c

…sheet in employee view

[UPD] Update hr_employee_calendar_planning.pot

0315895

Update translation files

32f2920

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-16.0/hr-16.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_employee_calendar_planning/

Translated using Weblate (Spanish)

489b523

Currently translated at 100.0% (24 of 24 strings) Translation: hr-16.0/hr-16.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_employee_calendar_planning/es/

Translated using Weblate (Italian)

9b3cb26

Currently translated at 100.0% (24 of 24 strings) Translation: hr-16.0/hr-16.0-hr_employee_calendar_planning Translate-URL: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_employee_calendar_planning/it/

[FIX]hr_employee_calendar_planning: only necessary leaves

520085c

Only create and unlink necessary resource_calendar_leaves

[BOT] post-merge updates

bdfc61d

[FIX]hr_employee_calendar_planning:create multi calendars

d02a431

[BOT] post-merge updates

772108b

pedro-evaristo-pegon force-pushed the 17.0-mig-hr_employee_calendar_planning branch from 145eb2b to 7c0268c Compare August 6, 2024 16:01

juanjosesegui-tecnativa approved these changes Aug 7, 2024

View reviewed changes

pedrobaeza reviewed Aug 12, 2024

View reviewed changes

OCA-git-bot added this to the 17.0 milestone Aug 12, 2024

pedrobaeza reviewed Aug 12, 2024

View reviewed changes

pedro-evaristo-pegon added 2 commits August 14, 2024 13:05

[IMP] hr_employee_calendar_planning: pre-commit auto fixes

2f9d07a

[17.0][MIG] hr_employee_calendar_planning: Migration to 17.0

b140571

pedro-evaristo-pegon force-pushed the 17.0-mig-hr_employee_calendar_planning branch from 7c0268c to b140571 Compare August 14, 2024 13:01

pedrobaeza approved these changes Aug 14, 2024

View reviewed changes

OCA-git-bot added the approved label Aug 14, 2024

OCA-git-bot added bot is merging ⏳ ready to merge labels Aug 14, 2024

OCA-git-bot merged commit 462b9a9 into OCA:17.0 Aug 14, 2024
7 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Aug 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[17.0][MIG] hr_employee_calendar_planning #1355

[17.0][MIG] hr_employee_calendar_planning #1355

pedro-evaristo-pegon commented May 23, 2024 •

edited

Loading

juanjosesegui-tecnativa commented Aug 7, 2024

juanjosesegui-tecnativa left a comment

pedrobaeza Aug 12, 2024

pedro-evaristo-pegon Aug 12, 2024

pedrobaeza Aug 12, 2024

pedro-evaristo-pegon Aug 14, 2024

pedrobaeza commented Aug 12, 2024

pedrobaeza Aug 12, 2024

pedrobaeza Aug 12, 2024

pedro-evaristo-pegon Aug 14, 2024

pedrobaeza left a comment

OCA-git-bot commented Aug 14, 2024

OCA-git-bot commented Aug 14, 2024

OCA-git-bot commented Aug 14, 2024

[17.0][MIG] hr_employee_calendar_planning #1355

[17.0][MIG] hr_employee_calendar_planning #1355

Conversation

pedro-evaristo-pegon commented May 23, 2024 • edited Loading

juanjosesegui-tecnativa commented Aug 7, 2024

juanjosesegui-tecnativa left a comment

Choose a reason for hiding this comment

pedrobaeza Aug 12, 2024

Choose a reason for hiding this comment

pedro-evaristo-pegon Aug 12, 2024

Choose a reason for hiding this comment

pedrobaeza Aug 12, 2024

Choose a reason for hiding this comment

pedro-evaristo-pegon Aug 14, 2024

Choose a reason for hiding this comment

pedrobaeza commented Aug 12, 2024

pedrobaeza Aug 12, 2024

Choose a reason for hiding this comment

pedrobaeza Aug 12, 2024

Choose a reason for hiding this comment

pedro-evaristo-pegon Aug 14, 2024

Choose a reason for hiding this comment

pedrobaeza left a comment

Choose a reason for hiding this comment

OCA-git-bot commented Aug 14, 2024

OCA-git-bot commented Aug 14, 2024

OCA-git-bot commented Aug 14, 2024

pedro-evaristo-pegon commented May 23, 2024 •

edited

Loading