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: added correct options for incoming_rate field of delivery note item (backport #45734) #45742

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 5, 2025

For some reason, incoming_rate field of Delivery Note Item DocType did not have the correct options set for the Currency type of the field. This sometimes caused issues like this.

This PR sets the options field to "Company:company:default_currency"


This is an automatic backport of pull request #45734 done by Mergify.

(cherry picked from commit 417bf49)

# Conflicts:
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
Copy link
Contributor Author

mergify bot commented Feb 5, 2025

Cherry-pick of 417bf49 has failed:

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

You are currently cherry-picking commit 417bf49a8d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

no changes added to commit (use "git add" and/or "git commit -a")

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

@rohitwaghchaure rohitwaghchaure merged commit dcdd8e9 into version-15-hotfix Feb 5, 2025
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-45734 branch February 5, 2025 11:38
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.

2 participants