[16.0] [MIG] resource_work_time_from_contracts #302

victor-champonnois · 2023-07-20T12:51:04Z

@huguesdk I have one failing test and I can't make it work. Also I am not sure about commit eca1800.
Could you help ?

The error happens for test_with_leaves

When I stop at line

addons/resource_work_time_from_contracts/models/resource_mixin.py

Line 143 in eca1800

num_days = 0.0

and do self.list_leaves(from_datetime,to_datetime)

0:
(datetime.date(2021, 10, 26), 1.8, resource.calendar.leaves(81,))
1:
(datetime.date(2021, 10, 26), 1.0, resource.calendar.leaves(81,))
2:
(datetime.date(2021, 10, 27), 1.8, resource.calendar.leaves(82,))
3:
(datetime.date(2021, 10, 29), 1.8, resource.calendar.leaves(83,))
4:
(datetime.date(2021, 10, 29), 3.8, resource.calendar.leaves(83,))

Alors qu'en 12 j'obtiens :

0:
(datetime.date(2021, 10, 26), 3.8, resource.calendar.leaves(10,))
1:
(datetime.date(2021, 10, 27), 3.8, resource.calendar.leaves(11,))
2:
(datetime.date(2021, 10, 29), 3.8, resource.calendar.leaves(12,))
3:
(datetime.date(2021, 10, 29), 3.8, resource.calendar.leaves(12,))
```

normal_work_time_per_day est OK. 

task : https://gestion.coopiteasy.be/web#id=10959&action=475&active_id=492&model=project.task&view_type=form&menu_id=

carmenbianca

Some small comments.

Will also look at the failing test.

carmenbianca · 2023-09-05T09:43:14Z

resource_work_time_from_contracts/models/resource_mixin.py

-    def get_work_days_data(
+    def _get_work_days_data_batch(


Per the commit message, which indirectly links to odoo/odoo#56477, I think this change (and all other changes in the commit 7bbb859) should be squashed into the 13.0 migration commit.

resource_work_time_from_contracts/tests/test_work_days_data.py

carmenbianca · 2023-09-05T11:55:40Z

Patched up the failing test. Please remove the reverted commit (and the revert commit) before merging. I kept them for history's sake.

codecov-commenter · 2023-09-05T11:57:53Z

Codecov Report

Merging #302 (c4937d6) into 16.0 (b640076) will decrease coverage by 0.15%.
The diff coverage is 97.45%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@            Coverage Diff             @@
##             16.0     #302      +/-   ##
==========================================
- Coverage   97.73%   97.59%   -0.15%     
==========================================
  Files          12       21       +9     
  Lines         221      457     +236     
  Branches       30       51      +21     
==========================================
+ Hits          216      446     +230     
- Misses          1        4       +3     
- Partials        4        7       +3

Files Changed	Coverage Δ
..._work_time_from_contracts/models/resource_mixin.py	`92.77% <92.77%> (ø)`
resource_work_time_from_contracts/__init__.py	`100.00% <100.00%> (ø)`
...source_work_time_from_contracts/models/__init__.py	`100.00% <100.00%> (ø)`
..._from_contracts/models/resource_calendar_leaves.py	`100.00% <100.00%> (ø)`
...rk_time_from_contracts/models/resource_resource.py	`100.00% <100.00%> (ø)`
...esource_work_time_from_contracts/tests/__init__.py	`100.00% <100.00%> (ø)`
...k_time_from_contracts/tests/test_work_days_data.py	`100.00% <100.00%> (ø)`
...e_work_time_from_contracts/tests/test_work_time.py	`100.00% <100.00%> (ø)`
...k_time_from_contracts/tests/test_work_time_base.py	`100.00% <100.00%> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

victor-champonnois · 2023-09-11T09:46:46Z

thanks a lot carmen !

robinkeunen · 2023-12-19T14:47:37Z

/ocabot rebase

* override resource.mixin.get_work_days_data() to also take contracts into account. this is used for example by the hr_holidays module to compute leave days. * force employees' working hours to be equal to the company's working hours. * hide the working hours field on the employee form view.

hide working time column from resource list view.

* fix work time computation with existing leaves. * add .list_normal_work_time_per_day() method to compute work time ignoring leaves. * fix timezone issues.

force leaves to use the resource calendar of the company. to compute working hours while taking leaves into account, this module requires that all leaves for all resources are defined in the same resource calendar.

Signed-off-by: Carmen Bianca Bakker <[email protected]>

[FIX] rename get_work_days_data to _get_work_days_data_batch following this commit OCA/OCB@8c96a88

Signed-off-by: Carmen Bianca BAKKER <[email protected]>

github-grap-bot · 2023-12-19T14:47:42Z

Congratulations, PR rebased to 16.0.

robinkeunen · 2023-12-19T14:58:11Z

/ocabot merge nobump

github-grap-bot · 2023-12-19T14:58:17Z

On my way to merge this fine PR!
Prepared branch 16.0-ocabot-merge-pr-302-by-robinkeunen-bump-nobump, awaiting test results.

github-grap-bot · 2023-12-19T15:02:28Z

Congratulations, your PR was merged at 5abf60e. Thanks a lot for contributing to coopiteasy. ❤️

github-grap-bot · 2023-12-19T15:02:31Z

@robinkeunen The merge process could not be finalized because an exception was raised: 500 [No message].

victor-champonnois changed the title ~~16.0 mig resource work time from contracts~~ [16.0] mig resource_work_time_from_contracts Jul 20, 2023

victor-champonnois changed the title ~~[16.0] mig resource_work_time_from_contracts~~ [16.0] [MIG] resource_work_time_from_contracts Jul 20, 2023

carmenbianca requested changes Sep 5, 2023

View reviewed changes

github-grap-bot added the needs review label Sep 5, 2023

victor-champonnois force-pushed the 16.0-mig-resource_work_time_from_contracts branch 2 times, most recently from c4937d6 to adea1ca Compare September 11, 2023 09:45

victor-champonnois marked this pull request as ready for review September 11, 2023 09:46

victor-champonnois requested a review from carmenbianca September 11, 2023 09:46

carmenbianca approved these changes Sep 29, 2023

View reviewed changes

robinkeunen approved these changes Dec 19, 2023

View reviewed changes

github-grap-bot added the approved label Dec 19, 2023

huguesdk and others added 15 commits December 19, 2023 14:47

[ADD] new module resource_work_time_from_contracts

c73ed30

[IMP] hide working time from resource list view

6b76ebf

hide working time column from resource list view.

[IMP] add (failing) tests with leaves

adb136d

[FIX] fix computation with existing leaves

e7f3a14

* fix work time computation with existing leaves. * add .list_normal_work_time_per_day() method to compute work time ignoring leaves. * fix timezone issues.

[IMP] force leaves to use company calendar

0520eb5

force leaves to use the resource calendar of the company. to compute working hours while taking leaves into account, this module requires that all leaves for all resources are defined in the same resource calendar.

[FIX] Run pre-commit

a4a6124

Signed-off-by: Carmen Bianca Bakker <[email protected]>

[UPD] Update resource_work_time_from_contracts.pot

9e6f191

[FIX] SCRLfs → SC

beee10c

Signed-off-by: Carmen Bianca Bakker <[email protected]>

[IMP] resource_work_time_from_contracts: pre-commit stuff

98e2c24

[MIG] resource_work_time_from_contracts: Migration to 13.0

fb80e42

[FIX] rename get_work_days_data to _get_work_days_data_batch following this commit OCA/OCB@8c96a88

[MIG] resource_work_time_from_contracts: Migration to 14.0

e1d912b

[MIG] resource_work_time_from_contracts: Migration to 15.0

557c0c6

[MIG] resource_work_time_from_contracts: Migration to 16.0

bdbce4b

[FIX] import ROUNDING_FACTOR error

8d91405

carmenbianca added 2 commits December 19, 2023 14:47

[IMP] resource_work_time_from_contracts: Helpful comment

8f95380

Signed-off-by: Carmen Bianca BAKKER <[email protected]>

[FIX] resource_work_time_from_contracts: Make ORM accept UTC datetimes

4503e9f

Signed-off-by: Carmen Bianca BAKKER <[email protected]>

github-grap-bot force-pushed the 16.0-mig-resource_work_time_from_contracts branch from adea1ca to 4503e9f Compare December 19, 2023 14:47

github-grap-bot added the bot is merging ⏳ label Dec 19, 2023

github-grap-bot merged commit 66846f7 into 16.0 Dec 19, 2023
2 checks passed

github-grap-bot deleted the 16.0-mig-resource_work_time_from_contracts branch December 19, 2023 15:02

github-grap-bot removed the bot is merging ⏳ label Dec 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[16.0] [MIG] resource_work_time_from_contracts #302

[16.0] [MIG] resource_work_time_from_contracts #302

victor-champonnois commented Jul 20, 2023 •

edited

Loading

carmenbianca left a comment

carmenbianca Sep 5, 2023

victor-champonnois Sep 11, 2023

carmenbianca commented Sep 5, 2023

codecov-commenter commented Sep 5, 2023 •

edited

Loading

victor-champonnois commented Sep 11, 2023

robinkeunen commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

robinkeunen commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

[16.0] [MIG] resource_work_time_from_contracts #302

[16.0] [MIG] resource_work_time_from_contracts #302

Conversation

victor-champonnois commented Jul 20, 2023 • edited Loading

carmenbianca left a comment

Choose a reason for hiding this comment

carmenbianca Sep 5, 2023

Choose a reason for hiding this comment

victor-champonnois Sep 11, 2023

Choose a reason for hiding this comment

carmenbianca commented Sep 5, 2023

codecov-commenter commented Sep 5, 2023 • edited Loading

Codecov Report

victor-champonnois commented Sep 11, 2023

robinkeunen commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

robinkeunen commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

github-grap-bot commented Dec 19, 2023

victor-champonnois commented Jul 20, 2023 •

edited

Loading

codecov-commenter commented Sep 5, 2023 •

edited

Loading