diff --git a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html index 5e4289d40..f2bc4a2d7 100644 --- a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html +++ b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html @@ -1042,6 +1042,14 @@ [withTitle]="'47%'" > + +

{{ 'labels.heading.Expenses' | translate }}

@@ -1076,6 +1084,14 @@ [withTitle]="'47%'" > + +

{{ 'labels.heading.Liabilities' | translate }}

+ + +

{{ 'labels.heading.Expenses' | translate }}

@@ -230,6 +240,16 @@ > + + +

{{ 'labels.heading.Liabilities' | translate }}

diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts index 6b0552e43..4fce2bbad 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts @@ -155,6 +155,12 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges { incomeFromCapitalizationAccountId: accountingMappings.incomeFromCapitalizationAccount.id }); } + if (this.deferredIncomeRecognition.buyDownFee.enableBuyDownFee) { + this.loanProductAccountingForm.patchValue({ + buyDownExpenseAccountId: accountingMappings.buyDownExpenseAccount.id, + incomeFromBuyDownAccountId: accountingMappings.incomeFromBuyDownAccount.id + }); + } } /* falls through */ case 2: @@ -607,6 +613,19 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges { this.loanProductAccountingForm.removeControl('deferredIncomeLiabilityAccountId'); this.loanProductAccountingForm.removeControl('incomeFromCapitalizationAccountId'); } + if (this.deferredIncomeRecognition.buyDownFee.enableBuyDownFee) { + this.loanProductAccountingForm.addControl( + 'buyDownExpenseAccountId', + new UntypedFormControl('', Validators.required) + ); + this.loanProductAccountingForm.addControl( + 'incomeFromBuyDownAccountId', + new UntypedFormControl('', Validators.required) + ); + } else { + this.loanProductAccountingForm.removeControl('buyDownExpenseAccountId'); + this.loanProductAccountingForm.removeControl('incomeFromBuyDownAccountId'); + } } } } diff --git a/src/app/products/loan-products/models/loan-product.model.ts b/src/app/products/loan-products/models/loan-product.model.ts index c06400348..d4a6a434f 100644 --- a/src/app/products/loan-products/models/loan-product.model.ts +++ b/src/app/products/loan-products/models/loan-product.model.ts @@ -121,8 +121,10 @@ export interface LoanProduct { // Accounting accountingRule: any; accountingMappings?: { [key: string]: AccountingMapping }; + buyDownExpenseAccountId?: number; fundSourceAccountId?: number; goodwillCreditAccountId?: number; + incomeFromBuyDownAccountId?: number; incomeFromCapitalizationAccountId?: number; incomeFromChargeOffFeesAccountId?: number; incomeFromChargeOffInterestAccountId?: number; diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index 2308c942f..ae194fd8b 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Typ výpočtu poplatku za odkup", "Buy down fee strategy": "Strategie poplatku za odkup", "Buy down fee income type": "Typ příjmu z poplatku za odkup", - "Buy down fees": "Poplatky za odkup" + "Buy down fees": "Poplatky za odkup", + "Income from Buy down fees": "Příjmy z poplatků za odkup", + "Buy down fee Expense": "Náklady na poplatek za odkup" }, "links": { "Community": "Společenství", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index 21b1a8c48..8c78abdce 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Berechnungsart der Buy-Down-Gebühr", "Buy down fee strategy": "Strategie für Buy-Down-Gebühr", "Buy down fee income type": "Einnahmeart der Buy-Down-Gebühr", - "Buy down fees": "Buy-Down-Gebühren" + "Buy down fees": "Buy-Down-Gebühren", + "Income from Buy down fees": "Einnahmen aus Buy-Down-Gebühren", + "Buy down fee Expense": "Aufwendungen aus Buy-Down-Gebühren" }, "links": { "Community": "Gemeinschaft", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index 5900fe27f..4e0f62d82 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -2484,7 +2484,9 @@ "Buy down fee calculation type": "Buy down fee calculation type", "Buy down fee strategy": "Buy down fee strategy", "Buy down fee income type": "Buy down fee income type", - "Buy down fees": "Buy down fees" + "Buy down fees": "Buy down fees", + "Income from Buy down fees": "Income from Buy down fees", + "Buy down fee Expense": "Buy down fee Expense" }, "links": { "Community": "Community", diff --git a/src/assets/translations/es-CL.json b/src/assets/translations/es-CL.json index 0e617ba07..e18c308e3 100644 --- a/src/assets/translations/es-CL.json +++ b/src/assets/translations/es-CL.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Tipo de cálculo de comisión de compra anticipada", "Buy down fee strategy": "Estrategia de comisión de compra anticipada", "Buy down fee income type": "Tipo de ingreso de comisión de compra anticipada", - "Buy down fees": "Tarifas de compra anticipada" + "Buy down fees": "Tarifas de compra anticipada", + "Income from Buy down fees": "Ingresos por comisiones de compra inicial", + "Buy down fee Expense": "Gastos por comisiones de compra inicial" }, "links": { "Community": "Comunidad", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index d4c809b8c..7e9132143 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Tipo de cálculo de comisión de compra anticipada", "Buy down fee strategy": "Estrategia de comisión de compra anticipada", "Buy down fee income type": "Tipo de ingreso de comisión de compra anticipada", - "Buy down fees": "Tarifas de compra anticipada" + "Buy down fees": "Tarifas de compra anticipada", + "Income from Buy down fees": "Ingresos por comisiones de compra inicial", + "Buy down fee Expense": "Gastos por comisiones de compra inicial" }, "links": { "Community": "Comunidad", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index 197877fae..896ca0bf4 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Type de calcul des frais de rachat", "Buy down fee strategy": "Stratégie des frais de rachat", "Buy down fee income type": "Type de revenu des frais de rachat", - "Buy down fees": "Frais d'achat" + "Buy down fees": "Frais d'achat", + "Income from Buy down fees": "Revenus des commissions de rachat", + "Buy down fee Expense": "Charges des commissions de rachat" }, "links": { "Community": "Communauté", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index 0121581fc..d034232c6 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Tipo di calcolo della commissione di buy down", "Buy down fee strategy": "Strategia per la commissione di buy down", "Buy down fee income type": "Tipo di ricavo da commissione di buy down", - "Buy down fees": "Commissioni di acquisto" + "Buy down fees": "Commissioni di acquisto", + "Income from Buy down fees": "Proventi da commissioni di buy down", + "Buy down fee Expense": "Spese da commissioni di buy down" }, "links": { "Community": "Comunità", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index ad889fff2..71f02a4c8 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -2478,7 +2478,9 @@ "Buy down fee calculation type": "매수 수수료 계산 유형", "Buy down fee strategy": "매수 수수료 전략", "Buy down fee income type": "매수 수수료 수익 유형", - "Buy down fees": "매수 수수료" + "Buy down fees": "매수 수수료", + "Income from Buy down fees": "매입 수수료 수입", + "Buy down fee Expense": "매입 수수료 비용" }, "links": { "Community": "지역 사회", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index f784f96d0..1f7abe192 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Supirkimo mokesčio skaičiavimo tipas", "Buy down fee strategy": "Supirkimo mokesčio strategija", "Buy down fee income type": "Supirkimo mokesčio pajamų tipas", - "Buy down fees": "Išpirkimo mokesčiai" + "Buy down fees": "Išpirkimo mokesčiai", + "Income from Buy down fees": "Pajamos iš supirkimo mokesčių", + "Buy down fee Expense": "Supirkimo mokesčio išlaidos" }, "links": { "Community": "bendruomenė", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index 9f003fb96..e6257b2d5 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Atpirkšanas maksas aprēķina veids", "Buy down fee strategy": "Atpirkšanas maksas stratēģija", "Buy down fee income type": "Atpirkšanas maksas ienākumu veids", - "Buy down fees": "Iepirkuma maksas" + "Buy down fees": "Iepirkuma maksas", + "Income from Buy down fees": "Ienākumi no akciju izpirkšanas komisijas maksām", + "Buy down fee Expense": "Akciju izpirkšanas komisijas izdevumi" }, "links": { "Community": "kopiena", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index 87ba5a698..383bde32b 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "बाइ डाउन शुल्क गणना प्रकार", "Buy down fee strategy": "बाइ डाउन शुल्क रणनीति", "Buy down fee income type": "बाइ डाउन शुल्क आय प्रकार", - "Buy down fees": "खरिद शुल्क" + "Buy down fees": "खरिद शुल्क", + "Income from Buy down fees": "खरिद शुल्कबाट हुने आम्दानी", + "Buy down fee Expense": "खरीद शुल्क खर्च" }, "links": { "Community": "समुदाय", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index 01b021085..857f7618b 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Tipo de cálculo de taxa de aquisição", "Buy down fee strategy": "Estratégia de taxa de aquisição", "Buy down fee income type": "Tipo de receita de taxa de aquisição", - "Buy down fees": "Taxas de compra antecipada" + "Buy down fees": "Taxas de compra antecipada", + "Income from Buy down fees": "Receita com taxas de recompra", + "Buy down fee Expense": "Despesa com taxas de recompra" }, "links": { "Community": "Comunidade", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index ea0898ce8..a4ccaca67 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -2477,7 +2477,9 @@ "Buy down fee calculation type": "Nunua aina ya hesabu ya ada ya chini", "Buy down fee strategy": "Nunua mkakati wa ada ya chini", "Buy down fee income type": "Nunua aina ya mapato ya chini", - "Buy down fees": "Nunua ada za chini" + "Buy down fees": "Nunua ada za chini", + "Income from Buy down fees": "Mapato kutoka kwa ada ya Kununua", + "Buy down fee Expense": "Kununua ada ya chini Gharama" }, "links": { "Community": "Jumuiya",