Skip to content

[FW][FIX]account_invoice_partial: recompute taxes when making percentage invoice#143

Open
fw-bot-adhoc wants to merge 1 commit intoingadhoc:16.0from
adhoc-dev:16.0-13.0-h-55170-pam-ztK6-fw
Open

[FW][FIX]account_invoice_partial: recompute taxes when making percentage invoice#143
fw-bot-adhoc wants to merge 1 commit intoingadhoc:16.0from
adhoc-dev:16.0-13.0-h-55170-pam-ztK6-fw

Conversation

@fw-bot-adhoc
Copy link

Ticket: 55170

Forward-Port-Of: #141
Forward-Port-Of: #139

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Author

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

stdout:

On branch 16.0-13.0-h-55170-pam-ztK6-fw
You are currently cherry-picking commit 2d462064.
  (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:56:07.946861 git.c:439               trace: built-in: git cherry-pick 2d462064945a93ed944bb9cd1ebd27806c40a04e
16:56:07.949126 run-command.c:663       trace: run_command: git commit -n -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
16:56:07.949743 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