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

[16.0] [MIG] hr_timesheet_sheet_current #28

Merged
merged 11 commits into from
Dec 19, 2023

Conversation

@codecov-commenter
Copy link

codecov-commenter commented Jul 25, 2023

Codecov Report

❗ No coverage uploaded for pull request base (16.0@69a9273). Click here to learn what that means.
The diff coverage is n/a.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@           Coverage Diff           @@
##             16.0      #28   +/-   ##
=======================================
  Coverage        ?   56.25%           
=======================================
  Files           ?        3           
  Lines           ?       16           
  Branches        ?        0           
=======================================
  Hits            ?        9           
  Misses          ?        7           
  Partials        ?        0           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Member

@huguesdk huguesdk left a comment

Choose a reason for hiding this comment

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

just a misc change request, otherwise lgtm.

hr_timesheet_sheet_current/__manifest__.py Outdated Show resolved Hide resolved
Copy link
Member

@carmenbianca carmenbianca left a comment

Choose a reason for hiding this comment

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

LGTM

@robinkeunen
Copy link
Member

/ocabot rebase

@github-grap-bot
Copy link
Contributor

@robinkeunen The rebase process failed, because command git rebase origin/16.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [ADD] server action to open current timesheet
Applying: [FIX] fix hr_timesheet_sheet_current readme
Applying: [IMP] pass pre-commit
Applying: [UPD] Update hr_timesheet_sheet_current.pot
Applying: [UPD] README.rst
Applying: [FIX] SCRLfs → SC
Applying: [IMP] hr_timesheet_sheet_current: black, isort, prettier
Using index info to reconstruct a base tree...
M	.pre-commit-config.yaml
Falling back to patching base and 3-way merge...
Auto-merging .pre-commit-config.yaml
Applying: [MIG] hr_timesheet_sheet_current: Migration to 13.0
Applying: [MIG] hr_timesheet_sheet_current: Migration to 14.0
Applying: [MIG] hr_timesheet_sheet_current: Migration to 15.0
Applying: [MIG] hr_timesheet_sheet_current: Migration to 16.0
Applying: [FIX] copier : repo website
Using index info to reconstruct a base tree...
M	.copier-answers.yml
Falling back to patching base and 3-way merge...
Auto-merging .copier-answers.yml
CONFLICT (content): Merge conflict in .copier-answers.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0012 [FIX] copier : repo website
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

@robinkeunen robinkeunen force-pushed the 16.0-mig-hr_timesheet_sheet_current branch from d1e11d7 to 4b12449 Compare December 15, 2023 14:42
@robinkeunen
Copy link
Member

/ocabot merge nobump

@github-grap-bot
Copy link
Contributor

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

@github-grap-bot github-grap-bot merged commit 3a7092e into 16.0 Dec 19, 2023
3 checks passed
@github-grap-bot github-grap-bot deleted the 16.0-mig-hr_timesheet_sheet_current branch December 19, 2023 14:57
@github-grap-bot
Copy link
Contributor

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

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.

6 participants