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

[13.0][FIX] payroll: add group migration #137

Merged
merged 4 commits into from
Dec 18, 2023

Conversation

MiquelRForgeFlow
Copy link
Contributor

@MiquelRForgeFlow MiquelRForgeFlow commented Dec 18, 2023

When #23 was done, they forgot to add this:
Selection_2380

Also, as the module is renamed to payroll in https://github.com/OCA/OpenUpgrade/blob/13.0/odoo/addons/openupgrade_records/lib/apriori.py#L95, all xmlids should begin with payroll. to be found.

Note: merge with nobump.

@MiquelRForgeFlow
Copy link
Contributor Author

@pedrobaeza pedrobaeza added this to the 13.0 milestone Dec 18, 2023
@pedrobaeza
Copy link
Member

Travis is red. This can be switched to GH actions.

@MiquelRForgeFlow
Copy link
Contributor Author

Ready to merge

@nimarosa
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 13.0-ocabot-merge-pr-137-by-nimarosa-bump-nobump, awaiting test results.

Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 13.0-ocabot-merge-pr-137-by-pedrobaeza-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Dec 18, 2023
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

@nimarosa The merge process could not be finalized, because command git push origin 13.0-ocabot-merge-pr-137-by-nimarosa-bump-nobump:13.0 failed with output:

To https://github.com/OCA/payroll
 ! [remote rejected] 13.0-ocabot-merge-pr-137-by-nimarosa-bump-nobump -> 13.0 (cannot lock ref 'refs/heads/13.0': is at 0da72105b3987534029a406ab04af0869bc9a7b7 but expected f59563b405d11adbfb03961b9b1512ff495511bd)
error: failed to push some refs to 'https://***@github.com/OCA/payroll'

@OCA-git-bot OCA-git-bot merged commit 3ba0164 into OCA:13.0 Dec 18, 2023
5 checks passed
@OCA-git-bot
Copy link
Contributor

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

@MiquelRForgeFlow MiquelRForgeFlow deleted the 13.0-mig-payroll-groups branch December 18, 2023 17:22
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 13.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 13.0-ocabot-merge-pr-137-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-137-by-pedrobaeza-bump-patch.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

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.

5 participants