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][IMP] account_accountant: Add warning for potential cross-partner reconciliations when selecting multiple partners #567

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #562

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

Auto-merging account_accountant_ux/__manifest__.py
CONFLICT (content): Merge conflict in account_accountant_ux/__manifest__.py
Auto-merging account_accountant_ux/README.rst

stderr:

18:07:51.076290 git.c:444               trace: built-in: git cherry-pick 3468b75cd8bed966c6ba63bb74963c6cb3b3cc76
error: could not apply 3468b75... [IMP] account_accountant: Add warning for potential cross-partner reconciliations when selecting multiple partners
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

…onciliations when selecting multiple partners

X-original-commit: e7b883f
@rov-adhoc rov-adhoc force-pushed the 18.0-17.0-t-49179-rov-wnHr-fw branch from 5a72253 to a637a60 Compare March 12, 2025 18:23
@rov-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