Skip to content

[IMP] ecommerce: update delivery and checkout pages#17030

Open
fw-bot wants to merge 1 commit intosaas-19.1from
saas-19.1-19.0-ecommerce-delivery-checkout-lman-508990-fw
Open

[IMP] ecommerce: update delivery and checkout pages#17030
fw-bot wants to merge 1 commit intosaas-19.1from
saas-19.1-19.0-ecommerce-delivery-checkout-lman-508990-fw

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Mar 20, 2026

task-5901872
task-4782023

Forward-Port-Of: #16938

task-5901872
task-4782023

X-original-commit: e6e166f
@robodoo
Copy link
Collaborator

robodoo commented Mar 20, 2026

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 20, 2026

@lman-odoo cherrypicking of pull request #16938 failed.

stdout:

Auto-merging content/applications/websites/ecommerce/configuration/prices.rst
CONFLICT (content): Merge conflict in content/applications/websites/ecommerce/configuration/prices.rst
Auto-merging content/applications/websites/ecommerce/shipping.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

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