taxtank-core 0.21.7 → 0.21.10

package/fesm2015/taxtank-core.js

@@ -5,7 +5,7 @@ import { CommonModule } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { ReplaySubject, Subject, BehaviorSubject, throwError, combineLatest, of, Observable, forkJoin, from } from 'rxjs';
-import { map, filter, catchError, take, switchMap, finalize, mergeMap } from 'rxjs/operators';
+import { map, filter, catchError, take, switchMap, finalize, mergeMap, distinctUntilChanged } from 'rxjs/operators';
 import { plainToClass, classToPlain, Type, Exclude, Transform, Expose } from 'class-transformer';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { __decorate, __awaiter } from 'tslib';
@@ -2107,6 +2107,12 @@ class Collection {
     removeBy(path, values) {
         return this.filter((item) => !(Array.isArray(values) ? values : [values]).includes(get(item, path)));
     }
+    minBy(path) {
+        return this.items.reduce((prev, current) => (get(prev, path) < get(current, path) ? prev : current));
+    }
+    maxBy(path) {
+        return this.items.reduce((prev, current) => (get(prev, path) > get(current, path) ? prev : current));
+    }
 }
 
 var TaxExemptionMetadataEnum;
@@ -4379,10 +4385,16 @@ var IncomeSourceTypeListOtherEnum;
 (function (IncomeSourceTypeListOtherEnum) {
     IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PSI"] = 6] = "PSI";
     IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PARTNERSHIPS_AND_TRUSTS"] = 9] = "PARTNERSHIPS_AND_TRUSTS";
+    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["TRUSTS"] = 9] = "TRUSTS";
     IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["OTHER_INCOME"] = 10] = "OTHER_INCOME";
+    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PARTNERSHIPS"] = 12] = "PARTNERSHIPS";
 })(IncomeSourceTypeListOtherEnum || (IncomeSourceTypeListOtherEnum = {}));
 
+var IncomeSourceTypeListSoleEnum;
+(function (IncomeSourceTypeListSoleEnum) {
+    IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
+})(IncomeSourceTypeListSoleEnum || (IncomeSourceTypeListSoleEnum = {}));
+
 class IncomeSourceType extends IncomeSourceType$1 {
     isBonuses() {
         return this.id === IncomeSourceTypeListWorkEnum.BONUSES;
@@ -4394,8 +4406,7 @@ class IncomeSourceType extends IncomeSourceType$1 {
         return !!IncomeSourceTypeListOtherEnum[this.id];
     }
     isSole() {
-        // @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
-        return !!IncomeSourceTypeListOtherEnum[this.id];
+        return !!IncomeSourceTypeListSoleEnum[this.id];
     }
     get type() {
         switch (true) {
@@ -5557,6 +5568,13 @@ var ChartAccountsHeadingListEnum;
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_RUNNING"] = 17] = "HOME_OFFICE_RUNNING";
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TOOLS_EQUIPMENT"] = 18] = "TOOLS_EQUIPMENT";
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_OCCUPANCY"] = 19] = "HOME_OFFICE_OCCUPANCY";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE"] = 20] = "AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["NEWSPAPER"] = 21] = "NEWSPAPER";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PRINTING_POSTAGE_STATIONERY"] = 22] = "PRINTING_POSTAGE_STATIONERY";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SEMINARS_ETC"] = 23] = "SEMINARS_ETC";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TELEPHONE"] = 24] = "TELEPHONE";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["UNION_FEES"] = 25] = "UNION_FEES";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER"] = 26] = "OTHER";
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DONATIONS"] = 27] = "DONATIONS";
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PSI"] = 30] = "PSI";
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BONUSES"] = 34] = "BONUSES";
@@ -5647,10 +5665,20 @@ var DepreciationWriteOffAmountEnum;
     DepreciationWriteOffAmountEnum[DepreciationWriteOffAmountEnum["BORROWING_EXPENSES"] = 100] = "BORROWING_EXPENSES";
 })(DepreciationWriteOffAmountEnum || (DepreciationWriteOffAmountEnum = {}));
 
-var IncomeSourceTypeListSoleEnum;
-(function (IncomeSourceTypeListSoleEnum) {
-    IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-})(IncomeSourceTypeListSoleEnum || (IncomeSourceTypeListSoleEnum = {}));
+var IncomeSourceForecastTrustTypeEnum;
+(function (IncomeSourceForecastTrustTypeEnum) {
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["SPECIAL_DISABILITY_TRUST"] = 1] = "SPECIAL_DISABILITY_TRUST";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DECEASED_ESTATE"] = 2] = "DECEASED_ESTATE";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["FIXED_TRUST"] = 3] = "FIXED_TRUST";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["HYBRID_TRUST"] = 4] = "HYBRID_TRUST";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DISCRETIONARY_SERVICE_TRUST"] = 5] = "DISCRETIONARY_SERVICE_TRUST";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DISCRETIONARY_TRADING_TRUST"] = 6] = "DISCRETIONARY_TRADING_TRUST";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DISCRETIONARY_INVESTMENT_TRUST"] = 7] = "DISCRETIONARY_INVESTMENT_TRUST";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["CASH_MANAGEMENT_UNIT_TRUST"] = 8] = "CASH_MANAGEMENT_UNIT_TRUST";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["PUBLIC_UNIT_TRUST_LISTED"] = 9] = "PUBLIC_UNIT_TRUST_LISTED";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["PUBLIC_UNIT_TRUST_UNLISTED"] = 10] = "PUBLIC_UNIT_TRUST_UNLISTED";
+    IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["TESTAMENTARY_TRUST"] = 11] = "TESTAMENTARY_TRUST";
+})(IncomeSourceForecastTrustTypeEnum || (IncomeSourceForecastTrustTypeEnum = {}));
 
 var InviteStatusEnum;
 (function (InviteStatusEnum) {
@@ -7416,7 +7444,14 @@ const DEDUCTION_CATEGORIES = {
         ChartAccountsHeadingListEnum.OTHER_WORK_RELATED_EXPENSES,
         ChartAccountsHeadingListEnum.SUBSCRIPTIONS,
         ChartAccountsHeadingListEnum.HOME_OFFICE_RUNNING,
-        ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY
+        ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY,
+        ChartAccountsHeadingListEnum.AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE,
+        ChartAccountsHeadingListEnum.NEWSPAPER,
+        ChartAccountsHeadingListEnum.PRINTING_POSTAGE_STATIONERY,
+        ChartAccountsHeadingListEnum.SEMINARS_ETC,
+        ChartAccountsHeadingListEnum.TELEPHONE,
+        ChartAccountsHeadingListEnum.UNION_FEES,
+        ChartAccountsHeadingListEnum.OTHER
     ],
     workRelatedSelfEducationExpenses: [
         ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
@@ -7492,45 +7527,45 @@ class MyTaxDeductions {
         this.workRelatedClothingExpenses = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);
         this.personalSuperContributions = this.transactions
-            .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.personalSuperContributions);
+            .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.personalSuperContributions);
         this.workRelatedSelfEducationExpenses = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);
         this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();
         this.workRelatedTravelExpensesTotalAmount = this.transactions
             .filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)
-            .sumBy('amount');
+            .sumBy('claimAmount');
         this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? DeductionClothingTypeEnum.COMPULSORY_C : null;
-        this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('amount');
+        this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');
         this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?
             DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;
-        this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('amount');
+        this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('claimAmount');
         this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)
             .getLowValuePoolDepreciations().sumBy('claimAmount');
         this.interestExpensesTotalAmount = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)
-            .sumBy('amount');
+            .sumBy('claimAmount');
         this.dividendExpensesTotalAmount = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.dividendExpenses)
-            .sumBy('amount');
+            .sumBy('claimAmount');
         this.donationsTotalAmount = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.donations)
-            .sumBy('amount');
+            .sumBy('claimAmount');
         this.interestsChargedByATOTotalAmount = this.transactions
             .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.interestsChargedByATO)
-            .sumBy('amount');
+            .sumBy('claimAmount');
         this.litigationCostsTotalAmount = this.transactions
             .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.litigationCosts)
-            .sumBy('amount');
+            .sumBy('claimAmount');
         this.otherManagingCostsTotalAmount = this.transactions
             .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherManagingCosts)
-            .sumBy('amount');
-        this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('amount');
+            .sumBy('claimAmount');
+        this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('claimAmount');
         this.forestryManagedInvestmentSchemesDeductionsTotalAmount = this.transactions
             .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)
-            .sumBy('amount');
+            .sumBy('claimAmount');
         this.otherDeductionsTotalAmount = this.transactions
             .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)
-            .sumBy('amount');
+            .sumBy('claimAmount');
     }
     getVehicleExpensesTotalAmount() {
         var _a;
@@ -7541,7 +7576,7 @@ class MyTaxDeductions {
     }
     setVehicleClaimData() {
         this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
-        this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('amount');
+        this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('claimAmount');
     }
     /**
      * Total amount from Other work related expenses and Tools & equipment depreciations
@@ -7549,7 +7584,7 @@ class MyTaxDeductions {
     setOtherWorkRelatedExpensesTotalAmount() {
         const otherIncomeRelatedExpenses = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
-        this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('amount')) +
+        this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
             this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
     }
 }
@@ -7603,8 +7638,8 @@ class MyTaxEstimate {
         const taxOffsetsReportItem = summarySection.items.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.TAX_OFFSETS);
         const lowMiddleIncomeTaxOffsets = this.getLowMiddleIncomeTaxOffsets(taxOffsetsReportItem);
         const taxPayable = grossTaxPayableReportItem.items.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.TAX_ON_TAXABLE_INCOME).amount;
-        const medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
-        const medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
+        const medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
+        const medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
         const taxCredits = summarySection.items.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.TAX_CREDITS).amount;
         const taxOffsets = this.getTaxOffsets(taxOffsetsReportItem.amount, lowMiddleIncomeTaxOffsets);
         return plainToClass(MyTaxEstimate, {
@@ -7709,7 +7744,7 @@ class MyTaxInterest {
         this.interestPaidTransactions = transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID);
         this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('amount');
         this.interestEarnedTotalTax = this.interestEarnedTransactions.sumBy('tax');
-        this.interestPaidTotalAmount = this.interestEarnedTransactions.sumBy('amount');
+        this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('amount');
     }
 }
 
@@ -7757,12 +7792,14 @@ class MyTaxOtherIncome {
 }
 
 class MyTaxPartnershipsAndTrusts {
-    constructor(transactions) {
+    constructor(transactions, incomeSources) {
         this.transactions = transactions;
+        this.incomeSources = incomeSources;
         this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
         this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
         this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
         this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
+        this.trustType = this.getTrustType();
         this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +
             (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));
         this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -
@@ -7782,29 +7819,70 @@ class MyTaxPartnershipsAndTrusts {
             .sumBy('value');
         this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
     }
+    /**
+     * Get Income source forecast trust type, related to trust income with max amount
+     */
+    getTrustType() {
+        const filteredTrustIncomes = this.trustsIncomes
+            .filterBy('incomeSource.id', this.incomeSources
+            .removeBy('actualForecast.trustType', null)
+            .getIds());
+        if (!filteredTrustIncomes.length) {
+            return null;
+        }
+        return this.incomeSources
+            .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
+            .actualForecast
+            .trustType;
+    }
 }
 
 class MyTaxRent {
-    constructor(transactions, depreciations) {
+    constructor(transactions, depreciations, taxSummary) {
         this.propertyExpenses = transactions.getPropertyTransactions().getExpenseTransactions();
+        this.taxSummaryPropertySection = taxSummary.property;
         this.grossRentAmount = transactions
+            .getPropertyTransactions()
             .getIncomeTransactions()
             .filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)
-            .sumBy('amount') +
-            transactions.
-                getIncomeTransactions()
+            .sumBy('claimAmount') +
+            transactions
+                .getPropertyTransactions()
+                .getIncomeTransactions()
                 .filterBy('chartAccounts.id', ChartAccountsListEnum.OTHER_RENTAL_INCOME)
-                .sumBy('amount');
+                .sumBy('claimAmount');
         this.interestDeductionsAmount = Math.abs(transactions.getInterestTransactions().sumBy('amount'));
         this.capitalWorksDeductionsAmount = Math.abs(depreciations.getCapitalDepreciations().sumBy('claimAmount'));
-        this.otherRentalDeductionsAmount = Math.abs(depreciations.getAssets().sumBy('claimAmount') +
-            depreciations.getBorrowingExpenseDepreciations().sumBy('claimAmount') +
-            this.propertyExpenses.sumBy('amount'));
+        this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
+        /**
+         * @Todo Vik uncomment when task TT-2009 will be implemented
+         */
+        // this.otherRentalDeductionsAmount = depreciations.getByTankType(TankTypeEnum.PROPERTY).getAssets().claimAmount +
+        //   depreciations.getByTankType(TankTypeEnum.PROPERTY).getBorrowingExpenseDepreciations().claimAmount +
+        //   Math.abs(this.propertyExpenses.sumBy('claimAmount'));
         this.netRent = this.grossRentAmount -
             this.interestDeductionsAmount -
             this.capitalWorksDeductionsAmount -
             this.otherRentalDeductionsAmount;
     }
+    /**
+     * @Todo Vik remove when TT-2009 will be implemented.
+     * We use tax summary data here because claim amount from depreciation is different
+     * from the claim amount that we get from tax summary (depreciation claim amount is not affected by property share,
+     * property contract date, e.t.c.). Details in the TT-2009 task
+     */
+    calculateOtherRentalDeductionsAmount() {
+        const plantAndEquipmentAmount = Math.abs(this.taxSummaryPropertySection.items
+            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.DEPRECIATION)
+            .amount);
+        const borrowingExpensesAmount = Math.abs(this.taxSummaryPropertySection.items
+            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)
+            .amount);
+        const otherRentalDeductionsAmount = Math.abs(this.taxSummaryPropertySection.items
+            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)
+            .amount);
+        return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
+    }
 }
 
 /**
@@ -12827,6 +12905,31 @@ function autocompleteValidator() {
     };
 }
 
+function conditionalValidator(condition, validator) {
+    return function (control) {
+        revalidateOnChanges(control);
+        if (control && control.parent) {
+            if (condition(control.parent)) {
+                return validator(control);
+            }
+        }
+        return null;
+    };
+}
+/**
+ * Conditional validator depends on other fields and should be updated on each form value change
+ */
+function revalidateOnChanges(control) {
+    if (control && control.parent && !control['_revalidateOnChanges']) {
+        control['_revalidateOnChanges'] = true;
+        control.parent.valueChanges.pipe(distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)))
+            .subscribe(() => {
+            control.updateValueAndValidity({ emitEvent: false });
+        });
+    }
+    return;
+}
+
 /**
  * Regular expressions that are used to check password strength and valid values
  */
@@ -13085,12 +13188,12 @@ class MyTaxDeductionsForm extends AbstractForm {
                 value: deductions.workRelatedTravelExpensesTotalAmount,
                 disabled: true
             }),
-            workRelatedClothingType: new FormControl(deductions.workRelatedClothingType, Validators.required),
+            workRelatedClothingType: new FormControl(deductions.workRelatedClothingType, conditionalValidator(() => !!deductions.workRelatedClothingTotalAmount, Validators.required)),
             workRelatedClothingTotalAmount: new FormControl({
                 value: deductions.workRelatedClothingTotalAmount,
                 disabled: true
             }),
-            workRelatedSelfEducationType: new FormControl(deductions.workRelatedSelfEducationType, Validators.required),
+            workRelatedSelfEducationType: new FormControl(deductions.workRelatedSelfEducationType, conditionalValidator(() => !!deductions.workRelatedSelfEducationTotalAmount, Validators.required)),
             workRelatedSelfEducationTotalAmount: new FormControl({
                 value: deductions.workRelatedSelfEducationTotalAmount,
                 disabled: true
@@ -13127,6 +13230,11 @@ class MyTaxDeductionsForm extends AbstractForm {
                 value: deductions.otherManagingCostsTotalAmount,
                 disabled: true
             }),
+            fundName: new FormControl(''),
+            hasFund: new FormControl(false),
+            fundABN: new FormControl(''),
+            fundTFN: new FormControl(''),
+            fundAccountNumber: new FormControl(''),
             personalSuperContributionsTotalAmount: new FormControl({
                 value: deductions.personalSuperContributionsTotalAmount,
                 disabled: true
@@ -13380,7 +13488,9 @@ class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
                 value: partnershipsAndTrusts.trustsNetIncome,
                 disabled: true
             }),
-            trustType: new FormControl(1),
+            trustType: new FormControl(partnershipsAndTrusts.trustType, conditionalValidator((control) => {
+                return !!partnershipsAndTrusts.trustsIncomes.length;
+            }, Validators.required)),
             partnershipsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, Validators.required),
             trustsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, Validators.required),
             taxPaidTotal: new FormControl({
@@ -13418,5 +13528,5 @@ class MyTaxRentForm extends AbstractForm {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountLoanForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankLoginData, BankLoginForm, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, ChartAccounts, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEDUCTION_CATEGORIES, DEFAULT_VEHICLE_EXPENSE, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DeductionClothingTypeEnum, DeductionSelfEducationTypeEnum, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, KompassifyService, Loan, LoanBankTypeEnum, LoanCollection, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookPeriod, LoginForm, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessOrLosses, MyTaxBusinessOrLossesForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, MyTaxEmployeeShareSchemes, MyTaxEmployeeShareSchemesForm, MyTaxEstimate, MyTaxIncomeStatements, MyTaxIncomeStatementsForm, MyTaxIncomeTests, MyTaxIncomeTestsForm, MyTaxInterest, MyTaxInterestForm, MyTaxLosses, MyTaxLossesForm, MyTaxMedicareForm, MyTaxOffsets, MyTaxOffsetsForm, MyTaxOtherIncome, MyTaxOtherIncomeForm, MyTaxPartnershipsAndTrusts, MyTaxPartnershipsAndTrustsForm, MyTaxRent, MyTaxRentForm, Notification, Occupation, OccupationService, PASSWORD_REGEXPS, PasswordForm, PdfFromDataTableService, PdfFromDomElementService, PdfFromHtmlTableService, PdfOrientationEnum, PdfSettings, Phone, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyForecast, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, SUBSCRIPTION_DESCRIPTION, SUBSCRIPTION_TITLE, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentStatusEnum, ServicePrice, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductIdEnum, ServiceProductStatusEnum, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleForecast, SoleForecastService, SpareDocumentSpareTypeEnum, SseService, SubscriptionService, SubscriptionTypeEnum, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, Vehicle, VehicleClaim, VehicleClaimForm, VehicleClaimMethodEnum, VehicleClaimService, VehicleCollection, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleService, WORK_TANK_LOGBOOK_PURPOSE_OPTIONS, XlsxService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, createDate, displayMatOptions, enumToList, getDocIcon, passwordMatchValidator, passwordValidator, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate };
+export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountLoanForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankLoginData, BankLoginForm, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, ChartAccounts, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEDUCTION_CATEGORIES, DEFAULT_VEHICLE_EXPENSE, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DeductionClothingTypeEnum, DeductionSelfEducationTypeEnum, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, KompassifyService, Loan, LoanBankTypeEnum, LoanCollection, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookPeriod, LoginForm, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessOrLosses, MyTaxBusinessOrLossesForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, MyTaxEmployeeShareSchemes, MyTaxEmployeeShareSchemesForm, MyTaxEstimate, MyTaxIncomeStatements, MyTaxIncomeStatementsForm, MyTaxIncomeTests, MyTaxIncomeTestsForm, MyTaxInterest, MyTaxInterestForm, MyTaxLosses, MyTaxLossesForm, MyTaxMedicareForm, MyTaxOffsets, MyTaxOffsetsForm, MyTaxOtherIncome, MyTaxOtherIncomeForm, MyTaxPartnershipsAndTrusts, MyTaxPartnershipsAndTrustsForm, MyTaxRent, MyTaxRentForm, Notification, Occupation, OccupationService, PASSWORD_REGEXPS, PasswordForm, PdfFromDataTableService, PdfFromDomElementService, PdfFromHtmlTableService, PdfOrientationEnum, PdfSettings, Phone, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyForecast, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, SUBSCRIPTION_DESCRIPTION, SUBSCRIPTION_TITLE, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentStatusEnum, ServicePrice, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductIdEnum, ServiceProductStatusEnum, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleForecast, SoleForecastService, SpareDocumentSpareTypeEnum, SseService, SubscriptionService, SubscriptionTypeEnum, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, Vehicle, VehicleClaim, VehicleClaimForm, VehicleClaimMethodEnum, VehicleClaimService, VehicleCollection, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleService, WORK_TANK_LOGBOOK_PURPOSE_OPTIONS, XlsxService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, displayMatOptions, enumToList, getDocIcon, passwordMatchValidator, passwordValidator, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate };
 //# sourceMappingURL=taxtank-core.js.map