Skip to content

[REF] Planning: create new field service page in planning - #19121

Closed
fw-bot wants to merge 1 commit into
saas-19.3from
saas-19.3-saas-19.2-field-service-planning-guga-526399-fw
Closed

[REF] Planning: create new field service page in planning#19121
fw-bot wants to merge 1 commit into
saas-19.3from
saas-19.3-saas-19.2-field-service-planning-guga-526399-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Jul 25, 2026

Copy link
Copy Markdown
Collaborator

task-6009439

Forward-Port-Of: #17905

@robodoo

robodoo commented Jul 25, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Jul 25, 2026

Copy link
Copy Markdown
Collaborator Author

@guga-odoo @auva-odoo cherrypicking of pull request #17905 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/manufacturing/workflows/continuous_improvement.rst
CONFLICT (content): Merge conflict in content/applications/inventory_and_mrp/manufacturing/workflows/continuous_improvement.rst
CONFLICT (modify/delete): content/applications/services/field_service/planning_itinerary.rst deleted in 86cfeb1c1a1d61bd1bee4116d11ac0b3eeb26a85 and modified in b770648aa00f34d3413b83a00c24e2c8e180e89a.  Version b770648aa00f34d3413b83a00c24e2c8e180e89a of content/applications/services/field_service/planning_itinerary.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

@fw-bot

fw-bot commented Aug 2, 2026

Copy link
Copy Markdown
Collaborator Author

@guga-odoo @auva-odoo this forward port of #17905 is awaiting action (not merged or closed).

@auva-odoo
auva-odoo force-pushed the saas-19.3-saas-19.2-field-service-planning-guga-526399-fw branch from eafca0e to 47f6a53 Compare August 4, 2026 07:09
@C3POdoo
C3POdoo requested review from a team August 4, 2026 07:12
@auva-odoo
auva-odoo removed request for a team August 4, 2026 07:12
@auva-odoo

Copy link
Copy Markdown
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Aug 4, 2026
task-6009439

closes #19121

Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>
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