Skip to content

[IMP] odoo_sh: refactor and update advanced section - #19933

Closed
fw-bot wants to merge 1 commit into
19.0from
19.0-17.0-odoosh-advanced-xpl-564159-fw
Closed

[IMP] odoo_sh: refactor and update advanced section#19933
fw-bot wants to merge 1 commit into
19.0from
19.0-17.0-odoosh-advanced-xpl-564159-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Sep 4, 2026

Copy link
Copy Markdown
Collaborator

Forward-Port-Of: #19924
Forward-Port-Of: #19859

@robodoo

robodoo commented Sep 4, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Sep 4, 2026

Copy link
Copy Markdown
Collaborator Author

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

stdout:

CONFLICT (modify/delete): content/applications/sales/subscriptions/scheduled_actions.rst deleted in 3214f424ca475ac58478c6ec3f4b2d55d7e00adc and modified in efb0a8e616c73c000ffce2b7decc86989ebe58cb.  Version efb0a8e616c73c000ffce2b7decc86989ebe58cb of content/applications/sales/subscriptions/scheduled_actions.rst left in tree.

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@xpl-odoo
xpl-odoo force-pushed the 19.0-17.0-odoosh-advanced-xpl-564159-fw branch from 6221d6b to 3d73eab Compare September 4, 2026 12:38
@C3POdoo
C3POdoo requested review from a team September 4, 2026 12:43
@xpl-odoo

xpl-odoo commented Sep 4, 2026

Copy link
Copy Markdown
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