Skip to content

Conversation

@fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #854

@roboadhoc
Copy link
Collaborator

Pull request status dashboard

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

CONFLICT (modify/delete): stock_voucher/models/stock_picking.py deleted in aa1d7709c4b6b37a28792fff6f2d9dafade33bf4 and modified in 373f412032e2f81aa731afcb60cc16ac231acea8.  Version 373f412032e2f81aa731afcb60cc16ac231acea8 of stock_voucher/models/stock_picking.py left in tree.

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 @roboadhoc.

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