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

[14.0] Fiscal Tax Benefit #2545

Merged
merged 9 commits into from
Jul 12, 2023
Merged

[14.0] Fiscal Tax Benefit #2545

merged 9 commits into from
Jul 12, 2023

Conversation

renatonlima
Copy link
Member

Port do PR #2461

@OCA-git-bot
Copy link
Contributor

Hi @rvalyi,
some modules you are maintaining are being modified, check this out!

@renatonlima renatonlima marked this pull request as draft June 20, 2023 22:04
@renatonlima
Copy link
Member Author

Pessoal,

Eu converti esse PR em draft porque vai ser necessário fazer alguns commits para adaptar esse port para 14.0

@rvalyi rvalyi mentioned this pull request Jul 2, 2023
Closed
@renatonlima renatonlima force-pushed the 14.0-fiscal-tax-benefit branch 7 times, most recently from 903d546 to 02b859d Compare July 4, 2023 18:55
@renatonlima renatonlima marked this pull request as ready for review July 4, 2023 19:13
@renatonlima
Copy link
Member Author

@rvalyi, @antoniospneto @marcelsavegnago

Fiz as adaptações necessárias para o port desse PR na versão 12.0

rvalyi
rvalyi approved these changes Jul 8, 2023
View reviewed changes
Copy link
Member

@rvalyi rvalyi left a comment

Choose a reason for hiding this comment

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

LGTM

@felipemotter
Copy link
Contributor

@renatonlima você chegou a ver a #2501? O que vc acha?

marcelsavegnago
marcelsavegnago approved these changes Jul 11, 2023
View reviewed changes
Copy link
Member

@marcelsavegnago marcelsavegnago left a comment

Choose a reason for hiding this comment

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

LGTM

@rvalyi
Copy link
Member

rvalyi commented Jul 11, 2023

/ocabot merge major

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 14.0-ocabot-merge-pr-2545-by-rvalyi-bump-major, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jul 11, 2023
@OCA-git-bot
Merge PR #2545 into 14.0
f618c87 
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

@rvalyi your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-2545-by-rvalyi-bump-major.

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.

@rvalyi
Copy link
Member

rvalyi commented Jul 11, 2023

/ocabot merge major

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-2545-by-rvalyi-bump-major, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jul 11, 2023
@OCA-git-bot
Merge PR #2545 into 14.0
14bdf9e 
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

@rvalyi your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-2545-by-rvalyi-bump-major.

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.

@rvalyi
Copy link
Member

rvalyi commented Jul 12, 2023

@renatonlima @marcelsavegnago parece que temos um erro inconsistente, eis o erro na tentativa de merge:
2023-07-11_21-23

@rvalyi
Copy link
Member

rvalyi commented Jul 12, 2023 •
edited
Loading

hum pelo jeito esse erro nio l10n_br_product_contract não tem a ver com as mudanças do PR, pois eu acabei de ter neste outro PR https://github.com/OCA/l10n-brazil/actions/runs/5526508205/jobs/10081312432?pr=2590#step:8:1206

@rvalyi
Copy link
Member

rvalyi commented Jul 12, 2023

hum, parece ser relacionado a esse refator que a gente acabou de fazer no modulo product_contract OCA/contract#945

@marcelsavegnago
Copy link
Member

marcelsavegnago commented Jul 12, 2023 •
edited
Loading

@renatonlima @marcelsavegnago parece que temos um erro inconsistente, eis o erro na tentativa de merge: 2023-07-11_21-23

Vamos dar uma olhada agora nisso.

@kaynnan kaynnan mentioned this pull request Jul 12, 2023
Merged
@renatonlima
Copy link
Member Author

@marcelsavegnago

O erro é relacionado a uma mudança no OCA/contract#945 foi feito a correção #2602 após o merge eu faço o rebase.

@renatonlima renatonlima force-pushed the 14.0-fiscal-tax-benefit branch from 02b859d to 4488598 Compare July 12, 2023 17:41
@rvalyi
Copy link
Member

rvalyi commented Jul 12, 2023

/ocabot merge major

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 14.0-ocabot-merge-pr-2545-by-rvalyi-bump-major, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit a4d71f1 into OCA:14.0 Jul 12, 2023
@OCA-git-bot
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcelsavegnago marcelsavegnago marcelsavegnago approved these changes

@rvalyi rvalyi rvalyi approved these changes

@antoniospneto antoniospneto Awaiting requested review from antoniospneto

@douglascstd douglascstd Awaiting requested review from douglascstd

Assignees
No one assigned
Labels
14.0 approved merged 🎉 new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@renatonlima @OCA-git-bot @felipemotter @rvalyi @marcelsavegnago