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_group:order lines by date maturity #333

Open
wants to merge 1 commit into
base: 15.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link
Contributor

Ticket: 57884

Forward-Port-Of: #332

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@pablohmontenegro @zaoral cherrypicking of pull request #332 failed.

stdout:

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

stderr:

16:27:07.865310 git.c:439               trace: built-in: git cherry-pick c3c19af7cd5e5b2bd9074d1852ea9d6cc0a9929a
error: could not apply c3c19af7... [FIX]account_payment_group:order lines by date maturity
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.

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.

None yet

3 participants