Skip to content

[FW][REF] Subscriptions: rewrite overview, integrate products page #12870

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

Open
wants to merge 1 commit into
base: saas-17.4
Choose a base branch
from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 11, 2025

Task: 4710396

Forward-Port-Of: #12843
Forward-Port-Of: #12823

closes #12823

Signed-off-by: Samuel Lieber (sali) <sali@odoo.com>
X-original-commit: 7ede395
@robodoo
Copy link
Collaborator

robodoo commented Apr 11, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 11, 2025

@StraubCreative @samueljlieber cherrypicking of pull request #12823 failed.

stdout:

Auto-merging content/applications/sales/sales/products_prices/prices/pricing.rst
CONFLICT (content): Merge conflict in content/applications/sales/sales/products_prices/prices/pricing.rst
Auto-merging content/applications/sales/subscriptions/ecommerce.rst
CONFLICT (content): Merge conflict in content/applications/sales/subscriptions/ecommerce.rst

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

@StraubCreative StraubCreative self-assigned this Apr 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants