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

[15.0][MIG] helpdesk_mgmt_timesheet : Migration to 15.0 #425

Merged
merged 23 commits into from
Oct 25, 2023

Conversation

vincent-hatakeyama
Copy link
Contributor

Rebase of #338

@pedrobaeza
Copy link
Member

/ocabot migration helpdesk_mgmt_timesheet

@OCA-git-bot OCA-git-bot added this to the 15.0 milestone Mar 2, 2023
@OCA-git-bot
Copy link
Contributor

There's no issue in this repo with the title 'Migration to version 15.0' and the milestone 15.0, so not possible to add the comment.

Copy link
Contributor

@dalonsod dalonsod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functionaly tested 👍

For code review, see comment.

Also and not blocking, I propose as improvement adding widget="many2one_avatar_user" to timesheet_helpdesk_ticket_view_form view for user_id timesheets field

Copy link
Contributor

@LoisRForgeFlow LoisRForgeFlow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you include (cherry-pick) #468 here?

@LoisRForgeFlow
Copy link
Contributor

Hi, could you also include this new change from v14: #477?

Thanks

@vincent-hatakeyama vincent-hatakeyama force-pushed the 15.0-mig-helpdesk_mgmt_timesheet branch 3 times, most recently from 7d04443 to 1639aa2 Compare September 14, 2023 09:35
@vincent-hatakeyama
Copy link
Contributor Author

Could you include (cherry-pick) #468 here?

Hi, could you also include this new change from v14: #477?

@LoisRForgeFlow Both changes have been cherry picked.

Copy link
Contributor

@LoisRForgeFlow LoisRForgeFlow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LG!

@OCA-git-bot
Copy link
Contributor

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

@dalonsod
Copy link
Contributor

Hello @pedrobaeza is it possible to merge this PR?

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not start, because command `git merge --no-ff -m 'Merge PR #425 into 15.0

Signed-off-by pedrobaeza' tmp-pr-425` failed with output:

CONFLICT (rename/delete): helpdesk_mgmt_project/controllers/main.py deleted in HEAD and renamed to helpdesk_mgmt_timesheet/controllers/main.py in tmp-pr-425. Version tmp-pr-425 of helpdesk_mgmt_timesheet/controllers/main.py left in tree.
CONFLICT (rename/delete): helpdesk_mgmt_project/controllers/__init__.py deleted in HEAD and renamed to helpdesk_mgmt_timesheet/controllers/__init__.py in tmp-pr-425. Version tmp-pr-425 of helpdesk_mgmt_timesheet/controllers/__init__.py left in tree.
Auto-merging helpdesk_mgmt/controllers/main.py
Automatic merge failed; fix conflicts and then commit the result.

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not start, because command `git merge --no-ff -m 'Merge PR #425 into 15.0

Signed-off-by pedrobaeza' tmp-pr-425` failed with output:

CONFLICT (rename/delete): helpdesk_mgmt_project/controllers/main.py deleted in HEAD and renamed to helpdesk_mgmt_timesheet/controllers/main.py in tmp-pr-425. Version tmp-pr-425 of helpdesk_mgmt_timesheet/controllers/main.py left in tree.
CONFLICT (rename/delete): helpdesk_mgmt_project/controllers/__init__.py deleted in HEAD and renamed to helpdesk_mgmt_timesheet/controllers/__init__.py in tmp-pr-425. Version tmp-pr-425 of helpdesk_mgmt_timesheet/controllers/__init__.py left in tree.
Auto-merging helpdesk_mgmt/controllers/main.py
Automatic merge failed; fix conflicts and then commit the result.

@pedrobaeza
Copy link
Member

@dalonsod can you please rebase and re-push to see if we remove the problem?

dalonsod and others added 15 commits October 24, 2023 11:58
Currently translated at 100.0% (32 of 32 strings)

Translation: helpdesk-14.0/helpdesk-14.0-helpdesk_mgmt_timesheet
Translate-URL: https://translation.odoo-community.org/projects/helpdesk-14-0/helpdesk-14-0-helpdesk_mgmt_timesheet/it/
Currently translated at 100.0% (32 of 32 strings)

Translation: helpdesk-14.0/helpdesk-14.0-helpdesk_mgmt_timesheet
Translate-URL: https://translation.odoo-community.org/projects/helpdesk-14-0/helpdesk-14-0-helpdesk_mgmt_timesheet/it/
…e_control

Also set the version to 15.0.1.0.0 as indicated in OCA’s migration
guide.
ypapouin and others added 2 commits October 24, 2023 12:02
If `helpdesk_mgmt_project` is installed without `helpdesk_mgmt_timesheet`, an `AttributeError` is raised when submitting a new ticket
@vincent-hatakeyama
Copy link
Contributor Author

Done, I’ve also squashed some bot/translation commits.

@dalonsod
Copy link
Contributor

@pedrobaeza could you try again?

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit bc79d82 into OCA:15.0 Oct 25, 2023
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@dalonsod
Copy link
Contributor

Thanks!!

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

Successfully merging this pull request may close these issues.