taxtank-core 0.21.9 → 0.21.10

package/bundles/taxtank-core.umd.js

@@ -7145,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";
@@ -9344,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
@@ -9420,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;
@@ -9469,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
@@ -9477,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;
@@ -9536,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, {
@@ -9645,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;
     }());
@@ -9744,26 +9758,51 @@
     }());
 
     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;
     }());
 
@@ -15617,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
@@ -15659,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