diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index 884e9b4df..74ea7bdb0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -364,7 +364,7 @@
 
                                   <mat-label>Age of Asset in Years</mat-label>
                                   <input matInput autocomplete="off" placeholder="eg.99" formControlName="vintage_personal"
-                                    minlength="1" maxlength="2" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,2)">
+                                    minlength="1" maxlength="2" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,3)">
                                   <!-- <mat-error> Invalid format</mat-error> -->
 
                                 </mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index 3b8989b55..27fc56a64 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -844,8 +844,37 @@ export class AssetsInfoComponent implements OnInit {
       }
     }
     else if (type == 3) {
+      // let control: any = <FormArray>this._assetsQuesFrom.controls['assets_details'];
+      // control.controls[controlKey].controls['purchase_year'].setValue(value != '' ? parseInt(this.currentYear) - parseInt(value) : '');
       let control: any = <FormArray>this._assetsQuesFrom.controls['assets_details'];
-      control.controls[controlKey].controls['purchase_year'].setValue(value != '' ? parseInt(this.currentYear) - parseInt(value) : '');
+      let vintage_personal=control.controls[controlKey].controls['vintage_personal'].value
+
+      control.controls[controlKey].controls['purchase_year'].setValue('');
+    
+    let currentMonth:any=new Date().getMonth()+1
+ 
+    let monthMinus:any=0;    
+      // control.controls[controlKey].controls['vintage_personal'].setValue(vintage_personal)
+      control.controls[controlKey].controls['purchase_year'].setValue(vintage_personal != '' ? parseInt(this.currentYear) - parseInt(vintage_personal) : '');
+      if(control.controls[controlKey].controls['asset_months'].value  !=  ''){
+    if(parseInt(currentMonth)-parseInt(control.controls[controlKey].controls['asset_months'].value) < 0){
+      monthMinus=parseInt(currentMonth)-parseInt(control.controls[controlKey].controls['asset_months'].value) 
+      if(monthMinus > -12){
+        monthMinus=1
+      }
+      else{
+        monthMinus=2
+      }
+    }
+  }
+      if(control.controls[controlKey].controls['asset_months'].value > 0 && (vintage_personal != '' || vintage_personal != 0)){
+        // vintage_personal=parseInt(vintage_personal)-1
+        control.controls[controlKey].controls['purchase_year'].setValue(parseInt( control.controls[controlKey].controls['purchase_year'].value)-monthMinus);
+
+      }
+      else if(control.controls[controlKey].controls['asset_months'].value > 0 && control.controls[controlKey].controls['asset_months'].value <12 && (vintage_personal == '' || vintage_personal == 0)){
+        control.controls[controlKey].controls['purchase_year'].setValue(parseInt(this.currentYear)-monthMinus);
+      }
     }
     else if (type == 4) {
       let control: any = <FormArray>this._assetsQuesFrom.controls['assets_details'];
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
index bfafa3ed5..3686548cc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
@@ -160,7 +160,7 @@
                             <mat-label>Age of Asset in Years</mat-label>
                             <input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage"
                               minlength="1" maxlength="2" OnlyNumber type="text"
-                              (keyup)="calculateVintagePurchase($event.target.value,i,5)">
+                              (keyup)="calculateVintagePurchase($event.target.value,i,1)">
                             <!-- <mat-error> Invalid format</mat-error> -->
                           </mat-form-field>
                           <mat-form-field style="width:45%">
@@ -420,7 +420,7 @@
                                   <mat-label>Age of Asset in Years</mat-label>
                                   <input matInput autocomplete="off" placeholder="eg.99"
                                     formControlName="business_vintage" minlength="1" maxlength="2" OnlyNumber
-                                    type="text" (keyup)="calculateVintagePurchase($event.target.value,i,6)">
+                                    type="text" (keyup)="calculateVintagePurchase($event.target.value,i,3)">
                                   <!-- <mat-error> Invalid format</mat-error> -->
                                 </mat-form-field>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
index bad8dbf4d..a320a371e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
@@ -864,19 +864,56 @@ export class BusinessAssetsInfoComponent implements OnInit {
 
   // calculate vintage and purchase {}
   calculateVintagePurchase(value: any, controlKey: any, type: number) {
-    if (type == 1) {
-      let control: any = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_details'];
-      control.controls[controlKey].controls['business_purchase_year'].setValue(value != '' ? parseInt(this.currentYear) - parseInt(value) : '');
-    }
-    else if (type == 2) {
+    // if (type == 1) {
+    //   let control: any = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_details'];
+    //   control.controls[controlKey].controls['business_purchase_year'].setValue(value != '' ? parseInt(this.currentYear) - parseInt(value) : '');
+    // }
+     if (type == 2) {
       let control: any = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_details'];
       value != '' && value <= this.currentYear ? control.controls[controlKey].controls['business_purchase_year'].setValue(value) : control.controls[controlKey].controls['business_purchase_year'].setValue('');
       value != '' && value <= this.currentYear ? control.controls[controlKey].controls['business_vintage'].setValue(parseInt(this.currentYear) - parseInt(value)) : control.controls[controlKey].controls['business_vintage'].setValue('')
       control.controls[controlKey].controls['asset_months'].setValue('')
     }
-    if (type == 3) {
-      let control: any = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];
-      control.controls[controlKey].controls['business_purchase_year'].setValue(value != '' ? parseInt(this.currentYear) - parseInt(value) : '');
+    if (type == 3 || type == 1) {
+      // let control: any = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];
+      // control.controls[controlKey].controls['business_purchase_year'].setValue(value != '' ? parseInt(this.currentYear) - parseInt(value) : '');
+
+      let control: any
+      if(type == 1){
+         control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];
+      }
+      else if(type == 3){
+         control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_details'];
+      }
+      // let control: any = <FormArray>this._assetsQuesFrom.controls['assets_details'];
+      let vintage_personal=control.controls[controlKey].controls['business_vintage'].value
+
+      control.controls[controlKey].controls['business_purchase_year'].setValue('');
+    
+    let currentMonth:any=new Date().getMonth()+1
+ 
+    let monthMinus:any=0;    
+      // control.controls[controlKey].controls['business_vintage'].setValue(business_vintage)
+      control.controls[controlKey].controls['business_purchase_year'].setValue(vintage_personal != '' ? parseInt(this.currentYear) - parseInt(vintage_personal) : '');
+      if(control.controls[controlKey].controls['asset_months'].value  !=  ''){
+    if(parseInt(currentMonth)-parseInt(control.controls[controlKey].controls['asset_months'].value) < 0){
+      monthMinus=parseInt(currentMonth)-parseInt(control.controls[controlKey].controls['asset_months'].value) 
+      if(monthMinus > -12){
+        monthMinus=1
+      }
+      else{
+        monthMinus=2
+      }
+    }
+  }
+      if(control.controls[controlKey].controls['asset_months'].value > 0 && (vintage_personal != '' || vintage_personal != 0)){
+        // vintage_personal=parseInt(vintage_personal)-1
+        control.controls[controlKey].controls['business_purchase_year'].setValue(parseInt( control.controls[controlKey].controls['business_purchase_year'].value)-monthMinus);
+
+      }
+      else if(control.controls[controlKey].controls['asset_months'].value > 0 && control.controls[controlKey].controls['asset_months'].value <12 && (vintage_personal == '' || vintage_personal == 0)){
+        control.controls[controlKey].controls['business_purchase_year'].setValue(parseInt(this.currentYear)-monthMinus);
+      }
     }
     else if (type == 4) {
       let control: any = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];