Skip to content

[IMP] Sales: Aligning 'Optional products' page#16885

Open
fw-bot wants to merge 1 commit into18.0from
18.0-17.0-sales-optional-products-update-thjud-504369-fw
Open

[IMP] Sales: Aligning 'Optional products' page#16885
fw-bot wants to merge 1 commit into18.0from
18.0-17.0-sales-optional-products-update-thjud-504369-fw

Conversation

@fw-bot
Copy link
Collaborator

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

Hiya, @larm-odoo! This file is a 17.0 update of the optional products page (remember that big rework I did back in December?) This redoes the images to match current standards, reorganizes the information to flow more logically, and tweaks some of the details so they more accurately capture what the user experiences when they actually try to use optional products with quotations and quotation templates. Thank you!

This 17.0 PR can be FWP up to saas-18.4.

Forward-Port-Of: #16686

X-original-commit: 7fc9b30
Co-authored-by: larm-odoo <121518652+larm-odoo@users.noreply.github.com>
Co-authored-by: Felicia Kuan <freakyotaku@gmail.com>
@robodoo
Copy link
Collaborator

robodoo commented Mar 14, 2026

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 14, 2026

@theRealThagomizer cherrypicking of pull request #16686 failed.

stdout:

CONFLICT (rename/delete): content/applications/sales/sales/send_quotations/optional_products/optional-products-checkout.png renamed to content/applications/sales/sales/sales_quotations/optional_products/optional-products-checkout.png in 16f5b69bc0e5e9f69a3dd1779fac38ffab45e991, but deleted in b1174334b1a27073e5836e2c2cdd915cc45097ab.
CONFLICT (file location): content/applications/sales/sales/send_quotations/optional_products/optional-products-options-section.png added in b1174334b1a27073e5836e2c2cdd915cc45097ab inside a directory that was renamed in 16f5b69bc0e5e9f69a3dd1779fac38ffab45e991, suggesting it should perhaps be moved to content/applications/sales/sales/sales_quotations/optional_products/optional-products-options-section.png.
CONFLICT (file location): content/applications/sales/sales/send_quotations/optional_products/optional-products-product-form.png added in b1174334b1a27073e5836e2c2cdd915cc45097ab inside a directory that was renamed in 16f5b69bc0e5e9f69a3dd1779fac38ffab45e991, suggesting it should perhaps be moved to content/applications/sales/sales/sales_quotations/optional_products/optional-products-product-form.png.
CONFLICT (rename/delete): content/applications/sales/sales/send_quotations/optional_products/optional-products-tab.png renamed to content/applications/sales/sales/sales_quotations/optional_products/optional-products-tab.png in 16f5b69bc0e5e9f69a3dd1779fac38ffab45e991, but deleted in b1174334b1a27073e5836e2c2cdd915cc45097ab.
CONFLICT (file location): content/applications/sales/sales/send_quotations/optional_products/search-optional-products-form.png added in b1174334b1a27073e5836e2c2cdd915cc45097ab inside a directory that was renamed in 16f5b69bc0e5e9f69a3dd1779fac38ffab45e991, suggesting it should perhaps be moved to content/applications/sales/sales/sales_quotations/optional_products/search-optional-products-form.png.

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