Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

To align with the updated terms of the Odoo Enterprise Subscription Agreement

Forward-Port-Of: #15431

@robodoo
Copy link
Collaborator

robodoo commented Dec 11, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 11, 2025

@xpl-odoo cherrypicking of pull request #15431 failed.

stdout:

Auto-merging content/administration/upgrade.rst
Auto-merging content/applications/finance/fiscal_localizations/belgium.rst
Auto-merging content/applications/general/apps_modules.rst
CONFLICT (content): Merge conflict in content/applications/general/apps_modules.rst
Auto-merging redirects/17.0.txt

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

To align with the updated terms of the Odoo Entreprise Subscription Agreement
@xpl-odoo xpl-odoo force-pushed the 18.0-17.0-administration-support-xpl-479585-fw branch from 323d6d3 to b7696e5 Compare December 15, 2025 06:47
@C3POdoo C3POdoo requested review from a team December 15, 2025 06:49
@xpl-odoo xpl-odoo removed request for a team December 15, 2025 06:53
@xpl-odoo
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.

3 participants