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

[13.0] [MIG] website_sale_b2x_alt_price: Migration to v13.0 #508

Merged
merged 8 commits into from
Mar 26, 2021
Merged

[13.0] [MIG] website_sale_b2x_alt_price: Migration to v13.0 #508

merged 8 commits into from
Mar 26, 2021

Conversation

CarlosRoca13
Copy link
Contributor

cc @Tecnativa TT27481

Please @sergio-teruel @yajo review this

@CarlosRoca13 CarlosRoca13 force-pushed the 13.0-MIG-website_sale_b2x_alt_price branch from 5e5faca to 5a3db98 Compare February 25, 2021 11:27
sergio-teruel
sergio-teruel approved these changes Feb 26, 2021
View reviewed changes
Copy link
Contributor

@sergio-teruel sergio-teruel left a comment

Choose a reason for hiding this comment

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

Code review and functional review OK

@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

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 13.0-ocabot-merge-pr-508-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Mar 10, 2021
@OCA-git-bot
Merge PR #508 into 13.0
94ac248 
Signed-off-by pedrobaeza
@pedrobaeza pedrobaeza mentioned this pull request Mar 10, 2021
Closed
22 tasks
@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-508-by-pedrobaeza-bump-nobump.

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.

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Mar 11, 2021
@OCA-git-bot
Merge PR #508 into 13.0
847ca5f 
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-508-by-pedrobaeza-bump-nobump.

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.

@pedrobaeza
Copy link
Member

@CarlosRoca13 please rebase and check the problem in tests

@CarlosRoca13 CarlosRoca13 mentioned this pull request Mar 24, 2021
Merged
Jairo Llopis and others added 8 commits March 25, 2021 08:57
@CarlosRoca13
[ADD] website_sale_b2x_alt_price: display B2{B,C} complementary price
1bafe95 
- If your website is B2B, display a smaller B2C price next to the main one. And viceversa.
- Toggle feature independently in list and product templates.
- Toggle feature per website.
- Supports live price recomputing.

@Tecnativa TT24410
@CarlosRoca13
[FIX] website_sale_b2x_alt_price: l10n resilient tests
86d9cda 
When testing on an integration environment which had a different l10n package enabled, the tours failed due to currency rate conversion.

Create instead a test-specific pricelist and reset currency conversions before testing, to avoid false negative tests. That's not the feature being tested here.

@Tecnativa TT24410
@ypapouin @CarlosRoca13
Added translation using Weblate (French)
36bc08d
@ypapouin @CarlosRoca13
Translated using Weblate (French)
cd43cea 
Currently translated at 100.0% (3 of 3 strings)

Translation: e-commerce-12.0/e-commerce-12.0-website_sale_b2x_alt_price
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-12-0/e-commerce-12-0-website_sale_b2x_alt_price/fr/
@claudiagn @CarlosRoca13
Added translation using Weblate (Catalan)
58d99d5
@claudiagn @CarlosRoca13
Translated using Weblate (Catalan)
02e35e2 
Currently translated at 100.0% (3 of 3 strings)

Translation: e-commerce-12.0/e-commerce-12.0-website_sale_b2x_alt_price
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-12-0/e-commerce-12-0-website_sale_b2x_alt_price/ca/
@CarlosRoca13
[IMP] website_sale_b2x_alt_price: black, isort
f3ea995
@CarlosRoca13
[MIG] website_sale_b2x_alt_price: Migration to v13.0
63d34d0
@CarlosRoca13 CarlosRoca13 force-pushed the 13.0-MIG-website_sale_b2x_alt_price branch from 5a3db98 to 63d34d0 Compare March 25, 2021 07:57
@CarlosRoca13
Copy link
Contributor Author

@pedrobaeza I think now it is ready to be merged

@pedrobaeza pedrobaeza added this to the 13.0 milestone Mar 26, 2021
@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 13.0-ocabot-merge-pr-508-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 8dfc112 into OCA:13.0 Mar 26, 2021
@OCA-git-bot
Copy link
Contributor

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

@sergio-teruel sergio-teruel sergio-teruel approved these changes

@joao-p-marques joao-p-marques joao-p-marques approved these changes

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

Successfully merging this pull request may close these issues.

None yet
7 participants
@CarlosRoca13 @OCA-git-bot @pedrobaeza @sergio-teruel @joao-p-marques @ypapouin @claudiagn