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

[16.0][MIG] mass_mailing_event_registration_exclude: Migration to version 16.0 #1225

Merged
merged 14 commits into from
Jan 5, 2024
Merged

[16.0][MIG] mass_mailing_event_registration_exclude: Migration to version 16.0 #1225

merged 14 commits into from
Jan 5, 2024

Conversation

carolinafernandez-tecnativa
Copy link
Contributor

@carolinafernandez-tecnativa carolinafernandez-tecnativa commented Oct 3, 2023 •
edited
Loading

@Tecnativa

TT45231

@pedrobaeza @chienandalu

@carolinafernandez-tecnativa
Copy link
Contributor Author

WIP

@pedrobaeza pedrobaeza mentioned this pull request Oct 4, 2023
Closed
@pedrobaeza
Copy link
Member

/ocabot migration mass_mailing_event_registration_exclude

@OCA-git-bot OCA-git-bot added this to the 16.0 milestone Oct 4, 2023
@OCA-git-bot OCA-git-bot mentioned this pull request Oct 4, 2023
Open
39 tasks
@pedrobaeza
Copy link
Member

Can you review the CI?

fcvalgar
fcvalgar approved these changes Oct 5, 2023
View reviewed changes
Copy link

@fcvalgar fcvalgar left a comment

Choose a reason for hiding this comment

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

Functional review

LGTM, thank you @carolinafernandez-tecnativa

image

image

image

chienandalu
chienandalu suggested changes Oct 5, 2023
View reviewed changes
Copy link
Member

@chienandalu chienandalu left a comment

Choose a reason for hiding this comment

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

When you're superseding, respect original PR commit attribution and work on top of it. Several changes are missing from that one btw.

@pedrobaeza
Copy link
Member

Well, sometimes the original PR doesn't have meaningful changes that should be respected, although this PR is now red, so maybe this is one of the cases where you should cherry-pick the commit from the other PR.

@carolinafernandez-tecnativa carolinafernandez-tecnativa force-pushed the 16.0-mig-mass_mailing_event_registration_exclude branch 5 times, most recently from fa9867e to c94ed3f Compare October 9, 2023 11:51
@carolinafernandez-tecnativa
Copy link
Contributor Author

When you're superseding, respect original PR commit attribution and work on top of it. Several changes are missing from that one btw.

@chienandalu Done, I do not understand why tests are failing.
I run the test locally and all test passed:

image

If you see there is an error on that test, but when i run locally i got the same results:

image

@chienandalu
Copy link
Member

@chienandalu Done, I do not understand why tests are failing. I run the test locally and all test passed:

You can try to reproduce it:

  • Updating your local core code for Odoo/OCB to the latest commit
  • Installing other modules in the repo that might be interacting with that condition

@carolinafernandez-tecnativa carolinafernandez-tecnativa force-pushed the 16.0-mig-mass_mailing_event_registration_exclude branch from c94ed3f to b856eb1 Compare November 17, 2023 13:52
@carolinafernandez-tecnativa carolinafernandez-tecnativa force-pushed the 16.0-mig-mass_mailing_event_registration_exclude branch from b856eb1 to f1bf3ab Compare January 4, 2024 17:56
@pedrobaeza
Copy link
Member

Please check CI

antespi and others added 9 commits January 4, 2024 17:36
@antespi @carolinafernandez-tecnativa
mass_mailing_event (OCA#127)
9da9c80 
OCA Transbot updated translations from Transifex
@chienandalu @carolinafernandez-tecnativa
[MIG] mass_mailing_event: Migration to 10.0
2b812c7 
OCA Transbot updated translations from Transifex
@yajo @carolinafernandez-tecnativa
[FIX] mass_mailing_event: Integration tests
c5e5740 
When running tests and `mass_mailing_list_dynamic` was installed, they failed.
@Tardo @carolinafernandez-tecnativa
[MIG] mass_mailing_event_registration_exlude: Migration to 12.0
ffd1e83 
[UPD] Update mass_mailing_event_registration_exclude.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: social-12.0/social-12.0-mass_mailing_event_registration_exclude
Translate-URL: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mass_mailing_event_registration_exclude/

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: social-12.0/social-12.0-mass_mailing_event_registration_exclude
Translate-URL: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mass_mailing_event_registration_exclude/
@fuentes73 @carolinafernandez-tecnativa
[IMP] mass_mailing_event_registration_exclude: black
706e1d4
@fuentes73 @carolinafernandez-tecnativa
[MIG] mass_mailing_event_registration_exclude: Migration to 13.0
fa1bec2 
[UPD] Update mass_mailing_event_registration_exclude.pot

[UPD] README.rst

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: social-13.0/social-13.0-mass_mailing_event_registration_exclude
Translate-URL: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mass_mailing_event_registration_exclude/
@carolinafernandez-tecnativa
[IMP] pre-commit run -a
508efb2
@Tardo @carolinafernandez-tecnativa
[IMP] Apply pre-commit changes: Resolve conflicts
764ddb3
@victoralmau @carolinafernandez-tecnativa
[MIG] mass_mailing_event_registration_exclude: Migration to 14.0
eb58c7e
@carolinafernandez-tecnativa carolinafernandez-tecnativa force-pushed the 16.0-mig-mass_mailing_event_registration_exclude branch from f1bf3ab to 10a6675 Compare January 4, 2024 20:37
@carolinafernandez-tecnativa carolinafernandez-tecnativa force-pushed the 16.0-mig-mass_mailing_event_registration_exclude branch from 10a6675 to 2f7c742 Compare January 4, 2024 21:02
@pedrobaeza pedrobaeza requested a review from chienandalu January 5, 2024 07:37
chienandalu
chienandalu approved these changes Jan 5, 2024
View reviewed changes
Copy link
Member

@chienandalu chienandalu left a comment

Choose a reason for hiding this comment

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

LGTM Thanks :)

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

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit 2fc0d5c into OCA:16.0 Jan 5, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@pedrobaeza pedrobaeza deleted the 16.0-mig-mass_mailing_event_registration_exclude branch January 5, 2024 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fcvalgar fcvalgar fcvalgar approved these changes

@chienandalu chienandalu chienandalu approved these changes

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

Successfully merging this pull request may close these issues.