[15.0][MIG] hr_timesheet_holiday #594

JasminSForgeFlow · 2023-06-30T08:55:09Z

Standard Migration

@ForgeFlow

include #545

AaronHForgeFlow

Functional tests so far so good. I think this can be ready for review.

LoisRForgeFlow

One test is failing, could you have a look?

JasminSForgeFlow · 2023-07-04T08:55:10Z

One test is failing, could you have a look?

it's fixed. Thanks

AaronHForgeFlow · 2023-09-19T09:41:55Z

FYI: rebased to build ocabot

AaronHForgeFlow

Functional review

AaronHForgeFlow · 2023-09-19T13:00:49Z

@JasminSForgeFlow it seems tests fail after the rebase. Can you check?

09-19 09:44:57,773 250 INFO odoo odoo.addons.hr_timesheet_holiday.tests.test_all: ====================================================================== 
2023-09-19 09:44:57,773 250 ERROR odoo odoo.addons.hr_timesheet_holiday.tests.test_all: FAIL: TimesheetHolidayTest.test_timesheet_half_day
Traceback (most recent call last):
  File "/__w/timesheet/timesheet/hr_timesheet_holiday/tests/test_all.py", line 198, in test_timesheet_half_day
    self.assertEqual(hours_after - hours_before, 2.625)
AssertionError: 3.0625 != 2.625

JasminSForgeFlow · 2023-09-26T11:03:05Z

@JasminSForgeFlow it seems tests fail after the rebase. Can you check?

09-19 09:44:57,773 250 INFO odoo odoo.addons.hr_timesheet_holiday.tests.test_all: ====================================================================== 
2023-09-19 09:44:57,773 250 ERROR odoo odoo.addons.hr_timesheet_holiday.tests.test_all: FAIL: TimesheetHolidayTest.test_timesheet_half_day
Traceback (most recent call last):
  File "/__w/timesheet/timesheet/hr_timesheet_holiday/tests/test_all.py", line 198, in test_timesheet_half_day
    self.assertEqual(hours_after - hours_before, 2.625)
AssertionError: 3.0625 != 2.625

its fixed, Thanks

github-actions · 2024-02-04T12:23:09Z

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

AaronHForgeFlow · 2024-02-14T16:57:11Z

hr_timesheet_holiday/models/hr_leave_type.py

+        string="Analytic Account",
+        related="project_id.analytic_account_id",
+    )
+    project_id = fields.Many2one(


I think we should depend this module on the standard module project_timesheet_holidays and reuse the field timesheet_project_id

https://github.com/odoo/odoo/blob/15.0/addons/project_timesheet_holidays/models/hr_holidays.py#L22

AaronHForgeFlow

As per comments

…e the s) in 7.0

Currently translated at 63.2% (12 of 19 strings) Translation: hr-timesheet-10.0/hr-timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/hr-timesheet-10-0/hr-timesheet-10-0-hr_timesheet_holiday/it/

Currently translated at 100.0% (19 of 19 strings) Translation: hr-timesheet-10.0/hr-timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/hr-timesheet-10-0/hr-timesheet-10-0-hr_timesheet_holiday/es/

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: timesheet-10.0/timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/timesheet-10-0/timesheet-10-0-hr_timesheet_holiday/

…, the user_id is not filled. Due to the sudo, this user_id field is auto-filled with the admin user (instead of the user related to the employee).

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: timesheet-10.0/timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/timesheet-10-0/timesheet-10-0-hr_timesheet_holiday/

…days

…uests

AaronHForgeFlow · 2024-02-28T08:08:08Z

hr_timesheet_holiday/tests/test_all.py

+                "date_to": leave_date,
+            }
+        )
+        leave.with_user(self.user_hruser_id).action_approve()


this is the line that is failing:

2024-02-28 05:30:33,674 399 ERROR odoo odoo.addons.hr_timesheet_holiday.tests.test_all: ERROR: TimesheetHolidayTest.test_timesheet_half_day Traceback (most recent call last): File "/__w/timesheet/timesheet/hr_timesheet_holiday/tests/test_all.py", line 190, in test_timesheet_half_day leave.with_user(self.user_hruser_id).action_approve() File "/__w/timesheet/timesheet/hr_timesheet_holiday/models/hr_leave.py", line 64, in action_approve res = super(HrLeave, self).action_approve() File "/opt/odoo/addons/hr_holidays/models/hr_leave.py", line 1133, in action_approve self.filtered(lambda hol: not hol.validation_type == 'both').action_validate() File "/opt/odoo/addons/hr_holidays/models/hr_leave.py", line 1157, in action_validate raise ValidationError(_('The following employees are not supposed to work during that period:\n %s') % ','.join(leaves.mapped('employee_id.name'))) odoo.exceptions.ValidationError: The following employees are not supposed to work during that period: David Employee

I think that it is because it is creating a leave on a weekend, but not sure

AaronHForgeFlow · 2024-02-29T15:58:14Z

After a deeper look I think standard module project_timesheet_holidays I think it covers everything in this module, so this is not needed.

AaronHForgeFlow reviewed Jun 30, 2023

View reviewed changes

JasminSForgeFlow marked this pull request as ready for review July 3, 2023 04:28

JasminSForgeFlow force-pushed the 15.0-mig-hr_timesheet_holiday branch from 1bde30d to ba6c264 Compare July 3, 2023 04:31

LoisRForgeFlow reviewed Jul 3, 2023

View reviewed changes

JasminSForgeFlow force-pushed the 15.0-mig-hr_timesheet_holiday branch 3 times, most recently from 29a3479 to 7001d08 Compare July 4, 2023 08:46

AaronHForgeFlow force-pushed the 15.0-mig-hr_timesheet_holiday branch from 7001d08 to 19e8960 Compare September 19, 2023 09:41

AaronHForgeFlow approved these changes Sep 19, 2023

View reviewed changes

JasminSForgeFlow force-pushed the 15.0-mig-hr_timesheet_holiday branch 2 times, most recently from e2d2048 to 77059ce Compare September 26, 2023 10:48

AaronHForgeFlow approved these changes Oct 5, 2023

View reviewed changes

github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Feb 4, 2024

AaronHForgeFlow reviewed Feb 14, 2024

View reviewed changes

AaronHForgeFlow suggested changes Feb 14, 2024

View reviewed changes

thomaspaulb and others added 10 commits February 28, 2024 09:43

[ADD] hr_timesheet_holiday, a rewrite of hr_timesheet_holidays (notic…

0954943

…e the s) in 7.0

OCA Transbot updated translations from Transifex

49d9f10

[MIG]hr_timesheet_holiday v10

760e17f

[ADD] Dependency for correctly menu displaying

2c5d11e

[UPD] Point leave types to projects instead of analytic accounts

531ac14

[UPD] Update hr_timesheet_holiday.pot

f8cd5a8

Added translation using Weblate (Italian)

13a9165

Translated using Weblate (Italian)

9abd6f2

Currently translated at 63.2% (12 of 19 strings) Translation: hr-timesheet-10.0/hr-timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/hr-timesheet-10-0/hr-timesheet-10-0-hr_timesheet_holiday/it/

Translated using Weblate (Spanish)

4b218d6

Currently translated at 100.0% (19 of 19 strings) Translation: hr-timesheet-10.0/hr-timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/hr-timesheet-10-0/hr-timesheet-10-0-hr_timesheet_holiday/es/

[FIX] hr_timesheet_holiday: write is api.multi...

0888aa9

oca-travis and others added 14 commits February 28, 2024 09:43

[UPD] Update hr_timesheet_holiday.pot

40be10e

Update translation files

2f250da

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: timesheet-10.0/timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/timesheet-10-0/timesheet-10-0-hr_timesheet_holiday/

[10.0][FIX] hr_timesheet_holiday: During generation of timesheet line…

d77c672

…, the user_id is not filled. Due to the sudo, this user_id field is auto-filled with the admin user (instead of the user related to the employee).

[UPD] Update hr_timesheet_holiday.pot

e8c11cb

hr_timesheet_holiday 10.0.1.0.1

c2144f6

Update translation files

2418919

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: timesheet-10.0/timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/timesheet-10-0/timesheet-10-0-hr_timesheet_holiday/

Update translation files

bb361d0

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: timesheet-10.0/timesheet-10.0-hr_timesheet_holiday Translate-URL: https://translation.odoo-community.org/projects/timesheet-10-0/timesheet-10-0-hr_timesheet_holiday/

[10.0][FIX] hr_timesheet_holiday: fill timesheet for partial day holi…

bfbb887

…days

[FIX] hr_timesheet_holiday: fix range for iterations

b94f172

[FIX] hr_timesheet_holiday: fix half day calculation

7655ac2

[IMP] hr_timesheet_holiday; add hook for hour validation

7aa2e00

[FIX] hr_timesheet_holiday: skip public holidays in between leave req…

c795604

…uests

[IMP] hr_timesheet_holiday: fix set hours

5b76b47

[IMP] hr_timesheet_holiday: black, isort, prettier

8d040d1

JasminSForgeFlow force-pushed the 15.0-mig-hr_timesheet_holiday branch 3 times, most recently from 75f41fc to 13758eb Compare February 28, 2024 04:27

[MIG] hr_timesheet_holiday: Migration to 15.0

85e35e6

JasminSForgeFlow force-pushed the 15.0-mig-hr_timesheet_holiday branch from 13758eb to 85e35e6 Compare February 28, 2024 05:27

AaronHForgeFlow reviewed Feb 28, 2024

View reviewed changes

JasminSForgeFlow closed this Mar 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[15.0][MIG] hr_timesheet_holiday #594

[15.0][MIG] hr_timesheet_holiday #594

JasminSForgeFlow commented Jun 30, 2023 •

edited

Loading

AaronHForgeFlow left a comment

LoisRForgeFlow left a comment

JasminSForgeFlow commented Jul 4, 2023

AaronHForgeFlow commented Sep 19, 2023

AaronHForgeFlow left a comment

AaronHForgeFlow commented Sep 19, 2023

JasminSForgeFlow commented Sep 26, 2023

github-actions bot commented Feb 4, 2024

AaronHForgeFlow Feb 14, 2024

AaronHForgeFlow left a comment

AaronHForgeFlow Feb 28, 2024

AaronHForgeFlow commented Feb 29, 2024

[15.0][MIG] hr_timesheet_holiday #594

[15.0][MIG] hr_timesheet_holiday #594

Conversation

JasminSForgeFlow commented Jun 30, 2023 • edited Loading

AaronHForgeFlow left a comment

Choose a reason for hiding this comment

LoisRForgeFlow left a comment

Choose a reason for hiding this comment

JasminSForgeFlow commented Jul 4, 2023

AaronHForgeFlow commented Sep 19, 2023

AaronHForgeFlow left a comment

Choose a reason for hiding this comment

AaronHForgeFlow commented Sep 19, 2023

JasminSForgeFlow commented Sep 26, 2023

github-actions bot commented Feb 4, 2024

AaronHForgeFlow Feb 14, 2024

Choose a reason for hiding this comment

AaronHForgeFlow left a comment

Choose a reason for hiding this comment

AaronHForgeFlow Feb 28, 2024

Choose a reason for hiding this comment

AaronHForgeFlow commented Feb 29, 2024

JasminSForgeFlow commented Jun 30, 2023 •

edited

Loading