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

fix: billed amount in delivery note items (backport #29290) #29549

Merged
merged 6 commits into from
Feb 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 1, 2022

This is an automatic backport of pull request #29290 done by Mergify.
Cherry-pick of fc65a3d has failed:

On branch mergify/bp/develop/pr-29290
Your branch is ahead of 'origin/develop' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit fc65a3d989.
  (fix conflicts and 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)

Changes to be committed:
	new file:   erpnext/patches/v13_0/set_billed_amount_in_returned_dn.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

Cherry-pick of fedeb2a has failed:

On branch mergify/bp/develop/pr-29290
Your branch is ahead of 'origin/develop' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit fedeb2a70f.
  (fix conflicts and 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)

Changes to be committed:
	deleted:    erpnext/patches/v13_0/set_billed_amount_in_returned_dn.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 5de6b8d)
(cherry picked from commit fc65a3d)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit fedeb2a)

# Conflicts:
#	erpnext/patches.txt
@mergify mergify bot added the conflicts label Feb 1, 2022
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Feb 1, 2022
@deepeshgarg007 deepeshgarg007 merged commit 2280ae5 into develop Feb 7, 2022
@mergify mergify bot deleted the mergify/bp/develop/pr-29290 branch February 7, 2022 18:22
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants