Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

Quick fix on subscriptions.rst to add an "Important" block highlighting that combining a physical product subscription with an on delivery invoicing policy will throw an error during invoicing. This PR resolves this task.

This 17.0 PR can be FWP up to master.

Forward-Port-Of: #14991
Forward-Port-Of: #14852

@robodoo
Copy link
Collaborator

robodoo commented Nov 11, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 11, 2025

@theRealThagomizer cherrypicking of pull request #14852 failed.

stdout:

Auto-merging content/applications/sales/subscriptions.rst
CONFLICT (content): Merge conflict in content/applications/sales/subscriptions.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

@theRealThagomizer theRealThagomizer force-pushed the saas-18.2-17.0-subscriptions-on-delivery-note-thjud-472647-fw branch from da62142 to cd8f4d2 Compare November 11, 2025 01:41
@C3POdoo C3POdoo requested a review from a team November 11, 2025 01:43
@theRealThagomizer
Copy link
Contributor

@robodoo r+

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