diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html
index a17966509..41372a8b1 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html
@@ -13,7 +13,7 @@
     <mat-dialog-content>
     
       <mat-card formArrayName="addtional_requirements" *ngFor="let requirements of pdRequirements.controls; let i = index;">
-          <mat-card-content [formGroupName]="i">
+          <mat-card-content [formGroupName]="i" *ngIf="requirements.value.isactive != 0">
                   <mat-form-field style="width: 90%;">
                           <input matInput placeholder="Queries" formControlName="add_requirement">
                   </mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts
index a41dec04c..b1cb55ac8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts
@@ -68,7 +68,13 @@ export class PdRequirementComponent implements OnInit {
 
       removeRequirements(index: number) {
         const requirement_control = <FormArray>this._EditPDRequirementForm.controls['addtional_requirements'];
+        console.log(requirement_control)
+        if(requirement_control.value[index].add_req_id != ''){
+          requirement_control.controls[index]['controls'].isactive.setValue(0)
+        }
+        else{
         requirement_control.removeAt(index);
+        }
       }
 
       updateAdditionalRequirement(formValue: any) {
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 74ea7bdb0..884e9b4df 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,3)">
+                                    minlength="1" maxlength="2" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,2)">
                                   <!-- <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 092541894..3b8989b55 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
@@ -811,21 +811,36 @@ export class AssetsInfoComponent implements OnInit {
       let years = Math.floor(value/12);
       let months = value % 12;
       console.log(years,months);
-     
+      vintage_personal=vintage_personal ==  '' ? 0 : vintage_personal
       vintage_personal=parseInt(vintage_personal)+ years
       control.controls[controlKey].controls['asset_months'].setValue(months)
     }
+    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(control.controls[controlKey].controls['purchase_year'].value - 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));
+        control.controls[controlKey].controls['purchase_year'].setValue(parseInt(this.currentYear)-monthMinus);
       }
     }
     else if (type == 3) {
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 c6d40214b..bad8dbf4d 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
@@ -903,21 +903,37 @@ export class BusinessAssetsInfoComponent implements OnInit {
       let years = Math.floor(value/12);
       let months = value % 12;
       console.log(years,months);
-     
+      vintage_personal=vintage_personal ==  '' ? 0 : vintage_personal
       vintage_personal=parseInt(vintage_personal)+ years
       control.controls[controlKey].controls['asset_months'].setValue(months)
     }
+    let currentMonth:any=new Date().getMonth()+1
+ 
+    let monthMinus:any=0;
+   
      
       control.controls[controlKey].controls['business_vintage'].setValue(vintage_personal)
       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(control.controls[controlKey].controls['business_purchase_year'].value - 1);
+        control.controls[controlKey].controls['business_purchase_year'].setValue(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));
+        control.controls[controlKey].controls['business_purchase_year'].setValue(parseInt(this.currentYear)-monthMinus);
       }
     }
   }