diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json
index b1ff6b019b..2b21ce45ed 100644
--- a/app/global-translations/locale-en.json
+++ b/app/global-translations/locale-en.json
@@ -5357,5 +5357,49 @@
   "label.heading.list.of.centers": "List of Centers",
   "label.view.principalpaymentdetail": "Principal Payment",
   "label.view.interestspayment": "Interest Payment",
+  "loanTermFrequency.periodFrequencyType.days": "Days",
+  "loanTermFrequency.periodFrequencyType.weeks": "Weeks",
+  "loanTermFrequency.periodFrequencyType.months": "Months",
+  "loanTermFrequency.periodFrequencyType.years": "Years",
+  "label.heading.on": "on",
+  "repaymentFrequency.nthDayType.one": "First",
+  "repaymentFrequency.nthDayType.two": "Second",
+  "repaymentFrequency.nthDayType.three": "Third",
+  "repaymentFrequency.nthDayType.four": "Fourth",
+  "repaymentFrequency.nthDayType.last": "Last",
+  "repaymentFrequency.weekDayType.sunday": "SUNDAY",
+  "repaymentFrequency.weekDayType.monday": "MONDAY",
+  "repaymentFrequency.weekDayType.tuesday": "TUESDAY",
+  "repaymentFrequency.weekDayType.wednesday": "WEDNESDAY",
+  "repaymentFrequency.weekDayType.thursday": "THURSDAY",
+  "repaymentFrequency.weekDayType.friday": "FRIDAY",
+  "repaymentFrequency.weekDayType.saturday": "SATURDAY",
+  "interestRateFrequency.periodFrequencyType.days": "Per Day",
+  "interestRateFrequency.periodFrequencyType.weeks": "Per Week",
+  "interestRateFrequency.periodFrequencyType.months": "Per month",
+  "interestRateFrequency.periodFrequencyType.years": "Per year",
+  "interestRateFrequency.periodFrequencyType.whole_term": "Whole term",
+  "interestRateFrequency.periodFrequencyType.invalid": "Invalid",
+  "interestType.flat": "Flat",
+  "interestType.declining.balance": "Declining Balance",
+  "amortizationType.equal.installments": "Equal installments",
+  "amortizationType.equal.principal": "Equal principal payments",
+  "interestCalculationPeriodType.daily": "Daily",
+  "interestCalculationPeriodType.same.as.repayment.period": "Same as repayment period",
+  "mifos-standard-strategy": "Penalties, Fees, Interest, Principal order",
+  "rbi-india-strategy": "Overdue/Due Fee/Int,Principal",
+  "principal-interest-penalties-fees-order-strategy": "Principal, Interest, Penalties, Fees Order",
+  "interest-principal-penalties-fees-order-strategy": "Interest, Principal, Penalties, Fees Order",
+  "early-repayment-strategy": "Early Repayment Strategy",
+  "heavensfamily-strategy": "HeavensFamily Unique",
+  "creocore-strategy": "Creocore Unique",
+  "validation.msg.loan.description.cannot.be.blank": "Description cannot be blank",
+  "DaysInYearType.actual": "Actual",
+  "DaysInYearType.days360": "360 Days",
+  "DaysInYearType.days364": "364 Days",
+  "DaysInYearType.days365": "365 Days",
+  "DaysInYearType.invalid": "Invalid",
+  "DaysInMonthType.actual": "Actual",
+  "DaysInMonthType.days360": "30 Days",
   "----End---": "--End of file--- "
 }
diff --git a/app/global-translations/locale-es.json b/app/global-translations/locale-es.json
index d2621f469f..54c6cbe7d1 100644
--- a/app/global-translations/locale-es.json
+++ b/app/global-translations/locale-es.json
@@ -4979,5 +4979,48 @@
 	"label.heading.billnumber": "Número de factura",
 	"label.view.principalpaymentdetail": "Pago principal",
 	"label.view.interestspayment": "Pago de intereses",
+	"loanTermFrequency.periodFrequencyType.days": "Días",
+	"loanTermFrequency.periodFrequencyType.weeks": "Semanas",
+	"loanTermFrequency.periodFrequencyType.months": "Meses",
+	"loanTermFrequency.periodFrequencyType.years": "Años",
+	"label.heading.on": "en",
+	"repaymentFrequency.nthDayType.one": "Primero",
+	"repaymentFrequency.nthDayType.two": "Segundo",
+	"repaymentFrequency.nthDayType.three": "Tercero",
+	"repaymentFrequency.nthDayType.four": "Cuarto",
+	"repaymentFrequency.nthDayType.last": "Último",
+	"repaymentFrequency.weekDayType.sunday": "DOMINGO",
+	"repaymentFrequency.weekDayType.monday": "LUNES",
+	"repaymentFrequency.weekDayType.tuesday": "MARTES",
+	"repaymentFrequency.weekDayType.wednesday": "MIÉRCOLES",
+	"repaymentFrequency.weekDayType.thursday": "JUEVES",
+	"repaymentFrequency.weekDayType.friday": "VIERNES",
+	"repaymentFrequency.weekDayType.saturday": "SÁBADO",
+	"interestRateFrequency.periodFrequencyType.days": "Por día",
+	"interestRateFrequency.periodFrequencyType.weeks": "Por semana",
+	"interestRateFrequency.periodFrequencyType.months": "Por mes",
+	"interestRateFrequency.periodFrequencyType.years": "Por año",
+	"interestRateFrequency.periodFrequencyType.whole_term": "Término completo",
+	"interestRateFrequency.periodFrequencyType.invalid": "Inválido",
+	"label.input.isequalamortization": "¿Es igual la amortización?",
+	"interestType.flat": "Plano",
+	"interestType.declining.balance": "Saldo decreciente",
+	"amortizationType.equal.installments": "Cuotas iguales",
+	"amortizationType.equal.principal": "Pagos iguales de principal",
+	"interestCalculationPeriodType.daily": "A diario",
+	"interestCalculationPeriodType.same.as.repayment.period": "Lo mismo que el período de amortización",
+	"mifos-standard-strategy": "Sanciones, Tarifas, Intereses, Orden principal",
+	"rbi-india-strategy": "Vencido/tarifa vencida/int,principal",
+	"principal-interest-penalties-fees-order-strategy": "Orden de capital, intereses, sanciones y comisiones",
+	"interest-principal-penalties-fees-order-strategy": "Intereses, Principal, Sanciones, Orden de Honorarios",
+	"early-repayment-strategy": "Estrategia de amortización anticipada",
+	"heavensfamily-strategy": "Cielos familia único",
+	"creocore-strategy": "Creocore único",
+	"validation.msg.loan.description.cannot.be.blank": "La descripción no puede estar en blanco",
+	"DaysInYearType.actual": "Actual",
+	"DaysInYearType.days360": "360 días",
+	"DaysInYearType.days364": "364 días",
+	"DaysInYearType.days365": "365 dias",
+	"DaysInYearType.invalid": "Invalid",
 	"----End---": "---Fin del archivo---"
 }
diff --git a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
index 7801dd9e46..eafea3fc0a 100755
--- a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
+++ b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
@@ -220,10 +220,10 @@
                             }
                         }
                     }
-                    scope.loandetails.interestValue = scope.loanaccountinfo.interestType.value;
-                    scope.loandetails.amortizationValue = scope.loanaccountinfo.amortizationType.value;
-                    scope.loandetails.interestCalculationPeriodValue = scope.loanaccountinfo.interestCalculationPeriodType.value;
-                    scope.loandetails.transactionProcessingStrategyValue = scope.formValue(scope.loanaccountinfo.transactionProcessingStrategyOptions, scope.formData.transactionProcessingStrategyId, 'id', 'name');
+                    scope.loandetails.interestValue = scope.loanaccountinfo.interestType.code;
+                    scope.loandetails.amortizationValue = scope.loanaccountinfo.amortizationType.code;
+                    scope.loandetails.interestCalculationPeriodValue = scope.loanaccountinfo.interestCalculationPeriodType.code;
+                    scope.loandetails.transactionProcessingStrategyValue = scope.formValue(scope.loanaccountinfo.transactionProcessingStrategyOptions, scope.formData.transactionProcessingStrategyId, 'id', 'code');
                     scope.datatables = data.datatables;
                     scope.handleDatatables(scope.datatables);
                     scope.disabled = false;
@@ -387,16 +387,16 @@
                 scope.formData.isEqualAmortization = scope.loanaccountinfo.isEqualAmortization;
                 scope.loandetails.amortizationValue = scope.loanaccountinfo.amortizationType.value;
                 scope.formData.interestType = scope.loanaccountinfo.interestType.id;
-                scope.loandetails.interestValue = scope.loanaccountinfo.interestType.value;
+                scope.loandetails.interestValue = scope.loanaccountinfo.interestType.code;
                 scope.formData.interestCalculationPeriodType = scope.loanaccountinfo.interestCalculationPeriodType.id;
-                scope.loandetails.interestCalculationPeriodValue = scope.loanaccountinfo.interestCalculationPeriodType.value;
+                scope.loandetails.interestCalculationPeriodValue = scope.loanaccountinfo.interestCalculationPeriodType.code;
                 scope.formData.allowPartialPeriodInterestCalcualtion = scope.loanaccountinfo.allowPartialPeriodInterestCalcualtion;
                 scope.formData.inArrearsTolerance = scope.loanaccountinfo.inArrearsTolerance;
                 scope.formData.graceOnPrincipalPayment = scope.loanaccountinfo.graceOnPrincipalPayment;
                 scope.formData.graceOnInterestPayment = scope.loanaccountinfo.graceOnInterestPayment;
                 scope.formData.graceOnArrearsAgeing = scope.loanaccountinfo.graceOnArrearsAgeing;
                 scope.formData.transactionProcessingStrategyId = scope.loanaccountinfo.transactionProcessingStrategyId;
-                scope.loandetails.transactionProcessingStrategyValue = scope.formValue(scope.loanaccountinfo.transactionProcessingStrategyOptions, scope.formData.transactionProcessingStrategyId, 'id', 'name');
+                scope.loandetails.transactionProcessingStrategyValue = scope.formValue(scope.loanaccountinfo.transactionProcessingStrategyOptions, scope.formData.transactionProcessingStrategyId, 'id', 'code');
                 scope.formData.graceOnInterestCharged = scope.loanaccountinfo.graceOnInterestCharged;
                 scope.formData.fixedEmiAmount = scope.loanaccountinfo.fixedEmiAmount;
                 scope.formData.maxOutstandingLoanBalance = scope.loanaccountinfo.maxOutstandingLoanBalance;
diff --git a/app/scripts/filters/YesOrNo.js b/app/scripts/filters/YesOrNo.js
index cbd722d170..f992285511 100644
--- a/app/scripts/filters/YesOrNo.js
+++ b/app/scripts/filters/YesOrNo.js
@@ -1,18 +1,18 @@
 (function (module) {
     mifosX.filters = _.extend(module, {
-        YesOrNo: function () {
+        YesOrNo: function ($filter, $locale) {
             return function (input) {
                 var status = 'No';
-                if (input == true) {
-                    status = 'Yes';
-                } else if (input == false) {
-                    status = 'No';
+                if (input === true) {
+                    status = $locale.id === 'es' ? 'Sí' : 'Yes';
+                } else if (input === false) {
+                    status = $locale.id === 'es' ? 'No' : 'No';
                 }
                 return status;
             }
         }
     });
-    mifosX.ng.application.filter('YesOrNo', ['dateFilter', mifosX.filters.YesOrNo]).run(function ($log) {
+    mifosX.ng.application.filter('YesOrNo', ['$filter', '$locale', mifosX.filters.YesOrNo]).run(function ($log) {
         $log.info("YesOrNo filter initialized");
     });
 }(mifosX.filters || {}));
diff --git a/app/views/loans/editloanaccount.html b/app/views/loans/editloanaccount.html
index b7a173496a..761bcb431b 100755
--- a/app/views/loans/editloanaccount.html
+++ b/app/views/loans/editloanaccount.html
@@ -175,7 +175,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                     <input id="loanTermFrequency" class="form-control" name="loanterm" type="text"
                            ng-model="formData.loanTermFrequency" required late-Validate/>
                     <select ng-disabled="response.uiDisplayConfigurations.loanAccount.isReadOnlyField.loanTermFrequencyType == true" id="loanTermFrequencyType" class="form-control" ng-model="formData.loanTermFrequencyType"
-                            ng-options="termFrequencyType.id as termFrequencyType.value for termFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
+                            ng-options="termFrequencyType.id as termFrequencyType.code | translate for termFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
                             value="{{termFrequencyType.id}}"/>
                     <form-validate valattributeform="editloanaccountform" valattribute="loanterm"/>
                 </td>
@@ -194,13 +194,13 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                            ng-model="formData.repaymentEvery" ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.repaymentEvery" required late-Validate/>
                     <select id="repaymentFrequencyType" class="form-control" ng-model="formData.repaymentFrequencyType"
                             ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.repaymentEvery"
-                            ng-options="repaymentFrequencyType.id as repaymentFrequencyType.value for repaymentFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
+                            ng-options="repaymentFrequencyType.id as repaymentFrequencyType.code | translate for repaymentFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
                             value="{{repaymentFrequencyType.id}}"/>&nbsp;
-                    <select id="repaymentFrequencyNthDayType" class="form-control" ng-model="formData.repaymentFrequencyNthDayType" ng-options="repaymentFrequencyNthDayType.id as repaymentFrequencyNthDayType.value for repaymentFrequencyNthDayType in loanaccountinfo.repaymentFrequencyNthDayTypeOptions" ng-show="formData.repaymentFrequencyType == 2" value="{{repaymentFrequencyNthDayType.id}}">
+                    <select id="repaymentFrequencyNthDayType" class="form-control" ng-model="formData.repaymentFrequencyNthDayType" ng-options="repaymentFrequencyNthDayType.id as repaymentFrequencyNthDayType.code | translate for repaymentFrequencyNthDayType in loanaccountinfo.repaymentFrequencyNthDayTypeOptions" ng-show="formData.repaymentFrequencyType == 2" value="{{repaymentFrequencyNthDayType.id}}">
                     <option value="">{{'label.selecton' | translate}}</option>
                     </select>&nbsp;
                     <select id="repaymentFrequencyDayOfWeekType" class="form-control" ng-model="formData.repaymentFrequencyDayOfWeekType"
-                    ng-options="repaymentFrequencyDayOfWeekType.id as repaymentFrequencyDayOfWeekType.value for  repaymentFrequencyDayOfWeekType in loanaccountinfo.repaymentFrequencyDaysOfWeekTypeOptions" ng-show="formData.repaymentFrequencyType == 2" value="{{repaymentFrequencyDayOfWeekType.id}}">
+                    ng-options="repaymentFrequencyDayOfWeekType.id as repaymentFrequencyDayOfWeekType.code | translate for  repaymentFrequencyDayOfWeekType in loanaccountinfo.repaymentFrequencyDaysOfWeekTypeOptions" ng-show="formData.repaymentFrequencyType == 2" value="{{repaymentFrequencyDayOfWeekType.id}}">
                     <option value="">{{'label.selectday' | translate}}</option>
                     </select>&nbsp;
                     <form-validate valattributeform="editloanaccountform" valattribute="repaidevery"/>
@@ -231,7 +231,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                 <td ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType == true"><label>{{ 'label.input.interestmethod' | translate }}</label></td>
                 <td class="paddedbottom10" ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType == true">
                      <select id="interestType" ng-model="formData.interestType" class="form-control width170px"
-                            ng-options="interestType.id as interestType.value for interestType in loanaccountinfo.interestTypeOptions"
+                            ng-options="interestType.id as interestType.code | translate for interestType in loanaccountinfo.interestTypeOptions"
                             value="{{interestType.id}}" ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.interestType"/>
                 </td>
             </tr>
@@ -246,7 +246,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                 <td class="width36 paddedbottom10" ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType == true">
                     <select id="interestType" ng-model="formData.interestType"
                             ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.interestType"
-                            ng-options="interestType.id as interestType.value for interestType in loanaccountinfo.interestTypeOptions" class="form-control width170px"
+                            ng-options="interestType.id as interestType.code | translate for interestType in loanaccountinfo.interestTypeOptions" class="form-control width170px"
                             value="{{interestType.id}}"/>
                     <label>{{ 'label.input.isfloatingrate' | translate}}</label>
                     <input id="isfloatingrate" class="input-mini-small" type="checkbox"
@@ -259,7 +259,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                 </td>
                 <td class="paddedbottom10" ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.amortizationType == true">
                     <select id="amortizationType" ng-model="formData.amortizationType" class="form-control width170px"
-                            ng-options="amortizationType.id as amortizationType.value for amortizationType in loanaccountinfo.amortizationTypeOptions"
+                            ng-options="amortizationType.id as amortizationType.code | translate for amortizationType in loanaccountinfo.amortizationTypeOptions"
                             value="{{amortizationType.id}}" ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.amortizationType"/>
                 </td>
                 <td ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType == true"><label>{{ 'label.input.isequalamortization' | translate }}</label></td>
@@ -283,7 +283,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                         class="required">*</span></label></td>
                 <td class="paddedbottom10" ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestCalculationPeriodType == true">
                     <select id="interestCalculationPeriodType" ng-model="formData.interestCalculationPeriodType"
-                            ng-options="interestCalculationPeriodType.id as interestCalculationPeriodType.value for interestCalculationPeriodType in loanaccountinfo.interestCalculationPeriodTypeOptions" class="form-control width170px"
+                            ng-options="interestCalculationPeriodType.id as interestCalculationPeriodType.code | translate for interestCalculationPeriodType in loanaccountinfo.interestCalculationPeriodTypeOptions" class="form-control width170px"
                             value="{{interestCalculationPeriodType.id}}" ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.interestCalculationPeriodType"/>
                 </td>
                 <td colspan="2" ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestCalculationPeriodType == true || formData.interestCalculationPeriodType == 0"><label>{{ 'label.input.allowpartialperiodinterestcalcualtion' | translate }}&nbsp;</label>
@@ -310,7 +310,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                         class="required">*</span></label></td>
                 <td class="paddedbottom10" ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.transactionProcessingStrategyId == true">
                     <select id="transactionProcessingStrategyId" ng-model="formData.transactionProcessingStrategyId" class="form-control width170px"
-                            ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.name for transactionProcessingStrategy in loanaccountinfo.transactionProcessingStrategyOptions"
+                            ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.code | translate for transactionProcessingStrategy in loanaccountinfo.transactionProcessingStrategyOptions"
                             value="{{transactionProcessingStrategy.id}}" ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.transactionProcessingStrategyId"/>
                 </td>
                 <td colspan=2 class="paddedbottom10">
@@ -363,7 +363,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                     <label>{{ 'label.input.daysinyears' | translate }}</label>
                 </td>
                 <td class="paddedbottom10">
-                    <label>{{ loanaccountinfo.daysInYearType.value}}</label>
+                    <label>{{ loanaccountinfo.daysInYearType.code | translate}}</label>
                 </td>
             </tr>
             <tr data-ng-show="loanaccountinfo.isInterestRecalculationEnabled">
@@ -1745,10 +1745,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                     <input type="text" class="form-control" id="totalIncome"
                                            name="totalIncome" disabled
-                                           number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                           ng-model="formData.totalIncome"
-                                           late-Validate/>
-                                    <form-validate valattributeform="editloanaccountform" valattribute="totalIncome"/>
+                                           ng-model="formData.totalIncome"/>
                                 </td>
 
                                 <td class="width14">
@@ -1759,10 +1756,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                     <input type="text" class="form-control" id="totalExpenditures"
                                            name="totalExpenditures" disabled
-                                           number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                           ng-model="formData.totalExpenditures"
-                                           late-Validate/>
-                                    <form-validate valattributeform="editloanaccountform" valattribute="totalExpenditures"/>
+                                           ng-model="formData.totalExpenditures"/>
                                 </td>
                                 <td class="width14">
                                     <label class="ml-2">{{ 'label.input.availableMonthly' | translate
@@ -1772,10 +1766,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                     <input type="text" class="form-control" id="availableMonthly"
                                            name="availableMonthly" disabled
-                                           number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                           ng-model="formData.availableMonthly"
-                                           late-Validate/>
-                                    <form-validate valattributeform="editloanaccountform" valattribute="availableMonthly"/>
+                                           ng-model="formData.availableMonthly"/>
                                 </td>
                             </tr>
                             <tr>
@@ -1787,10 +1778,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                     <input type="text" class="form-control" id="paymentCapacity"
                                            name="paymentCapacity" disabled
-                                           number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                           ng-model="formData.paymentCapacity"
-                                           late-Validate/>
-                                    <form-validate valattributeform="editloanaccountform" valattribute="paymentCapacity"/>
+                                           ng-model="formData.paymentCapacity"/>
                                 </td>
 
                                 <td class="width14">
@@ -1800,10 +1788,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                     <input type="text" class="form-control" id="facValue"
                                            name="facValue" disabled
-                                           number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                           ng-model="formData.facValue"
-                                           late-Validate/>
-                                    <form-validate valattributeform="editloanaccountform" valattribute="facValue"/>
+                                           ng-model="formData.facValue"/>
                                 </td>
 
                                 <td class="width14">
@@ -1813,10 +1798,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                     <input type="text" class="form-control" id="debtLevel"
                                            name="debtLevel" disabled
-                                           number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                           ng-model="formData.debtLevel"
-                                           late-Validate/>
-                                    <form-validate valattributeform="editloanaccountform" valattribute="debtLevel"/>
+                                           ng-model="formData.debtLevel"/>
                                 </td>
                             </tr>
                         </table>
diff --git a/app/views/loans/newglimaccount.html b/app/views/loans/newglimaccount.html
index 093b7ad904..4f5bdd29ca 100644
--- a/app/views/loans/newglimaccount.html
+++ b/app/views/loans/newglimaccount.html
@@ -100,7 +100,7 @@
                                                         <input id="loanTermFrequency" class="form-control" name="loanterm" type="text"
                                                                ng-model="formData.loanTermFrequency" required late-Validate/>
                                                         <select id="loanTermFrequencyType" class="form-control" ng-model="formData.loanTermFrequencyType"
-                                                                ng-options="termFrequencyType.id as termFrequencyType.value for termFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
+                                                                ng-options="termFrequencyType.id as termFrequencyType.code | translate for termFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
                                                                 value="{{termFrequencyType.id}}"/>
                                                         <form-validate valattributeform="newloanaccountform" valattribute="loanterm"/>
                                                     </td>
@@ -119,7 +119,7 @@
                                                         <input id="repaymentEvery" class="form-control" type="text" name="repaidevery"
                                                                ng-model="formData.repaymentEvery" ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.repaymentEvery" required late-Validate/>
                                                         <select id="repaymentFrequencyType" class="form-control" ng-model="formData.repaymentFrequencyType"
-                                                                ng-options="repaymentFrequencyType.id as repaymentFrequencyType.value for repaymentFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
+                                                                ng-options="repaymentFrequencyType.id as repaymentFrequencyType.code | translate for repaymentFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
                                                                 ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.repaymentEvery"
                                                                 value="{{repaymentFrequencyType.id}}"/>&nbsp;<span ng-show="formData.repaymentFrequencyType == 2">on</span>
                                                         <select id="repaymentFrequencyNthDayType" class="form-control" ng-model="formData.repaymentFrequencyNthDayType"
diff --git a/app/views/loans/newloanaccount.html b/app/views/loans/newloanaccount.html
index 90340dea1f..e1089226d3 100755
--- a/app/views/loans/newloanaccount.html
+++ b/app/views/loans/newloanaccount.html
@@ -269,7 +269,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                         id="loanTermFrequencyType"
                                         class="form-control" ng-model="formData.loanTermFrequencyType"
                                         ng-change="loandetails.loanTermFrequencyValue = formValue(loanaccountinfo.termFrequencyTypeOptions,formData.loanTermFrequencyType)"
-                                        ng-options="termFrequencyType.id as termFrequencyType.value for termFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
+                                        ng-options="termFrequencyType.id as termFrequencyType.code | translate for termFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
                                         value="{{termFrequencyType.id}}"></select>
                                 <form-validate valattributeform="Terms" valattribute="loanterm"/>
                             </td>
@@ -302,15 +302,15 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 <select id="repaymentFrequencyType" class="form-control"
                                         ng-model="formData.repaymentFrequencyType"
                                         ng-change="loandetails.repaymentFrequencyValue = formValue(loanaccountinfo.termFrequencyTypeOptions,formData.repaymentFrequencyType)"
-                                        ng-options="repaymentFrequencyType.id as repaymentFrequencyType.value for repaymentFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
+                                        ng-options="repaymentFrequencyType.id as repaymentFrequencyType.code | translate for repaymentFrequencyType in loanaccountinfo.termFrequencyTypeOptions"
                                         ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.repaymentEvery"
                                         value="{{repaymentFrequencyType.id}}"></select>&nbsp;
-                                <span ng-show="formData.repaymentFrequencyType == 2">on</span>
+                                <span ng-show="formData.repaymentFrequencyType == 2">{{'label.heading.on' | translate}}</span>
                                 <select id="repaymentFrequencyNthDayType" class="form-control"
                                         ng-disabled="disableFrequencySelect"
                                         ng-model="formData.repaymentFrequencyNthDayType"
                                         ng-change="loandetails.repaymentFrequencyNthDayValue = formValue(loanaccountinfo.repaymentFrequencyNthDayTypeOptions,formData.repaymentFrequencyNthDayType)"
-                                        ng-options="repaymentFrequencyNthDayType.id as repaymentFrequencyNthDayType.value for repaymentFrequencyNthDayType in loanaccountinfo.repaymentFrequencyNthDayTypeOptions"
+                                        ng-options="repaymentFrequencyNthDayType.id as repaymentFrequencyNthDayType.code | translate for repaymentFrequencyNthDayType in loanaccountinfo.repaymentFrequencyNthDayTypeOptions"
                                         ng-show="formData.repaymentFrequencyType == 2"
                                         value="{{repaymentFrequencyNthDayType.id}}">
                                     <option value="">{{'label.selecton' | translate}}</option>
@@ -319,7 +319,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                         ng-disabled="disableDaySelect"
                                         ng-model="formData.repaymentFrequencyDayOfWeekType"
                                         ng-change="loandetails.repaymentFrequencyDayOfWeekValue = formValue(loanaccountinfo.repaymentFrequencyDaysOfWeekTypeOptions,formData.repaymentFrequencyDayOfWeekType)"
-                                        ng-options="repaymentFrequencyDayOfWeekType.id as repaymentFrequencyDayOfWeekType.value for repaymentFrequencyDayOfWeekType in loanaccountinfo.repaymentFrequencyDaysOfWeekTypeOptions"
+                                        ng-options="repaymentFrequencyDayOfWeekType.id as repaymentFrequencyDayOfWeekType.code | translate for repaymentFrequencyDayOfWeekType in loanaccountinfo.repaymentFrequencyDaysOfWeekTypeOptions"
                                         ng-show="formData.repaymentFrequencyType == 2"
                                         value="{{repaymentFrequencyDayOfWeekType.id}}">
                                     <option value="">{{'label.selectday' | translate}}</option>
@@ -364,7 +364,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 <input id="interestRatePerPeriod" class="form-control" type="text"
                                        name="nominalinterestrate" ng-model="formData.interestRatePerPeriod"
                                        ng-disabled="ratesEnabled&&rateFlag"
-                                />&nbsp;&nbsp;{{loanaccountinfo.interestRateFrequencyType.value}}
+                                />&nbsp;&nbsp;{{loanaccountinfo.interestRateFrequencyType.code | translate}}
                             </td>
                             <td ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType == true">
                                 <label>{{ 'label.input.interestmethod' | translate }}</label>
@@ -375,7 +375,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                     <select id="interestType" ng-model="formData.interestType"
                                             ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.interestType"
                                             ng-change="loandetails.interestValue = formValue(loanaccountinfo.interestTypeOptions,formData.interestType)"
-                                            ng-options="interestType.id as interestType.value for interestType in loanaccountinfo.interestTypeOptions"
+                                            ng-options="interestType.id as interestType.code | translate for interestType in loanaccountinfo.interestTypeOptions"
                                             class="form-control width170px" value="{{interestType.id}}"></select>
                                     <label class="col-sm-offset-1">{{ 'label.input.isequalamortization' | translate
                                         }}</label>
@@ -403,7 +403,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType == true">
                                 <select id="interestType1" ng-model="formData.interestType"
                                         ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.interestType"
-                                        ng-options="interestType.id as interestType.value for interestType in loanaccountinfo.interestTypeOptions"
+                                        ng-options="interestType.id as interestType.code | translate for interestType in loanaccountinfo.interestTypeOptions"
                                         class="form-control width170px" value="{{interestType.id}}"/>
                                 <label>{{ 'label.input.isfloatingrate' | translate}}</label>
                                 <input id="isfloatingrate" class="input-mini-small" type="checkbox"
@@ -421,7 +421,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 <select id="amortizationType" ng-model="formData.amortizationType"
                                         class="form-control width170px"
                                         ng-change="loandetails.amortizationValue = formValue(loanaccountinfo.amortizationTypeOptions,formData.amortizationType)"
-                                        ng-options="amortizationType.id as amortizationType.value for amortizationType in loanaccountinfo.amortizationTypeOptions"
+                                        ng-options="amortizationType.id as amortizationType.code | translate for amortizationType in loanaccountinfo.amortizationTypeOptions"
                                         value="{{amortizationType.id}}"
                                         ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.amortizationType"></select>
                             </td>
@@ -450,7 +450,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 <select id="interestCalculationPeriodType"
                                         ng-model="formData.interestCalculationPeriodType"
                                         ng-change="loandetails.interestCalculationPeriodValue = formValue(loanaccountinfo.interestCalculationPeriodTypeOptions,formData.interestCalculationPeriodType)"
-                                        ng-options="interestCalculationPeriodType.id as interestCalculationPeriodType.value for interestCalculationPeriodType in loanaccountinfo.interestCalculationPeriodTypeOptions"
+                                        ng-options="interestCalculationPeriodType.id as interestCalculationPeriodType.code | translate for interestCalculationPeriodType in loanaccountinfo.interestCalculationPeriodTypeOptions"
                                         class="form-control width170px" value="{{interestCalculationPeriodType.id}}"
                                         ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.interestCalculationPeriodType"></select>
                             </td>
@@ -496,7 +496,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 <select id="transactionProcessingStrategyId"
                                         ng-model="formData.transactionProcessingStrategyId"
                                         ng-change="loandetails.transactionProcessingStrategyValue = formValue(loanaccountinfo.transactionProcessingStrategyOptions,formData.transactionProcessingStrategyId,'id','name')"
-                                        ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.name for transactionProcessingStrategy in loanaccountinfo.transactionProcessingStrategyOptions"
+                                        ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.code | translate for transactionProcessingStrategy in loanaccountinfo.transactionProcessingStrategyOptions"
                                         value="{{transactionProcessingStrategy.id}}"
                                         ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.transactionProcessingStrategyId"
                                         class="form-control width170px"></select>
@@ -560,16 +560,14 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 <label class="control-label">{{ 'label.input.recalculateinterest' | translate }}</label>
                             </td>
                             <td class="paddedbottom20">
-                                <label class="control-label">{{ loanaccountinfo.isInterestRecalculationEnabled | YesOrNo
-                                    }}
-                                </label>
+                                <label class="control-label">{{ loanaccountinfo.isInterestRecalculationEnabled | YesOrNo}}</label>
                             </td>
-                            <td data-ng-show="loanaccountinfo.isInterestRecalculationEnabled">
+                            <td>
                                 <label>{{ 'label.input.daysinyears' | translate }}</label>
                                 <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.days' | translate}}"></i>
                             </td>
                             <td class="paddedbottom20">
-                                <label>{{ loanaccountinfo.daysInYearType.value}}</label>
+                                <label>{{ loanaccountinfo.daysInYearType.code | translate}}</label>
                             </td>
                         </tr>
                         <tr data-ng-show="loanaccountinfo.isInterestRecalculationEnabled">
@@ -578,7 +576,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                             </td>
                             <td class="paddedbottom20"
                                 ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenSection.interestRecalculationSection == true">
-                                <label>{{ loanaccountinfo.interestRecalculationData.rescheduleStrategyType.value}}
+                                <label>{{ loanaccountinfo.interestRecalculationData.rescheduleStrategyType.code | translate}}
                                 </label>
                             </td>
                             <td ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenSection.interestRecalculationSection == true">
@@ -587,7 +585,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                             </td>
                             <td class="paddedbottom20"
                                 ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenSection.interestRecalculationSection == true">
-                                <label>{{ loanaccountinfo.daysInMonthType.value }}</label>
+                                <label>{{ loanaccountinfo.daysInMonthType.code | translate }}</label>
                             </td>
                         </tr>
                         <tr data-ng-show="loanaccountinfo.isInterestRecalculationEnabled">
@@ -613,7 +611,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                                 </label>
                                 <label data-ng-show="loanaccountinfo.interestRecalculationData.recalculationRestFrequencyType.id == 3 &&
                                             loanaccountinfo.interestRecalculationData.recalculationRestFrequencyWeekday != null">
-                                    on
+                                    {{label.heading.on}}
                                     {{ loanaccountinfo.interestRecalculationData.recalculationRestFrequencyWeekday.value}}
                                 </label>
                                 <label data-ng-show="loanaccountinfo.interestRecalculationData.recalculationRestFrequencyType.id == 4 &&
@@ -2208,8 +2206,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                         <input type="text" class="form-control" id="totalIncome"
                                                name="totalIncome" disabled
-                                               ng-model="formData.totalIncome" number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                               late-Validate/>
+                                               ng-model="formData.totalIncome"/>
                                         <form-validate valattributeform="Additionals" valattribute="totalIncome"/>
                                     </td>
 
@@ -2221,8 +2218,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                         <input type="text" class="form-control" id="totalExpenditures"
                                                name="totalExpenditures" disabled
-                                               ng-model="formData.totalExpenditures" number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                               late-Validate/>
+                                               ng-model="formData.totalExpenditures"/>
                                         <form-validate valattributeform="Additionals" valattribute="totalExpenditures"/>
                                     </td>
                                     <td class="width14">
@@ -2233,8 +2229,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                         <input type="text" class="form-control" id="availableMonthly"
                                                name="availableMonthly" disabled
-                                               ng-model="formData.availableMonthly" number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                               late-Validate/>
+                                               ng-model="formData.availableMonthly"/>
                                         <form-validate valattributeform="Additionals" valattribute="availableMonthly"/>
                                     </td>
                                 </tr>
@@ -2247,8 +2242,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                         <input type="text" class="form-control" id="paymentCapacity"
                                                name="paymentCapacity" disabled
-                                               ng-model="formData.paymentCapacity" number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                               late-Validate/>
+                                               ng-model="formData.paymentCapacity"/>
                                         <form-validate valattributeform="Additionals" valattribute="paymentCapacity"/>
                                     </td>
 
@@ -2259,8 +2253,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                         <input type="text" class="form-control" id="facValue"
                                                name="facValue" disabled
-                                               ng-model="formData.facValue" number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                               late-Validate/>
+                                               ng-model="formData.facValue"/>
                                         <form-validate valattributeform="Additionals" valattribute="facValue"/>
                                     </td>
 
@@ -2271,8 +2264,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
 
                                         <input type="text" class="form-control" id="debtLevel"
                                                name="debtLevel" disabled
-                                               ng-model="formData.debtLevel" number-format ng-pattern="/^(?!,$)[\d,.]+$/"
-                                               late-Validate/>
+                                               ng-model="formData.debtLevel"/>
                                         <form-validate valattributeform="Additionals" valattribute="debtLevel"/>
                                     </td>
                                 </tr>
@@ -2430,7 +2422,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         </tr>
                         <tr>
                             <td colspan="6">{{ 'label.input.loanterm' | translate }}</td>
-                            <td>{{loandetails.loanTermFrequency}} {{loandetails.loanTermFrequencyValue}}</td>
+                            <td>{{loandetails.loanTermFrequency}} {{loandetails.loanTermFrequencyValue | translate}}</td>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.numberOfRepayments">
                             <td colspan="6">
@@ -2440,7 +2432,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.repaymentEvery">
                             <td colspan="6">{{ 'label.input.repaidevery' | translate }}</td>
-                            <td>{{loandetails.repaymentEvery}} {{loandetails.repaymentFrequencyValue}}
+                            <td>{{loandetails.repaymentEvery}} {{loandetails.repaymentFrequencyValue | translate}}
                                 {{loandetails.repaymentFrequencyNthDayValue}}
                                 {{loandetails.repaymentFrequencyDayOfWeekValue}}
                             </td>
@@ -2456,7 +2448,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         <tr ng-show="!loanaccountinfo.isLoanProductLinkedToFloatingRate">
                             <td colspan="6">{{ 'label.input.nominalinterestrate' | translate }}</td>
                             <td>
-                                {{loandetails.interestRatePerPeriod}}&nbsp;&nbsp;{{loanaccountinfo.interestRateFrequencyType.value}}
+                                {{loandetails.interestRatePerPeriod}}&nbsp;&nbsp;{{loanaccountinfo.interestRateFrequencyType.code | translate}}
                             </td>
                         </tr>
                         <tr ng-show="loanaccountinfo.isLoanProductLinkedToFloatingRate">
@@ -2465,7 +2457,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType">
                             <td colspan="6">{{ 'label.input.interestmethod' | translate }}</td>
-                            <td>{{loandetails.interestValue}}</td>
+                            <td>{{loandetails.interestValue | translate}}</td>
                         </tr>
                         <tr ng-show="loanaccountinfo.isLoanProductLinkedToFloatingRate">
                             <td colspan="6">{{ 'label.input.isfloatingrate' | translate}}</td>
@@ -2473,11 +2465,11 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestType">
                             <td colspan="6">{{ 'label.input.isequalamortization' | translate }}</td>
-                            <td>{{loandetails.isEqualAmortization}}</td>
+                            <td>{{loandetails.isEqualAmortization | YesOrNo }}</td>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.amortizationType">
                             <td colspan="6">{{ 'label.input.amortization' | translate }}&nbsp;</td>
-                            <td>{{loandetails.amortizationValue}}</td>
+                            <td>{{loandetails.amortizationValue | translate}}</td>
                         </tr>
                         <tr ng-show="formData.amortizationType == 0">
                             <td colspan="6">{{ 'label.input.fixed.pricipal.percentage.per.installment' | translate }}&nbsp;</td>
@@ -2485,7 +2477,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestCalculationPeriodType">
                             <td colspan="6">{{ 'label.input.interestcalculationperiod' | translate }}&nbsp;</td>
-                            <td>{{loandetails.interestCalculationPeriodValue}}</td>
+                            <td>{{loandetails.interestCalculationPeriodValue | translate}}</td>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.interestCalculationPeriodType || formData.interestCalculationPeriodType == 0">
                             <td colspan="6">{{ 'label.input.allowpartialperiodinterestcalcualtion' | translate
@@ -2503,7 +2495,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.transactionProcessingStrategyId">
                             <td colspan="6">{{ 'label.input.repaymentstrategy' | translate }}&nbsp;</td>
-                            <td>{{loandetails.transactionProcessingStrategyValue}}</td>
+                            <td>{{loandetails.transactionProcessingStrategyValue | translate}}</td>
                         </tr>
                         <tr class="bottomborder toppadding">
                             <td colspan="7">
@@ -2540,7 +2532,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                         </tr>
                         <tr ng-show="loanaccountinfo.isInterestRecalculationEnabled">
                             <td colspan="6">{{ 'label.input.daysinyears' | translate }}</td>
-                            <td>{{ loanaccountinfo.daysInYearType.value}}</td>
+                            <td>{{ loanaccountinfo.daysInYearType.code | translate}}</td>
                         </tr>
                         <tr data-ng-show="loanaccountinfo.isInterestRecalculationEnabled">
                             <td colspan="6"
@@ -2548,12 +2540,12 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                                 {{ 'label.input.interest.recalculation.reschdule.strategy' | translate }}
                             </td>
                             <td ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenSection.interestRecalculationSection == true">
-                                {{ loanaccountinfo.interestRecalculationData.rescheduleStrategyType.value}}
+                                {{ loanaccountinfo.interestRecalculationData.rescheduleStrategyType.code | translate}}
                             </td>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenSection.interestRecalculationSection">
                             <td colspan="6">{{ 'label.input.daysinmonth' | translate }}</td>
-                            <td>{{ loanaccountinfo.daysInMonthType.value }}</td>
+                            <td>{{ loanaccountinfo.daysInMonthType.code | translate }}</td>
                         </tr>
                         <tr data-ng-show="loanaccountinfo.isInterestRecalculationEnabled">
                             <td colspan="6"
@@ -2561,7 +2553,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                                 {{ 'label.input.interest.recalculation.compounding.method' | translate }}
                             </td>
                             <td ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenSection.interestRecalculationSection == true">
-                                {{ loanaccountinfo.interestRecalculationData.interestRecalculationCompoundingType.value}}
+                                {{ loanaccountinfo.interestRecalculationData.interestRecalculationCompoundingType.code | translate}}
                             </td>
                         </tr>
                         <tr ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenSection.interestRecalculationSection">
@@ -2572,7 +2564,7 @@ <h3>{{'label.heading.analysis' | translate}}</h3>
                                 {{ loanaccountinfo.interestRecalculationData.recalculationRestFrequencyType.value}}</label>
                                 <label data-ng-show="loanaccountinfo.interestRecalculationData.recalculationRestFrequencyType.id == 3 &&
                                             loanaccountinfo.interestRecalculationData.recalculationRestFrequencyWeekday != null">
-                                    on
+                                    {{'label.heading.on' | translate}}
                                     {{ loanaccountinfo.interestRecalculationData.recalculationRestFrequencyWeekday.value}}
                                 </label>
                                 <label data-ng-show="loanaccountinfo.interestRecalculationData.recalculationRestFrequencyType.id == 4 &&