taxtank-core 0.28.82 → 0.28.83

package/bundles/taxtank-core.umd.js

@@ -11648,7 +11648,7 @@
         MyTaxCgt.createFrom = function (propertySales, properties, clientCapitalLoss) {
             return classTransformer.plainToClass(MyTaxCgt, {
                 hasCapitalGain: !!propertySales.grossCGT,
-                hasExemption: this.isCGTApplicable(propertySales, properties),
+                hasExemption: !!propertySales.grossCGT && this.isCGTApplicable(propertySales, properties),
                 netCapitalGain: propertySales.sumBy('netCGT'),
                 grossCapitalGain: propertySales.grossCGT,
                 netCapitalLoss: clientCapitalLoss
@@ -11930,7 +11930,7 @@
                 .groupBy('incomeSource.name');
             this.allowanceTotalAmount = this.transactionsByChartAccountsHeadings
                 .get(exports.ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)
-                .sumBy('amount');
+                .sumBy('grossAmount');
             this.allowanceTotalTax = this.transactionsByChartAccountsHeadings
                 .get(exports.ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)
                 .sumBy('tax');
@@ -11946,13 +11946,13 @@
             this.lumpBTransactionsTotalTax = this.transactionsByChartAccounts.get(exports.ChartAccountsListEnum.LUMP_SUM_B).sumBy('tax');
             this.australianAllowancesAndPaymentsTotalAmount = this.transactionsByChartAccountsHeadings
                 .get(exports.ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)
-                .sumBy('amount');
+                .sumBy('grossAmount');
             this.australianAllowancesAndPaymentsTotalTax = this.transactionsByChartAccountsHeadings
                 .get(exports.ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)
                 .sumBy('tax');
             this.australianPensionsAndAllowancesTotalAmount = this.transactionsByChartAccountsHeadings
                 .get(exports.ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)
-                .sumBy('amount');
+                .sumBy('grossAmount');
             this.australianPensionsAndAllowancesTotalTax = this.transactionsByChartAccountsHeadings
                 .get(exports.ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)
                 .sumBy('tax');
@@ -11974,7 +11974,7 @@
                 exports.ChartAccountsListEnum.CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH
             ]).sumBy('untaxedElement');
             this.attributablePsiTransactionsTotalAmount = this.transactionsByChartAccounts
-                .get(exports.ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('amount');
+                .get(exports.ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('grossAmount');
             this.attributablePsiTransactionsTotalTax = this.transactionsByChartAccounts
                 .get(exports.ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('tax');
         }
@@ -11994,9 +11994,9 @@
         function MyTaxInterest(transactions) {
             this.interestEarnedTransactions = transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.INTEREST_EARNED);
             this.interestPaidTransactions = transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ATO_INTEREST_PAID);
-            this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('amount');
+            this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('grossAmount');
             this.interestEarnedTotalTax = this.interestEarnedTransactions.sumBy('tax');
-            this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('amount');
+            this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('grossAmount');
         }
         return MyTaxInterest;
     }());
@@ -12031,22 +12031,22 @@
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.LUMP_SUM_PAYMENTS_IN_ARREARS);
             this.bonusesTotalAmount = this.transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.BONUSES)
-                .sumBy('amount');
+                .sumBy('grossAmount');
             this.forestryManagedInvestmentSchemesIncomeTotalAmount = this.transactions
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES_INCOME)
-                .sumBy('amount');
+                .sumBy('grossAmount');
             this.lumpSumPaymentsInArrearsTotalTax = this.lumpSumPaymentsInArrearsTransactions.sumBy('tax');
             this.specialProfessionIncomeTotalAmount = this.transactions
-                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.SPECIAL_PROFESSION_INCOME).sumBy('amount');
-            this.category1TotalIncome = this.lumpSumPaymentsInArrearsTransactions.sumBy('amount') +
-                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.JURY_ATTENDANCE_FEES).sumBy('amount') +
-                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.FOREIGN_EXCHANGE_GAINS_NON_BUSINESS).sumBy('amount') +
-                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ROYALTIES).sumBy('amount') +
-                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS).sumBy('amount');
-            this.atoInterestPaidTotalAmount = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ATO_INTEREST_PAID).sumBy('amount');
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.SPECIAL_PROFESSION_INCOME).sumBy('grossAmount');
+            this.category1TotalIncome = this.lumpSumPaymentsInArrearsTransactions.sumBy('grossAmount') +
+                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.JURY_ATTENDANCE_FEES).sumBy('grossAmount') +
+                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.FOREIGN_EXCHANGE_GAINS_NON_BUSINESS).sumBy('grossAmount') +
+                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ROYALTIES).sumBy('grossAmount') +
+                this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS).sumBy('grossAmount');
+            this.atoInterestPaidTotalAmount = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ATO_INTEREST_PAID).sumBy('grossAmount');
             this.gainOnSaleOfVehiclePreviouslyDepreciatedTotalAmount = this.transactions
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.GAIN_ON_SALE_OF_VEHICLE_PREVIOUSLY_DEPRECIATED)
-                .sumBy('amount');
+                .sumBy('grossAmount');
         }
         return MyTaxOtherIncome;
     }());