diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index da3344fdf..7120fd8aa 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -117,10 +117,10 @@
                                                             </mat-form-field>
                                                             <p style="padding-left: 2% !important">No of Years in Current Business</p>
                                                             <mat-form-field style="width: 20%;">
-                                                                <input matInput type="number" placeholder="Year" formControlName="current_business_experiance_year" (keyup)="getWorkExperience(members.value,i)"  required min='0'>
+                                                                <input matInput  placeholder="Year" formControlName="current_business_experiance_year" (keyup)="getWorkExperience(members.value,i)" required autocomplete="off"  (keypress)="keyPress($event)">
                                                             </mat-form-field>
                                                             <mat-form-field style="width: 21%;">
-                                                                <input matInput type="number" placeholder="Month" formControlName="current_business_experiance_month" required min='0' max='12'>
+                                                                <input matInput  placeholder="Month" formControlName="current_business_experiance_month" required (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(members,$event.target.value)" autocomplete="off">
                                                             </mat-form-field>
                                                             <mat-form-field style="width: 35%;">
                                                                 <input matInput type="number" placeholder="Total Work Experience"
@@ -151,10 +151,11 @@
                                     </mat-card-header>
                                     <mat-card-content>
                                         <mat-form-field style="width: 20%;">
-                                            <input matInput type="number" placeholder="Year" formControlName="business_years" required min='0'>
+                                            <input matInput placeholder="Year" formControlName="business_years" required autocomplete="off"  (keypress)="keyPress($event)">
+                                            <mat-error>Please Enter Correct Year</mat-error>
                                         </mat-form-field>
                                         <mat-form-field style="width: 20%;">
-                                            <input matInput type="number" placeholder="Month" formControlName="business_month" required min='0' max='12'>
+                                            <input matInput type="number" placeholder="Month" formControlName="business_month" required (keypress)="keyPress($event)" (change)="ConvertMonthintoYearforBusiness($event.target.value)">
                                         </mat-form-field>
                                         <mat-form-field style="width: 40%;">
                                                 <input matInput [max]="maxDate" [matDatepicker]="picker" formControlName="business_date_object" placeholder="Enter Date of Formation, If Available">
@@ -1173,11 +1174,11 @@
                                                 formControlName="employees_total" required>
                                         </mat-form-field>
                                         <mat-form-field>
-                                            <input matInput placeholder="Permanent"
+                                            <input matInput placeholder="Permanent"  (change)="checkTotal(businessForm)"
                                                 formControlName="employees_permanent" required>
                                         </mat-form-field>
                                         <mat-form-field>
-                                            <input matInput placeholder="Temporary"
+                                            <input matInput placeholder="Temporary"  (change)="checkTotal(businessForm)"
                                                 formControlName="employees_temporary" required>
                                         </mat-form-field>
                                     </mat-card-content>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index ca887a24f..c9ced44b8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -1214,7 +1214,38 @@ export class BusinessInfoComponent implements OnInit {
         else {
             control.controls[key].removeControl('total_business_previous_experience')
         }
+        let total ;
+        if(control.length > 0){
+            total = control.value.reduce((sum, val) => sum + +val.current_business_experiance_year, 0);
+            console.log(total);
+            this.businessForm.controls.business_years.setValidators([Validators.required, Validators.min(+total)]);
+            this.businessForm.controls.business_years.updateValueAndValidity();
+        }
+    }
 
+    /**  To Convert Month into Year */
+    ConvertMonthintoYear(itemrow,e){
+
+        let year = itemrow.controls.current_business_experiance_year.value;
+        
+        let converted_month : number = e%12;
+        let converted_year : number = e/12;
+
+        itemrow.controls.current_business_experiance_year.setValue(+year + +Math.floor(converted_year));
+        itemrow.controls.current_business_experiance_month.setValue(Math.floor(converted_month));
+        
+    }
+
+    ConvertMonthintoYearforBusiness(e){
+    
+        let business_year = this.businessForm.controls.business_years.value;
+
+        let converted_month : number = e%12;
+        let converted_year : number = e/12;
+
+        this.businessForm.controls.business_years.setValue(+business_year + +Math.floor(converted_year));
+        this.businessForm.controls.business_month.setValue(Math.floor(converted_month));
+        
     }
 
     /**
@@ -1452,4 +1483,11 @@ export class BusinessInfoComponent implements OnInit {
          }
      })
   }
+
+  checkTotal(FormData){
+    // console.log(FormData.value.employees_permanent);
+    // console.log(FormData.value.employees_temporary);
+    // console.log(FormData.value.employees_total);
+    this.businessForm.controls['employees_total'].setValue((+FormData.value.employees_permanent ||0)+(+FormData.value.employees_temporary||0));
+  }
 }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
index 94009c7f8..d4170f910 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
@@ -39,7 +39,7 @@
                                                                     <mat-card-content class="matcard">
                                                                         <mat-form-field>
                                                                             <input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,i,1)">  
-                                                                            <mat-hint align="start" style="font-size:70%" *ngIf="details.get('loan_amount').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint>
+                                                                            <mat-hint  my-mat-hint align="start" *ngIf="details.get('loan_amount').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint>
                                                                         </mat-form-field>
                                                                         <mat-form-field>
                                                                                 <mat-select  placeholder="Frequency" (selectionChange)="selectedfrequency($event.value,i)"
@@ -53,7 +53,7 @@
                                                                         <mat-form-field *ngIf="details.get('frequency').value != ''"  style="width:35%">
                                                                             <input matInput autocomplete="off" [placeholder]="placeholderName[i] != ''  ? placeholderName[i] : 'Instalment Amount' " formControlName="emi" (keypress)="keyPress($event)" (keyup)="inWords($event,i,2)">
                                                                             <!-- <input matInput autocomplete="off" placeholder="details.get('loan_type').value + Instalment Amount " formControlName="emi" (keypress)="keyPress($event)" (keyup)="inWords($event,i,2)"> -->
-                                                                            <mat-hint align="start" style="font-size:70%" *ngIf="details.get('emi').value != ''">{{"&#8377;"}} {{emiAmtInwords[i]}} Only</mat-hint>
+                                                                            <mat-hint my-mat-hint align="start" style="font-size:70%" *ngIf="details.get('emi').value != ''">{{"&#8377;"}} {{emiAmtInwords[i]}} Only</mat-hint>
                                                                         </mat-form-field>
                                                                         <mat-form-field>
                                                                             <mat-select placeholder="Loan Type" formControlName="loan_type" >
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss
index 6478f8ba9..758b41c0c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss
@@ -26,7 +26,7 @@
     line-height: 1.2em;
     transform: translateY(10px);
     font-size: 75%;
-}
+  }
 .mat-card-content {
     background-color: white;
 }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index 68f5444b7..2963e0702 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -29,7 +29,7 @@
                                         <div fxFlex="33">
                                               <mat-form-field style="width: 80%">
                                             <mat-select multiple (selectionChange)="endUserChange($event.value)" placeholder="What is the end use" formControlName="end_use" >
-                                                <mat-option *ngFor="let enduse of m_endUseofLoad" [value]="enduse.subproduct_id">{{ enduse.name }}</mat-option>
+                                                <mat-option *ngFor="let enduse of m_endUseForLoan" [value]="enduse.enduse_of_loan_id">{{ enduse.enduse_of_loan}}</mat-option>
                                             </mat-select>
                                             <!--<mat-select multiple placeholder="What is the end use"
                                                         formControlName="end_use" (selectionChange)="endUserChange($event)">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 015cce3a0..2187bdc8a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -50,6 +50,7 @@ export class LoanDetailsComponent implements OnInit {
     endUserList: any  = [];
     sourceList : any = [];
     ownerNames: any = [];
+    m_endUseForLoan = [];
     m_endUseofLoad = [];
     m_sourceofamount = [];
     m_mortageTypeProperty = [];
@@ -109,6 +110,7 @@ export class LoanDetailsComponent implements OnInit {
         console.clear();
         this.initloanDetailsForm();
         this.getM_EndUseofLoad();
+        this.getM_EndUseForLoan(this.pdid);
         this.getM_sourceofamount();
         this.getM_MortageTypeProperty();
         this.getM_StatusofCunstruction();
@@ -122,33 +124,40 @@ export class LoanDetailsComponent implements OnInit {
                 let result = Object.keys(value.records.end_use_group).map(function(key) {
                     return value.records.end_use_group[key];
                 });
-                let owner = Object.keys(value.records.owner_name_group).map(function(key) {
-                    return value.records.owner_name_group[key];
-                });
+                let ownername: any = [];
+                if(value.records.owner_name_group != null){
+                    let owner = Object.keys(value.records.owner_name_group).map(function(key) {
+                        return value.records.owner_name_group[key];
+                    });
+
+                 
+                            owner.forEach(val => {
+                                        ownername.push(val.owner_name);
+                                        if(val.owner_name == 'Others'){
+                                            this.OtherOwnerFlag = true;
+                                        }
+                                        else{
+                                            this.OtherOwnerFlag = false;
+                                        }
+                            });
+                }
 
                 let enduse: any = [];
                 result.forEach(val => {
                     enduse.push(val.end_use);
                 });
-                let ownername: any = [];
-                owner.forEach(val => {
-                    ownername.push(val.owner_name);
-                    if(val.owner_name == 'Others'){
-                        this.OtherOwnerFlag = true;
-                    }
-                    else{
-                        this.OtherOwnerFlag = false;
-                    }
-                });
+
+                this.loanDetailsForm.controls['end_use'].setValue(enduse);
+                this.endUserChange(enduse);
+                
                 // console.log('enduse', enduse);
                 // console.log('ownername', ownername);
                 
                 this.loanDetailsForm.controls['loan_amount'].setValue(value.records.loan_amount);
                 if(value.records.loan_amount){ this.loanAmtInWords = this._pd.convertNumberToWords(value.records.loan_amount); }
 
-                this.loanDetailsForm.controls['end_use'].setValue(enduse);
-                this.endUserChange(enduse);
-                if (value.records.end_use_other) {
+                
+                if (value.records.end_use_other != null) {
                     this.loanDetailsForm.controls['end_use_other'].setValue(value.records.end_use_other);
                 }
                 this.loanDetailsForm.controls['is_transfer'].setValue(value.records.is_transfer);
@@ -211,8 +220,11 @@ export class LoanDetailsComponent implements OnInit {
                 this.loanDetailsForm.controls['property_type'].setValue(value.records.property_type);
                 this.propertyType = value.records.property_type;
                 //console.log(value.records.property_type);
-                this.mortage_type(value.records.property_type);
+                if(this.propertyType != null){
+                this.mortage_type(this.propertyType);
+                }
                 //console.log(this.propertyType);
+                if(this.mortageCardAccess == true){
                 this.loanDetailsForm.controls['property_type_others'].setValue(value.records.property_type_others);
                 this.loanDetailsForm.controls['owner_name'].setValue(ownername);
                 this.loanDetailsForm.controls['other_owners_name'].setValue(value.records.other_owners_name);
@@ -228,6 +240,10 @@ export class LoanDetailsComponent implements OnInit {
                     this.loanDetailsForm.controls['emv_per_customer'].setValue(value.records.emv_per_customer);
                     this.emvAmtInWords = this._pd.convertNumberToWords(value.records.emv_per_customer); 
                 }
+
+                }
+                
+                
                 
                 // this.loanDetailsForm.controls['value_per_agreement'].setValue(value.records.value_per_agreement);
                 // if(value.records.value_per_agreement){ this.valAsPerAgmtInWords = this._pd.convertNumberToWords(value.records.value_per_agreement); }
@@ -256,6 +272,17 @@ export class LoanDetailsComponent implements OnInit {
       }
     )
   }
+  getM_EndUseForLoan(pdid) {
+    this._pd.getEndUseForLoan(pdid).subscribe(
+      data => {
+        this.m_endUseForLoan = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        // this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
 
 getM_sourceofamount() {
     this._pd.getAllMasterDatas('SOURCEOFBALANCETRANSFER').subscribe(
@@ -381,13 +408,15 @@ getM_sourceofamount() {
         this.endUserList = [];
         let OthersAvaliable;
         event.forEach(option => {
-          let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0];
-          OthersAvaliable = othersData.name.substr(0,6).toLowerCase();
+        //   let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0];
+        let othersData = this.m_endUseForLoan.filter(sub=>sub.enduse_of_loan_id==option)[0];
+        console.log(othersData);
+          OthersAvaliable = othersData.enduse_of_loan.substr(0,6).toLowerCase();
+        console.log(OthersAvaliable);
           this.endUserList.push({ end_use: option });
-          
         });
 
-        if (OthersAvaliable == 'others') {    
+        if(OthersAvaliable == 'others') {    
             this.isOtherPurpose = true;
         }else
         {
@@ -442,23 +471,25 @@ getM_sourceofamount() {
         records.fk_createdby = this.pdid;
         records.loan_amount = this.loanDetailsForm.controls['loan_amount'].value;
         
-        // get end user final group data
-        let dataEnd_user_data = [];
-        this.loanDetailsForm.controls['end_use'].value.forEach(element => {
-                dataEnd_user_data.push({end_use: element})
+                // get end user final group data
+                let dataEnd_user_data = [];
+                this.loanDetailsForm.controls['end_use'].value.forEach(element => {
+                        dataEnd_user_data.push({end_use: element})
                 });
         records.end_use_group = dataEnd_user_data;
 
         if (this.isOtherPurpose) {
-            records.end_use_other = this.loanDetailsForm.controls['end_use_other'].value;
-        }else{ records.end_use_other = '' ;}
+        records.end_use_other = this.loanDetailsForm.controls['end_use_other'].value;
+        }else{ records.end_use_other = null ;}
+
         records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value;
         records.is_topup = this.loanDetailsForm.controls['is_topup'].value;
+        
         if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
-            records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value;
+        records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value;
         }
         else if(this.loanDetailsForm.controls['is_transfer'].value == 'no') {
-            records.own_contribution = this.loanDetailsForm.controls['own_contribution'].value;
+        records.own_contribution = this.loanDetailsForm.controls['own_contribution'].value;
             // records.source = this.loanDetailsForm.controls['source'].value;
             // if (this.loanDetailsForm.controls['source'].value == 'other') {
             //  records.lender_name_type = this.loanDetailsForm.controls['lender_name_type'].value;
@@ -488,19 +519,36 @@ getM_sourceofamount() {
         }
         
         records.emi_level = this.loanDetailsForm.controls['emi_level'].value;
-        records.property_type = this.loanDetailsForm.controls['property_type'].value;
-        records.property_type_others = this.loanDetailsForm.controls['property_type_others'].value;
-        // records.owner_name_group = this.ownerNames;
-        // console.log(this.loanDetailsForm.controls['owner_name'].value);
-        let dataOwner_name = [];
-        this.loanDetailsForm.controls['owner_name'].value.forEach(element => {
+        if(this.mortageCardAccess == true){
+            records.property_type = this.loanDetailsForm.controls['property_type'].value;
+            records.property_type_others = this.loanDetailsForm.controls['property_type_others'].value;
+            // records.owner_name_group = this.ownerNames;
+            // console.log(this.loanDetailsForm.controls['owner_name'].value);
+            let dataOwner_name = [];
+            this.loanDetailsForm.controls['owner_name'].value.forEach(element => {
                 dataOwner_name.push({owner_name: element})
                 });
-        records.owner_name_group = dataOwner_name;
+            records.owner_name_group = dataOwner_name;
+            if(this.OtherOwnerFlag){
+                records.other_owners_name = this.loanDetailsForm.controls['other_owners_name'].value;
+             }else{ records.other_owners_name = ''; }
+             records.construction_status = this.loanDetailsForm.controls['construction_status'].value;
+             records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value;
+        }else{
+            records.property_type = null;
+            records.property_type_others = null;
+            records.owner_name_group = null;
+            records.other_owners_name = null;
+            records.construction_status = null;
+            records.emv_per_customer = null;
+        }
+        
+        
+    
+        
+        
+        
         
-        if(this.OtherOwnerFlag){
-           records.other_owners_name = this.loanDetailsForm.controls['other_owners_name'].value;
-        }else{ records.other_owners_name = ''; }
 
         if(this.isOtherSource){
             records.other_source = this.loanDetailsForm.controls['other_source'].value;
@@ -510,7 +558,7 @@ getM_sourceofamount() {
             records.personal_loan_source = this.loanDetailsForm.controls['personal_loan_source'].value;
         }else{ records.personal_loan_source = ''; }
 
-        records.construction_status = this.loanDetailsForm.controls['construction_status'].value;
+      
         //records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
         records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value;
         //records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value;
@@ -612,8 +660,6 @@ getM_sourceofamount() {
       }else{
         this.mortageAccess = false; 
       }
-     
-     
   }
 
   /**
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 61bcfab5e..ab1b8d8d9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -164,7 +164,7 @@
                       </span> &nbsp;&nbsp;&nbsp;
                       <span *ngIf="applicant.landline != '' && applicant.landline != 'null-null' && applicant.landline != null " class="mb-2 text-center hover-icon">
                         <i class="fa-1x fa fa-phone" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>
-                        &nbsp;<span matPrefix>+91</span>{{applicant.landline}}
+                        &nbsp;{{applicant.landline}}
                       </span>
                       <span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">( Main Applicant ) </span>
                       <ng-template #codetails><span>( {{applicant.relation_name}} )</span></ng-template>
diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
index 42efd209c..3f26fc14a 100755
--- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
@@ -477,6 +477,13 @@ export class PdTrigerService {
             )
     }
 
+    getEndUseForLoan(pdid: any): Observable<any> {
+        return this._http.post<any>(this.apiUrl + "getEndUseOfLoan",{ "records":{ "pd_id" : pdid}})
+        .pipe(
+        catchError(this.handleError('operation', []))
+        )
+}
+
     // private handleError<T>(operation = 'operation', result?: T) {
     //   return (error: any): Observable<T> => {
     //     return of(result as T);