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: Assign multiple securities to one loan (copy #108) #109

Merged
merged 4 commits into from
Oct 20, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 20, 2023

This is an automatic copy of pull request #108 done by Mergify.
Cherry-pick of ea3c9d7 has failed:

On branch mergify/copy/poc-staging/pr-108
Your branch is up to date with 'origin/poc-staging'.

You are currently cherry-picking commit ea3c9d7.
  (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:   lending/loan_management/doctype/loan/loan.js
	modified:   lending/loan_management/doctype/loan/loan.py
	modified:   lending/loan_management/doctype/loan/loan_dashboard.py
	modified:   lending/loan_management/doctype/loan/test_loan.py
	modified:   lending/loan_management/doctype/loan_application/loan_application.js
	modified:   lending/loan_management/doctype/loan_application/loan_application.py
	modified:   lending/loan_management/doctype/loan_application/loan_application_dashboard.py
	renamed:    lending/loan_management/doctype/loan_security_pledge/__init__.py -> lending/loan_management/doctype/loan_assignment_detail/__init__.py
	new file:   lending/loan_management/doctype/loan_assignment_detail/loan_assignment_detail.json
	new file:   lending/loan_management/doctype/loan_assignment_detail/loan_assignment_detail.py
	modified:   lending/loan_management/doctype/loan_disbursement/loan_disbursement.py
	modified:   lending/loan_management/doctype/loan_repayment/loan_repayment.py
	modified:   lending/loan_management/doctype/loan_security/loan_security_dashboard.py
	renamed:    lending/loan_management/doctype/loan_security_unpledge/__init__.py -> lending/loan_management/doctype/loan_security_assignment/__init__.py
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.js -> lending/loan_management/doctype/loan_security_assignment/loan_security_assignment.js
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.json -> lending/loan_management/doctype/loan_security_assignment/loan_security_assignment.json
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.py -> lending/loan_management/doctype/loan_security_assignment/loan_security_assignment.py
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge_list.js -> lending/loan_management/doctype/loan_security_assignment/loan_security_assignment_list.js
	renamed:    lending/loan_management/doctype/loan_security_unpledge/test_loan_security_unpledge.py -> lending/loan_management/doctype/loan_security_assignment/test_loan_security_assignment.py
	new file:   lending/loan_management/doctype/loan_security_release/__init__.py
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.js -> lending/loan_management/doctype/loan_security_release/loan_security_release.js
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.json -> lending/loan_management/doctype/loan_security_release/loan_security_release.json
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py -> lending/loan_management/doctype/loan_security_release/loan_security_release.py
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge_list.js -> lending/loan_management/doctype/loan_security_release/loan_security_release_list.js
	renamed:    lending/loan_management/doctype/loan_security_pledge/test_loan_security_pledge.py -> lending/loan_management/doctype/loan_security_release/test_loan_security_release.py
	modified:   lending/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
	modified:   lending/loan_management/doctype/loan_security_type/loan_security_type_dashboard.py
	modified:   lending/loan_management/report/loan_security_status/loan_security_status.py
	modified:   lending/loan_management/workspace/loan_management/loan_management.json
	modified:   lending/loan_management/workspace/loans/loans.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   lending/patches.txt

Cherry-pick of 0a5ca09 has failed:

On branch mergify/copy/poc-staging/pr-108
Your branch is ahead of 'origin/poc-staging' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0a5ca09.
  (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:   lending/patches.txt

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

Cherry-pick of 8dfe196 has failed:

On branch mergify/copy/poc-staging/pr-108
Your branch is ahead of 'origin/poc-staging' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8dfe196.
  (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:   lending/patches.txt

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/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 ea3c9d7)

# Conflicts:
#	lending/patches.txt
(cherry picked from commit 0a5ca09)

# Conflicts:
#	lending/patches.txt
(cherry picked from commit 8dfe196)

# Conflicts:
#	lending/patches.txt
@deepeshgarg007 deepeshgarg007 merged commit 1f4884e into poc-staging Oct 20, 2023
2 of 4 checks passed
@mergify mergify bot deleted the mergify/copy/poc-staging/pr-108 branch October 20, 2023 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant