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.

Sign up for GitHub

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

Jump to bottom

feat: loan collateral (copy #106) #107

Closed
wants to merge 5 commits into from
Closed

feat: loan collateral (copy #106) #107

wants to merge 5 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 19, 2023

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

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

You are currently cherry-picking commit de301bc.
  (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/test_loan.py
	modified:   lending/loan_management/doctype/loan_application/loan_application.js
	modified:   lending/loan_management/doctype/loan_application/loan_application.json
	modified:   lending/loan_management/doctype/loan_application/loan_application.py
	new file:   lending/loan_management/doctype/loan_collateral/__init__.py
	new file:   lending/loan_management/doctype/loan_collateral/loan_collateral.js
	new file:   lending/loan_management/doctype/loan_collateral/loan_collateral.json
	new file:   lending/loan_management/doctype/loan_collateral/loan_collateral.py
	new file:   lending/loan_management/doctype/loan_collateral/loan_collateral_list.js
	new file:   lending/loan_management/doctype/loan_collateral/test_loan_collateral.py
	new file:   lending/loan_management/doctype/loan_collateral_assignment_loan_collateral/__init__.py
	new file:   lending/loan_management/doctype/loan_collateral_assignment_loan_collateral/loan_collateral_assignment_loan_collateral.json
	new file:   lending/loan_management/doctype/loan_collateral_assignment_loan_collateral/loan_collateral_assignment_loan_collateral.py
	new file:   lending/loan_management/doctype/loan_collateral_deassignment_loan_collateral/__init__.py
	new file:   lending/loan_management/doctype/loan_collateral_deassignment_loan_collateral/loan_collateral_deassignment_loan_collateral.json
	new file:   lending/loan_management/doctype/loan_collateral_deassignment_loan_collateral/loan_collateral_deassignment_loan_collateral.py
	new file:   lending/loan_management/doctype/loan_collateral_third_party_owner/__init__.py
	new file:   lending/loan_management/doctype/loan_collateral_third_party_owner/loan_collateral_third_party_owner.js
	new file:   lending/loan_management/doctype/loan_collateral_third_party_owner/loan_collateral_third_party_owner.json
	new file:   lending/loan_management/doctype/loan_collateral_third_party_owner/loan_collateral_third_party_owner.py
	new file:   lending/loan_management/doctype/loan_collateral_third_party_owner/test_loan_collateral_third_party_owner.py
	new file:   lending/loan_management/doctype/loan_collateral_values_log/__init__.py
	new file:   lending/loan_management/doctype/loan_collateral_values_log/loan_collateral_values_log.js
	new file:   lending/loan_management/doctype/loan_collateral_values_log/loan_collateral_values_log.json
	new file:   lending/loan_management/doctype/loan_collateral_values_log/loan_collateral_values_log.py
	new file:   lending/loan_management/doctype/loan_collateral_values_log/test_loan_collateral_values_log.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_pledge/loan_security_pledge.js
	modified:   lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.json
	modified:   lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
	modified:   lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.json
	modified:   lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
	modified:   lending/loan_management/doctype/proposed_pledge/proposed_pledge.json
	new file:   lending/patches/v15_0/set_collateral_type.py

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

Cherry-pick of dc62bd8 has failed:

On branch mergify/copy/poc-staging/pr-106
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 dc62bd8.
  (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:   .github/helper/install.sh
	modified:   .github/workflows/ci.yml
	modified:   lending/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py
	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
	modified:   lending/loan_management/doctype/loan_collateral/loan_collateral.py
	renamed:    lending/loan_management/doctype/loan_security_pledge/__init__.py -> lending/loan_management/doctype/loan_collateral_assignment/__init__.py
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.js -> lending/loan_management/doctype/loan_collateral_assignment/loan_collateral_assignment.js
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.json -> lending/loan_management/doctype/loan_collateral_assignment/loan_collateral_assignment.json
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.py -> lending/loan_management/doctype/loan_collateral_assignment/loan_collateral_assignment.py
	renamed:    lending/loan_management/doctype/loan_security_pledge/loan_security_pledge_list.js -> lending/loan_management/doctype/loan_collateral_assignment/loan_collateral_assignment_list.js
	renamed:    lending/loan_management/doctype/loan_security_pledge/test_loan_security_pledge.py -> lending/loan_management/doctype/loan_collateral_assignment/test_loan_collateral_assignment.py
	renamed:    lending/loan_management/doctype/loan_security_unpledge/__init__.py -> lending/loan_management/doctype/loan_collateral_deassignment/__init__.py
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.js -> lending/loan_management/doctype/loan_collateral_deassignment/loan_collateral_deassignment.js
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.json -> lending/loan_management/doctype/loan_collateral_deassignment/loan_collateral_deassignment.json
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py -> lending/loan_management/doctype/loan_collateral_deassignment/loan_collateral_deassignment.py
	renamed:    lending/loan_management/doctype/loan_security_unpledge/loan_security_unpledge_list.js -> lending/loan_management/doctype/loan_collateral_deassignment/loan_collateral_deassignment_list.js
	renamed:    lending/loan_management/doctype/loan_security_unpledge/test_loan_security_unpledge.py -> lending/loan_management/doctype/loan_collateral_deassignment/test_loan_collateral_deassignment.py
	modified:   lending/loan_management/doctype/loan_disbursement/loan_disbursement.py
	modified:   lending/loan_management/doctype/loan_disbursement/test_loan_disbursement.py
	modified:   lending/loan_management/doctype/loan_security/loan_security_dashboard.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/doctype/proposed_pledge/proposed_pledge.json
	modified:   lending/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py
	modified:   lending/loan_management/report/loan_interest_report/loan_interest_report.py
	modified:   lending/loan_management/report/loan_security_status/loan_security_status.js
	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
	new file:   lending/patches/v15_0/change_status_of_loan_security_pledges.py
	new file:   lending/patches/v15_0/rename_loan_security_pledge_and_unpledge.py
	modified:   lending/patches/v15_0/set_collateral_type.py

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

@anandbaburajan @mergify
feat: loan collateral
9cc2e82 
(cherry picked from commit de301bc)

# Conflicts:
#	lending/loan_management/doctype/loan/loan.json
#	lending/patches.txt
@anandbaburajan @mergify
chore: rename_loan_security_pledge_and_unpledge
dfbeaa7 
(cherry picked from commit dc62bd8)

# Conflicts:
#	lending/patches.txt
@anandbaburajan @mergify
ci: use mariadb:10.6
93f476b 
(cherry picked from commit 7358fb8)
@anandbaburajan @mergify
ci: minor fix
83bf22b 
(cherry picked from commit b417cdb)
@anandbaburajan @mergify
ci: minor fix
7482093 
(cherry picked from commit e093ebc)
@mergify mergify bot added the conflicts label Oct 19, 2023
@mergify mergify bot mentioned this pull request Oct 19, 2023
Closed
@mergify mergify bot deleted the mergify/copy/poc-staging/pr-106 branch October 19, 2023 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@anandbaburajan anandbaburajan Awaiting requested review from anandbaburajan

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@anandbaburajan