taxtank-core 0.28.82 → 0.28.83
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/taxtank-core.umd.js +17 -17
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/models/report/my-tax/my-tax-cgt/my-tax-cgt.js +2 -2
- package/esm2015/lib/models/report/my-tax/my-tax-income-statements/my-tax-income-statements.js +5 -5
- package/esm2015/lib/models/report/my-tax/my-tax-interest/my-tax-interest.js +3 -3
- package/esm2015/lib/models/report/my-tax/my-tax-other-income/my-tax-other-income.js +11 -11
- package/fesm2015/taxtank-core.js +17 -17
- package/fesm2015/taxtank-core.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,7 +9,7 @@ export class MyTaxCgt {
|
|
|
9
9
|
static createFrom(propertySales, properties, clientCapitalLoss) {
|
|
10
10
|
return plainToClass(MyTaxCgt, {
|
|
11
11
|
hasCapitalGain: !!propertySales.grossCGT,
|
|
12
|
-
hasExemption: this.isCGTApplicable(propertySales, properties),
|
|
12
|
+
hasExemption: !!propertySales.grossCGT && this.isCGTApplicable(propertySales, properties),
|
|
13
13
|
netCapitalGain: propertySales.sumBy('netCGT'),
|
|
14
14
|
grossCapitalGain: propertySales.grossCGT,
|
|
15
15
|
netCapitalLoss: clientCapitalLoss
|
|
@@ -23,4 +23,4 @@ export class MyTaxCgt {
|
|
|
23
23
|
return !sales.getCGTApplicable().length || !properties.getCGTApplicable().length;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LWNndC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvcmVwb3J0L215LXRheC9teS10YXgtY2d0L215LXRheC1jZ3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQTBGLENBQUM7QUFDM0YsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBR2pEOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sUUFBUTtJQVduQixNQUFNLENBQUMsVUFBVSxDQUFDLGFBQXFDLEVBQUUsVUFBOEIsRUFBRSxpQkFBeUI7UUFDaEgsT0FBTyxZQUFZLENBQUMsUUFBUSxFQUFFO1lBQzVCLGNBQWMsRUFBRSxDQUFDLENBQUMsYUFBYSxDQUFDLFFBQVE7WUFDeEMsWUFBWSxFQUFFLENBQUMsQ0FBQyxhQUFhLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxFQUFFLFVBQVUsQ0FBQztZQUN6RixjQUFjLEVBQUUsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUM7WUFDN0MsZ0JBQWdCLEVBQUUsYUFBYSxDQUFDLFFBQVE7WUFDeEMsY0FBYyxFQUFFLGlCQUFpQjtTQUNsQyxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxLQUE2QixFQUFFLFVBQThCO1FBQ2xGLE9BQU8sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDbkYsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUHJvcGVydHlDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vLi4vY29sbGVjdGlvbnMvcHJvcGVydHkvcHJvcGVydHkuY29sbGVjdGlvbic7O1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgUHJvcGVydHlTYWxlQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL2NvbGxlY3Rpb25zL3Byb3BlcnR5L3Byb3BlcnR5LXNhbGUvcHJvcGVydHktc2FsZS5jb2xsZWN0aW9uJztcblxuLyoqXG4gKiBSZXBvcnQgcmVsYXRlZCB0byBQcm9wZXJ0eSBzYWxlcyBDR1QgZGV0YWlscy5cbiAqIEFsbCBmaWVsZHMgYXJlIGFib3V0IGN1cnJlbnQgeWVhciwgZXhjZXB0IG5ldENhcGl0YWxMb3NzXG4gKlxuICovXG5leHBvcnQgY2xhc3MgTXlUYXhDZ3Qge1xuICBoYXNDYXBpdGFsR2FpbjogYm9vbGVhbjtcbiAgaGFzRXhlbXB0aW9uOiBib29sZWFuO1xuICBuZXRDYXBpdGFsR2FpbjogbnVtYmVyO1xuICBncm9zc0NhcGl0YWxHYWluOiBudW1iZXI7XG5cbiAgLyoqXG4gICAqIExvc3MgY29sbGVjdGVkIG92ZXIgdGhlIHllYXJzXG4gICAqL1xuICBuZXRDYXBpdGFsTG9zczogbnVtYmVyO1xuXG4gIHN0YXRpYyBjcmVhdGVGcm9tKHByb3BlcnR5U2FsZXM6IFByb3BlcnR5U2FsZUNvbGxlY3Rpb24sIHByb3BlcnRpZXM6IFByb3BlcnR5Q29sbGVjdGlvbiwgY2xpZW50Q2FwaXRhbExvc3M6IG51bWJlcik6IE15VGF4Q2d0IHtcbiAgICByZXR1cm4gcGxhaW5Ub0NsYXNzKE15VGF4Q2d0LCB7XG4gICAgICBoYXNDYXBpdGFsR2FpbjogISFwcm9wZXJ0eVNhbGVzLmdyb3NzQ0dULFxuICAgICAgaGFzRXhlbXB0aW9uOiAhIXByb3BlcnR5U2FsZXMuZ3Jvc3NDR1QgJiYgdGhpcy5pc0NHVEFwcGxpY2FibGUocHJvcGVydHlTYWxlcywgcHJvcGVydGllcyksXG4gICAgICBuZXRDYXBpdGFsR2FpbjogcHJvcGVydHlTYWxlcy5zdW1CeSgnbmV0Q0dUJyksXG4gICAgICBncm9zc0NhcGl0YWxHYWluOiBwcm9wZXJ0eVNhbGVzLmdyb3NzQ0dULFxuICAgICAgbmV0Q2FwaXRhbExvc3M6IGNsaWVudENhcGl0YWxMb3NzXG4gICAgfSlcbiAgfVxuXG4gIC8qKlxuICAgKiBFeGVtcHRpb24gaXMgYXBwbGljYWJsZSBmb3IgUFBSIHNhbGVzIGFuZCBwcm9wZXJ0aWVzIGFjcXVpcmVkIGJlZm9yZSBQcm9wZXJ0eS5wcmVDR1RBc3NldERhdGVcbiAgICogaHR0cHM6Ly90YXh0YW5rLmF0bGFzc2lhbi5uZXQvd2lraS9zcGFjZXMvVEFYVEFOSy9wYWdlcy80NjQ0MTEwNDY2L1RheCtSZXR1cm4rTXlUYXgrLStPbmxpbmUrRm9ybSAoXCJDYXBpdGFsIGdhaW5zIG9yIGxvc3Nlc1wiIHNlY3Rpb24pXG4gICAqL1xuICBzdGF0aWMgaXNDR1RBcHBsaWNhYmxlKHNhbGVzOiBQcm9wZXJ0eVNhbGVDb2xsZWN0aW9uLCBwcm9wZXJ0aWVzOiBQcm9wZXJ0eUNvbGxlY3Rpb24pOiBib29sZWFuIHtcbiAgICByZXR1cm4gIXNhbGVzLmdldENHVEFwcGxpY2FibGUoKS5sZW5ndGggfHwgIXByb3BlcnRpZXMuZ2V0Q0dUQXBwbGljYWJsZSgpLmxlbmd0aDtcbiAgfVxufVxuIl19
|
package/esm2015/lib/models/report/my-tax/my-tax-income-statements/my-tax-income-statements.js
CHANGED
|
@@ -16,7 +16,7 @@ export class MyTaxIncomeStatements {
|
|
|
16
16
|
.groupBy('incomeSource.name');
|
|
17
17
|
this.allowanceTotalAmount = this.transactionsByChartAccountsHeadings
|
|
18
18
|
.get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)
|
|
19
|
-
.sumBy('
|
|
19
|
+
.sumBy('grossAmount');
|
|
20
20
|
this.allowanceTotalTax = this.transactionsByChartAccountsHeadings
|
|
21
21
|
.get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)
|
|
22
22
|
.sumBy('tax');
|
|
@@ -32,13 +32,13 @@ export class MyTaxIncomeStatements {
|
|
|
32
32
|
this.lumpBTransactionsTotalTax = this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_B).sumBy('tax');
|
|
33
33
|
this.australianAllowancesAndPaymentsTotalAmount = this.transactionsByChartAccountsHeadings
|
|
34
34
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)
|
|
35
|
-
.sumBy('
|
|
35
|
+
.sumBy('grossAmount');
|
|
36
36
|
this.australianAllowancesAndPaymentsTotalTax = this.transactionsByChartAccountsHeadings
|
|
37
37
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)
|
|
38
38
|
.sumBy('tax');
|
|
39
39
|
this.australianPensionsAndAllowancesTotalAmount = this.transactionsByChartAccountsHeadings
|
|
40
40
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)
|
|
41
|
-
.sumBy('
|
|
41
|
+
.sumBy('grossAmount');
|
|
42
42
|
this.australianPensionsAndAllowancesTotalTax = this.transactionsByChartAccountsHeadings
|
|
43
43
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)
|
|
44
44
|
.sumBy('tax');
|
|
@@ -60,9 +60,9 @@ export class MyTaxIncomeStatements {
|
|
|
60
60
|
ChartAccountsListEnum.CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH
|
|
61
61
|
]).sumBy('untaxedElement');
|
|
62
62
|
this.attributablePsiTransactionsTotalAmount = this.transactionsByChartAccounts
|
|
63
|
-
.get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('
|
|
63
|
+
.get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('grossAmount');
|
|
64
64
|
this.attributablePsiTransactionsTotalTax = this.transactionsByChartAccounts
|
|
65
65
|
.get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('tax');
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-income-statements.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-income-statements/my-tax-income-statements.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { ChartAccountsListEnum } from '../../../../db/Enums/chart-accounts-list.enum';\nimport { CollectionDictionary } from '../../../../collections/collection-dictionary';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { ChartAccountsHeadingTaxDeductibleEnum } from '../../../../db/Enums/chart-accounts-heading-tax-deductible.enum';\n\nexport class MyTaxIncomeStatements {\n  transactionsByChartAccounts: CollectionDictionary<TransactionCollection>;\n  transactionsByChartAccountsHeadings: CollectionDictionary<TransactionCollection>;\n\n  salaryTransactionsByIncomeSource: CollectionDictionary<TransactionCollection>;\n  etpTransactionsByIncomeSource: CollectionDictionary<TransactionCollection>;\n  superannuationLumpSumTransactionsByIncomeSource: CollectionDictionary<TransactionCollection>;\n\n  allowanceTotalAmount: number;\n  allowanceTotalTax: number;\n  lumpATransactionsTotalAmount: number;\n  lumpATransactionsTotalTax: number;\n  hasGenuineLumpATransactions: boolean;\n  hasOtherLumpATransactions: boolean;\n  lumpBTransactionsTotalAmount: number;\n  lumpBTransactionsTotalTax: number;\n  australianAllowancesAndPaymentsTotalAmount: number;\n  australianAllowancesAndPaymentsTotalTax: number;\n  australianPensionsAndAllowancesTotalAmount: number;\n  australianPensionsAndAllowancesTotalTax: number;\n  australianAnnuitiesSuperannuationIncomesTotalTax: number;\n  australianAnnuityPaymentsTaxed: number;\n  australianAnnuityPaymentsUntaxed: number;\n  assessableCappedDefinedBenefitTotalAmount: number;\n  superannuationIncomeStreamsTotalTaxed: number;\n  superannuationIncomeStreamsTotalUntaxed: number;\n  attributablePsiTransactionsTotalAmount: number;\n  attributablePsiTransactionsTotalTax: number;\n\n  constructor(\n    transactions: TransactionCollection\n  ) {\n    this.transactionsByChartAccounts = transactions.groupBy('chartAccounts.id');\n    this.transactionsByChartAccountsHeadings = transactions.groupBy('chartAccounts.heading.id');\n\n    this.salaryTransactionsByIncomeSource = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.SALARY_OR_WAGES)\n      .groupBy('incomeSource.name');\n\n    this.etpTransactionsByIncomeSource = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.ETP)\n      .groupBy('incomeSource.name');\n\n    this.superannuationLumpSumTransactionsByIncomeSource = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingTaxDeductibleEnum.SUPERANNUATION_LUMP_SUM)\n      .groupBy('incomeSource.name');\n\n    this.allowanceTotalAmount = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)\n      .sumBy('amount');\n\n    this.allowanceTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)\n      .sumBy('tax');\n\n    this.lumpATransactionsTotalAmount =\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_GENUINE_REDUNDANCY).sumBy('claimAmount') +\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_ALL_OTHER_PAYMENTS).sumBy('claimAmount');\n\n    this.lumpATransactionsTotalTax =\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_GENUINE_REDUNDANCY).sumBy('tax') +\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_ALL_OTHER_PAYMENTS).sumBy('tax');\n\n    this.hasGenuineLumpATransactions = !!this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_GENUINE_REDUNDANCY).length;\n    this.hasOtherLumpATransactions = !!this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_ALL_OTHER_PAYMENTS).length;\n    this.lumpBTransactionsTotalAmount = this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_B).sumBy('claimAmount');\n    this.lumpBTransactionsTotalTax = this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_B).sumBy('tax');\n    this.australianAllowancesAndPaymentsTotalAmount = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)\n      .sumBy('amount');\n    this.australianAllowancesAndPaymentsTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)\n      .sumBy('tax');\n    this.australianPensionsAndAllowancesTotalAmount = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)\n      .sumBy('amount');\n    this.australianPensionsAndAllowancesTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)\n      .sumBy('tax');\n    this.australianAnnuitiesSuperannuationIncomesTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingTaxDeductibleEnum.ANNUITIES_AND_SUPERANNUATION_INCOME_STREAMS)\n      .sumBy('tax');\n    this.australianAnnuityPaymentsTaxed = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.AUSTRALIAN_ANNUITY_PAYMENTS).sumBy('claimAmount');\n    this.australianAnnuityPaymentsUntaxed = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.AUSTRALIAN_ANNUITY_PAYMENTS).sumBy('untaxedElement');\n    this.assessableCappedDefinedBenefitTotalAmount = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT).sumBy('claimAmount');\n    this.superannuationIncomeStreamsTotalTaxed = this.transactionsByChartAccounts.merge([\n      ChartAccountsListEnum.CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY,\n      ChartAccountsListEnum.CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH\n    ]).sumBy('claimAmount');\n    this.superannuationIncomeStreamsTotalUntaxed = this.transactionsByChartAccounts.merge([\n      ChartAccountsListEnum.CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY,\n      ChartAccountsListEnum.CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH\n    ]).sumBy('untaxedElement');\n    this.attributablePsiTransactionsTotalAmount = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('amount');\n    this.attributablePsiTransactionsTotalTax = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('tax');\n  }\n}\n"]}
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-income-statements.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-income-statements/my-tax-income-statements.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { ChartAccountsListEnum } from '../../../../db/Enums/chart-accounts-list.enum';\nimport { CollectionDictionary } from '../../../../collections/collection-dictionary';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { ChartAccountsHeadingTaxDeductibleEnum } from '../../../../db/Enums/chart-accounts-heading-tax-deductible.enum';\n\nexport class MyTaxIncomeStatements {\n  transactionsByChartAccounts: CollectionDictionary<TransactionCollection>;\n  transactionsByChartAccountsHeadings: CollectionDictionary<TransactionCollection>;\n\n  salaryTransactionsByIncomeSource: CollectionDictionary<TransactionCollection>;\n  etpTransactionsByIncomeSource: CollectionDictionary<TransactionCollection>;\n  superannuationLumpSumTransactionsByIncomeSource: CollectionDictionary<TransactionCollection>;\n\n  allowanceTotalAmount: number;\n  allowanceTotalTax: number;\n  lumpATransactionsTotalAmount: number;\n  lumpATransactionsTotalTax: number;\n  hasGenuineLumpATransactions: boolean;\n  hasOtherLumpATransactions: boolean;\n  lumpBTransactionsTotalAmount: number;\n  lumpBTransactionsTotalTax: number;\n  australianAllowancesAndPaymentsTotalAmount: number;\n  australianAllowancesAndPaymentsTotalTax: number;\n  australianPensionsAndAllowancesTotalAmount: number;\n  australianPensionsAndAllowancesTotalTax: number;\n  australianAnnuitiesSuperannuationIncomesTotalTax: number;\n  australianAnnuityPaymentsTaxed: number;\n  australianAnnuityPaymentsUntaxed: number;\n  assessableCappedDefinedBenefitTotalAmount: number;\n  superannuationIncomeStreamsTotalTaxed: number;\n  superannuationIncomeStreamsTotalUntaxed: number;\n  attributablePsiTransactionsTotalAmount: number;\n  attributablePsiTransactionsTotalTax: number;\n\n  constructor(\n    transactions: TransactionCollection\n  ) {\n    this.transactionsByChartAccounts = transactions.groupBy('chartAccounts.id');\n    this.transactionsByChartAccountsHeadings = transactions.groupBy('chartAccounts.heading.id');\n\n    this.salaryTransactionsByIncomeSource = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.SALARY_OR_WAGES)\n      .groupBy('incomeSource.name');\n\n    this.etpTransactionsByIncomeSource = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.ETP)\n      .groupBy('incomeSource.name');\n\n    this.superannuationLumpSumTransactionsByIncomeSource = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingTaxDeductibleEnum.SUPERANNUATION_LUMP_SUM)\n      .groupBy('incomeSource.name');\n\n    this.allowanceTotalAmount = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)\n      .sumBy('grossAmount');\n\n    this.allowanceTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)\n      .sumBy('tax');\n\n    this.lumpATransactionsTotalAmount =\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_GENUINE_REDUNDANCY).sumBy('claimAmount') +\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_ALL_OTHER_PAYMENTS).sumBy('claimAmount');\n\n    this.lumpATransactionsTotalTax =\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_GENUINE_REDUNDANCY).sumBy('tax') +\n      this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_ALL_OTHER_PAYMENTS).sumBy('tax');\n\n    this.hasGenuineLumpATransactions = !!this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_GENUINE_REDUNDANCY).length;\n    this.hasOtherLumpATransactions = !!this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_A_ALL_OTHER_PAYMENTS).length;\n    this.lumpBTransactionsTotalAmount = this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_B).sumBy('claimAmount');\n    this.lumpBTransactionsTotalTax = this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_B).sumBy('tax');\n    this.australianAllowancesAndPaymentsTotalAmount = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)\n      .sumBy('grossAmount');\n    this.australianAllowancesAndPaymentsTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)\n      .sumBy('tax');\n    this.australianPensionsAndAllowancesTotalAmount = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)\n      .sumBy('grossAmount');\n    this.australianPensionsAndAllowancesTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)\n      .sumBy('tax');\n    this.australianAnnuitiesSuperannuationIncomesTotalTax = this.transactionsByChartAccountsHeadings\n      .get(ChartAccountsHeadingTaxDeductibleEnum.ANNUITIES_AND_SUPERANNUATION_INCOME_STREAMS)\n      .sumBy('tax');\n    this.australianAnnuityPaymentsTaxed = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.AUSTRALIAN_ANNUITY_PAYMENTS).sumBy('claimAmount');\n    this.australianAnnuityPaymentsUntaxed = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.AUSTRALIAN_ANNUITY_PAYMENTS).sumBy('untaxedElement');\n    this.assessableCappedDefinedBenefitTotalAmount = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT).sumBy('claimAmount');\n    this.superannuationIncomeStreamsTotalTaxed = this.transactionsByChartAccounts.merge([\n      ChartAccountsListEnum.CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY,\n      ChartAccountsListEnum.CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH\n    ]).sumBy('claimAmount');\n    this.superannuationIncomeStreamsTotalUntaxed = this.transactionsByChartAccounts.merge([\n      ChartAccountsListEnum.CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY,\n      ChartAccountsListEnum.CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH\n    ]).sumBy('untaxedElement');\n    this.attributablePsiTransactionsTotalAmount = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('grossAmount');\n    this.attributablePsiTransactionsTotalTax = this.transactionsByChartAccounts\n      .get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('tax');\n  }\n}\n"]}
|
|
@@ -3,9 +3,9 @@ export class MyTaxInterest {
|
|
|
3
3
|
constructor(transactions) {
|
|
4
4
|
this.interestEarnedTransactions = transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.INTEREST_EARNED);
|
|
5
5
|
this.interestPaidTransactions = transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID);
|
|
6
|
-
this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('
|
|
6
|
+
this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('grossAmount');
|
|
7
7
|
this.interestEarnedTotalTax = this.interestEarnedTransactions.sumBy('tax');
|
|
8
|
-
this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('
|
|
8
|
+
this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('grossAmount');
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LWludGVyZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9yZXBvcnQvbXktdGF4L215LXRheC1pbnRlcmVzdC9teS10YXgtaW50ZXJlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFFdEYsTUFBTSxPQUFPLGFBQWE7SUFPeEIsWUFDRSxZQUFtQztRQUVuQyxJQUFJLENBQUMsMEJBQTBCLEdBQUcsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUNuSCxJQUFJLENBQUMsd0JBQXdCLEdBQUcsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ25ILElBQUksQ0FBQyx5QkFBeUIsR0FBRyxJQUFJLENBQUMsMEJBQTBCLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3RGLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLENBQUMsMEJBQTBCLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyx1QkFBdUIsR0FBRyxJQUFJLENBQUMsd0JBQXdCLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3BGLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL2NvbGxlY3Rpb25zL3RyYW5zYWN0aW9uL3RyYW5zYWN0aW9uLmNvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50c0xpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtbGlzdC5lbnVtJztcblxuZXhwb3J0IGNsYXNzIE15VGF4SW50ZXJlc3Qge1xuICBpbnRlcmVzdEVhcm5lZFRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uO1xuICBpbnRlcmVzdFBhaWRUcmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgaW50ZXJlc3RFYXJuZWRUb3RhbEFtb3VudDogbnVtYmVyO1xuICBpbnRlcmVzdEVhcm5lZFRvdGFsVGF4OiBudW1iZXI7XG4gIGludGVyZXN0UGFpZFRvdGFsQW1vdW50OiBudW1iZXI7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgdHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24sXG4gICkge1xuICAgIHRoaXMuaW50ZXJlc3RFYXJuZWRUcmFuc2FjdGlvbnMgPSB0cmFuc2FjdGlvbnMuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uSU5URVJFU1RfRUFSTkVEKTtcbiAgICB0aGlzLmludGVyZXN0UGFpZFRyYW5zYWN0aW9ucyA9IHRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5BVE9fSU5URVJFU1RfUEFJRCk7XG4gICAgdGhpcy5pbnRlcmVzdEVhcm5lZFRvdGFsQW1vdW50ID0gdGhpcy5pbnRlcmVzdEVhcm5lZFRyYW5zYWN0aW9ucy5zdW1CeSgnZ3Jvc3NBbW91bnQnKTtcbiAgICB0aGlzLmludGVyZXN0RWFybmVkVG90YWxUYXggPSB0aGlzLmludGVyZXN0RWFybmVkVHJhbnNhY3Rpb25zLnN1bUJ5KCd0YXgnKTtcbiAgICB0aGlzLmludGVyZXN0UGFpZFRvdGFsQW1vdW50ID0gdGhpcy5pbnRlcmVzdFBhaWRUcmFuc2FjdGlvbnMuc3VtQnkoJ2dyb3NzQW1vdW50Jyk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -7,22 +7,22 @@ export class MyTaxOtherIncome {
|
|
|
7
7
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.LUMP_SUM_PAYMENTS_IN_ARREARS);
|
|
8
8
|
this.bonusesTotalAmount = this.transactions
|
|
9
9
|
.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.BONUSES)
|
|
10
|
-
.sumBy('
|
|
10
|
+
.sumBy('grossAmount');
|
|
11
11
|
this.forestryManagedInvestmentSchemesIncomeTotalAmount = this.transactions
|
|
12
12
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES_INCOME)
|
|
13
|
-
.sumBy('
|
|
13
|
+
.sumBy('grossAmount');
|
|
14
14
|
this.lumpSumPaymentsInArrearsTotalTax = this.lumpSumPaymentsInArrearsTransactions.sumBy('tax');
|
|
15
15
|
this.specialProfessionIncomeTotalAmount = this.transactions
|
|
16
|
-
.filterBy('chartAccounts.id', ChartAccountsListEnum.SPECIAL_PROFESSION_INCOME).sumBy('
|
|
17
|
-
this.category1TotalIncome = this.lumpSumPaymentsInArrearsTransactions.sumBy('
|
|
18
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.JURY_ATTENDANCE_FEES).sumBy('
|
|
19
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.FOREIGN_EXCHANGE_GAINS_NON_BUSINESS).sumBy('
|
|
20
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ROYALTIES).sumBy('
|
|
21
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS).sumBy('
|
|
22
|
-
this.atoInterestPaidTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID).sumBy('
|
|
16
|
+
.filterBy('chartAccounts.id', ChartAccountsListEnum.SPECIAL_PROFESSION_INCOME).sumBy('grossAmount');
|
|
17
|
+
this.category1TotalIncome = this.lumpSumPaymentsInArrearsTransactions.sumBy('grossAmount') +
|
|
18
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.JURY_ATTENDANCE_FEES).sumBy('grossAmount') +
|
|
19
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.FOREIGN_EXCHANGE_GAINS_NON_BUSINESS).sumBy('grossAmount') +
|
|
20
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ROYALTIES).sumBy('grossAmount') +
|
|
21
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS).sumBy('grossAmount');
|
|
22
|
+
this.atoInterestPaidTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID).sumBy('grossAmount');
|
|
23
23
|
this.gainOnSaleOfVehiclePreviouslyDepreciatedTotalAmount = this.transactions
|
|
24
24
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.GAIN_ON_SALE_OF_VEHICLE_PREVIOUSLY_DEPRECIATED)
|
|
25
|
-
.sumBy('
|
|
25
|
+
.sumBy('grossAmount');
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LW90aGVyLWluY29tZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvcmVwb3J0L215LXRheC9teS10YXgtb3RoZXItaW5jb21lL215LXRheC1vdGhlci1pbmNvbWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDdEYsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFFckcsTUFBTSxPQUFPLGdCQUFnQjtJQVczQixZQUNFLFlBQW1DO1FBRW5DLElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxvQ0FBb0MsR0FBRyxJQUFJLENBQUMsWUFBWTthQUMxRCxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsNEJBQTRCLENBQUMsQ0FBQztRQUNwRixJQUFJLENBQUMsa0JBQWtCLEdBQUcsSUFBSSxDQUFDLFlBQVk7YUFDeEMsUUFBUSxDQUFDLDBCQUEwQixFQUFFLDRCQUE0QixDQUFDLE9BQU8sQ0FBQzthQUMxRSxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDeEIsSUFBSSxDQUFDLGlEQUFpRCxHQUFHLElBQUksQ0FBQyxZQUFZO2FBQ3ZFLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQywwQ0FBMEMsQ0FBQzthQUM5RixLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDeEIsSUFBSSxDQUFDLGdDQUFnQyxHQUFHLElBQUksQ0FBQyxvQ0FBb0MsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0YsSUFBSSxDQUFDLGtDQUFrQyxHQUFHLElBQUksQ0FBQyxZQUFZO2FBQ3hELFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN0RyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLG9DQUFvQyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUM7WUFDeEYsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDO1lBQy9HLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLG1DQUFtQyxDQUFDLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQztZQUM5SCxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDO1lBQ3BHLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLHFDQUFxQyxDQUFDLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ25JLElBQUksQ0FBQywwQkFBMEIsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMvSSxJQUFJLENBQUMsbURBQW1ELEdBQUcsSUFBSSxDQUFDLFlBQVk7YUFDekUsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLDhDQUE4QyxDQUFDO2FBQ2xHLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUMxQixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy90cmFuc2FjdGlvbi90cmFuc2FjdGlvbi5jb2xsZWN0aW9uJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLWxpc3QuZW51bSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtaGVhZGluZy1saXN0LmVudW0nO1xuXG5leHBvcnQgY2xhc3MgTXlUYXhPdGhlckluY29tZSB7XG4gIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uO1xuICBsdW1wU3VtUGF5bWVudHNJbkFycmVhcnNUcmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgYm9udXNlc1RvdGFsQW1vdW50OiBudW1iZXI7XG4gIGZvcmVzdHJ5TWFuYWdlZEludmVzdG1lbnRTY2hlbWVzSW5jb21lVG90YWxBbW91bnQ6IG51bWJlcjtcbiAgbHVtcFN1bVBheW1lbnRzSW5BcnJlYXJzVG90YWxUYXg6IG51bWJlcjtcbiAgc3BlY2lhbFByb2Zlc3Npb25JbmNvbWVUb3RhbEFtb3VudDogbnVtYmVyO1xuICBjYXRlZ29yeTFUb3RhbEluY29tZTogbnVtYmVyO1xuICBhdG9JbnRlcmVzdFBhaWRUb3RhbEFtb3VudDogbnVtYmVyO1xuICBnYWluT25TYWxlT2ZWZWhpY2xlUHJldmlvdXNseURlcHJlY2lhdGVkVG90YWxBbW91bnQ6IG51bWJlcjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgKSB7XG4gICAgdGhpcy50cmFuc2FjdGlvbnMgPSB0cmFuc2FjdGlvbnM7XG4gICAgdGhpcy5sdW1wU3VtUGF5bWVudHNJbkFycmVhcnNUcmFuc2FjdGlvbnMgPSB0aGlzLnRyYW5zYWN0aW9uc1xuICAgICAgLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkxVTVBfU1VNX1BBWU1FTlRTX0lOX0FSUkVBUlMpO1xuICAgIHRoaXMuYm9udXNlc1RvdGFsQW1vdW50ID0gdGhpcy50cmFuc2FjdGlvbnNcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5oZWFkaW5nLmlkJywgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5CT05VU0VTKVxuICAgICAgLnN1bUJ5KCdncm9zc0Ftb3VudCcpO1xuICAgIHRoaXMuZm9yZXN0cnlNYW5hZ2VkSW52ZXN0bWVudFNjaGVtZXNJbmNvbWVUb3RhbEFtb3VudCA9IHRoaXMudHJhbnNhY3Rpb25zXG4gICAgICAuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uRk9SRVNUUllfTUFOQUdFRF9JTlZFU1RNRU5UX1NDSEVNRVNfSU5DT01FKVxuICAgICAgLnN1bUJ5KCdncm9zc0Ftb3VudCcpO1xuICAgIHRoaXMubHVtcFN1bVBheW1lbnRzSW5BcnJlYXJzVG90YWxUYXggPSB0aGlzLmx1bXBTdW1QYXltZW50c0luQXJyZWFyc1RyYW5zYWN0aW9ucy5zdW1CeSgndGF4Jyk7XG4gICAgdGhpcy5zcGVjaWFsUHJvZmVzc2lvbkluY29tZVRvdGFsQW1vdW50ID0gdGhpcy50cmFuc2FjdGlvbnNcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5TUEVDSUFMX1BST0ZFU1NJT05fSU5DT01FKS5zdW1CeSgnZ3Jvc3NBbW91bnQnKTtcbiAgICB0aGlzLmNhdGVnb3J5MVRvdGFsSW5jb21lID0gdGhpcy5sdW1wU3VtUGF5bWVudHNJbkFycmVhcnNUcmFuc2FjdGlvbnMuc3VtQnkoJ2dyb3NzQW1vdW50JykgK1xuICAgICAgdGhpcy50cmFuc2FjdGlvbnMuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uSlVSWV9BVFRFTkRBTkNFX0ZFRVMpLnN1bUJ5KCdncm9zc0Ftb3VudCcpICtcbiAgICAgIHRoaXMudHJhbnNhY3Rpb25zLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkZPUkVJR05fRVhDSEFOR0VfR0FJTlNfTk9OX0JVU0lORVNTKS5zdW1CeSgnZ3Jvc3NBbW91bnQnKSArXG4gICAgICB0aGlzLnRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5ST1lBTFRJRVMpLnN1bUJ5KCdncm9zc0Ftb3VudCcpICtcbiAgICAgIHRoaXMudHJhbnNhY3Rpb25zLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlRBWEFCTEVfU0NIT0xBUlNISVBTX0JVUlNBUklFU19HUkFOVFMpLnN1bUJ5KCdncm9zc0Ftb3VudCcpO1xuICAgIHRoaXMuYXRvSW50ZXJlc3RQYWlkVG90YWxBbW91bnQgPSB0aGlzLnRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5BVE9fSU5URVJFU1RfUEFJRCkuc3VtQnkoJ2dyb3NzQW1vdW50Jyk7XG4gICAgdGhpcy5nYWluT25TYWxlT2ZWZWhpY2xlUHJldmlvdXNseURlcHJlY2lhdGVkVG90YWxBbW91bnQgPSB0aGlzLnRyYW5zYWN0aW9uc1xuICAgICAgLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkdBSU5fT05fU0FMRV9PRl9WRUhJQ0xFX1BSRVZJT1VTTFlfREVQUkVDSUFURUQpXG4gICAgICAuc3VtQnkoJ2dyb3NzQW1vdW50Jyk7XG4gIH1cbn1cbiJdfQ==
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -9342,7 +9342,7 @@ class MyTaxCgt {
|
|
|
9342
9342
|
static createFrom(propertySales, properties, clientCapitalLoss) {
|
|
9343
9343
|
return plainToClass(MyTaxCgt, {
|
|
9344
9344
|
hasCapitalGain: !!propertySales.grossCGT,
|
|
9345
|
-
hasExemption: this.isCGTApplicable(propertySales, properties),
|
|
9345
|
+
hasExemption: !!propertySales.grossCGT && this.isCGTApplicable(propertySales, properties),
|
|
9346
9346
|
netCapitalGain: propertySales.sumBy('netCGT'),
|
|
9347
9347
|
grossCapitalGain: propertySales.grossCGT,
|
|
9348
9348
|
netCapitalLoss: clientCapitalLoss
|
|
@@ -9620,7 +9620,7 @@ class MyTaxIncomeStatements {
|
|
|
9620
9620
|
.groupBy('incomeSource.name');
|
|
9621
9621
|
this.allowanceTotalAmount = this.transactionsByChartAccountsHeadings
|
|
9622
9622
|
.get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)
|
|
9623
|
-
.sumBy('
|
|
9623
|
+
.sumBy('grossAmount');
|
|
9624
9624
|
this.allowanceTotalTax = this.transactionsByChartAccountsHeadings
|
|
9625
9625
|
.get(ChartAccountsHeadingListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES)
|
|
9626
9626
|
.sumBy('tax');
|
|
@@ -9636,13 +9636,13 @@ class MyTaxIncomeStatements {
|
|
|
9636
9636
|
this.lumpBTransactionsTotalTax = this.transactionsByChartAccounts.get(ChartAccountsListEnum.LUMP_SUM_B).sumBy('tax');
|
|
9637
9637
|
this.australianAllowancesAndPaymentsTotalAmount = this.transactionsByChartAccountsHeadings
|
|
9638
9638
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)
|
|
9639
|
-
.sumBy('
|
|
9639
|
+
.sumBy('grossAmount');
|
|
9640
9640
|
this.australianAllowancesAndPaymentsTotalTax = this.transactionsByChartAccountsHeadings
|
|
9641
9641
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS)
|
|
9642
9642
|
.sumBy('tax');
|
|
9643
9643
|
this.australianPensionsAndAllowancesTotalAmount = this.transactionsByChartAccountsHeadings
|
|
9644
9644
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)
|
|
9645
|
-
.sumBy('
|
|
9645
|
+
.sumBy('grossAmount');
|
|
9646
9646
|
this.australianPensionsAndAllowancesTotalTax = this.transactionsByChartAccountsHeadings
|
|
9647
9647
|
.get(ChartAccountsHeadingListEnum.AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES)
|
|
9648
9648
|
.sumBy('tax');
|
|
@@ -9664,7 +9664,7 @@ class MyTaxIncomeStatements {
|
|
|
9664
9664
|
ChartAccountsListEnum.CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH
|
|
9665
9665
|
]).sumBy('untaxedElement');
|
|
9666
9666
|
this.attributablePsiTransactionsTotalAmount = this.transactionsByChartAccounts
|
|
9667
|
-
.get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('
|
|
9667
|
+
.get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('grossAmount');
|
|
9668
9668
|
this.attributablePsiTransactionsTotalTax = this.transactionsByChartAccounts
|
|
9669
9669
|
.get(ChartAccountsListEnum.ATTRIBUTABLE_PSI).sumBy('tax');
|
|
9670
9670
|
}
|
|
@@ -9682,9 +9682,9 @@ class MyTaxInterest {
|
|
|
9682
9682
|
constructor(transactions) {
|
|
9683
9683
|
this.interestEarnedTransactions = transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.INTEREST_EARNED);
|
|
9684
9684
|
this.interestPaidTransactions = transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID);
|
|
9685
|
-
this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('
|
|
9685
|
+
this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('grossAmount');
|
|
9686
9686
|
this.interestEarnedTotalTax = this.interestEarnedTransactions.sumBy('tax');
|
|
9687
|
-
this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('
|
|
9687
|
+
this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('grossAmount');
|
|
9688
9688
|
}
|
|
9689
9689
|
}
|
|
9690
9690
|
|
|
@@ -9716,22 +9716,22 @@ class MyTaxOtherIncome {
|
|
|
9716
9716
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.LUMP_SUM_PAYMENTS_IN_ARREARS);
|
|
9717
9717
|
this.bonusesTotalAmount = this.transactions
|
|
9718
9718
|
.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.BONUSES)
|
|
9719
|
-
.sumBy('
|
|
9719
|
+
.sumBy('grossAmount');
|
|
9720
9720
|
this.forestryManagedInvestmentSchemesIncomeTotalAmount = this.transactions
|
|
9721
9721
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES_INCOME)
|
|
9722
|
-
.sumBy('
|
|
9722
|
+
.sumBy('grossAmount');
|
|
9723
9723
|
this.lumpSumPaymentsInArrearsTotalTax = this.lumpSumPaymentsInArrearsTransactions.sumBy('tax');
|
|
9724
9724
|
this.specialProfessionIncomeTotalAmount = this.transactions
|
|
9725
|
-
.filterBy('chartAccounts.id', ChartAccountsListEnum.SPECIAL_PROFESSION_INCOME).sumBy('
|
|
9726
|
-
this.category1TotalIncome = this.lumpSumPaymentsInArrearsTransactions.sumBy('
|
|
9727
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.JURY_ATTENDANCE_FEES).sumBy('
|
|
9728
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.FOREIGN_EXCHANGE_GAINS_NON_BUSINESS).sumBy('
|
|
9729
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ROYALTIES).sumBy('
|
|
9730
|
-
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS).sumBy('
|
|
9731
|
-
this.atoInterestPaidTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID).sumBy('
|
|
9725
|
+
.filterBy('chartAccounts.id', ChartAccountsListEnum.SPECIAL_PROFESSION_INCOME).sumBy('grossAmount');
|
|
9726
|
+
this.category1TotalIncome = this.lumpSumPaymentsInArrearsTransactions.sumBy('grossAmount') +
|
|
9727
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.JURY_ATTENDANCE_FEES).sumBy('grossAmount') +
|
|
9728
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.FOREIGN_EXCHANGE_GAINS_NON_BUSINESS).sumBy('grossAmount') +
|
|
9729
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ROYALTIES).sumBy('grossAmount') +
|
|
9730
|
+
this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS).sumBy('grossAmount');
|
|
9731
|
+
this.atoInterestPaidTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID).sumBy('grossAmount');
|
|
9732
9732
|
this.gainOnSaleOfVehiclePreviouslyDepreciatedTotalAmount = this.transactions
|
|
9733
9733
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.GAIN_ON_SALE_OF_VEHICLE_PREVIOUSLY_DEPRECIATED)
|
|
9734
|
-
.sumBy('
|
|
9734
|
+
.sumBy('grossAmount');
|
|
9735
9735
|
}
|
|
9736
9736
|
}
|
|
9737
9737
|
|