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][BCKP] account_payment_promissory_note: Backport to 14.0 #770

Merged
merged 21 commits into from
Jan 28, 2025
Merged

[14.0][BCKP] account_payment_promissory_note: Backport to 14.0 #770

merged 21 commits into from
Jan 28, 2025

Conversation

unaiberis
Copy link
Contributor

No description provided.

@unaiberis unaiberis force-pushed the 14.0-mig-account_payment_promissory_note branch 4 times, most recently from 3b6ef65 to 1ca9cb1 Compare November 22, 2024 12:54
@unaiberis unaiberis force-pushed the 14.0-mig-account_payment_promissory_note branch 7 times, most recently from 96ca83d to 9e91640 Compare December 5, 2024 14:07
@unaiberis unaiberis marked this pull request as ready for review December 19, 2024 08:25
rlizana
rlizana approved these changes Jan 2, 2025
View reviewed changes
Copy link

@rlizana rlizana left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@anajuaristi
Copy link

@rlizana Thank you for your review.

@pedrobaeza, @JordiBForgeFlow @etobella @StefanRijnhart this is a backport from V15.
Could you please review and merge?

Thank you!! and Happy new year!!

@pedrobaeza pedrobaeza added this to the 14.0 milestone Jan 2, 2025
pedrobaeza
pedrobaeza requested changes Jan 2, 2025
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

It seems the commits are a bit mangled, mixing in the migration to 14.0 commit things that are not of the migration itself.

account_payment_promissory_note/README.rst Show resolved Hide resolved
account_payment_promissory_note/__manifest__.py Outdated Show resolved Hide resolved
account_payment_promissory_note/i18n/account_payment_promissory_note.pot Outdated Show resolved Hide resolved
account_payment_promissory_note/i18n/es.po Show resolved Hide resolved
@unaiberis unaiberis force-pushed the 14.0-mig-account_payment_promissory_note branch 6 times, most recently from ba39d77 to eccb4d7 Compare January 2, 2025 12:03
@pedrobaeza
Copy link
Member

@unaiberis I think you mix the commit history, as pre-commit is not adding names randomly to READMEs. Please start from scratch following carefully the procedure and avoiding to squash commits that shouldn't be squashed.

@unaiberis unaiberis force-pushed the 14.0-mig-account_payment_promissory_note branch 3 times, most recently from ee01344 to 01c3fea Compare January 2, 2025 12:21
cesar-tecnativa and others added 11 commits January 3, 2025 10:52
@cesar-tecnativa @unaiberis
[MIG] account_payment_promissory_note: Migration to 15.0
cedc1a2
@CarlosRoca13 @unaiberis
[MIG] account_payment_promissory_note: Migration to 15.0
781c463
@unaiberis
[UPD] Update account_payment_promissory_note.pot
e78b8e5
@OCA-git-bot @unaiberis
[UPD] README.rst
7049213
@oihane @unaiberis
[FIX] account_payment_promissory_note: avoid error when paying vendor…
2852890 
… bills
@OCA-git-bot @unaiberis
account_payment_promissory_note 15.0.1.0.1
97a2aee
@OCA-git-bot @unaiberis
[UPD] README.rst
2fa2322
@Ivorra78 @unaiberis
Translated using Weblate (Spanish)
887a436 
Currently translated at 100.0% (9 of 9 strings)

Translation: account-payment-15.0/account-payment-15.0-account_payment_promissory_note
Translate-URL: https://translation.odoo-community.org/projects/account-payment-15-0/account-payment-15-0-account_payment_promissory_note/es/
@weblate @unaiberis
Update translation files
8403d57 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: account-payment-15.0/account-payment-15.0-account_payment_promissory_note
Translate-URL: https://translation.odoo-community.org/projects/account-payment-15-0/account-payment-15-0-account_payment_promissory_note/
@pilarvargas-tecnativa @unaiberis
[FIX] account_payment_promissory_note: Fixed payment test to use corr…
c4a6329 
…ect journal and manual payment method

TT47800
@OCA-git-bot @unaiberis
[BOT] post-merge updates
8f66cef
@unaiberis unaiberis force-pushed the 14.0-mig-account_payment_promissory_note branch from 9b1f8ea to 1564f61 Compare January 3, 2025 09:57
@unaiberis unaiberis changed the title [14.0][MIG] account_payment_promissory_note: Migration to 14.0 [14.0][BCKP] account_payment_promissory_note: Backport to 14.0 Jan 3, 2025
@unaiberis unaiberis force-pushed the 14.0-mig-account_payment_promissory_note branch 3 times, most recently from 1eb2094 to e2b726b Compare January 3, 2025 10:06
@unaiberis
Copy link
Contributor Author

It still seems that you have taken the changes from e333cb3 in the migration to 15.0, and include it in your 14.0 migration commit, which is not correct.

You should cherry-pick the commit as is, and then perform on top of it the little adaptations to 14.0.

Now I have maintainted the commits of the migration to the version 15.0 to show it is a backport from that specific version.

pedrobaeza
pedrobaeza reviewed Jan 3, 2025
View reviewed changes
account_payment_promissory_note/readme/CONTRIBUTORS.rst Outdated

* `Avanzosc <https://www.avanzosc.es>`_:

* Berezi Amubieta
Copy link
Member

Choose a reason for hiding this comment

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

You can't add 3 names for such simple migration.

Copy link

Choose a reason for hiding this comment

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

@pedrobaeza
Is it correct now?
We need this merged asap
Thank you

@unaiberis unaiberis force-pushed the 14.0-mig-account_payment_promissory_note branch from e2b726b to c5d774f Compare January 4, 2025 10:25
pedrobaeza
pedrobaeza approved these changes Jan 28, 2025
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 14.0-ocabot-merge-pr-770-by-pedrobaeza-bump-nobump, awaiting test results.

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

@OCA-git-bot OCA-git-bot merged commit 6c5a803 into OCA:14.0 Jan 28, 2025
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at d7a1139. 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

@anajuaristi anajuaristi anajuaristi approved these changes

@pedrobaeza pedrobaeza pedrobaeza approved these changes

@rlizana rlizana rlizana approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 ready to merge
Projects
None yet
Milestone
14.0
Development

Successfully merging this pull request may close these issues.