8000 [FW][FIX]stock_ux: inverse_qty_done context for manual_lines by fw-bot-adhoc · Pull Request #692 · ingadhoc/stock · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[FW][FIX]stock_ux: inverse_qty_done context for manual_lines #692

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

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #689

@roboadhoc
Copy link
Collaborator

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

Auto-merging stock_ux/models/stock_move_line.py
CONFLICT (content): Merge conflict in stock_ux/models/stock_move_line.py

stderr:

17:56:46.001112 git.c:444               trace: built-in: git cherry-pick 001cc2eb506f5ad9bc01aec2a9a0af2f91478059
error: could not apply 001cc2eb... [FIX]stock_ux: inverse_qty_done context for manual_lines
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
0