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]stock_batch_picking_voucher: stock_voucher_ux dependencie #644

Open
wants to merge 1 commit into
base: 18.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #643

@roboadhoc
Copy link
Collaborator

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

Auto-merging stock_batch_picking_voucher/views/stock_batch_picking_views.xml
Auto-merging stock_batch_picking_voucher/__manifest__.py
CONFLICT (content): Merge conflict in stock_batch_picking_voucher/__manifest__.py

stderr:

17:52:29.144119 git.c:444               trace: built-in: git cherry-pick 51970abbd616f9395069640d1365043728ca4545
error: could not apply 51970abb... [FIX]stock_batch_picking_voucher: stock_voucher_ux dependencie
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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

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