Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 23, 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: #14852

@robodoo
Copy link
Collaborator

robodoo commented Oct 23, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 23, 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 18.0-17.0-subscriptions-on-delivery-note-thjud-470079-fw branch from faa1ec7 to 39b612e Compare October 23, 2025 20:26
@C3POdoo C3POdoo requested a review from a team October 23, 2025 20:28
@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 31, 2025

@theRealThagomizer this forward port of #14852 is awaiting action (not merged or closed).

1 similar comment
@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 7, 2025

@theRealThagomizer this forward port of #14852 is awaiting action (not merged or closed).

@theRealThagomizer theRealThagomizer force-pushed the 18.0-17.0-subscriptions-on-delivery-note-thjud-470079-fw branch from 43cabe4 to 64e3232 Compare November 10, 2025 20:50
@theRealThagomizer
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Nov 10, 2025
closes #14991

Signed-off-by: Thomas Jude Cavazos (thjud) <thjud@odoo.com>
Co-authored-by: Felicia Kuan <feku@odoo.com>
@robodoo robodoo closed this Nov 11, 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.

4 participants