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_debt_report: corregir importes en Detalle de Deuda #375

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

Conversation

fw-bot-adhoc
Copy link
Contributor

Ticket 53861

Forward-Port-Of: #358
Forward-Port-Of: #357

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

Auto-merging account_debt_report/models/res_partner.py
On branch 16.0-13.0-h-53861-pam-ArxG-fw
You are currently cherry-picking commit 389d5625.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

stderr:

16:54:09.088219 git.c:439               trace: built-in: git cherry-pick 389d5625184164ac5319d0cc0f9dbc5364676b41
16:54:09.090430 run-command.c:663       trace: run_command: git commit -n -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
16:54:09.092844 git.c:439               trace: built-in: git commit -n -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
----------
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.

3 participants