taxtank-core 0.21.7 → 0.21.10

package/bundles/taxtank-core.umd.js

@@ -2867,6 +2867,12 @@
         Collection.prototype.removeBy = function (path, values) {
             return this.filter(function (item) { return !(Array.isArray(values) ? values : [values]).includes(get__default["default"](item, path)); });
         };
+        Collection.prototype.minBy = function (path) {
+            return this.items.reduce(function (prev, current) { return (get__default["default"](prev, path) < get__default["default"](current, path) ? prev : current); });
+        };
+        Collection.prototype.maxBy = function (path) {
+            return this.items.reduce(function (prev, current) { return (get__default["default"](prev, path) > get__default["default"](current, path) ? prev : current); });
+        };
         return Collection;
     }());
 
@@ -5688,10 +5694,16 @@
     (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";
     })(exports.IncomeSourceTypeListOtherEnum || (exports.IncomeSourceTypeListOtherEnum = {}));
 
+    exports.IncomeSourceTypeListSoleEnum = void 0;
+    (function (IncomeSourceTypeListSoleEnum) {
+        IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
+    })(exports.IncomeSourceTypeListSoleEnum || (exports.IncomeSourceTypeListSoleEnum = {}));
+
     var IncomeSourceType = /** @class */ (function (_super) {
         __extends(IncomeSourceType, _super);
         function IncomeSourceType() {
@@ -5707,8 +5719,7 @@
             return !!exports.IncomeSourceTypeListOtherEnum[this.id];
         };
         IncomeSourceType.prototype.isSole = function () {
-            // @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
-            return !!exports.IncomeSourceTypeListOtherEnum[this.id];
+            return !!exports.IncomeSourceTypeListSoleEnum[this.id];
         };
         Object.defineProperty(IncomeSourceType.prototype, "type", {
             get: function () {
@@ -7134,6 +7145,13 @@
         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";
@@ -7224,10 +7242,20 @@
         DepreciationWriteOffAmountEnum[DepreciationWriteOffAmountEnum["BORROWING_EXPENSES"] = 100] = "BORROWING_EXPENSES";
     })(exports.DepreciationWriteOffAmountEnum || (exports.DepreciationWriteOffAmountEnum = {}));
 
-    exports.IncomeSourceTypeListSoleEnum = void 0;
-    (function (IncomeSourceTypeListSoleEnum) {
-        IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-    })(exports.IncomeSourceTypeListSoleEnum || (exports.IncomeSourceTypeListSoleEnum = {}));
+    exports.IncomeSourceForecastTrustTypeEnum = void 0;
+    (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";
+    })(exports.IncomeSourceForecastTrustTypeEnum || (exports.IncomeSourceForecastTrustTypeEnum = {}));
 
     exports.InviteStatusEnum = void 0;
     (function (InviteStatusEnum) {
@@ -9323,7 +9351,14 @@
             exports.ChartAccountsHeadingListEnum.OTHER_WORK_RELATED_EXPENSES,
             exports.ChartAccountsHeadingListEnum.SUBSCRIPTIONS,
             exports.ChartAccountsHeadingListEnum.HOME_OFFICE_RUNNING,
-            exports.ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY
+            exports.ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY,
+            exports.ChartAccountsHeadingListEnum.AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE,
+            exports.ChartAccountsHeadingListEnum.NEWSPAPER,
+            exports.ChartAccountsHeadingListEnum.PRINTING_POSTAGE_STATIONERY,
+            exports.ChartAccountsHeadingListEnum.SEMINARS_ETC,
+            exports.ChartAccountsHeadingListEnum.TELEPHONE,
+            exports.ChartAccountsHeadingListEnum.UNION_FEES,
+            exports.ChartAccountsHeadingListEnum.OTHER
         ],
         workRelatedSelfEducationExpenses: [
             exports.ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
@@ -9399,45 +9434,45 @@
             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', exports.ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? exports.DeductionClothingTypeEnum.COMPULSORY_C : null;
-            this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('amount');
+            this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');
             this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?
                 exports.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(exports.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');
         }
         MyTaxDeductions.prototype.getVehicleExpensesTotalAmount = function () {
             var _a;
@@ -9448,7 +9483,7 @@
         };
         MyTaxDeductions.prototype.setVehicleClaimData = function () {
             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
@@ -9456,7 +9491,7 @@
         MyTaxDeductions.prototype.setOtherWorkRelatedExpensesTotalAmount = function () {
             var 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', exports.ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
         };
         return MyTaxDeductions;
@@ -9515,8 +9550,8 @@
             var taxOffsetsReportItem = summarySection.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_OFFSETS);
             var lowMiddleIncomeTaxOffsets = this.getLowMiddleIncomeTaxOffsets(taxOffsetsReportItem);
             var taxPayable = grossTaxPayableReportItem.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_ON_TAXABLE_INCOME).amount;
-            var medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
-            var medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
+            var medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
+            var medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
             var taxCredits = summarySection.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_CREDITS).amount;
             var taxOffsets = this.getTaxOffsets(taxOffsetsReportItem.amount, lowMiddleIncomeTaxOffsets);
             return classTransformer.plainToClass(MyTaxEstimate, {
@@ -9624,7 +9659,7 @@
             this.interestPaidTransactions = transactions.filterBy('chartAccounts.id', exports.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');
         }
         return MyTaxInterest;
     }());
@@ -9676,12 +9711,14 @@
     }());
 
     var MyTaxPartnershipsAndTrusts = /** @class */ (function () {
-        function MyTaxPartnershipsAndTrusts(transactions) {
+        function MyTaxPartnershipsAndTrusts(transactions, incomeSources) {
             this.transactions = transactions;
+            this.incomeSources = incomeSources;
             this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_INCOME);
             this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
             this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TRUST_INCOME);
             this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', exports.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') -
@@ -9701,30 +9738,71 @@
                 .sumBy('value');
             this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
         }
+        /**
+         * Get Income source forecast trust type, related to trust income with max amount
+         */
+        MyTaxPartnershipsAndTrusts.prototype.getTrustType = function () {
+            var 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;
+        };
         return MyTaxPartnershipsAndTrusts;
     }());
 
     var MyTaxRent = /** @class */ (function () {
-        function MyTaxRent(transactions, depreciations) {
+        function MyTaxRent(transactions, depreciations, taxSummary) {
             this.propertyExpenses = transactions.getPropertyTransactions().getExpenseTransactions();
+            this.taxSummaryPropertySection = taxSummary.property;
             this.grossRentAmount = transactions
+                .getPropertyTransactions()
                 .getIncomeTransactions()
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.RENTAL_INCOME)
-                .sumBy('amount') +
-                transactions.
-                    getIncomeTransactions()
+                .sumBy('claimAmount') +
+                transactions
+                    .getPropertyTransactions()
+                    .getIncomeTransactions()
                     .filterBy('chartAccounts.id', exports.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
+         */
+        MyTaxRent.prototype.calculateOtherRentalDeductionsAmount = function () {
+            var plantAndEquipmentAmount = Math.abs(this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.DEPRECIATION)
+                .amount);
+            var borrowingExpensesAmount = Math.abs(this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)
+                .amount);
+            var otherRentalDeductionsAmount = Math.abs(this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)
+                .amount);
+            return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
+        };
         return MyTaxRent;
     }());
 
@@ -15265,6 +15343,31 @@
         };
     }
 
+    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(operators.distinctUntilChanged(function (a, b) { return JSON.stringify(a) === JSON.stringify(b); }))
+                .subscribe(function () {
+                control.updateValueAndValidity({ emitEvent: false });
+            });
+        }
+        return;
+    }
+
     /**
      * Regular expressions that are used to check password strength and valid values
      */
@@ -15553,12 +15656,12 @@
                     value: deductions.workRelatedTravelExpensesTotalAmount,
                     disabled: true
                 }),
-                workRelatedClothingType: new forms.FormControl(deductions.workRelatedClothingType, forms.Validators.required),
+                workRelatedClothingType: new forms.FormControl(deductions.workRelatedClothingType, conditionalValidator(function () { return !!deductions.workRelatedClothingTotalAmount; }, forms.Validators.required)),
                 workRelatedClothingTotalAmount: new forms.FormControl({
                     value: deductions.workRelatedClothingTotalAmount,
                     disabled: true
                 }),
-                workRelatedSelfEducationType: new forms.FormControl(deductions.workRelatedSelfEducationType, forms.Validators.required),
+                workRelatedSelfEducationType: new forms.FormControl(deductions.workRelatedSelfEducationType, conditionalValidator(function () { return !!deductions.workRelatedSelfEducationTotalAmount; }, forms.Validators.required)),
                 workRelatedSelfEducationTotalAmount: new forms.FormControl({
                     value: deductions.workRelatedSelfEducationTotalAmount,
                     disabled: true
@@ -15595,6 +15698,11 @@
                     value: deductions.otherManagingCostsTotalAmount,
                     disabled: true
                 }),
+                fundName: new forms.FormControl(''),
+                hasFund: new forms.FormControl(false),
+                fundABN: new forms.FormControl(''),
+                fundTFN: new forms.FormControl(''),
+                fundAccountNumber: new forms.FormControl(''),
                 personalSuperContributionsTotalAmount: new forms.FormControl({
                     value: deductions.personalSuperContributionsTotalAmount,
                     disabled: true
@@ -15873,7 +15981,9 @@
                     value: partnershipsAndTrusts.trustsNetIncome,
                     disabled: true
                 }),
-                trustType: new forms.FormControl(1),
+                trustType: new forms.FormControl(partnershipsAndTrusts.trustType, conditionalValidator(function (control) {
+                    return !!partnershipsAndTrusts.trustsIncomes.length;
+                }, forms.Validators.required)),
                 partnershipsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, forms.Validators.required),
                 trustsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, forms.Validators.required),
                 taxPaidTotal: new forms.FormControl({
@@ -16200,6 +16310,7 @@
     exports.cloneDeep = cloneDeep;
     exports.compare = compare;
     exports.compareMatOptions = compareMatOptions;
+    exports.conditionalValidator = conditionalValidator;
     exports.createDate = createDate;
     exports.displayMatOptions = displayMatOptions;
     exports.enumToList = enumToList;