Skip to content

[FW][REF] ecommerce: restructure doc #12483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Mar 14, 2025

task-4645039

Content updates will be done in subsequent PRs

Forward-Port-Of: #12419

@robodoo
Copy link
Collaborator

robodoo commented Mar 14, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 14, 2025

@auva-odoo cherrypicking of pull request #12419 failed.

stdout:

Auto-merging content/applications/finance/fiscal_localizations/argentina.rst
Auto-merging content/applications/finance/fiscal_localizations/peru.rst
Auto-merging content/applications/finance/payment_providers.rst
Auto-merging content/applications/sales/subscriptions/plans.rst
Auto-merging content/applications/websites/ecommerce/cart.rst
Auto-merging content/applications/websites/ecommerce/checkout.rst
CONFLICT (content): Merge conflict in content/applications/websites/ecommerce/checkout.rst
CONFLICT (rename/delete): content/applications/websites/ecommerce/checkout_payment_shipping/checkout/checkout-express.png renamed to content/applications/websites/ecommerce/checkout/checkout-express.png in 427f2d97b90b2a45c6bd3baa7e20ad77e7a2103b, but deleted in 52f8fc964d0fc049630a7f4fb59a6752fca1d046.
CONFLICT (rename/delete): content/applications/websites/ecommerce/checkout_payment_shipping/checkout/checkout-form.png renamed to content/applications/websites/ecommerce/checkout/checkout-form.png in 427f2d97b90b2a45c6bd3baa7e20ad77e7a2103b, but deleted in 52f8fc964d0fc049630a7f4fb59a6752fca1d046.
CONFLICT (rename/delete): content/applications/websites/ecommerce/checkout_payment_shipping/checkout/checkout-steps.png renamed to content/applications/websites/ecommerce/checkout/checkout-steps.png in 427f2d97b90b2a45c6bd3baa7e20ad77e7a2103b, but deleted in 52f8fc964d0fc049630a7f4fb59a6752fca1d046.
CONFLICT (rename/delete): content/applications/websites/ecommerce/checkout_payment_shipping/checkout/checkout-subtotal.png renamed to content/applications/websites/ecommerce/checkout/checkout-subtotal.png in 427f2d97b90b2a45c6bd3baa7e20ad77e7a2103b, but deleted in 52f8fc964d0fc049630a7f4fb59a6752fca1d046.
CONFLICT (rename/delete): content/applications/websites/ecommerce/checkout_payment_shipping/checkout/checkout-terms.png renamed to content/applications/websites/ecommerce/checkout/checkout-terms.png in 427f2d97b90b2a45c6bd3baa7e20ad77e7a2103b, but deleted in 52f8fc964d0fc049630a7f4fb59a6752fca1d046.
CONFLICT (modify/delete): content/applications/websites/ecommerce/checkout_payment_shipping.rst deleted in 427f2d97b90b2a45c6bd3baa7e20ad77e7a2103b and modified in 52f8fc964d0fc049630a7f4fb59a6752fca1d046.  Version 52f8fc964d0fc049630a7f4fb59a6752fca1d046 of content/applications/websites/ecommerce/checkout_payment_shipping.rst left in tree.
Auto-merging content/applications/websites/ecommerce/products/catalog.rst
Auto-merging content/applications/websites/ecommerce/shipping.rst
CONFLICT (content): Merge conflict in content/applications/websites/ecommerce/shipping.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

task-4645039

Content updates will be done in subsequent PRs
@auva-odoo auva-odoo force-pushed the 18.0-17.0-ecommerce-restructure-auva-423144-fw branch from 99edae9 to 42c7e49 Compare March 18, 2025 07:49
@C3POdoo C3POdoo requested review from a team March 18, 2025 07:52
@auva-odoo auva-odoo removed request for a team March 18, 2025 07:59
@auva-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