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.

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

[FW][FIX] product: update variants when modifying exclusions #156212

Closed

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 1, 2024

opw-3693065


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #155103

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 1, 2024
@robodoo
Copy link
Contributor

robodoo commented Mar 1, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 1, 2024

@chevalierv @Feyensv cherrypicking of pull request #155103 failed.

stdout:

Auto-merging addons/product/models/product_attribute.py
CONFLICT (content): Merge conflict in addons/product/models/product_attribute.py
Auto-merging addons/product/tests/test_variants.py

stderr:

22:52:59.114603 git.c:463               trace: built-in: git cherry-pick 14a789acaf690d87c172956a7ff9d7f23b204960
error: could not apply 14a789acaf69... [FIX] product: update variants when modifying exclusions
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Mar 1, 2024
Before this commit, when importing product template attribute exclusions,
variants were not updated accordingly.

Now, variants will be created, archived, or deleted when creating,
modifying, or removing exclusions.

opw-3693065

X-original-commit: a20da96
@chevalierv chevalierv force-pushed the saas-16.2-16.0-opw-3693065-vcr-5jhV-fw branch from e487716 to 4113328 Compare March 4, 2024 10:07
@chevalierv
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 4, 2024
Before this commit, when importing product template attribute exclusions,
variants were not updated accordingly.

Now, variants will be created, archived, or deleted when creating,
modifying, or removing exclusions.

opw-3693065

closes #156212

X-original-commit: a20da96
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Signed-off-by: Valentin Chevalier <vcr@odoo.com>
@robodoo robodoo closed this Mar 4, 2024
@fw-bot fw-bot deleted the saas-16.2-16.0-opw-3693065-vcr-5jhV-fw branch March 18, 2024 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants