Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIG] hr_timesheet_sheet migration to 17.0 #703

Open
wants to merge 225 commits into
base: 17.0
Choose a base branch
from

Conversation

vnikolayev1
Copy link

@vnikolayev1 vnikolayev1 commented Aug 14, 2024

  • ported module from version 16 to version 17
  • fixed/updated tests, logic based on views change
  • updated pre-commit auto fixes

@pedrobaeza
Copy link
Member

Thanks for the contribution.

Please preserve commit history following technical method explained in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0.

If the jump is between several versions, you have to modify the source branch in the main command to accommodate it to this circumstance.

@vnikolayev1 vnikolayev1 force-pushed the 17.0 branch 2 times, most recently from 42e3a36 to b26edde Compare August 14, 2024 18:09
MiquelRForgeFlow and others added 27 commits August 15, 2024 18:19
* [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.
adrianojprado and others added 20 commits August 15, 2024 18:19
Currently translated at 100.0% (182 of 182 strings)

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/pt_BR/
Currently translated at 95.0% (173 of 182 strings)

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

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/
Currently translated at 100.0% (181 of 181 strings)

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/ca/
Currently translated at 100.0% (181 of 181 strings)

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

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/it/
Currently translated at 99.4% (180 of 181 strings)

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

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

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/
Currently translated at 100.0% (183 of 183 strings)

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/it/
Currently translated at 82.5% (151 of 183 strings)

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/pt/
Currently translated at 84.1% (154 of 183 strings)

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/pt/
Currently translated at 100.0% (183 of 183 strings)

Translation: timesheet-16.0/timesheet-16.0-hr_timesheet_sheet
Translate-URL: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet/pt_BR/
- ported module from version 16 to version 17
- fixed/updated tests, python logic based on views changes
- fixed linter errors
@vnikolayev1
Copy link
Author

@pedrobaeza Thank you for migration guide, here is an update.

@pedrobaeza
Copy link
Member

/ocabot migration hr_timesheet_sheet

@OCA-git-bot OCA-git-bot added this to the 17.0 milestone Aug 15, 2024
@OCA-git-bot
Copy link
Contributor

The migration issue (#617) has not been updated to reference the current pull request because a previous pull request (#687) is not closed.
Perhaps you should check that there is no duplicate work.
CC @SodexisTeam

@pedrobaeza
Copy link
Member

@vnikolayev1 it seems there's another migration on progress. Did you check it?

@vnikolayev1
Copy link
Author

vnikolayev1 commented Aug 16, 2024

@pedrobaeza probably i should check if it exists first.

Looks like it has some extra functionality here ( _check_can_write method) e952741
settings views are not updated,
tests does not look like were touched either (they should be updated because we change readonly logic)

Sadly they did same mistake like i did on my first push - did not use patch so it' s hard to see everything what is changed

Looks like i did a bit better porting overall, so maybe their extra changes can be placed over mine later

p.s. is there anything i could read on how to check existing MR and what to do with them(or what should i google)? i am relatively new to this.

@pedrobaeza
Copy link
Member

Please review and put comments in the other PR.

@pedrobaeza
Copy link
Member

Please include #712 if this PR is finally used.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.