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

[MIG][12.0] website_sale_product_brand: Migration to v12.0 #319

Merged
merged 6 commits into from
Dec 10, 2019
Merged

[MIG][12.0] website_sale_product_brand: Migration to v12.0 #319

merged 6 commits into from
Dec 10, 2019

Conversation

sergio-teruel
Copy link
Contributor

@sergio-teruel sergio-teruel commented Nov 28, 2019 •
edited
Loading

cc @Tecnativa TT20150
Please @Tardo @chienandalu review.
One question @pedrobaeza, what's happend with the ACL in this module... ???

@sergio-teruel sergio-teruel force-pushed the 12.0-mig-website_sale_product_brand branch 2 times, most recently from 0a67243 to 34a3ebb Compare November 28, 2019 19:29
@sergio-teruel sergio-teruel changed the title [WIP][MIG][12.0] website_sale_product_brand: Migration to v12.0 [MIG][12.0] website_sale_product_brand: Migration to v12.0 Nov 28, 2019
@sergio-teruel sergio-teruel force-pushed the 12.0-mig-website_sale_product_brand branch from 34a3ebb to 8d0764a Compare November 28, 2019 19:40
@pedrobaeza pedrobaeza added this to the 12.0 milestone Nov 28, 2019
pedrobaeza
pedrobaeza reviewed Nov 28, 2019
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.

You have made something weird squashing commits, so that the migration commit appears as done by the bot, but others commit that you can squash are not:

Selección_010

chienandalu
chienandalu approved these changes Nov 29, 2019
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.

👍 Tested. Just a little issue and once @pedrobaeza comments are attended is ok for me

website_sale_product_brand/README.rst Outdated Show resolved Hide resolved
MeetSCS and others added 5 commits December 3, 2019 16:33
@sergio-teruel
[IMP]Changed name of module.
514befc
@sergio-teruel
[MIG]Migrated shop_by_brand module in v9.
69f71d1 
OCA Transbot updated translations from Transifex
@yajo @sergio-teruel
[ADD][website_sale_wishlist] Wishlist for your online shop. (OCA#122)
ac38dc0 
[ADD][website_sale_wishlist] Wishlist for your online shop.

Allow your visitors and users to wishlist your products and have a shortcut for seeing them.

Wishlisted products are stored in the session for public users, and linked to the user if s/he is logged in.

OCA Transbot updated translations from Transifex
@carlosdauden @sergio-teruel
[FIX] website_sale_product_brand: Page not found in category pagination
1bc73dd 
OCA Transbot updated translations from Transifex
@ernestotejeda @sergio-teruel
[MIG] website_sale_product_brand: Migration to 11.0
cb907ff 
[UPD] Update website_sale_product_brand.pot

[UPD] README.rst

Translated using Weblate (Persian)

Currently translated at 100.0% (5 of 5 strings)

Translation: e-commerce-11.0/e-commerce-11.0-website_sale_product_brand
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-11-0/e-commerce-11-0-website_sale_product_brand/fa/
@sergio-teruel sergio-teruel force-pushed the 12.0-mig-website_sale_product_brand branch 3 times, most recently from ddffbb0 to 6c29554 Compare December 3, 2019 15:42
@sergio-teruel
Copy link
Contributor Author

Changes done!!

@pedrobaeza
Copy link
Member

The only weird thing right now is the squashing that has attribute incorrectly the migration to the OCA bot.

Tardo
Tardo approved these changes Dec 5, 2019
View reviewed changes
Copy link
Member

@Tardo Tardo left a comment

Choose a reason for hiding this comment

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

👍

@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

@sergio-teruel are you going to fix the authorship in the migration commit?

@sergio-teruel sergio-teruel force-pushed the 12.0-mig-website_sale_product_brand branch from 6c29554 to 947c049 Compare December 10, 2019 09:28
@sergio-teruel
Copy link
Contributor Author

Ready!!

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 12.0-ocabot-merge-pr-319-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Dec 10, 2019
@OCA-git-bot
Merge PR #319 into 12.0
d090beb 
Signed-off-by pedrobaeza
@OCA-git-bot OCA-git-bot mentioned this pull request Dec 10, 2019
Closed
19 tasks
@OCA-git-bot OCA-git-bot merged commit 947c049 into OCA:12.0 Dec 10, 2019
@OCA-git-bot
Copy link
Contributor

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

@pedrobaeza pedrobaeza pedrobaeza left review comments

@Tardo Tardo Tardo approved these changes

@chienandalu chienandalu chienandalu approved these changes

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

Successfully merging this pull request may close these issues.

None yet
8 participants
@sergio-teruel @pedrobaeza @OCA-git-bot @Tardo @chienandalu @yajo @carlosdauden @ernestotejeda