odoo/odoo#161849
Created by fw-bot
Merged
at fca2be7814fd246dfb79c2bb1ace764fa8530429
Linked pull requests
- label
- odoo-dev:master-saas-17.1-opw-3802560-customer_account-sbel-1Ij9-fw
- head
- f2f90983cc4db8edd9b2bde483099c527f08a648
- target
- master
- merged
- 1 month ago by Sarah Bellefroid (sbel)
- forward-port of
- odoo/odoo#160961 DETACHED (conflicts: ('a66c4c9e0911e4d5a4bd6f67fedd32858e856768', 'Auto-merging addons/point_of_sale/static/tests/tours/utils/common.js\nCONFLICT (content): Merge conflict in addons/point_of_sale/static/tests/tours/utils/common.js\n', '12:12:32.754898 git.c:463 trace: built-in: git cherry-pick a66c4c9e0911e4d5a4bd6f67fedd32858e856768\nerror: could not apply a66c4c9e0911... [FIX] point_of_sale: add helper for tour writing\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['a66c4c9e0911e4d5a4bd6f67fedd32858e856768']) ('a66c4c9e0911e4d5a4bd6f67fedd32858e856768', 'Auto-merging addons/point_of_sale/static/tests/tours/utils/common.js\nCONFLICT (content): Merge conflict in addons/point_of_sale/static/tests/tours/utils/common.js\n', '12:12:32.754898 git.c:463 trace: built-in: git cherry-pick a66c4c9e0911e4d5a4bd6f67fedd32858e856768\nerror: could not apply a66c4c9e0911... [FIX] point_of_sale: add helper for tour writing\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['a66c4c9e0911e4d5a4bd6f67fedd32858e856768']))
[FW][FIX] point_of_sale: add helper for tour writing
This commit adds helpers that are used in a tour created in enterprise.
opw-3802560
Forward-Port-Of: odoo/odoo#161733
Forward-Port-Of: odoo/odoo#160961