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.

Sign up for GitHub

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

Jump to bottom

{13.0}[PORT] 363 from 12.0 [FIX] project_timesheet_time_control: incompatible with sale_timesheet_rounded #474

Merged
merged 1 commit into from
Feb 6, 2023
Merged

{13.0}[PORT] 363 from 12.0 [FIX] project_timesheet_time_control: incompatible with sale_timesheet_rounded #474

merged 1 commit into from
Feb 6, 2023

Conversation

bosd
Copy link
Contributor

@bosd bosd commented Feb 28, 2022

{#363} from 12.0 to 13.0
(generated automatically with the port-pr module)

@bosd bosd changed the title {13.0}[PORT] 363 from 12.0 {13.0}[PORT] 363 from 12.0 [FIX] project_timesheet_time_control: incompatible with sale_timesheet_rounded Mar 6, 2022
@bosd
Copy link
Contributor Author

bosd commented Apr 10, 2022

on local system pre-commit is
green

@bosd
Copy link
Contributor Author

bosd commented Aug 8, 2022

@oca/timesheet-maintainers Can you check pre-commit config?

@bosd
Copy link
Contributor Author

bosd commented Nov 17, 2022

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

Sorry @bosd you are not allowed to rebase.

To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons.

If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the maintainers key of its manifest.

@bosd bosd mentioned this pull request Nov 17, 2022
Closed
@nimarosa
Copy link

I rebase it for you

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

Congratulations, PR rebased to 13.0.

@bosd
Copy link
Contributor Author

bosd commented Nov 17, 2022

@nimarosa Thanks, I think first the repo template which contains the github actions config needs an update.
Then rebasing the PR's again should work.

@nimarosa
Copy link

@bosd yes it's happening in many repos. I will update the templates today and then we rebase.

@bosd bosd mentioned this pull request Nov 24, 2022
Merged
@bosd
Copy link
Contributor Author

bosd commented Nov 30, 2022

@flotho Can you please review this version of the port as well?

@bosd
Copy link
Contributor Author

bosd commented Feb 6, 2023

This one kis open for quite some while. Can it be merged?

@pedrobaeza pedrobaeza added this to the 13.0 milestone Feb 6, 2023
@pedrobaeza
Copy link
Member

OK, it's straight-forward:

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 13.0-ocabot-merge-pr-474-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 0305636 into OCA:13.0 Feb 6, 2023
@OCA-git-bot
Copy link
Contributor

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

@bosd bosd deleted the 13.0-363-port branch February 6, 2023 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged 🎉
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.
5 participants
@bosd @OCA-git-bot @nimarosa @pedrobaeza @enriquemartin