[16.0][MIG] hr_employee_calendar_planning #1290

jonasbuchholz · 2023-11-07T13:46:55Z

Module migration, since there hasn't been any activity on #1242 for some time. Includes the commits mentioned by @victoralmau and a fix for the bug when creating new employees. For better formatting, the calendar_ids field is placed in a separate notebook page in the employee view

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

…from employee public form view TT40038

We should only fill the calendar with sync_user if and only if you don't have one Sync user is used also when we modify the user of an employee

…have finished. Show them on calendar view

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

…o cover all use cases TT44093

…calendar_id fields to allow removal TT44093

victoralmau

Some comments:

It is not clear to me that adding the calendars on a new page could not have side effects.
Check the tests and make the necessary fixes.

hr_employee_calendar_planning/tests/test_hr_employee_calendar_planning.py

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

victoralmau · 2023-11-22T09:43:33Z

hr_employee_calendar_planning/views/resource_calendar_views.xml

+        <field name="inherit_id" ref="resource.resource_calendar_form" />
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page name="employee_calendar" string="Employee Calendars">


Adding a new tab doesn't quite convince me, maybe you could move employee_calendar_ids field to another place (inside the tab it was previously in) to be the full size of the tab. What do you think @pedrobaeza ?

Yes, a whole new tab just for this seems over-killing.

What do you think about leaving the label and setting a colspan? Looks like this:

It seems it overflows a bit the limits.

Yes, I know what you mean. But to me, this seems like the way Odoo is treating fields like this in views, see eg here. Defining custom css just for this view seems a bit unnecessary. Alternatively, we could place it in a sheet, like this:

OK, that can be another option.

…sheet in employee view

pedrobaeza

/ocabot merge nobump
/ocabot migration hr_employee_calendar_planning

OCA-git-bot · 2023-11-27T09:23:22Z

What a great day to merge this nice PR. Let's do it!
Prepared branch 16.0-ocabot-merge-pr-1290-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot · 2023-11-27T09:23:26Z

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 · 2023-11-27T09:28:08Z

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

pedrobaeza and others added 30 commits November 7, 2023 12:49

[MIG] hr_employee_calendar_planning

1cf3bb6

[UPD] README.rst

[12.0][MIG] hr_employee_calendar_planning

fff32b9

[UPD] Update hr_employee_calendar_planning.pot

[12.0][IMP] hr_employee_calendar_planning

f6daef3

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

864dd3b

[13.0][MIG] hr_employee_calendar_planning

6c8047a

[FIX] hr_employee_calendar_planning: link leaves

36e8812

- 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

18fedf6

[UPD] README.rst

[14.0][MIG] hr_employee_calendar_planning

cd991d8

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

Added translation using Weblate (French)

a93cd11

Translated using Weblate (French)

e25a95a

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 …

9828d86

…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…

d73de1e

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

Translated using Weblate (Catalan)

f29d3f0

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…

9a0b627

…void create employees without calendar planing. TT35897

[FIX] hr_employee_calendar_planning: Avoid error with parent

2417727

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)

6a009d1

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

b413c48

…to autogenerated calendar

Added translation using Weblate (Spanish (Argentina))

ed7c3d8

[MIG] hr_employee_calendar_planning: Migration to 15.0

025be98

TT36463

[UPD] Update hr_employee_calendar_planning.pot

3c99e19

[UPD] README.rst

2eadc5e

[IMP] hr_employee_calendar_planning: Hide resource_calendar_id field …

2b214a1

…from employee public form view TT40038

hr_employee_calendar_planning 15.0.1.1.0

d74026b

etobella and others added 9 commits November 7, 2023 13:01

[FIX] hr_employee_calendar_planning: fill calendar if empty

06153a6

We should only fill the calendar with sync_user if and only if you don't have one Sync user is used also when we modify the user of an employee

hr_employee_calendar_planning 15.0.1.1.6

7c740a5

[IMP] hr_employee_calendar_planning: pre-commit stuff

bd3c8ce

[MIG] hr_employee_calendar_planning: Migration to 16.0

3d51dca

[IMP] hr_employee_calendar_planning: Allow to archive when calendars …

564deb6

…have finished. Show them on calendar view

[UPD] Update hr_employee_calendar_planning.pot

89246bf

Update translation files

efe979c

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

[IMP] hr_employee_calendar_planning: Set calendar_ids default value t…

f63edd9

…o cover all use cases TT44093

[FIX] hr_employee_calendar_planning: Add ondelete to employee_id and …

b0a5d37

…calendar_id fields to allow removal TT44093

jonasbuchholz force-pushed the 16.0-mig_hr_employee_calendar_planning branch from 8085dae to d6d91d6 Compare November 7, 2023 16:40

victoralmau suggested changes Nov 10, 2023

View reviewed changes

hr_employee_calendar_planning/tests/test_hr_employee_calendar_planning.py Outdated Show resolved Hide resolved

[FIX] hr_employee_calendar_planning: avoid constrain on global leaves…

19884bd

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

jonasbuchholz force-pushed the 16.0-mig_hr_employee_calendar_planning branch from d6d91d6 to 16c87e5 Compare November 15, 2023 17:33

victoralmau reviewed Nov 22, 2023

View reviewed changes

[IMP] hr_employee_calendar_planning: display working schedule inside …

8576705

…sheet in employee view

jonasbuchholz force-pushed the 16.0-mig_hr_employee_calendar_planning branch from 16c87e5 to 8576705 Compare November 27, 2023 09:03

victoralmau approved these changes Nov 27, 2023

View reviewed changes

pedrobaeza changed the title ~~[16.0][MIG] hr employee calendar planning~~ [16.0][MIG] hr_employee_calendar_planning Nov 27, 2023

pedrobaeza approved these changes Nov 27, 2023

View reviewed changes

OCA-git-bot added the approved label Nov 27, 2023

OCA-git-bot added this to the 16.0 milestone Nov 27, 2023

OCA-git-bot added the bot is merging ⏳ label Nov 27, 2023

OCA-git-bot mentioned this pull request Nov 27, 2023

Migration to version 16.0 #1141

Open

28 tasks

OCA-git-bot added the ready to merge label Nov 27, 2023

OCA-git-bot merged commit e14fe86 into OCA:16.0 Nov 27, 2023
6 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Nov 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[16.0][MIG] hr_employee_calendar_planning #1290

[16.0][MIG] hr_employee_calendar_planning #1290

jonasbuchholz commented Nov 7, 2023

victoralmau left a comment

victoralmau Nov 22, 2023

pedrobaeza Nov 22, 2023

jonasbuchholz Nov 22, 2023

pedrobaeza Nov 22, 2023

jonasbuchholz Nov 23, 2023

pedrobaeza Nov 24, 2023

pedrobaeza left a comment

OCA-git-bot commented Nov 27, 2023

OCA-git-bot commented Nov 27, 2023

OCA-git-bot commented Nov 27, 2023

[16.0][MIG] hr_employee_calendar_planning #1290

[16.0][MIG] hr_employee_calendar_planning #1290

Conversation

jonasbuchholz commented Nov 7, 2023

victoralmau left a comment

Choose a reason for hiding this comment

victoralmau Nov 22, 2023

Choose a reason for hiding this comment

pedrobaeza Nov 22, 2023

Choose a reason for hiding this comment

jonasbuchholz Nov 22, 2023

Choose a reason for hiding this comment

pedrobaeza Nov 22, 2023

Choose a reason for hiding this comment

jonasbuchholz Nov 23, 2023

Choose a reason for hiding this comment

pedrobaeza Nov 24, 2023

Choose a reason for hiding this comment

pedrobaeza left a comment

Choose a reason for hiding this comment

OCA-git-bot commented Nov 27, 2023

OCA-git-bot commented Nov 27, 2023

OCA-git-bot commented Nov 27, 2023