Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 24, 2025

This PR updates 5 files, making the following changes:

  • removing all instances of future tense from subscriptions.rst and automatic_alerts.rst
  • performing optimizations suggested by make review on subscriptions, automatic_alerts, upselling, reports, and eccomerce.rst
  • revising language in subscriptions.rst for readability

This 18.0 PR can FWP up to master.

Forward-Port-Of: #14851

X-original-commit: f1b4e26
Co-authored-by: Felicia Kuan <[email protected]>
@robodoo
Copy link
Collaborator

robodoo commented Oct 24, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 24, 2025

@theRealThagomizer cherrypicking of pull request #14851 failed.

stdout:

Auto-merging content/applications/sales/subscriptions.rst
CONFLICT (modify/delete): content/applications/sales/subscriptions/automatic_alerts.rst deleted in cb15646fe0617fa7b8f7eb487299457b8e640685 and modified in 1272a149008223b9eef2559cb2ec8b28e1aaa266.  Version 1272a149008223b9eef2559cb2ec8b28e1aaa266 of content/applications/sales/subscriptions/automatic_alerts.rst left in tree.

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

@theRealThagomizer
Copy link
Contributor

Closing this per documentation.

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.

4 participants