Datepickers using max date with business date

src/app/products/charges/create-charge/create-charge.component.ts

@@ -54,8 +54,12 @@ export class CreateChargeComponent implements OnInit {
               private settingsService: SettingsService) {
     this.route.data.subscribe((data: { chargesTemplate: any }) => {
       this.chargesTemplateData = data.chargesTemplate;
-      this.incomeAndLiabilityAccountData = data.chargesTemplate.incomeOrLiabilityAccountOptions.incomeAccountOptions
-        .concat(data.chargesTemplate.incomeOrLiabilityAccountOptions.liabilityAccountOptions);
+      if (data.chargesTemplate.incomeOrLiabilityAccountOptions.liabilityAccountOptions) {
+        this.incomeAndLiabilityAccountData = data.chargesTemplate.incomeOrLiabilityAccountOptions.incomeAccountOptions
+          .concat(data.chargesTemplate.incomeOrLiabilityAccountOptions.liabilityAccountOptions);
+      } else {
+        this.incomeAndLiabilityAccountData = data.chargesTemplate.incomeOrLiabilityAccountOptions.incomeAccountOptions;
+      }
     });
   }
 

src/app/products/share-products/create-dividend/create-dividend.component.ts

@@ -49,6 +49,7 @@ export class CreateDividendComponent implements OnInit {
   }
 
   ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
     this.setDividendForm();
   }