Skip to content

[FIX] *: remove position attribute in js tour steps#2041

Closed
fw-bot wants to merge 1 commit intoodoo:saas-18.3from
odoo-dev:saas-18.3-18.0-remove-position-js-tour-vava-519667-fw
Closed

[FIX] *: remove position attribute in js tour steps#2041
fw-bot wants to merge 1 commit intoodoo:saas-18.3from
odoo-dev:saas-18.3-18.0-remove-position-js-tour-vava-519667-fw

Conversation

@fw-bot
Copy link
Copy Markdown

@fw-bot fw-bot commented Apr 22, 2026

Forward-Port-Of: #2037

@robodoo
Copy link
Copy Markdown
Collaborator

robodoo commented Apr 22, 2026

Pull request status dashboard

@fw-bot
Copy link
Copy Markdown
Author

fw-bot commented Apr 22, 2026

@vava-odoo cherrypicking of pull request #2037 failed.

stdout:

Auto-merging bar_industry/static/src/js/my_tour.js
Auto-merging base_industry_data/static/src/js/my_tour.js
CONFLICT (modify/delete): cleaning_services/static/src/js/my_tour.js deleted in 63c53c7628bde98130d6b90a03628bd7ebcc3cb2 and modified in 211b90578e5fa905f0e61ffe54257bd668498433.  Version 211b90578e5fa905f0e61ffe54257bd668498433 of cleaning_services/static/src/js/my_tour.js left in tree.
CONFLICT (modify/delete): environmental_agency/static/src/js/my_tour.js deleted in 63c53c7628bde98130d6b90a03628bd7ebcc3cb2 and modified in 211b90578e5fa905f0e61ffe54257bd668498433.  Version 211b90578e5fa905f0e61ffe54257bd668498433 of environmental_agency/static/src/js/my_tour.js left in tree.
CONFLICT (modify/delete): eyewear_shop/static/src/js/my_tour.js deleted in 63c53c7628bde98130d6b90a03628bd7ebcc3cb2 and modified in 211b90578e5fa905f0e61ffe54257bd668498433.  Version 211b90578e5fa905f0e61ffe54257bd668498433 of eyewear_shop/static/src/js/my_tour.js left in tree.
CONFLICT (modify/delete): marketing_agency/static/src/js/my_tour.js deleted in 63c53c7628bde98130d6b90a03628bd7ebcc3cb2 and modified in 211b90578e5fa905f0e61ffe54257bd668498433.  Version 211b90578e5fa905f0e61ffe54257bd668498433 of marketing_agency/static/src/js/my_tour.js left in tree.
CONFLICT (modify/delete): micro_brewery/static/src/js/my_tour.js deleted in 63c53c7628bde98130d6b90a03628bd7ebcc3cb2 and modified in 211b90578e5fa905f0e61ffe54257bd668498433.  Version 211b90578e5fa905f0e61ffe54257bd668498433 of micro_brewery/static/src/js/my_tour.js left in tree.
Auto-merging museum/static/src/js/my_tour.js

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

@vava-odoo vava-odoo force-pushed the saas-18.3-18.0-remove-position-js-tour-vava-519667-fw branch from 17d09eb to 9b353e5 Compare April 24, 2026 12:51
@vava-odoo
Copy link
Copy Markdown
Collaborator

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 24, 2026
closes #2041

X-original-commit: 1f2183a
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
robodoo pushed a commit that referenced this pull request Apr 24, 2026
closes #2041

X-original-commit: 1f2183a
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
@robodoo robodoo closed this Apr 24, 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.

3 participants