[16.0][MIG] hr_timesheet_sheet #580

tarteo · 2023-03-21T15:58:29Z

No description provided.

* [10.0] hr_timesheet_sheet * [11.0][MIG] hr_timesheet_sheet * [REMOVE] hr_timesheet.sheet.account * [REMOVE] 'new' state * [ADD] Tests * [UPD] Adapt to multicompany * [ADD] Add more tests (include multicompany tests) * [FIX] project_task_stage_allow_timesheet: show error message only if task * [ADD] Migration scripts to v11

Currently translated at 98.9% (88 of 89 strings) Translation: hr-timesheet-11.0/hr-timesheet-11.0-hr_timesheet_sheet Translate-URL: https://translation.odoo-community.org/projects/hr-timesheet-11-0/hr-timesheet-11-0-hr_timesheet_sheet/ja/

Currently translated at 100,0% (89 of 89 strings) Translation: hr-timesheet-11.0/hr-timesheet-11.0-hr_timesheet_sheet Translate-URL: https://translation.odoo-community.org/projects/hr-timesheet-11-0/hr-timesheet-11-0-hr_timesheet_sheet/pt_BR/

…ay into this module, which adds a configuration to select the week start day.

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

If you run tests on Sunday, test_4 was not prepared for it, as next day is Monday, which belongs to other week, and thus not included in same timesheet. With this, we cover that case, decreasing one day instead of adding it.

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

astirpe

Tested on runboat, works well and also the matrix has the same functionality as it was in previous versions. Great work @tarteo 👍

bizzappdev · 2023-04-19T04:24:46Z

hr_timesheet_sheet/models/hr_timesheet_sheet.py

+    )
+    def _compute_available_task_ids(self):
+        project_task_obj = self.env["project.task"]
+        for rec in self:


some nitpick only if you want. instead of rec it will be better to have sheet as a variable name.

bizzappdev · 2023-04-19T04:26:26Z

hr_timesheet_sheet/__manifest__.py

@@ -26,10 +26,4 @@
        "views/account_analytic_line_views.xml",
        "views/res_config_settings_views.xml",
    ],
-    "assets": {


Does this mean, it is working from the web_widget_x2many_2d_matrix itself which was customized in those js and scss

Yes, this didn't worked in 15.0 either btw.

micheledic · 2023-05-08T16:03:44Z

I tried the PR but there is a bug but not caused by the PR itself.
It is caused by the native write function that does not consent to write on analytic line that are connected to an holiday .

To replicate the issue:

Create a time off request and approve it
Create a hr timesheet_sheet with the date range that contains this time off analytic line
The error appears .

I did this PR on native odoo code that will fix this issue allowing to set sheet_id also on timeoff analytic lines
odoo/odoo#120597

tarteo · 2023-05-10T12:41:20Z

@micheledic Thanks for testing. Yes this comes from native Odoo indeed, thanks for creating a PR to fix this issue!!

micheledic · 2023-05-10T14:43:04Z

@micheledic Thanks for testing. Yes this comes from native Odoo indeed, thanks for creating a PR to fix this issue!!

odoo/odoo#120597 My PR is approved! Check the changes so you can full migrate the module ;)

AntoniRomera

LGTM

Yadier-Tecnativa

You need to squash the administrative commits, in this case for "Translated using weblate" there are 34 commits, for "Update translation files" 26 and for "Update hr_timesheet_sheet.pot" 18, so there are at least 78 which can be reduced from 184 total.

TT43226

micheledic · 2023-06-03T04:41:06Z

@micheledic Thanks for testing. Yes this comes from native Odoo indeed, thanks for creating a PR to fix this issue!!

odoo/odoo#120597 My PR is approved! Check the changes so you can full migrate the module ;)

@tarteo i Guess you have also to implement that check or can't be created a sheet in a periodi with timeoff analytic line!

tarteo · 2023-06-29T08:40:38Z

@micheledic Fixed it!

astirpe · 2023-06-29T08:52:46Z

Is it ok to merge this one?

OCA-git-bot · 2023-06-29T08:59:37Z

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). 🤖

pedrobaeza · 2023-06-29T23:20:48Z

/ocabot migration hr_timesheet_sheet
/ocabot merge nobump

OCA-git-bot · 2023-06-29T23:21:28Z

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

OCA-git-bot · 2023-06-29T23:28:25Z

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

chicco785 · 2024-04-08T22:12:19Z

@micheledic Thanks for testing. Yes this comes from native Odoo indeed, thanks for creating a PR to fix this issue!!

odoo/odoo#120597 My PR is approved! Check the changes so you can full migrate the module ;)

@tarteo i Guess you have also to implement that check or can't be created a sheet in a periodi with timeoff analytic line!

I tried the PR but there is a bug but not caused by the PR itself. It is caused by the native write function that does not consent to write on analytic line that are connected to an holiday .

To replicate the issue:

Create a time off request and approve it

Create a hr timesheet_sheet with the date range that contains this time off analytic line
The error appears .

I did this PR on native odoo code that will fix this issue allowing to set sheet_id also on timeoff analytic lines odoo/odoo#120597

what's the configuration required to avoid this error message? I am running odoo 16.0 with OCA timesheet_sheet and I get it :/

MiquelRForgeFlow and others added 30 commits February 28, 2023 14:40

[UPD] Update hr_timesheet_sheet.pot

a8c29a6

Translated using Weblate (Japanese)

875586c

Currently translated at 98.9% (88 of 89 strings) Translation: hr-timesheet-11.0/hr-timesheet-11.0-hr_timesheet_sheet Translate-URL: https://translation.odoo-community.org/projects/hr-timesheet-11-0/hr-timesheet-11-0-hr_timesheet_sheet/ja/

[11.0][hr_timesheet_sheet]: allow to display more than 40 cells

030713a

hr_timesheet_sheet: add menu 'Timesheet Sheets to Approve'

bbc5e6e

[UPD] Update hr_timesheet_sheet.pot

bbbb619

hr_timesheet_sheet: pass selected project context to task creation

2b1f974

[11.0][IMP] hr_timesheet_sheet: ease extensions (OCA#131)

cc761b3

[UPD] Update hr_timesheet_sheet.pot

d409b47

Fix task domain and default project_id

df9f2ab

Bump version

d42b253

[IMP] hr_timesheet_sheet ux

3b6162a

Code review

aa62875

Update contributors list

83ed77a

[UPD] Update hr_timesheet_sheet.pot

bad25e6

[FIX] hr_timesheet_sheet: "Refuse" button name (OCA#134)

99e70a6

[UPD] Update hr_timesheet_sheet.pot

dff92d5

[11.0][IMP] hr_timesheet_sheet: merge hr_timesheet_sheet_week_start_d…

02a68b2

…ay into this module, which adds a configuration to select the week start day.

[UPD] Update hr_timesheet_sheet.pot

2dce546

restrict selection of projects to those that have 'allow_timsheets' set

b5b8aff

[MIG] hr_timesheet_sheet: Migration to 12.0

217a949

Update translation files

87e571d

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

[FIX] hr_timesheet_sheet: Don't fail tests on Sunday

0ea7066

If you run tests on Sunday, test_4 was not prepared for it, as next day is Monday, which belongs to other week, and thus not included in same timesheet. With this, we cover that case, decreasing one day instead of adding it.

[IMP] hr_timesheet_sheet: more extendability & cleanup

fac1fb9

[FIX] Fix related fields in hr_timesheet_sheet

76de449

[FIX] hr_timesheet_sheet: who approves timesheets should be the manager

0f16d67

[FIX]hr_timesheet_sheet : fix singleton error in _compute_line_ids

fd74521

Update translation files

fd9adcc

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

[FIX] timesheet sheet lines inconsistency

f7c0e03

[DON'T MERGE] test-requirements.txt

9403521

tarteo force-pushed the 16-mig-timesheet-sheet branch from 7dbd67f to 9403521 Compare March 24, 2023 12:05

astirpe approved these changes Mar 24, 2023

View reviewed changes

bizzappdev reviewed Apr 19, 2023

View reviewed changes

micheledic mentioned this pull request May 9, 2023

[IMP] whitelist some field to write on analytic line with the field holiday_id set odoo/odoo#120597

Closed

AntoniRomera approved these changes May 30, 2023

View reviewed changes

OCA-git-bot added the approved label May 30, 2023

Yadier-Tecnativa approved these changes Jun 2, 2023

View reviewed changes

tarteo mentioned this pull request Jun 29, 2023

[MIG][16.0] hr_timesheet_sheet #591

Closed

Fix for odoo/odoo#120597

b5f6372

remove test dependency

7041df0

OCA-git-bot added the ready to merge label Jun 29, 2023

OCA-git-bot added this to the 16.0 milestone Jun 29, 2023

OCA-git-bot mentioned this pull request Jun 29, 2023

Migration to version 16.0 #524

Open

16 tasks

OCA-git-bot added the bot is merging ⏳ label Jun 29, 2023

OCA-git-bot merged commit e93ba7f into OCA:16.0 Jun 29, 2023

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Jun 29, 2023

LauraCForgeFlow mentioned this pull request May 10, 2024

[16.0][FIX] hr_timesheet_sheet: Update sheet with time off line #675

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[16.0][MIG] hr_timesheet_sheet #580

[16.0][MIG] hr_timesheet_sheet #580

tarteo commented Mar 21, 2023

astirpe left a comment

bizzappdev Apr 19, 2023

bizzappdev Apr 19, 2023

tarteo Apr 20, 2023

micheledic commented May 8, 2023 •

edited

Loading

tarteo commented May 10, 2023

micheledic commented May 10, 2023 •

edited

Loading

AntoniRomera left a comment

Yadier-Tecnativa left a comment •

edited

Loading

micheledic commented Jun 3, 2023

tarteo commented Jun 29, 2023

astirpe commented Jun 29, 2023

OCA-git-bot commented Jun 29, 2023

pedrobaeza commented Jun 29, 2023

OCA-git-bot commented Jun 29, 2023

OCA-git-bot commented Jun 29, 2023

chicco785 commented Apr 8, 2024

[16.0][MIG] hr_timesheet_sheet #580

[16.0][MIG] hr_timesheet_sheet #580

Conversation

tarteo commented Mar 21, 2023

astirpe left a comment

Choose a reason for hiding this comment

bizzappdev Apr 19, 2023

Choose a reason for hiding this comment

bizzappdev Apr 19, 2023

Choose a reason for hiding this comment

tarteo Apr 20, 2023

Choose a reason for hiding this comment

micheledic commented May 8, 2023 • edited Loading

tarteo commented May 10, 2023

micheledic commented May 10, 2023 • edited Loading

AntoniRomera left a comment

Choose a reason for hiding this comment

Yadier-Tecnativa left a comment • edited Loading

Choose a reason for hiding this comment

micheledic commented Jun 3, 2023

tarteo commented Jun 29, 2023

astirpe commented Jun 29, 2023

OCA-git-bot commented Jun 29, 2023

pedrobaeza commented Jun 29, 2023

OCA-git-bot commented Jun 29, 2023

OCA-git-bot commented Jun 29, 2023

chicco785 commented Apr 8, 2024

micheledic commented May 8, 2023 •

edited

Loading

micheledic commented May 10, 2023 •

edited

Loading

Yadier-Tecnativa left a comment •

edited

Loading