diff --git a/app/scripts/directives/LateValidateDirective.js b/app/scripts/directives/LateValidateDirective.js
index 01461fe0..01640a08 100644
--- a/app/scripts/directives/LateValidateDirective.js
+++ b/app/scripts/directives/LateValidateDirective.js
@@ -2,11 +2,13 @@
     mifosX.directives = _.extend(module, {
         LateValidateDirective: function () {
             var numRegex = /^([0-9])*([0-9]+(,)[0-9]+)*$/;
+            var decimalRegex=/^([0-9])*([0-9]+(,)[0-9]+)*([0-9]+(\.)[0-9]+)*$/;
             return {
                 restrict: 'A',
                 require: 'ngModel',
                 scope:{
-                    number:'@number'
+                    number:'@number',
+                    decimalNumber:'@decimalNumber'
                 },
 
                 link: function (scope, elm, attr, ctrl) {
@@ -14,6 +16,7 @@
                     elm.bind('blur', function () {
                         scope.$apply(function () {
                             var isMatchRegex = numRegex.test(elm.val());
+                            var isDecimalMatchRegex=decimalRegex.test(elm.val());
                             if (elm.val() == "") {
                                 ctrl.$setValidity('req', false);
                             } else {
@@ -26,6 +29,13 @@
                                     ctrl.$setValidity('nval', false);
                                 }
                             }
+                            if(scope.decimalNumber) {
+                                if (isDecimalMatchRegex || elm.val() == '') {
+                                    ctrl.$setValidity('nval', true);
+                                } else {
+                                    ctrl.$setValidity('nval', false);
+                                }
+                            }
                         });
                     });
                 }
diff --git a/app/views/products/createfixeddepositproduct.html b/app/views/products/createfixeddepositproduct.html
index 8f2022e9..8e02e96a 100755
--- a/app/views/products/createfixeddepositproduct.html
+++ b/app/views/products/createfixeddepositproduct.html
@@ -12,23 +12,22 @@
                     <!--<h3>{{ 'label.heading.details' | translate }}</h3>-->
                     <hr>
                     <div class="form-group">
-                        <label class="control-label col-sm-2">{{ 'label.input.productname' | translate }}<span
-                                class="required">*</span></label>
+                        <label class="control-label col-sm-2">{{ 'label.input.productname' | translate }}<span class="required">*</span></label>
                         <div class="col-sm-2">
                             <input type="text" id="name" class="form-control" name="name" ng-model="formData.name"
-                                   required late-validate/>
+                                required late-validate />
                         </div>
                         <div class="col-sm-2">
-                            <form-validate valattributeform="Details" valattribute="name"/>
+                            <form-validate valattributeform="Details" valattribute="name" />
                         </div>
                         <label class="control-label col-sm-2">{{ 'label.input.product.shortname' | translate }}<span
                                 class="required">*</span></label>
                         <div class="col-sm-2">
-                            <input type="text" id="shortName" name="shortName" ng-model="formData.shortName"
-                                   class="form-control" maxlength="4" required late-validate/>
+                            <input type="text" id="shortName" name="shortName" ng-model="formData.shortName" class="form-control"
+                                maxlength="4" required late-validate />
                         </div>
                         <div class="col-sm-2">
-                            <form-validate valattributeform="Details" valattribute="shortName"/>
+                            <form-validate valattributeform="Details" valattribute="shortName" />
                         </div>
                     </div>
                     <div class="form-group">
@@ -53,36 +52,43 @@
                     <!--<h3>{{ 'label.heading.currency' | translate }}</h3>-->
                     <hr>
                     <div class="form-group">
-                        <label class="control-label col-sm-2">{{ 'label.input.currency' | translate }}<span
-                                class="required">*</span></label>
+                        <label class="control-label col-sm-2">{{ 'label.input.currency' | translate }}<span class="required">*</span></label>
                         <div class="col-sm-2">
-                            <select id="currencyCode" ng-model="formData.currencyCode" class="form-control"
-                                    ng-options="currency.code as currency.name for currency in product.currencyOptions"
-                                    ng-change="depositproduct.currency.name = formValue(product.currencyOptions,formData.currencyCode,'code','name')"
-                                    value="{{currency.code}}">
+                            <select id="currencyCode" ng-model="formData.currencyCode" class="form-control" ng-options="currency.code as currency.name for currency in product.currencyOptions"
+                                ng-change="depositproduct.currency.name = formValue(product.currencyOptions,formData.currencyCode,'code','name')"
+                                value="{{currency.code}}">
                             </select>
                         </div>
-                        <label class="control-label col-sm-2 col-sm-offset-2">{{ 'label.input.decimalplaces' | translate
+                        <label class="control-label col-sm-2 col-sm-offset-2">{{ 'label.input.decimalplaces' |
+                            translate
                             }}<span class="required">*</span></label>
                         <div class="col-sm-2">
                             <input type="text" id="digitsAfterDecimal" name="decimalplace" class="form-control"
-                                   ng-model="formData.digitsAfterDecimal" required late-validate/>
+                                ng-model="formData.digitsAfterDecimal" required  late-validate number=true />
                         </div>
                         <div class="col-sm-2">
-                            <form-validate valattributeform="Currency"
-                                           valattribute="decimalplace"/>
+                            <form-validate valattributeform="Currency" valattribute="decimalplace" />
+                            <span ng-show="Currency.decimalplace.$invalid && Currency.decimalplace.$dirty">
+                                <small class="required error" ng-show="Currency.decimalplace.$error.pattern">
+                                    {{'label.mustbenumeric' | translate}}
+                                </small>
+                            </span>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="control-label col-sm-2">{{ 'label.input.multiplesof' | translate }}<span
-                                class="required">*</span></label>
+                        <label class="control-label col-sm-2">{{ 'label.input.multiplesof' | translate }}<span class="required">*</span></label>
                         <div class="col-sm-2">
                             <input type="text" id="inMultiplesOf" class="form-control" name="multiplesof" number-format
-                                   ng-model="formData.inMultiplesOf"
-                                   required late-validate number=true/>
+                                ng-model="formData.inMultiplesOf" required 
+                                late-validate number=true />
                         </div>
                         <div class="col-sm-2">
-                            <form-validate valattributeform="Currency" valattribute="multiplesof"/>
+                            <form-validate valattributeform="Currency" valattribute="multiplesof" />
+                            <span ng-show="Currency.multiplesof.$invalid && Currency.multiplesof.$dirty">
+                                <small class="required error" ng-show="Currency.multiplesof.$error.pattern">
+                                    {{'label.mustbenumeric' | translate}}
+                                </small>
+                            </span>
                         </div>
                     </div>
                     <hr>
@@ -94,7 +100,7 @@
             </form>
         </wz-step>
         <wz-step wz-title="{{'label.heading.terms' | translate}}">
-            <form name="Terms"  ng-submit="goNext(Terms)" novalidate="" class="form-horizontal">
+            <form name="Terms" ng-submit="goNext(Terms)" novalidate="" class="form-horizontal">
                 <fieldset>
                     <api-validate></api-validate>
                     <!--<h3>{{ 'label.heading.terms' | translate }}</h3>-->
@@ -102,99 +108,94 @@
                     <div class="form-group">
                         <label class="control-label col-sm-2">{{ 'label.input.default.deposit.amount' | translate
                             }}<span class="required">*</span>
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.defaultamount' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.defaultamount' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <input type="text" id="depositAmount" name="depositAmount" class="form-control"
-                                   number-format ng-model="formData.depositAmount" required late-validate/>
+                                number-format ng-model="formData.depositAmount" required 
+                                late-validate decimal-number=true />
                         </div>
                         <div class="col-sm-2">
-                            <form-validate valattributeform="Terms"
-                                           valattribute="depositAmount"/>
+                            <form-validate valattributeform="Terms" valattribute="depositAmount" />
+                            <span ng-show="Terms.depositAmount.$invalid && Terms.depositAmount.$dirty">
+                                <small class="required error" ng-show="Terms.depositAmount.$error.pattern">
+                                    {{'label.mustbenumeric' | translate}}
+                                </small>
+                            </span>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="control-label col-sm-2">{{ 'label.input.minDepositAmount' | translate }}
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.minimumamount' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.minimumamount' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <input type="text" id="minDepositAmount" name="minDepositAmount" class="form-control"
-                                   number-format ng-model="formData.minDepositAmount" late-validate/>
-                            <form-validate valattributeform="Terms" valattribute="minDepositAmount"/>
+                                number-format ng-model="formData.minDepositAmount" late-validate decimal-number=true />
+                            <form-validate valattributeform="Terms" valattribute="minDepositAmount" />
                         </div>
-                        <label class="control-label col-sm-2 col-sm-offset-2">{{ 'label.input.maxDepositAmount' |
+                        <label class="control-label col-sm-2">{{ 'label.input.maxDepositAmount' |
                             translate }}
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.maximumamount' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.maximumamount' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <input type="text" id="maxDepositAmount" name="maxDepositAmount" class="form-control"
-                                   number-format ng-model="formData.maxDepositAmount" late-validate/>
-                            <form-validate valattributeform="Terms" valattribute="maxDepositAmount"/>
+                                number-format ng-model="formData.maxDepositAmount" late-validate decimal-number=true />
+                            <form-validate valattributeform="Terms" valattribute="maxDepositAmount" />
                         </div>
+
                     </div>
                     <div class="form-group">
                         <label class="control-label col-sm-2">{{ 'label.input.interestcompoundingperiod' | translate
                             }}<span class="required">*</span>
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.compoundperiod' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.compoundperiod' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
-                            <select id="interestCompoundingPeriodTypeOptions"
-                                    ng-model="formData.interestCompoundingPeriodType" class="form-control"
-                                    ng-options="type.id as type.value for type in product.interestCompoundingPeriodTypeOptions"
-                                    ng-change="depositproduct.interestCompoundingPeriodOption.value = formValue(product.interestCompoundingPeriodTypeOptions,formData.interestCompoundingPeriodType)"
-                                    value="{{type.id}}">
+                            <select id="interestCompoundingPeriodTypeOptions" ng-model="formData.interestCompoundingPeriodType"
+                                class="form-control" ng-options="type.id as type.value for type in product.interestCompoundingPeriodTypeOptions"
+                                ng-change="depositproduct.interestCompoundingPeriodOption.value = formValue(product.interestCompoundingPeriodTypeOptions,formData.interestCompoundingPeriodType)"
+                                value="{{type.id}}">
                             </select>
                         </div>
                         <label class="control-label col-sm-2 col-sm-offset-2">{{ 'label.input.interestpostingperiod' |
                             translate }}<span class="required">*</span>
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.postingperiod' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.postingperiod' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <select id="interestPostingPeriodTypeOptions" ng-model="formData.interestPostingPeriodType"
-                                    class="form-control"
-                                    ng-options="type.id as type.value for type in product.interestPostingPeriodTypeOptions"
-                                    ng-change="depositproduct.interestPostingPeriodOption.value = formValue(product.interestPostingPeriodTypeOptions,formData.interestPostingPeriodType)"
-                                    value="{{type.id}}">
+                                class="form-control" ng-options="type.id as type.value for type in product.interestPostingPeriodTypeOptions"
+                                ng-change="depositproduct.interestPostingPeriodOption.value = formValue(product.interestPostingPeriodTypeOptions,formData.interestPostingPeriodType)"
+                                value="{{type.id}}">
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="control-label col-sm-2">{{ 'label.input.interestcalculatedusing' | translate
                             }}<span class="required">*</span>
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.calcmethod' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.calcmethod' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
-                            <select id="interestCalculationType" ng-model="formData.interestCalculationType"
-                                    class="form-control"
-                                    ng-options="type.id as type.value for type in product.interestCalculationTypeOptions"
-                                    ng-change="depositproduct.interestCalculationOption.value = formValue(product.interestCalculationTypeOptions,formData.interestCalculationType)"
-                                    value="{{type.id}}">
+                            <select id="interestCalculationType" ng-model="formData.interestCalculationType" class="form-control"
+                                ng-options="type.id as type.value for type in product.interestCalculationTypeOptions"
+                                ng-change="depositproduct.interestCalculationOption.value = formValue(product.interestCalculationTypeOptions,formData.interestCalculationType)"
+                                value="{{type.id}}">
                             </select>
                         </div>
                         <label class="control-label col-sm-2 col-sm-offset-2">{{ 'label.input.daysinyears' | translate
                             }}<span class="required">*</span>
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.daysinyear' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.daysinyear' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
-                            <select id="interestCalculationDaysInYearType"
-                                    ng-model="formData.interestCalculationDaysInYearType" class="form-control"
-                                    ng-options="type.id as type.value for type in product.interestCalculationDaysInYearTypeOptions"
-                                    ng-change="depositproduct.interestCalculationDaysInYearOption.value = formValue(product.interestCalculationDaysInYearTypeOptions,formData.interestCalculationDaysInYearType)"
-                                    value="{{type.id}}">
+                            <select id="interestCalculationDaysInYearType" ng-model="formData.interestCalculationDaysInYearType"
+                                class="form-control" ng-options="type.id as type.value for type in product.interestCalculationDaysInYearTypeOptions"
+                                ng-change="depositproduct.interestCalculationDaysInYearOption.value = formValue(product.interestCalculationDaysInYearTypeOptions,formData.interestCalculationDaysInYearType)"
+                                value="{{type.id}}">
                             </select>
                         </div>
                     </div>
@@ -207,139 +208,129 @@
             </form>
         </wz-step>
         <wz-step wz-title="{{'label.heading.settings' | translate}}">
-            <form name="Settings" ng-submit="goNext(Settings)"  novalidate="" class="form-horizontal">
+            <form name="Settings" ng-submit="goNext(Settings)" novalidate="" class="form-horizontal">
                 <fieldset>
                     <api-validate></api-validate>
                     <!--<h3>{{ 'label.heading.settings' | translate }}</h3>-->
                     <hr>
                     <div class="form-group">
                         <label class="control-label col-sm-2">{{ 'label.input.lockinPeriodFrequency' | translate }}
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.lockinperiod' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.lockinperiod' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <input id="lockinPeriodFrequency" type="text" name="lockinPeriodFrequency" class="form-control"
-                                   ng-model="formData.lockinPeriodFrequency" late-validate number=true>
-                            <form-validate valattributeform="Settings" valattribute="lockinPeriodFrequency"/>
+                                ng-model="formData.lockinPeriodFrequency" late-validate number=true>
+                            <form-validate valattributeform="Settings" valattribute="lockinPeriodFrequency" />
                         </div>
+
                         <div class="col-sm-2">
-                            <select id="lockinPeriodFrequencyType" ng-model="formData.lockinPeriodFrequencyType"
-                                    class="form-control"
-                                    ng-options="type.id as type.value for type in product.lockinPeriodFrequencyTypeOptions"
-                                    ng-change="depositproduct.lockinPeriodFrequencyOption.value = formValue(product.lockinPeriodFrequencyTypeOptions,formData.lockinPeriodFrequencyType)"
-                                    value="{{type.id}}">
+                            <select id="lockinPeriodFrequencyType" ng-model="formData.lockinPeriodFrequencyType" class="form-control"
+                                ng-options="type.id as type.value for type in product.lockinPeriodFrequencyTypeOptions"
+                                ng-change="depositproduct.lockinPeriodFrequencyOption.value = formValue(product.lockinPeriodFrequencyTypeOptions,formData.lockinPeriodFrequencyType)"
+                                value="{{type.id}}">
                                 <option class="displaynone" value="">{{'label.selectone' | translate}}</option>
                             </select>
                         </div>
                         <label class="control-label col-sm-2">{{ 'label.input.minimumdepositterm' | translate }}<span
                                 class="required">*</span>
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.minimumterm' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.minimumterm' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <input id="minimumDepositTerm" type="text" name="minimumDepositTerm" class="form-control"
-                                   ng-model="formData.minDepositTerm" required late-validate number=true>
-                            <form-validate valattributeform="Settings" valattribute="minimumDepositTerm"/>
+                                ng-model="formData.minDepositTerm" required late-validate number=true>
+                            <form-validate valattributeform="Settings" valattribute="minimumDepositTerm" />
                         </div>
 
                         <div class="col-sm-2">
-                            <select id="minDepositTermTypeId" ng-model="formData.minDepositTermTypeId"
-                                    class="form-control"
-                                    ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
-                                    ng-change="depositproduct.minDepositTermType.value = formValue(product.periodFrequencyTypeOptions,formData.minDepositTermTypeId)"
-                                    value="{{type.id}}">
+                            <select id="minDepositTermTypeId" ng-model="formData.minDepositTermTypeId" class="form-control"
+                                ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
+                                ng-change="depositproduct.minDepositTermType.value = formValue(product.periodFrequencyTypeOptions,formData.minDepositTermTypeId)"
+                                value="{{type.id}}">
                                 <option class="displaynone" value="">{{'label.selectone' | translate}}</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="control-label col-sm-2">{{ 'label.input.inmultiplesof' | translate }}
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.termmultiplesof' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.termmultiplesof' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <input id="inMultiplesOfDepositTerm" type="text" name="inMultiplesOfDepositTerm" class="form-control"
-                                   ng-model="formData.inMultiplesOfDepositTerm" late-validate number=true>
-                            <form-validate valattributeform="Settings" valattribute="inMultiplesOfDepositTerm"/>
+                                ng-model="formData.inMultiplesOfDepositTerm" late-validate number=true>
+                            <form-validate valattributeform="Settings" valattribute="inMultiplesOfDepositTerm" />
                         </div>
                         <div class="col-sm-2">
-                            <select id="inMultiplesOfDepositTermTypeId"
-                                    ng-model="formData.inMultiplesOfDepositTermTypeId"
-                                    class="form-control"
-                                    ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
-                                    ng-change="depositproduct.inMultiplesOfDepositTermType.value = formValue(product.periodFrequencyTypeOptions,formData.inMultiplesOfDepositTermTypeId)"
-                                    value="{{type.id}}">
+                            <select id="inMultiplesOfDepositTermTypeId" ng-model="formData.inMultiplesOfDepositTermTypeId"
+                                class="form-control" ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
+                                ng-change="depositproduct.inMultiplesOfDepositTermType.value = formValue(product.periodFrequencyTypeOptions,formData.inMultiplesOfDepositTermTypeId)"
+                                value="{{type.id}}">
                                 <option class="displaynone" value="">{{'label.selectone' | translate}}</option>
                             </select>
                         </div>
                         <label class="control-label col-sm-2">{{ 'label.input.maximumdepositterm' | translate }}
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.maximumterm' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.maximumterm' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <input id="maximumDepositTerm" type="text" name="maximumDepositTerm" class="form-control"
-                                   ng-model="formData.maxDepositTerm" late-validate number=true/>
-                            <form-validate valattributeform="Settings" valattribute="maximumDepositTerm"/>
+                                ng-model="formData.maxDepositTerm" late-validate number=true />
+                            <form-validate valattributeform="Settings" valattribute="maximumDepositTerm" />
                         </div>
                         <div class="col-sm-2">
-                            <select id="maxDepositTermTypeId" ng-model="formData.maxDepositTermTypeId"
-                                    class="form-control"
-                                    ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
-                                    ng-change="depositproduct.maxDepositTermType.value = formValue(product.periodFrequencyTypeOptions,formData.maxDepositTermTypeId)"
-                                    value="{{type.id}}">
+                            <select id="maxDepositTermTypeId" ng-model="formData.maxDepositTermTypeId" class="form-control"
+                                ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
+                                ng-change="depositproduct.maxDepositTermType.value = formValue(product.periodFrequencyTypeOptions,formData.maxDepositTermTypeId)"
+                                value="{{type.id}}">
                                 <option class="displaynone" value="">{{'label.selectone' | translate}}</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="control-label col-sm-2">{{ 'label.prematureclosure' | translate }}
-                            <i class="fa fa-question-circle"
-                               uib-tooltip="{{'label.tooltip.fixeddepositproduct.prematureclosure' | translate}}"
-                               tooltip-append-to-body="true"></i>
+                            <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.prematureclosure' | translate}}"
+                                tooltip-append-to-body="true"></i>
                         </label>
                         <div class="col-sm-2">
                             <label class="checkbox">
-                                <input id="preClosurePenalApplicable" type="checkbox"
-                                       ng-model="formData.preClosurePenalApplicable">
+                                <input id="preClosurePenalApplicable" type="checkbox" ng-model="formData.preClosurePenalApplicable">
                                 {{ 'label.checkbox.applypreclosurepenalinterest' | translate }}
                             </label>
                         </div>
                         <div class="col-sm-2">
-                            <input id="preClosurePenalInterest" name="preClosurePenalInterest" type="text"
-                                   class="form-control" ng-model="formData.preClosurePenalInterest"/>
+                            <input id="preClosurePenalInterest" name="preClosurePenalInterest" type="text" class="form-control"
+                                ng-model="formData.preClosurePenalInterest" late-validate decimal-number=true />
+                            <span ng-show="Settings.preClosurePenalInterest.$invalid && Settings.preClosurePenalInterest.$dirty">
+                                <small class="required error">
+                                    {{'label.mustbenumeric' | translate}}
+                                </small>
+                            </span>
                         </div>
                         <div class="col-sm-1 col-sm-offset-1">
                             {{ 'label.on' | translate }}
                         </div>
                         <div class="col-sm-2">
-                            <select class="form-control" id="preClosurePenalInterestOnTypeId"
-                                    ng-model="formData.preClosurePenalInterestOnTypeId"
-                                    ng-options="type.id as type.value for type in product.preClosurePenalInterestOnTypeOptions"
-                                    value="{{formData.preClosurePenalInterestOnTypeId}}">
+                            <select class="form-control" id="preClosurePenalInterestOnTypeId" ng-model="formData.preClosurePenalInterestOnTypeId"
+                                ng-options="type.id as type.value for type in product.preClosurePenalInterestOnTypeOptions"
+                                value="{{formData.preClosurePenalInterestOnTypeId}}">
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="control-label col-sm-3">{{ 'label.input.withholdtax' | translate }}
-                            <i class="fa fa-question-circle"
-                            uib-tooltip="{{'label.tooltip.withholdtax' | translate}}"
-                            tooltip-append-to-body="true"></i>
-                        </label>
+                        <label class="control-label col-sm-3">{{ 'label.input.withholdtax' | translate }}</label>
+                        <i class="fa fa-question-circle col-sm-1" uib-tooltip="{{'label.tooltip.withholdtax' | translate}}"></i>
                         <div class="col-sm-2">
                             <input id="withHoldTax" type="checkbox" ng-model="formData.withHoldTax" ng-true-value="true"
-                                   ng-false-value="false">
+                                ng-false-value="false">
                         </div>
                         <div ng-show="formData.withHoldTax">
                             <label class="control-label col-sm-2">{{ 'label.input.taxgroup' | translate }}</label>
                             <div class="col-sm-2">
-                                <select id="taxGroupId" ng-model="formData.taxGroupId"
-                                        chosen="product.taxGroupOptions"
-                                        ng-options="taxGroup.id as taxGroup.name for taxGroup in product.taxGroupOptions"
-                                        value="{{taxGroup.id}}">
+                                <select id="taxGroupId" ng-model="formData.taxGroupId" chosen="product.taxGroupOptions"
+                                    ng-options="taxGroup.id as taxGroup.name for taxGroup in product.taxGroupOptions"
+                                    value="{{taxGroup.id}}">
                                     <option value="">{{'label.select' | translate}}</option>
                                 </select>
                             </div>
@@ -354,13 +345,12 @@
             </form>
         </wz-step>
         <wz-step wz-title="{{'label.heading.interestchart' | translate}}">
-            <form name="interestchart"  ng-submit="goNext(interestchart)" novalidate="" class="form-horizontal">
+            <form name="interestchart" ng-submit="goNext(interestchart)" novalidate="" class="form-horizontal">
                 <fieldset>
                     <api-validate></api-validate>
                     <h3>{{ 'label.heading.interestchart' | translate }}
-                        <i class="fa fa-question-circle"
-                           uib-tooltip="{{'label.tooltip.fixeddepositproduct.interesetchart' | translate}}"
-                           tooltip-append-to-body="true"></i>
+                        <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.fixeddepositproduct.interesetchart' | translate}}"
+                            tooltip-append-to-body="true"></i>
                     </h3>
                     <hr>
                     <!--<tr>
@@ -391,21 +381,22 @@
                            <td>&nbsp;</td>
                        </tr>-->
                     <div class="form-group">
-                        <label class="control-label col-sm-2" for="name">{{ 'label.input.interestratechart.valid.from' |
+                        <label class="control-label col-sm-2" for="name">{{ 'label.input.interestratechart.valid.from'
+                            |
                             translate }}<span class="required">*</span></label>
                         <div class="col-sm-2">
                             <input id="fromDate" sort type="text" name="fromDate" class="form-control" datepicker-pop="dd MMMM yyyy"
-                                   ng-model="fromDate.date"
-                                   is-open="opened" min="minDate" max="restrictDate" required late-validate>
+                                ng-model="fromDate.date" is-open="opened" min="minDate" max="restrictDate" required
+                                late-validate>
                         </div>
                         <div class="col-sm-2">
-                            <form-validate valattributeform="interestchart" valattribute="fromDate"/>
+                            <form-validate valattributeform="interestchart" valattribute="fromDate" />
                         </div>
                         <label class="control-label col-sm-2 col-sm-2 " for="name">{{
                             'label.input.interestratechart.valid.to' | translate }}</label>
                         <div class="col-sm-2">
                             <input id="endDate" sort type="text" class="form-control" datepicker-pop="dd MMMM yyyy"
-                                   ng-model="endDate.date" is-open="opened" min="minDate"/>
+                                ng-model="endDate.date" is-open="opened" min="minDate" />
                         </div>
                     </div>
                     <div class="form-group">
@@ -414,8 +405,7 @@
                             translate }}</label>
                         <div class="col-sm-2">
                             <label class="checkbox">
-                                <input id="isPrimaryGroupingByAmount" type="checkbox"
-                                       ng-model="isPrimaryGroupingByAmount">
+                                <input id="isPrimaryGroupingByAmount" type="checkbox" ng-model="isPrimaryGroupingByAmount">
 
                             </label>
                         </div>
@@ -443,47 +433,65 @@
 
                             <tr ng-repeat="chartSlab in chart.chartSlabs">
                                 <td ng-show="isPrimaryGroupingByAmount">
-                                    <input id="amountRangeFrom1" name="amountRangeFrom" type="text" class="input-mini"
-                                           ng-model="chartSlab.amountRangeFrom"/> -
-                                    <input id="amountRangeTo1" name="amountRangeTo" type="text" class="input-mini"
-                                           ng-model="chartSlab.amountRangeTo"/>
+                                    <input id="amountRangeFrom1" name="amountRangeFrom1" type="text" class="input-mini"
+                                        ng-model="chartSlab.amountRangeFrom" late-validate decimal-number=true/>
+                                    <span ng-show="interestchart.amountRangeFrom1.$invalid && interestchart.amountRangeFrom1.$dirty">
+                                        <small class="required error">
+                                            {{'label.mustbenumeric' | translate}}
+                                        </small>
+                                    </span> -
+                                    <input id="amountRangeTo1" name="amountRangeTo1" type="text" class="input-mini"
+                                        ng-model="chartSlab.amountRangeTo" late-validate decimal-number=true/>
+                                    <span ng-show="interestchart.amountRangeTo1.$invalid && interestchart.amountRangeTo1.$dirty">
+                                        <small class="required error">
+                                            {{'label.mustbenumeric' | translate}}
+                                        </small>
+                                    </span>
                                 </td>
                                 <td class="width20">
                                     <select class="form-control" id="periodType" ng-model="chartSlab.periodType.id"
-                                            ng-options="type.id as type.value for type in chart.periodTypes"
-                                            value="{{chartSlab.periodType.id}}">
+                                        ng-options="type.id as type.value for type in chart.periodTypes" value="{{chartSlab.periodType.id}}">
                                     </select>
                                 </td>
                                 <td class="width15">
                                     <table class="width100">
                                         <tr>
-                                            <td><input id="fromPeriod" name="fromPeriod" type="text"
-                                                       class="form-control"
-                                                       ng-model="chartSlab.fromPeriod"/></td>
+                                            <td><input id="fromPeriod" name="fromPeriod" type="text" class="form-control"
+                                                    ng-model="chartSlab.fromPeriod" /></td>
                                             <td>&nbsp;&nbsp;-&nbsp;&nbsp;</td>
                                             <td><input id="toPeriod" name="toPeriod" type="text" class="form-control"
-                                                       ng-model="chartSlab.toPeriod"/></td>
+                                                    ng-model="chartSlab.toPeriod" /></td>
                                         </tr>
                                     </table>
                                 </td>
                                 <td ng-hide="isPrimaryGroupingByAmount">
                                     <input id="amountRangeFrom" name="amountRangeFrom" type="text" class="input-mini"
-                                           ng-model="chartSlab.amountRangeFrom"/> -
+                                        ng-model="chartSlab.amountRangeFrom" late-validate decimal-number=true />
+                                    <span ng-show="interestchart.amountRangeFrom.$invalid && interestchart.amountRangeFrom.$dirty">
+                                        <small class="required error">
+                                            {{'label.mustbenumeric' | translate}}
+                                        </small>
+                                    </span> -
                                     <input id="amountRangeTo" name="amountRangeTo" type="text" class="input-mini"
-                                           ng-model="chartSlab.amountRangeTo"/>
+                                        ng-model="chartSlab.amountRangeTo" late-validate decimal-number=true />
+
+                                    <span ng-show="interestchart.amountRangeTo.$invalid && interestchart.amountRangeTo.$dirty">
+                                        <small class="required error">
+                                            {{'label.mustbenumeric' | translate}}
+                                        </small>
+                                    </span>
+
                                 </td>
                                 <td class="width15">
-                                    <input id="annualInterestRate" name="annualInterestRate" type="text"
-                                           class="form-control"
-                                           ng-model="chartSlab.annualInterestRate"/>
+                                    <input id="annualInterestRate" name="annualInterestRate" type="text" class="form-control"
+                                        ng-model="chartSlab.annualInterestRate" />
                                 </td>
-                                <td class="width20"><input name="description" type="text" class="form-control"
-                                                           ng-model="chartSlab.description"/></td>
+                                <td class="width20"><input name="description" type="text" class="form-control" ng-model="chartSlab.description" /></td>
                                 <td class="width10">
                                     <a ng-click="removeRow($index)"><i class="fa fa-times-circle fa-2x"></i></a>
 
                                     <div ng-show="$last">
-                                        <br/>
+                                        <br />
                                         <a ng-click="addNewRow()" class="btn btn-primary"><i class="fa fa-plus "></i>&nbsp;&nbsp;{{'label.add.row'
                                             | translate}}</a>
                                     </div>
@@ -504,21 +512,21 @@
             </form>
         </wz-step>
         <wz-step wz-title="{{'label.heading.charges' | translate}}">
-            <form name="Charges"  ng-submit="goNext(Charges)" novalidate="" class="form-horizontal">
+            <form name="Charges" ng-submit="goNext(Charges)" novalidate="" class="form-horizontal">
                 <fieldset>
                     <api-validate></api-validate>
                     <!--<h3>{{ 'label.heading.charges' | translate }}</h3>-->
                     <hr>
                     <div class="form-group">
                         <div class="col-sm-3">
-                            <select ng-model="chargeId" class="form-control"
-                                    ng-options="charge.id as ((charge.name+' '+'('+charge.currency.name+')')) for charge in product.chargeOptions|filter:formData.currencyCode:strict"
-                                    value="{{charge.id}}">
+                            <select ng-model="chargeId" class="form-control" ng-options="charge.id as ((charge.name+' '+'('+charge.currency.name+')')) for charge in product.chargeOptions|filter:formData.currencyCode:strict"
+                                value="{{charge.id}}">
                                 <option class="displaynone" value="">{{'label.selectcharge' | translate}}</option>
                             </select>
                         </div>
                         <div class="col-sm-1">
-                            <a class="btn btn-primary" ng-click="chargeSelected(chargeId)"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{ 'label.button.add' |
+                            <a class="btn btn-primary" ng-click="chargeSelected(chargeId)"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{
+                                'label.button.add' |
                                 translate }}</a>
                         </div>
                     </div>
@@ -549,7 +557,7 @@
             </form>
         </wz-step>
         <wz-step wz-title="{{'label.heading.accounting' | translate}}">
-            <form name="Accounting" ng-submit="goNext(Accounting)"  novalidate="" class="form-horizontal">
+            <form name="Accounting" ng-submit="goNext(Accounting)" novalidate="" class="form-horizontal">
                 <fieldset>
                     <api-validate></api-validate>
                     <!--<h3>{{ 'label.heading.accounting' | translate }}</h3>-->
@@ -571,16 +579,14 @@
                         <div class="form-group">
                             <h4>{{"label.heading.assets" | translate}}</h4>
                             <label class="control-label col-sm-2">{{ 'label.input.savingreference' | translate }}
-                                <i class="fa fa-question-circle"
-                                   uib-tooltip="{{'label.tooltip.savingreference' | translate}}"
-                                   tooltip-append-to-body="true"></i>
+                                <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.savingreference' | translate}}"
+                                    tooltip-append-to-body="true"></i>
                             </label>
                             <div class="col-sm-3">
                                 <select id="savingsReferenceAccountId" ng-model="formData.savingsReferenceAccountId"
-                                        chosen="assetAccountOptions"
-                                        ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
-                                        ng-change="depositproduct.accountingMappings.savingsReferenceAccount.name = formValue(assetAccountOptions,formData.savingsReferenceAccountId,'id','name')"
-                                        value="{{assetAccount.id}}">
+                                    chosen="assetAccountOptions" ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
+                                    ng-change="depositproduct.accountingMappings.savingsReferenceAccount.name = formValue(assetAccountOptions,formData.savingsReferenceAccountId,'id','name')"
+                                    value="{{assetAccount.id}}">
                                 </select>
                             </div>
                         </div>
@@ -588,30 +594,26 @@
                         <div class="form-group">
                             <h4>{{"label.heading.liabilities" | translate}}</h4>
                             <label class="control-label col-sm-2">{{ 'label.input.savingcontrol' | translate }}
-                                <i class="fa fa-question-circle"
-                                   uib-tooltip="{{'label.tooltip.savingcontrol' | translate}}"
-                                   tooltip-append-to-body="true"></i>
-                            </label>
-                            <div class="col-sm-3">
-                                <select id="savingsControlAccountId" ng-model="formData.savingsControlAccountId"
-                                        chosen="liabilityAccountOptions"
-                                        ng-options="liabilityAccount.id as liabilityAccount.name for liabilityAccount in liabilityAccountOptions"
-                                        ng-change="depositproduct.accountingMappings.savingsControlAccount.name = formValue(liabilityAccountOptions,formData.savingsControlAccountId,'id','name')"
-                                        value="{{liabilityAccount.id}}">
-                                </select>
-                            </div>
-                            <label class="control-label col-sm-2">{{ 'label.input.savingstransfersinsuspenpense' | translate }}
-                                <i class="fa fa-question-circle"
-                                    uib-tooltip="{{'label.tooltip.savingsuspense' | translate}}"
+                                <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.savingcontrol' | translate}}"
                                     tooltip-append-to-body="true"></i>
                             </label>
                             <div class="col-sm-3">
-                                <select id="transfersInSuspenseAccountId"
-                                        ng-model="formData.transfersInSuspenseAccountId"
-                                        chosen="liabilityAccountOptions"
-                                        ng-options="liabilityAccount.id as liabilityAccount.name for liabilityAccount in liabilityAccountOptions"
-                                        ng-change="depositproduct.accountingMappings.transfersInSuspenseAccount.name = formValue(liabilityAccountOptions,formData.transfersInSuspenseAccountId,'id','name')"
-                                        value="{{liabilityAccount.id}}">
+                                <select id="savingsControlAccountId" ng-model="formData.savingsControlAccountId" chosen="liabilityAccountOptions"
+                                    ng-options="liabilityAccount.id as liabilityAccount.name for liabilityAccount in liabilityAccountOptions"
+                                    ng-change="depositproduct.accountingMappings.savingsControlAccount.name = formValue(liabilityAccountOptions,formData.savingsControlAccountId,'id','name')"
+                                    value="{{liabilityAccount.id}}">
+                                </select>
+                            </div>
+                            <label class="control-label col-sm-2">{{ 'label.input.savingstransfersinsuspenpense' |
+                                translate }}
+                                <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.savingsuspense' | translate}}"
+                                    tooltip-append-to-body="true"></i>
+                            </label>
+                            <div class="col-sm-3">
+                                <select id="transfersInSuspenseAccountId" ng-model="formData.transfersInSuspenseAccountId"
+                                    chosen="liabilityAccountOptions" ng-options="liabilityAccount.id as liabilityAccount.name for liabilityAccount in liabilityAccountOptions"
+                                    ng-change="depositproduct.accountingMappings.transfersInSuspenseAccount.name = formValue(liabilityAccountOptions,formData.transfersInSuspenseAccountId,'id','name')"
+                                    value="{{liabilityAccount.id}}">
                                 </select>
                             </div>
                         </div>
@@ -619,16 +621,14 @@
                         <div class="form-group">
                             <h4>{{"label.heading.expenses" | translate}}</h4>
                             <label class="control-label col-sm-2">{{ 'label.input.interestonsavings' | translate }}
-                                <i class="fa fa-question-circle"
-                                   uib-tooltip="{{'label.tooltip.interestonsavings' | translate}}"
-                                   tooltip-append-to-body="true"></i>
+                                <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.interestonsavings' | translate}}"
+                                    tooltip-append-to-body="true"></i>
                             </label>
                             <div class="col-sm-3">
                                 <select id="interestOnSavingsAccountId" ng-model="formData.interestOnSavingsAccountId"
-                                        chosen="expenseAccountOptions"
-                                        ng-options="expenseAccount.id as expenseAccount.name for expenseAccount in expenseAccountOptions"
-                                        ng-change="depositproduct.accountingMappings.interestOnSavingsAccount.name = formValue(expenseAccountOptions,formData.interestOnSavingsAccountId,'id','name')"
-                                        value="{{expenseAccount.id}}">
+                                    chosen="expenseAccountOptions" ng-options="expenseAccount.id as expenseAccount.name for expenseAccount in expenseAccountOptions"
+                                    ng-change="depositproduct.accountingMappings.interestOnSavingsAccount.name = formValue(expenseAccountOptions,formData.interestOnSavingsAccountId,'id','name')"
+                                    value="{{expenseAccount.id}}">
                                 </select>
                             </div>
                         </div>
@@ -636,41 +636,37 @@
                         <div class="form-group">
                             <h4>{{"label.heading.income" | translate}}</h4>
                             <label class="control-label col-sm-2">{{ 'label.input.incomefromfees' | translate }}
-                                <i class="fa fa-question-circle"
-                                   uib-tooltip="{{'label.tooltip.incomefromfees' | translate}}"
-                                   tooltip-append-to-body="true"></i>
+                                <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.incomefromfees' | translate}}"
+                                    tooltip-append-to-body="true"></i>
                             </label>
                             <div class="col-sm-3">
-                                <select id="incomeFromFeeAccountId" ng-model="formData.incomeFromFeeAccountId"
-                                        chosen="incomeAccountOptions"
-                                        ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
-                                        ng-change="depositproduct.accountingMappings.incomeFromFeeAccount.name = formValue(incomeAccountOptions,formData.incomeFromFeeAccountId,'id','name')"
-                                        value="{{incomeAccount.id}}">
+                                <select id="incomeFromFeeAccountId" ng-model="formData.incomeFromFeeAccountId" chosen="incomeAccountOptions"
+                                    ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
+                                    ng-change="depositproduct.accountingMappings.incomeFromFeeAccount.name = formValue(incomeAccountOptions,formData.incomeFromFeeAccountId,'id','name')"
+                                    value="{{incomeAccount.id}}">
                                 </select>
                             </div>
                             <label class="control-label col-sm-2">{{ 'label.input.incomefrompenalties' | translate }}
-                                <i class="fa fa-question-circle"
-                                   uib-tooltip="{{'label.tooltip.incomefrompenalties' | translate}}"
-                                   tooltip-append-to-body="true"></i>
+                                <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.incomefrompenalties' | translate}}"
+                                    tooltip-append-to-body="true"></i>
                             </label>
                             <div class="col-sm-3">
                                 <select id="incomeFromPenaltyAccountId" ng-model="formData.incomeFromPenaltyAccountId"
-                                        chosen="incomeAccountOptions"
-                                        ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
-                                        ng-change="depositproduct.accountingMappings.incomeFromPenaltyAccount.name = formValue(incomeAccountOptions,formData.incomeFromPenaltyAccountId,'id','name')"
-                                        value="{{incomeAccount.id}}">
+                                    chosen="incomeAccountOptions" ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
+                                    ng-change="depositproduct.accountingMappings.incomeFromPenaltyAccount.name = formValue(incomeAccountOptions,formData.incomeFromPenaltyAccountId,'id','name')"
+                                    value="{{incomeAccount.id}}">
                                 </select>
                             </div>
                         </div>
                         <hr>
-                        <h4>{{'label.heading.advancedaccountingrules' | translate}}[<a
-                                ng-click="showOrHide(showOrHideValue)">{{showOrHideValue}}</a>]</h4>
+                        <h4>{{'label.heading.advancedaccountingrules' | translate}}[<a ng-click="showOrHide(showOrHideValue)">{{showOrHideValue}}</a>]</h4>
                         <div class="col-md-12" ng-show="showOrHideValue == 'hide'">
                             <div class="col-md-8">{{'label.heading.configurefundsourcesforpaymentchannels' |
                                 translate}}
                             </div>
                             <div class="col-md-4">
-                                <a class="btn btn-primary" ng-click="addConfigureFundSource()"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{ 'label.button.add' |
+                                <a class="btn btn-primary" ng-click="addConfigureFundSource()"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{
+                                    'label.button.add' |
                                     translate}}</a>
                             </div>
                             <table class="table">
@@ -683,22 +679,18 @@
                                 </tr>
                                 <tr ng-repeat="configureFundOption in configureFundOptions">
                                     <td class="width30">
-                                        <select id="configureFundOptions[{{$index}}].paymentTypeId"
-                                                class="form-control"
-                                                ng-model="configureFundOption.paymentTypeId"
-                                                ng-options="paymentType.id as paymentType.name for paymentType in configureFundOption.paymentTypeOptions"
-                                                ng-change="depositproduct.paymentChannelToFundSourceMappings[$index].paymentType.name = formValue(configureFundOption.paymentTypeOptions,configureFundOption.paymentTypeId,'id','name')"
-                                                value="{{paymentType.id}}">
+                                        <select id="configureFundOptions[{{$index}}].paymentTypeId" class="form-control"
+                                            ng-model="configureFundOption.paymentTypeId" ng-options="paymentType.id as paymentType.name for paymentType in configureFundOption.paymentTypeOptions"
+                                            ng-change="depositproduct.paymentChannelToFundSourceMappings[$index].paymentType.name = formValue(configureFundOption.paymentTypeOptions,configureFundOption.paymentTypeId,'id','name')"
+                                            value="{{paymentType.id}}">
                                         </select>
                                     </td>
                                     <td></td>
                                     <td class="width30">
-                                        <select id="configureFundOptions[{{$index}}].fundSourceAccountId"
-                                                class="form-control"
-                                                ng-model="configureFundOption.fundSourceAccountId"
-                                                ng-options="assetAccount.id as assetAccount.name for assetAccount in configureFundOption.assetAccountOptions"
-                                                ng-change="depositproduct.paymentChannelToFundSourceMappings[$index].fundSourceAccount.name = formValue(configureFundOption.assetAccountOptions,configureFundOption.fundSourceAccountId,'id','name')"
-                                                value="{{assetAccount.id}}">
+                                        <select id="configureFundOptions[{{$index}}].fundSourceAccountId" class="form-control"
+                                            ng-model="configureFundOption.fundSourceAccountId" ng-options="assetAccount.id as assetAccount.name for assetAccount in configureFundOption.assetAccountOptions"
+                                            ng-change="depositproduct.paymentChannelToFundSourceMappings[$index].fundSourceAccount.name = formValue(configureFundOption.assetAccountOptions,configureFundOption.fundSourceAccountId,'id','name')"
+                                            value="{{assetAccount.id}}">
                                         </select>
                                     </td>
                                     <td></td>
@@ -707,7 +699,8 @@
                             </table>
                             <div class="col-md-8">{{'label.heading.mapfeestoincomeaccounts' | translate}}</div>
                             <div class="col-md-4">
-                                <a class="btn btn-primary" ng-click="mapFees()"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{ 'label.button.add' | translate }}</a>
+                                <a class="btn btn-primary" ng-click="mapFees()"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{
+                                    'label.button.add' | translate }}</a>
                             </div>
                             <table class="table">
                                 <tr class="graybg">
@@ -719,22 +712,18 @@
                                 </tr>
                                 <tr ng-repeat="specificIncomeaccount in specificIncomeaccounts">
                                     <td class="width30">
-                                        <select id="specificIncomeaccounts[{{$index}}].chargeId"
-                                                class="form-control"
-                                                ng-model="specificIncomeaccount.chargeId"
-                                                ng-options="charge.id as charge.name for charge in specificIncomeaccount.chargeOptions"
-                                                ng-change="depositproduct.feeToIncomeAccountMappings[$index].charge.name = formValue(specificIncomeaccount.chargeOptions,specificIncomeaccount.chargeId,'id','name')"
-                                                value="{{charge.id}}">
+                                        <select id="specificIncomeaccounts[{{$index}}].chargeId" class="form-control"
+                                            ng-model="specificIncomeaccount.chargeId" ng-options="charge.id as charge.name for charge in specificIncomeaccount.chargeOptions"
+                                            ng-change="depositproduct.feeToIncomeAccountMappings[$index].charge.name = formValue(specificIncomeaccount.chargeOptions,specificIncomeaccount.chargeId,'id','name')"
+                                            value="{{charge.id}}">
                                         </select>
                                     </td>
                                     <td></td>
                                     <td class="width30">
-                                        <select id="specificIncomeaccounts[{{$index}}].incomeAccountId"
-                                                class="form-control"
-                                                ng-model="specificIncomeaccount.incomeAccountId"
-                                                ng-options="assetAccount.id as assetAccount.name for assetAccount in specificIncomeaccount.incomeAccountOptions"
-                                                ng-change="depositproduct.feeToIncomeAccountMappings[$index].incomeAccount.name = formValue(specificIncomeaccount.incomeAccountOptions,specificIncomeaccount.incomeAccountId,'id','name')"
-                                                value="{{assetAccount.id}}">
+                                        <select id="specificIncomeaccounts[{{$index}}].incomeAccountId" class="form-control"
+                                            ng-model="specificIncomeaccount.incomeAccountId" ng-options="assetAccount.id as assetAccount.name for assetAccount in specificIncomeaccount.incomeAccountOptions"
+                                            ng-change="depositproduct.feeToIncomeAccountMappings[$index].incomeAccount.name = formValue(specificIncomeaccount.incomeAccountOptions,specificIncomeaccount.incomeAccountId,'id','name')"
+                                            value="{{assetAccount.id}}">
                                         </select>
                                     </td>
                                     <td></td>
@@ -744,7 +733,8 @@
                             <div class="col-md-8">{{'label.heading.mappenaltiestospecificincomeaccounts' | translate}}
                             </div>
                             <div class="col-md-4">
-                                <a class="btn btn-primary" ng-click="mapPenalty()"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{ 'label.button.add' | translate
+                                <a class="btn btn-primary" ng-click="mapPenalty()"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{
+                                    'label.button.add' | translate
                                     }}</a>
                             </div>
                             <table class="table">
@@ -757,22 +747,18 @@
                                 </tr>
                                 <tr ng-repeat="penaltySpecificIncomeaccount in penaltySpecificIncomeaccounts">
                                     <td class="width30">
-                                        <select id="penaltySpecificIncomeaccounts[{{$index}}].chargeId"
-                                                class="form-control"
-                                                ng-model="penaltySpecificIncomeaccount.chargeId"
-                                                ng-options="charge.id as charge.name for charge in penaltySpecificIncomeaccount.penaltyOptions"
-                                                ng-change="depositproduct.penaltyToIncomeAccountMappings[$index].charge.name = formValue(penaltySpecificIncomeaccount.penaltyOptions,penaltySpecificIncomeaccount.chargeId,'id','name')"
-                                                value="{{charge.id}}">
+                                        <select id="penaltySpecificIncomeaccounts[{{$index}}].chargeId" class="form-control"
+                                            ng-model="penaltySpecificIncomeaccount.chargeId" ng-options="charge.id as charge.name for charge in penaltySpecificIncomeaccount.penaltyOptions"
+                                            ng-change="depositproduct.penaltyToIncomeAccountMappings[$index].charge.name = formValue(penaltySpecificIncomeaccount.penaltyOptions,penaltySpecificIncomeaccount.chargeId,'id','name')"
+                                            value="{{charge.id}}">
                                         </select>
                                     </td>
                                     <td></td>
                                     <td class="width30">
-                                        <select id="penaltySpecificIncomeaccounts[{{$index}}].incomeAccountId"
-                                                class="form-control"
-                                                ng-model="penaltySpecificIncomeaccount.incomeAccountId"
-                                                ng-options="assetAccount.id as assetAccount.name for assetAccount in penaltySpecificIncomeaccount.incomeAccountOptions"
-                                                ng-change="depositproduct.penaltyToIncomeAccountMappings[$index].incomeAccount.name = formValue(penaltySpecificIncomeaccount.incomeAccountOptions,penaltySpecificIncomeaccount.incomeAccountId,'id','name')"
-                                                value="{{assetAccount.id}}">
+                                        <select id="penaltySpecificIncomeaccounts[{{$index}}].incomeAccountId" class="form-control"
+                                            ng-model="penaltySpecificIncomeaccount.incomeAccountId" ng-options="assetAccount.id as assetAccount.name for assetAccount in penaltySpecificIncomeaccount.incomeAccountOptions"
+                                            ng-change="depositproduct.penaltyToIncomeAccountMappings[$index].incomeAccount.name = formValue(penaltySpecificIncomeaccount.incomeAccountOptions,penaltySpecificIncomeaccount.incomeAccountId,'id','name')"
+                                            value="{{assetAccount.id}}">
                                         </select>
                                     </td>
                                     <td></td>
@@ -818,7 +804,7 @@
                             <td colspan="3">{{depositproduct.shortName}}</td>
                         </tr>
                         <tr>
-                            <td colspan="4"><br/></td>
+                            <td colspan="4"><br /></td>
                         </tr>
                         <tr class="bottomborder">
                             <td colspan="4"><strong>{{'label.heading.items' | translate}}</strong></td>
@@ -868,7 +854,7 @@
                             <td colspan="3">{{depositproduct.interestCalculationDaysInYearOption.value}}</td>
                         </tr>
                         <tr>
-                            <td colspan="4"><br/></td>
+                            <td colspan="4"><br /></td>
                         </tr>
                         <tr class="bottomborder">
                             <td colspan="4"><strong>{{'label.heading.settings' | translate}}</strong></td>
@@ -905,8 +891,7 @@
                         <tr ng-show="depositproduct.preClosurePenalInterest">
                             <td>{{'label.heading.preclosurepenalapplicable' | translate}}</td>
                             <td>{{depositproduct.preClosurePenalInterest | number}} &nbsp; &nbsp; % &nbsp; &nbsp; On
-                                &nbsp;&nbsp;
-                                {{depositproduct.preClosurePenalInterestOnType.value}}
+                                &nbsp;&nbsp; {{depositproduct.preClosurePenalInterestOnType.value}}
                             </td>
                         </tr>
                         <tr>
@@ -918,19 +903,17 @@
                             <td colspan="3">{{depositproduct.taxGroup.name}}</td>
                         </tr>
                         <tr>
-                            <td colspan="4"><br/></td>
+                            <td colspan="4"><br /></td>
                         </tr>
                         <tr class="bottomborder">
                             <td colspan="4"><strong>{{'label.heading.interestchart' | translate}}</strong></td>
                         </tr>
                         <tr>
                             <td>{{'label.heading.interestratechart.valid.from' | translate}} :
-                                {{depositproduct.activeChart.fromDate |
-                                DateFormat}}
+                                {{depositproduct.activeChart.fromDate | DateFormat}}
                             </td>
                             <td>{{'label.heading.interestratechart.valid.to' | translate}} :
-                                {{depositproduct.activeChart.endDate |
-                                DateFormat}}
+                                {{depositproduct.activeChart.endDate | DateFormat}}
                             </td>
                             &nbsp;
                         </tr>
@@ -967,7 +950,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td colspan="4"><br/></td>
+                            <td colspan="4"><br /></td>
                         </tr>
                         <tr class="bottomborder">
                             <td colspan="4"><strong>{{'label.heading.charges' | translate}}</strong></td>
@@ -985,12 +968,11 @@
                             <td>{{charge.chargeTimeType.value}}</td>
                         </tr>
                         <tr>
-                            <td colspan="4"><br/></td>
+                            <td colspan="4"><br /></td>
                         </tr>
                         <tr class="bottomborder">
                             <td><strong>{{'label.heading.accounting' | translate}}</strong></td>
-                            <td colspan="3"><span
-                                    ng-hide="formData.accountingRule == 2">{{'label.none' | translate}}</span></td>
+                            <td colspan="3"><span ng-hide="formData.accountingRule == 2">{{'label.none' | translate}}</span></td>
                         </tr>
                         <tr>
                             <td colspan="4">
@@ -1004,8 +986,8 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td>{{'label.heading.savingscontrol' | translate}}({{'label.heading.liabilities'
-                                            | translate}})
+                                        <td>{{'label.heading.savingscontrol' |
+                                            translate}}({{'label.heading.liabilities' | translate}})
                                         </td>
                                         <td colspan="3">
                                             {{depositproduct.accountingMappings.savingsControlAccount.name}}
@@ -1013,16 +995,15 @@
                                     </tr>
                                     <tr>
                                         <td>{{'label.heading.transfersinsuspenpense' |
-                                            translate}}({{'label.heading.liabilities' |
-                                            translate}})
+                                            translate}}({{'label.heading.liabilities' | translate}})
                                         </td>
                                         <td colspan="3">
                                             {{depositproduct.accountingMappings.transfersInSuspenseAccount.name}}
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td>{{'label.heading.interestonsavings' | translate}}({{'label.heading.expenses'
-                                            | translate}})
+                                        <td>{{'label.heading.interestonsavings' |
+                                            translate}}({{'label.heading.expenses' | translate}})
                                         </td>
                                         <td colspan="3">
                                             {{depositproduct.accountingMappings.interestOnSavingsAccount.name}}
@@ -1037,8 +1018,8 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td>{{'label.heading.incomefrompenalties' | translate}}({{'label.heading.income'
-                                            | translate}})
+                                        <td>{{'label.heading.incomefrompenalties' |
+                                            translate}}({{'label.heading.income' | translate}})
                                         </td>
                                         <td colspan="3">
                                             {{depositproduct.accountingMappings.incomeFromPenaltyAccount.name}}
@@ -1046,7 +1027,7 @@
                                     </tr>
 
                                     <tr>
-                                        <td colspan="4"><br/></td>
+                                        <td colspan="4"><br /></td>
                                     </tr>
                                     <tr>
                                         <td>
@@ -1113,8 +1094,7 @@
                     </div>
                     <button class="btn btn-default pull-left" wz-previous><i class="fa fa-arrow-left"></i>&nbsp;&nbsp;Previous
                     </button>
-                    <button class="btn btn-default pull-right"  disabled>Next&nbsp;&nbsp;<i
-                            class="fa fa-arrow-right"></i></button>
+                    <button class="btn btn-default pull-right" disabled>Next&nbsp;&nbsp;<i class="fa fa-arrow-right"></i></button>
                 </fieldset>
             </form>
         </wz-step>
@@ -1142,49 +1122,29 @@
                 </tr>
                 <tr ng-repeat="incentiveData in chartSlab.incentives">
                     <td>
-                        <select class="form-control" id="attributename" ng-model="incentiveData.attributeName.id"
-                                ng-options="type.id as type.value for type in data.attributeNameOptions"
-                                value="{{type.id}}">
+                        <select class="form-control" id="attributename" ng-model="incentiveData.attributeName.id" ng-options="type.id as type.value for type in data.attributeNameOptions" value="{{type.id}}">
                         </select>
                     </td>
                     <td>
-                        <select class="form-control" id="conditionType" ng-model="incentiveData.conditionType.id"
-                                ng-options="type.id as type.value for type in data.conditionTypeOptions"
-                                value="{{type.id}}">
+                        <select class="form-control" id="conditionType" ng-model="incentiveData.conditionType.id" ng-options="type.id as type.value for type in data.conditionTypeOptions" value="{{type.id}}">
                         </select>
                     </td>
                     <td>
-                        <select class="form-control" ng-show="incentiveData.attributeName.id == 2"
-                                id="attributeValuegender" ng-model="incentiveData.attributeValue"
-                                ng-options="type.id as type.name for type in data.genderOptions"
-                                value="{{type.id}}">
+                        <select class="form-control" ng-show="incentiveData.attributeName.id == 2" id="attributeValuegender" ng-model="incentiveData.attributeValue" ng-options="type.id as type.name for type in data.genderOptions" value="{{type.id}}">
                         </select>
-                        <select class="form-control" ng-show="incentiveData.attributeName.id == 4"
-                                id="attributeValueclienttype" ng-model="incentiveData.attributeValue"
-                                ng-options="type.id as type.name for type in data.clientTypeOptions"
-                                value="{{type.id}}">
+                        <select class="form-control" ng-show="incentiveData.attributeName.id == 4" id="attributeValueclienttype" ng-model="incentiveData.attributeValue" ng-options="type.id as type.name for type in data.clientTypeOptions" value="{{type.id}}">
                         </select>
-                        <select class="form-control" ng-show="incentiveData.attributeName.id == 5"
-                                id="attributeValueclientclassification" ng-model="incentiveData.attributeValue"
-                                ng-options="type.id as type.name for type in data.clientClassificationOptions"
-                                value="{{type.id}}">
+                        <select class="form-control" ng-show="incentiveData.attributeName.id == 5" id="attributeValueclientclassification" ng-model="incentiveData.attributeValue" ng-options="type.id as type.name for type in data.clientClassificationOptions" value="{{type.id}}">
                         </select>
-                        <input id="attributeValue" ng-show="incentiveData.attributeName.id == 3"
-                               name="attributeValueclientage" type="text"
-                               class="form-control"
-                               ng-model="incentiveData.attributeValue"/>
+                        <input id="attributeValue" ng-show="incentiveData.attributeName.id == 3" name="attributeValueclientage" type="text" class="form-control" ng-model="incentiveData.attributeValue" />
                     </td>
                     <td>
-                        <select class="form-control" id="incentiveType" ng-model="incentiveData.incentiveType.id"
-                                ng-options="type.id as type.value for type in data.incentiveTypeOptions"
-                                value="{{type.id}}">
+                        <select class="form-control" id="incentiveType" ng-model="incentiveData.incentiveType.id" ng-options="type.id as type.value for type in data.incentiveTypeOptions" value="{{type.id}}">
                         </select>
                     </td>
 
                     <td>
-                        <input id="amount" name="amount" type="text"
-                               class="form-control" number-format
-                               ng-model="incentiveData.amount"/>
+                        <input id="amount" name="amount" type="text" class="form-control" number-format ng-model="incentiveData.amount" />
                     </td>
                     <td>
                         <a class="btn btn-primary" ng-click="removeRow($index)"><i class="fa fa-times "></i>&nbsp;&nbsp;{{'label.remove.row'
@@ -1203,4 +1163,4 @@
             <button class="btn btn-default" ng-click="cancel()">{{'label.button.close' | translate}}</button>
         </div>
     </script>
-</div>
+</div>
\ No newline at end of file