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: update per_billed value in Purchase Receipt while creating Debit Note (backport #43977) #44114

Merged
merged 2 commits into from
Nov 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2024

Issue:
per_billed value is always 100 for partial Debit Notes

ref: 22656

Before:
partial_return_debit_note_before.webm

After:
partial_return_debit_note_after.webm

backport needed for v14 and v15


This is an automatic backport of pull request #43977 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Nov 13, 2024

Cherry-pick of 494fd7c has failed:

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

You are currently cherry-picking commit 494fd7ceea.
  (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/stock/doctype/purchase_receipt/purchase_receipt.py

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

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

@ruthra-kumar
Copy link
Member

Depends on #44128

Navin-S-R and others added 2 commits November 13, 2024 18:27
… Note (#43977)

* fix: update per_billed value in Purchase Receipt while creating Debit Note

* test: add unit test for validating per_billed value for partial Debit Note

(cherry picked from commit 494fd7c)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-43977 branch from 3489d5a to 030df0d Compare November 13, 2024 12:58
@ruthra-kumar ruthra-kumar merged commit ddac2c5 into version-14-hotfix Nov 13, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-43977 branch November 13, 2024 13:31
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.76.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants