Skip to content

[REM] subscriptions: deprecate plans doc #14208

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

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Aug 1, 2025

Task

Forward-Port-Of: #14200
Forward-Port-Of: #14192

@robodoo
Copy link
Collaborator

robodoo commented Aug 1, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 1, 2025

@StraubCreative cherrypicking of pull request #14192 failed.

stdout:

Auto-merging content/applications/sales/subscriptions.rst
CONFLICT (modify/delete): content/applications/sales/subscriptions/automatic_alerts.rst deleted in 5375ccbec2c4d12c83e2966fc176f05f0e9c94b7 and modified in f6c5e2ee5513af7ef25588c7a0332ffca091fcad.  Version f6c5e2ee5513af7ef25588c7a0332ffca091fcad of content/applications/sales/subscriptions/automatic_alerts.rst left in tree.
Auto-merging content/applications/sales/subscriptions/scheduled_actions.rst
CONFLICT (content): Merge conflict in content/applications/sales/subscriptions/scheduled_actions.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

closes #14192

Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
@StraubCreative StraubCreative force-pushed the saas-18.2-17.0-subscriptions-remove-plans-doc-zst-454053-fw branch from 4a4b6cd to f043b4d Compare August 4, 2025 21:36
@C3POdoo C3POdoo requested review from a team August 4, 2025 21:38
@StraubCreative
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Aug 4, 2025
closes #14192

closes #14208

Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
@robodoo robodoo closed this Aug 4, 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