Merging all changes in main branch of the last weeks into dev branch (#2444)
* fixed identities tab * fix: Loan Product capitalized income form validation * Loan account with Capitalized Income transaction * fix: Use first API url from url list * Loan Product with Capitalized Income GL accounting mappings * fix: Loan Product capitalized income with Income Type * Loan account details - income capitalization type * fix: Loan Product Cash accounting view * fix: Loan Id updated in Loan views after url changed * fix: Charge management minimum and maximum cap values validation * build(deps-dev): bump http-proxy-middleware from 2.0.7 to 2.0.9 (#2421) Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.7 to 2.0.9. - [Release notes](https://github.com/chimurai/http-proxy-middleware/releases) - [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.9/CHANGELOG.md) - [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.7...v2.0.9) --- updated-dependencies: - dependency-name: http-proxy-middleware dependency-version: 2.0.9 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * docs: Improve contributing guidelines (#2440) The CONTRIBUTING.md file has been updated to clarify that we use the dev branch for development. In addition to that, I have slightly shortened and restructured the text. FIXES: WEB-165 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Craig-Rosario <craig.rosario04@gmail.com> Co-authored-by: Jose Alberto Hernandez <alberto@art3ch.solutions> Co-authored-by: Jose Alberto Hernandez <alberto@black-box.local> Co-authored-by: adam.magyari <magyari.adam96@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
Craig-Rosario
Jose Alberto Hernandez
Jose Alberto Hernandez
adam.magyari
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
parent
b61d9e3d34
commit
c8d857f3cb
@@ -1483,6 +1483,7 @@
|
||||
"Default Savings Account": "기본 저축 계좌",
|
||||
"Default Shares per Client": "클라이언트당 기본 공유",
|
||||
"Default Theme": "기본 테마",
|
||||
"Deferred income": "이연소득",
|
||||
"Deleted": "삭제됨",
|
||||
"Delinquency Action": "연체 행동",
|
||||
"Delinquency Bucket": "연체 버킷",
|
||||
@@ -1710,6 +1711,7 @@
|
||||
"Income from fees": "수수료 수입",
|
||||
"Income from fees Repayments": "수수료 수익 상환",
|
||||
"Income from penalties": "벌금으로 인한 소득",
|
||||
"Income type": "소득 유형",
|
||||
"Incorporation No": "법인설립번호",
|
||||
"Incorporation Number": "법인번호",
|
||||
"Incorporation Validity Till Date": "법인설립 유효일까지",
|
||||
@@ -2462,7 +2464,8 @@
|
||||
"Passwords do not match": "비밀번호가 일치하지 않습니다.",
|
||||
"Enable income capitalization": "소득 자본화 활성화",
|
||||
"Income capitalization calculation type": "소득 자본화 계산 유형",
|
||||
"Income capitalization strategy": "소득 자본화 전략"
|
||||
"Income capitalization strategy": "소득 자본화 전략",
|
||||
"Income capitalization type": "소득 자본화 유형"
|
||||
},
|
||||
"links": {
|
||||
"Community": "지역 사회",
|
||||
@@ -2499,6 +2502,7 @@
|
||||
"Block Withdrawal": "출금 차단",
|
||||
"Breadcrumbs": "빵 부스러기",
|
||||
"Calculate Interest": "이자 계산",
|
||||
"Capitalized Income": "자본화 소득",
|
||||
"Centers": "센터",
|
||||
"Charge-Off": "상각",
|
||||
"Chart of Accounts": "계정 목록",
|
||||
|
||||
Reference in New Issue
Block a user