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_voucher_ux: print and assign method #604

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #583

@roboadhoc
Copy link
Collaborator

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

CONFLICT (modify/delete): stock_voucher_ux/wizards/stock_print_stock_voucher_views.xml deleted in HEAD and modified in 47f7c057 ([FIX] stock_voucher_ux: print and assign method). Version 47f7c057 ([FIX] stock_voucher_ux: print and assign method) of stock_voucher_ux/wizards/stock_print_stock_voucher_views.xml left in tree.
CONFLICT (modify/delete): stock_voucher_ux/wizards/stock_print_stock_voucher.py deleted in HEAD and modified in 47f7c057 ([FIX] stock_voucher_ux: print and assign method). Version 47f7c057 ([FIX] stock_voucher_ux: print and assign method) of stock_voucher_ux/wizards/stock_print_stock_voucher.py left in tree.
Auto-merging stock_voucher_ux/controllers/main.py
CONFLICT (content): Merge conflict in stock_voucher_ux/controllers/main.py
Auto-merging stock_voucher_ux/__manifest__.py
CONFLICT (content): Merge conflict in stock_voucher_ux/__manifest__.py

stderr:

16:26:03.115669 git.c:444               trace: built-in: git cherry-pick 47f7c057ee47b5c1a092b9f37b10e49a862577a1
error: could not apply 47f7c057... [FIX] stock_voucher_ux: print and assign method
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

@mav-adhoc mav-adhoc force-pushed the 17.0-16.0-h-83276-mav-1-Xe7C-fw branch from 69dd1ce to 340544f Compare January 3, 2025 12:01
@mav-adhoc mav-adhoc closed this Jan 10, 2025
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