Skip to content
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

[FW][FIX] point_of_sale: add helper for tour writing #161849

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 15, 2024

This commit adds helpers that are used in a tour created in enterprise.

opw-3802560

Forward-Port-Of: #161733
Forward-Port-Of: #160961

@robodoo
Copy link
Contributor

robodoo commented Apr 15, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 15, 2024

@sbel-odoo @vlst-odoo cherrypicking of pull request #160961 failed.

stdout:

Auto-merging addons/point_of_sale/static/tests/tours/utils/common.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/tests/tours/utils/common.js

stderr:

12:12:32.754898 git.c:463               trace: built-in: git cherry-pick a66c4c9e0911e4d5a4bd6f67fedd32858e856768
error: could not apply a66c4c9e0911... [FIX] point_of_sale: add helper for tour writing
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 15, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Apr 15, 2024
@sbel-odoo sbel-odoo force-pushed the master-saas-17.1-opw-3802560-customer_account-sbel-1Ij9-fw branch from de73125 to 1eb9423 Compare April 15, 2024 12:26
@C3POdoo C3POdoo requested review from a team and caburj and removed request for a team April 15, 2024 12:29
@sbel-odoo sbel-odoo force-pushed the master-saas-17.1-opw-3802560-customer_account-sbel-1Ij9-fw branch from 1eb9423 to 09c6064 Compare April 15, 2024 13:25
@sbel-odoo sbel-odoo force-pushed the master-saas-17.1-opw-3802560-customer_account-sbel-1Ij9-fw branch from 09c6064 to 426f700 Compare April 16, 2024 19:49
@caburj caburj force-pushed the master-saas-17.1-opw-3802560-customer_account-sbel-1Ij9-fw branch from 426f700 to b81d034 Compare April 18, 2024 08:12
@sbel-odoo sbel-odoo force-pushed the master-saas-17.1-opw-3802560-customer_account-sbel-1Ij9-fw branch from b81d034 to 89fe18e Compare April 18, 2024 09:03
This commit adds helpers that are used in a tour created in enterprise.

opw-3802560

X-original-commit: debf516
@sbel-odoo sbel-odoo force-pushed the master-saas-17.1-opw-3802560-customer_account-sbel-1Ij9-fw branch from 89fe18e to f2f9098 Compare April 19, 2024 06:31
@sbel-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 19, 2024
This commit adds helpers that are used in a tour created in enterprise.

opw-3802560

closes #161849

X-original-commit: debf516
Related: odoo/enterprise#60726
Signed-off-by: Vlad Stroia (vlst) <vlst@odoo.com>
Signed-off-by: Sarah Bellefroid (sbel) <sbel@odoo.com>
@robodoo robodoo closed this Apr 19, 2024
@robodoo robodoo added the 17.3 label Apr 19, 2024
muab-odoo pushed a commit to odoo-dev/odoo that referenced this pull request Apr 19, 2024
This commit adds helpers that are used in a tour created in enterprise.

opw-3802560

closes odoo#161849

X-original-commit: debf516
Related: odoo/enterprise#60726
Signed-off-by: Vlad Stroia (vlst) <vlst@odoo.com>
Signed-off-by: Sarah Bellefroid (sbel) <sbel@odoo.com>
zel-odoo pushed a commit to odoo-dev/odoo that referenced this pull request Apr 29, 2024
This commit adds helpers that are used in a tour created in enterprise.

opw-3802560

closes odoo#161849

X-original-commit: debf516
Related: odoo/enterprise#60726
Signed-off-by: Vlad Stroia (vlst) <vlst@odoo.com>
Signed-off-by: Sarah Bellefroid (sbel) <sbel@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
17.3 conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants