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

feat: Refund entry against loans (backport #29460) #29678

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 7, 2022

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

On branch mergify/bp/version-13-pre-release/pr-29460
Your branch is up to date with 'origin/version-13-pre-release'.

You are currently cherry-picking commit c68c70f8bc.
  (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/loan_management/doctype/loan/loan.js
	modified:   erpnext/loan_management/doctype/loan/loan.py
	modified:   erpnext/loan_management/doctype/loan/test_loan.py
	modified:   erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
	modified:   erpnext/loan_management/doctype/loan_type/loan_type.js
	modified:   erpnext/loan_management/doctype/loan_type/loan_type.json
	new file:   erpnext/patches/v13_0/update_disbursement_account.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/loan_management/doctype/loan/loan.json
	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

(cherry picked from commit c68c70f)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.json
#	erpnext/patches.txt
@deepeshgarg007 deepeshgarg007 merged commit 427d8c8 into version-13-pre-release Feb 7, 2022
@mergify mergify bot deleted the mergify/bp/version-13-pre-release/pr-29460 branch February 7, 2022 13:47
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 10, 2025
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.

1 participant