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(sales order): incorrect no. of items fetched while creating dn (backport #29454) #29528

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2022

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

On branch mergify/bp/version-13-hotfix/pr-29454
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit a73ad6759d.
  (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/selling/doctype/sales_order/sales_order.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/selling/doctype/sales_order/sales_order.js

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 a73ad67)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
(cherry picked from commit 0b9a850)
@nextchamp-saqib nextchamp-saqib merged commit 144c8ec into version-13-hotfix Jan 31, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-29454 branch January 31, 2022 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant