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][IMP]stock_batch_picking_ux:new preprinted report #606

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #539

@roboadhoc
Copy link
Collaborator

@fw-bot-adhoc
Copy link
Contributor Author

@jcadhoc @mav-adhoc cherrypicking of pull request #539 failed.

stderr:

17:06:47.930420 git.c:444               trace: built-in: git cherry-pick d8ee0f3e0acacebd04713c38dfcf940240050568
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed
----------
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

@jcadhoc jcadhoc force-pushed the 18.0-17.0-t-41856-jc-qA4z-fw branch 2 times, most recently from 6c59944 to 0717532 Compare December 30, 2024 19:16
stdout:

stderr:
17:06:47.930420 git.c:444               trace: built-in: git cherry-pick d8ee0f3
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed
----------
status:
@mav-adhoc mav-adhoc force-pushed the 18.0-17.0-t-41856-jc-qA4z-fw branch from 0717532 to ff45d6c Compare January 2, 2025 13:35
@mav-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in 6f9083d Jan 2, 2025
@roboadhoc roboadhoc added the 17.1 label Jan 2, 2025
@fw-bot-adhoc fw-bot-adhoc deleted the 18.0-17.0-t-41856-jc-qA4z-fw branch January 16, 2025 14:30
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