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] account_payment_pro: fix default partner in move lines #592

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #582

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@cav-adhoc @rov-adhoc cherrypicking of pull request #582 failed.

stdout:

Auto-merging account_payment_pro/models/account_move_line.py
CONFLICT (content): Merge conflict in account_payment_pro/models/account_move_line.py

stderr:

12:20:04.961394 git.c:444               trace: built-in: git cherry-pick 192f9e193c97a4119cac2cbd8d48203cc2d4e253
error: could not apply 192f9e19... [FIX] account_payment_pro: fix default partner in move 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

@cav-adhoc cav-adhoc force-pushed the 18.0-17.0-h-85425-cav-8yVB-fw branch from ad8d69f to 008a587 Compare January 13, 2025 12:32
@cav-adhoc
Copy link
Contributor

@roboadhoc r+

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