taxtank-core 0.21.9 → 0.21.10

package/fesm2015/taxtank-core.js

@@ -5568,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";
@@ -7437,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
@@ -7513,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;
@@ -7562,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
@@ -7570,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');
     }
 }
@@ -7624,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, {
@@ -7730,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');
     }
 }
 
@@ -7824,26 +7838,51 @@ class MyTaxPartnershipsAndTrusts {
 }
 
 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);
+    }
 }
 
 /**
@@ -13149,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
@@ -13191,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