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 sale timesheet rounded #494

Closed

Conversation

slominchar
Copy link

No description provided.

simahawk and others added 21 commits June 22, 2022 15:44
sale_timesheet_rounded: fix do not use default
This way, we avoid a lot of code and get the same features.
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: timesheet-13.0/timesheet-13.0-sale_timesheet_rounded
Translate-URL: https://translation.odoo-community.org/projects/timesheet-13-0/timesheet-13-0-sale_timesheet_rounded/
Currently translated at 100.0% (22 of 22 strings)

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

Translation: timesheet-14.0/timesheet-14.0-sale_timesheet_rounded
Translate-URL: https://translation.odoo-community.org/projects/timesheet-14-0/timesheet-14-0-sale_timesheet_rounded/
a rounded amount that is equal to the amount.

WARNING: This module cannot be used with `timesheet_grid` without further
adapation as an update of an existing timesheet line will NOT update the

Choose a reason for hiding this comment

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

Suggested change
adapation as an update of an existing timesheet line will NOT update the
adaptation as an update of an existing timesheet line will NOT update the

Copy link

@florentx florentx left a comment

Choose a reason for hiding this comment

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

Porting to 15.0 looks good

@github-actions
Copy link

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Nov 13, 2022
Copy link
Contributor

@bosd bosd left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

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

@nimarosa
Copy link

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Nov 25, 2022
Signed-off-by nimarosa
@OCA-git-bot
Copy link
Contributor

@nimarosa your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-494-by-nimarosa-bump-nobump.

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.

@nimarosa
Copy link

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@nimarosa The rebase process failed, because command git push --force archeti-org tmp-pr-494:15.0_MIG_sale_timesheet_rounded failed with output:

remote: Permission to archeti-org/timesheet.git denied to OCA-git-bot.
fatal: unable to access 'https://github.com/archeti-org/timesheet/': The requested URL returned error: 403

@nimarosa
Copy link

Please manually rebase this PR to base branch.

@OCA-git-bot
Copy link
Contributor

@nimarosa your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-494-by-nimarosa-bump-nobump.

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.

@github-actions github-actions bot removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Nov 27, 2022
@leemannd
Copy link

leemannd commented Dec 6, 2022

Hello @nimarosa , I've taken the actual PR with a rebase to this PR. The goal is to have it merged. Feel free to merge it or to close it -> #550

@nimarosa
Copy link

nimarosa commented Dec 6, 2022

@leemannd This PR is the same of #550? If yes i close #550 and merge this. Please confirm.

@nimarosa
Copy link

nimarosa commented Dec 6, 2022

Yes, i verified it myself. Closing this one.

@nimarosa nimarosa closed this Dec 6, 2022
@leemannd
Copy link

leemannd commented Dec 6, 2022

Yes it is. Only rebased on 15.0

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.