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][IMP] base_comment_template: update readme files #785

Merged

Conversation

alan196
Copy link
Contributor

@alan196 alan196 commented Aug 22, 2023

Change deprecated t-raw to t-out.
Rename invoice_comment_template to account_comment_template

I have updated the readme files and run oca-gen-addon-readme

@pedrobaeza pedrobaeza added this to the 16.0 milestone Aug 22, 2023
@gurneyalex
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

@gurneyalex The merge process could not start, because command `git merge --no-ff -m 'Merge PR #785 into 16.0

Signed-off-by gurneyalex' tmp-pr-785` failed with output:

Auto-merging base_comment_template/static/description/index.html
CONFLICT (content): Merge conflict in base_comment_template/static/description/index.html
Auto-merging base_comment_template/README.rst
CONFLICT (content): Merge conflict in base_comment_template/README.rst
Automatic merge failed; fix conflicts and then commit the result.

@gurneyalex
Copy link
Member

@alan196 can you rebase and fix the conflicts?

@alan196 alan196 force-pushed the 16.0-update-readme-base_comment_template branch from 8211891 to bd1320a Compare December 11, 2023 15:18
@alan196
Copy link
Contributor Author

alan196 commented Dec 11, 2023

@gurneyalex I rebased the branch 👍

Copy link
Contributor

@ivantodorovich ivantodorovich left a comment

Choose a reason for hiding this comment

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

This one looks ready to merge 👍🏻

@pedrobaeza
Copy link
Member

It has conflicts. Can you please rebase and fix it?

@gurneyalex
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

@gurneyalex The merge process could not start, because command `git merge --no-ff -m 'Merge PR #785 into 16.0

Signed-off-by gurneyalex' tmp-pr-785` failed with output:

Auto-merging base_comment_template/static/description/index.html
CONFLICT (content): Merge conflict in base_comment_template/static/description/index.html
Auto-merging base_comment_template/README.rst
CONFLICT (content): Merge conflict in base_comment_template/README.rst
Automatic merge failed; fix conflicts and then commit the result.

@alan196 alan196 force-pushed the 16.0-update-readme-base_comment_template branch from bd1320a to 66b64bc Compare May 3, 2024 15:31
Change deprecated t-raw to t-out.
Rename invoice_comment_template to account_comment_template
@alan196 alan196 force-pushed the 16.0-update-readme-base_comment_template branch from 66b64bc to 9263f10 Compare May 3, 2024 15:32
@alan196
Copy link
Contributor Author

alan196 commented May 3, 2024

I have rebased and fixed the conflicts @pedrobaeza @gurneyalex

@pedrobaeza
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit 2d75770 into OCA:16.0 May 3, 2024
5 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at e8df660. 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants