Skip to content

[FW][IMP] pos: update content of the pricelists page #6117

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

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 12, 2023

task-3005170

Forward-Port-Of: #5688

@robodoo
Copy link
Collaborator

robodoo commented Oct 12, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 12, 2023

@LoredanaLrpz @xpl-odoo cherrypicking of pull request #5688 failed.

stdout:

Auto-merging content/applications/websites/website/configuration/multi_website.rst
CONFLICT (content): Merge conflict in content/applications/websites/website/configuration/multi_website.rst

stderr:

15:03:48.748381 git.c:463               trace: built-in: git cherry-pick ae96b4f0a6cbc87fe7591b28e979cbb3f6b0203e
error: could not apply ae96b4f0a... [IMP] pos: update content of the pricelists page
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.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@LoredanaLrpz LoredanaLrpz force-pushed the 16.0-15.0-pos-pricelists-lrpz-uH7h-fw branch from dd4e1c8 to 094493c Compare October 17, 2023 10:25
@C3POdoo C3POdoo requested a review from a team October 17, 2023 10:27
@LoredanaLrpz
Copy link
Contributor

@fw-bot r+

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 17, 2023

@LoredanaLrpz I can only do this on unmodified forward-port PRs, ask robodoo.

@LoredanaLrpz
Copy link
Contributor

@robodoo r+

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