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

Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (backport #29782) #29807

Merged
merged 3 commits into from
Mar 11, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 15, 2022

This is an automatic backport of pull request #29782 done by Mergify.
Cherry-pick of 7fa46f7 has failed:

On branch mergify/bp/develop/pr-29782
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit 7fa46f77e0.
  (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:
	modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	modified:   erpnext/stock/doctype/delivery_note/delivery_note.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

…led-amount" (#29782)

* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f949, reversing
changes made to c7b4918.

* fix: linter

(cherry picked from commit 7fa46f7)

# Conflicts:
#	erpnext/patches.txt
@mergify mergify bot added the conflicts label Feb 15, 2022
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Feb 15, 2022
@ankush ankush removed the needs-tests This PR needs automated unit-tests. label Feb 15, 2022
@s-aga-r s-aga-r removed the conflicts label Mar 2, 2022
@ankush ankush merged commit b085e96 into develop Mar 11, 2022
@ankush ankush deleted the mergify/bp/develop/pr-29782 branch March 11, 2022 12:58
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants