Skip to content

[IMP] POS: homepage update#16373

Closed
fw-bot wants to merge 1 commit intosaas-19.1from
saas-19.1-18.0-pos-homepage-lrpz-444269-fw
Closed

[IMP] POS: homepage update#16373
fw-bot wants to merge 1 commit intosaas-19.1from
saas-19.1-18.0-pos-homepage-lrpz-444269-fw

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Feb 11, 2026

task-4472597

Forward-Port-Of: #13761

@robodoo
Copy link
Collaborator

robodoo commented Feb 11, 2026

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Feb 11, 2026

@LoredanaLrpz @auva-odoo cherrypicking of pull request #13761 failed.

stdout:

Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals.rst
CONFLICT (modify/delete): content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst deleted in 14c37acd3ba2a15941178ac33196967bdb0bfe8a and modified in 30df690e1f3b8169af56e498f67b47fa8b56e787.  Version 30df690e1f3b8169af56e498f67b47fa8b56e787 of content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst left in tree.
Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals/worldline_axepta.rst
CONFLICT (content): Merge conflict in content/applications/sales/point_of_sale/payment_methods/terminals/worldline_axepta.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

@auva-odoo auva-odoo force-pushed the saas-19.1-18.0-pos-homepage-lrpz-444269-fw branch 2 times, most recently from 3d2e67d to ca9bb62 Compare February 11, 2026 14:06
@auva-odoo auva-odoo force-pushed the saas-19.1-18.0-pos-homepage-lrpz-444269-fw branch from ca9bb62 to 28b91ad Compare February 11, 2026 14:27
@C3POdoo C3POdoo requested review from a team February 11, 2026 15:02
@auva-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Feb 12, 2026
task-4472597

closes #16373

Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>
@robodoo robodoo closed this Feb 12, 2026
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.

4 participants