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] sale_product_set_layout: merge into product_set #2786

Merged
merged 24 commits into from
Dec 15, 2023
Merged

[16.0][MIG] sale_product_set_layout: merge into product_set #2786

merged 24 commits into from
Dec 15, 2023

Conversation

CRogos
Copy link
Contributor

@CRogos CRogos commented Nov 18, 2023

supersede: #2777

Merge sale_product_set_layout into product_set and sale_product_set

depends on: OCA/product-attribute#1452

Pierre Verkest and others added 23 commits November 16, 2023 09:54
rename bundle to set
8251682
add oca icon
6c639a2
translattion about related new module name
3941f0c
Rename Bundle to Set
879e901
rename Sale Order Set to Product Set Add
a69f8a6
@sysadminmatmoz
Slovene translations added
3b375fe
@sbidoul
[UPD] prefix versions with 8.0
a7a6b3d
@pedrobaeza
[MIG] Make modules uninstallable
b903add
@pedrobaeza
[MIG] Rename manifest files
1773fc5
@leemannd
migration to V10
bfffb14 
migration to V10
@guewen
Activate 'sale layout' with sale_product_set_layout
9ac5b95 
If you install this addon, it means you want to use sale layouts so it
makes sense to activate the feature.
@sbidoul
remove obsolete .pot files [ci skip]
0fbb289
@rousseldenis
[10.0][FIX] pylint
4ff8d7e
@pedrocs-exo
Added translation using Weblate (Portuguese)
c47eef0
@pedrocs-exo
Translated using Weblate (Portuguese)
09cef5f 
Currently translated at 100.0% (3 of 3 strings)

Translation: sale-workflow-10.0/sale-workflow-10.0-sale_product_set_layout
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-10-0/sale-workflow-10-0-sale_product_set_layout/pt/
@danimv5
Added translation using Weblate (Catalan)
45a8ddf
@danimv5
Added translation using Weblate (Spanish)
93d10b3
@danimv5
Translated using Weblate (Catalan)
59424fa 
Currently translated at 100.0% (3 of 3 strings)

Translation: sale-workflow-10.0/sale-workflow-10.0-sale_product_set_layout
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-10-0/sale-workflow-10-0-sale_product_set_layout/ca/
@danimv5
Translated using Weblate (Spanish)
b915c9a 
Currently translated at 100.0% (3 of 3 strings)

Translation: sale-workflow-10.0/sale-workflow-10.0-sale_product_set_layout
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-10-0/sale-workflow-10-0-sale_product_set_layout/es/
@rousseldenis
[14.0][MIG] sale_product_set_layout
1cbea06
@manuelregidor
[IMP]sale_product_set_layout: black, isort, prettier
80a94e1
@manuelregidor
[MIG]sale_product_set_layout: Migration to 15.0
1a041bf
[IMP] sale_product_set_layout: black, isort, prettier
2752c29
@CRogos CRogos mentioned this pull request Nov 18, 2023
Closed
@CRogos CRogos closed this Nov 19, 2023
@CRogos CRogos reopened this Nov 19, 2023
@CRogos CRogos closed this Nov 20, 2023
@CRogos CRogos reopened this Nov 20, 2023
@CRogos CRogos mentioned this pull request Nov 20, 2023
Open
100 tasks
@CRogos CRogos closed this Nov 27, 2023
@CRogos CRogos reopened this Nov 27, 2023
@CRogos CRogos force-pushed the 16.0-mig-sale_product_set_layout-merge branch from 0f9a348 to 808e145 Compare November 27, 2023 11:48
MohamedOsman7
MohamedOsman7 approved these changes Nov 28, 2023
View reviewed changes
Copy link

@MohamedOsman7 MohamedOsman7 left a comment

Choose a reason for hiding this comment

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

Code & functional changes LGTM

@CRogos CRogos force-pushed the 16.0-mig-sale_product_set_layout-merge branch from 808e145 to 1d5b7d9 Compare November 28, 2023 13:31
@CRogos
Copy link
Contributor Author

CRogos commented Dec 14, 2023

@pedrobaeza I did the split of sale_product_set / product_set on your suggestion. I would like to discontinue sale_product_set_layout and add the feature into sale_product_set / product_set as well, because otherwise sale_product_set_layout needs to be split into sale_product_set_layout / product_set_layout as well, where I do not see any benefit.
Everything is ready so fare but a second review/merge is missing.

@CRogos
Copy link
Contributor Author

CRogos commented Dec 14, 2023

@pedrobaeza do I have to remove the last commit or is it removed automatically?
[DON'T MERGE] test-requirements.txt

@pedrobaeza
Copy link
Member

You need to remove it.

@CRogos CRogos force-pushed the 16.0-mig-sale_product_set_layout-merge branch from 1d5b7d9 to d0eb872 Compare December 14, 2023 21:15
@CRogos
Copy link
Contributor Author

CRogos commented Dec 14, 2023

OK done... thanks a lot for your support so fare.

@pedrobaeza pedrobaeza added this to the 16.0 milestone Dec 15, 2023
pedrobaeza
pedrobaeza approved these changes Dec 15, 2023
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 major

@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit e687eea into OCA:16.0 Dec 15, 2023
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@CRogos CRogos deleted the 16.0-mig-sale_product_set_layout-merge branch December 15, 2023 07:37
@CRogos CRogos mentioned this pull request Dec 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MohamedOsman7 MohamedOsman7 MohamedOsman7 approved these changes

@pedrobaeza pedrobaeza pedrobaeza approved these changes

Assignees
No one assigned
Labels
approved merged 🎉
Projects
None yet
Milestone
16.0
Development

Successfully merging this pull request may close these issues.