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: improved the conditions for determining voucher subtypes (backport #43273) #44022

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2024

  • Removed Debit Note And Credit Note for Sales Invoice and Purchase Invoice because it was confusing for users.
  • Added Debit Note when Sales Invoice and is_debit_note

Closes: #39382, #39382
Frappe Support Issue: https://support.frappe.io/app/hd-ticket/18562

backport version-15-hotfix
backport version-14-hotfix


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

ljain112 and others added 3 commits November 8, 2024 04:51
(cherry picked from commit d76cc21)

# Conflicts:
#	erpnext/patches.txt
Copy link
Contributor Author

mergify bot commented Nov 8, 2024

Cherry-pick of d76cc21 has failed:

On branch mergify/bp/version-15-hotfix/pr-43273
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d76cc21086.
  (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/v15_0/update_sub_voucher_type_in_gl_entries.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruthra-kumar ruthra-kumar merged commit 23e9a46 into version-15-hotfix Nov 8, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-43273 branch November 8, 2024 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants