taxtank-core 0.28.104 → 0.28.105
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 +27 -41
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/forms/report/my-tax/my-tax-partnerships-and-trusts.form.js +16 -14
- package/esm2015/lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts.js +14 -31
- package/fesm2015/taxtank-core.js +27 -41
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts.d.ts +9 -14
- package/package.json +1 -1
|
@@ -1,24 +1,26 @@
|
|
|
1
1
|
import { AbstractForm } from '../../abstract.form';
|
|
2
|
-
import { FormControl
|
|
3
|
-
import { conditionalValidator } from '../../../validators';
|
|
2
|
+
import { FormControl } from '@angular/forms';
|
|
4
3
|
export class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
|
|
5
4
|
constructor(partnershipsAndTrusts) {
|
|
6
5
|
super({
|
|
7
|
-
|
|
8
|
-
value: partnershipsAndTrusts.
|
|
6
|
+
partnershipsIncomeTotalAmount: new FormControl({
|
|
7
|
+
value: partnershipsAndTrusts.partnershipsIncomeTotalAmount,
|
|
9
8
|
disabled: true
|
|
10
9
|
}),
|
|
11
|
-
|
|
12
|
-
value: partnershipsAndTrusts.
|
|
10
|
+
partnershipsExpenseTotalAmount: new FormControl({
|
|
11
|
+
value: partnershipsAndTrusts.partnershipsExpenseTotalAmount,
|
|
13
12
|
disabled: true
|
|
14
13
|
}),
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
14
|
+
trustsIncomeTotalAmount: new FormControl({
|
|
15
|
+
value: partnershipsAndTrusts.trustsIncomeTotalAmount,
|
|
16
|
+
disabled: true
|
|
17
|
+
}),
|
|
18
|
+
trustsExpenseTotalAmount: new FormControl({
|
|
19
|
+
value: partnershipsAndTrusts.trustsExpenseTotalAmount,
|
|
20
|
+
disabled: true
|
|
21
|
+
}),
|
|
22
|
+
trustsIncomeTotalTax: new FormControl({
|
|
23
|
+
value: partnershipsAndTrusts.trustsIncomeTotalTax,
|
|
22
24
|
disabled: true
|
|
23
25
|
}),
|
|
24
26
|
frankingCreditsTotal: new FormControl({
|
|
@@ -32,4 +34,4 @@ export class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
|
|
|
32
34
|
});
|
|
33
35
|
}
|
|
34
36
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXBhcnRuZXJzaGlwcy1hbmQtdHJ1c3RzLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvcmVwb3J0L215LXRheC9teS10YXgtcGFydG5lcnNoaXBzLWFuZC10cnVzdHMuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRzdDLE1BQU0sT0FBTyw4QkFBK0IsU0FBUSxZQUF3QztJQUMxRixZQUNFLHFCQUFpRDtRQUVqRCxLQUFLLENBQUM7WUFDSiw2QkFBNkIsRUFBRSxJQUFJLFdBQVcsQ0FBQztnQkFDN0MsS0FBSyxFQUFFLHFCQUFxQixDQUFDLDZCQUE2QjtnQkFDMUQsUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDO1lBQ0YsOEJBQThCLEVBQUUsSUFBSSxXQUFXLENBQUM7Z0JBQzlDLEtBQUssRUFBRSxxQkFBcUIsQ0FBQyw4QkFBOEI7Z0JBQzNELFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQztZQUNGLHVCQUF1QixFQUFFLElBQUksV0FBVyxDQUFDO2dCQUN2QyxLQUFLLEVBQUUscUJBQXFCLENBQUMsdUJBQXVCO2dCQUNwRCxRQUFRLEVBQUUsSUFBSTthQUNmLENBQUM7WUFDRix3QkFBd0IsRUFBRSxJQUFJLFdBQVcsQ0FBQztnQkFDeEMsS0FBSyxFQUFFLHFCQUFxQixDQUFDLHdCQUF3QjtnQkFDckQsUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDO1lBQ0Ysb0JBQW9CLEVBQUUsSUFBSSxXQUFXLENBQUM7Z0JBQ3BDLEtBQUssRUFBRSxxQkFBcUIsQ0FBQyxvQkFBb0I7Z0JBQ2pELFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQztZQUNGLG9CQUFvQixFQUFFLElBQUksV0FBVyxDQUFDO2dCQUNwQyxLQUFLLEVBQUUscUJBQXFCLENBQUMsb0JBQW9CO2dCQUNqRCxRQUFRLEVBQUUsSUFBSTthQUNmLENBQUM7WUFDRix3QkFBd0IsRUFBRSxJQUFJLFdBQVcsQ0FBQztnQkFDeEMsS0FBSyxFQUFFLHFCQUFxQixDQUFDLHdCQUF3QjtnQkFDckQsUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDO1NBQ0gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQWJzdHJhY3RGb3JtIH0gZnJvbSAnLi4vLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQgeyBGb3JtQ29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IE15VGF4UGFydG5lcnNoaXBzQW5kVHJ1c3RzIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL3JlcG9ydC9teS10YXgnO1xuXG5leHBvcnQgY2xhc3MgTXlUYXhQYXJ0bmVyc2hpcHNBbmRUcnVzdHNGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPE15VGF4UGFydG5lcnNoaXBzQW5kVHJ1c3RzPiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHBhcnRuZXJzaGlwc0FuZFRydXN0czogTXlUYXhQYXJ0bmVyc2hpcHNBbmRUcnVzdHNcbiAgKSB7XG4gICAgc3VwZXIoe1xuICAgICAgcGFydG5lcnNoaXBzSW5jb21lVG90YWxBbW91bnQ6IG5ldyBGb3JtQ29udHJvbCh7XG4gICAgICAgIHZhbHVlOiBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMucGFydG5lcnNoaXBzSW5jb21lVG90YWxBbW91bnQsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KSxcbiAgICAgIHBhcnRuZXJzaGlwc0V4cGVuc2VUb3RhbEFtb3VudDogbmV3IEZvcm1Db250cm9sKHtcbiAgICAgICAgdmFsdWU6IHBhcnRuZXJzaGlwc0FuZFRydXN0cy5wYXJ0bmVyc2hpcHNFeHBlbnNlVG90YWxBbW91bnQsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KSxcbiAgICAgIHRydXN0c0luY29tZVRvdGFsQW1vdW50OiBuZXcgRm9ybUNvbnRyb2woe1xuICAgICAgICB2YWx1ZTogcGFydG5lcnNoaXBzQW5kVHJ1c3RzLnRydXN0c0luY29tZVRvdGFsQW1vdW50LFxuICAgICAgICBkaXNhYmxlZDogdHJ1ZVxuICAgICAgfSksXG4gICAgICB0cnVzdHNFeHBlbnNlVG90YWxBbW91bnQ6IG5ldyBGb3JtQ29udHJvbCh7XG4gICAgICAgIHZhbHVlOiBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMudHJ1c3RzRXhwZW5zZVRvdGFsQW1vdW50LFxuICAgICAgICBkaXNhYmxlZDogdHJ1ZVxuICAgICAgfSksXG4gICAgICB0cnVzdHNJbmNvbWVUb3RhbFRheDogbmV3IEZvcm1Db250cm9sKHtcbiAgICAgICAgdmFsdWU6IHBhcnRuZXJzaGlwc0FuZFRydXN0cy50cnVzdHNJbmNvbWVUb3RhbFRheCxcbiAgICAgICAgZGlzYWJsZWQ6IHRydWVcbiAgICAgIH0pLFxuICAgICAgZnJhbmtpbmdDcmVkaXRzVG90YWw6IG5ldyBGb3JtQ29udHJvbCh7XG4gICAgICAgIHZhbHVlOiBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMuZnJhbmtpbmdDcmVkaXRzVG90YWwsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KSxcbiAgICAgIHRheE9mZnNldE5SQVNUb3RhbEFtb3VudDogbmV3IEZvcm1Db250cm9sKHtcbiAgICAgICAgdmFsdWU6IHBhcnRuZXJzaGlwc0FuZFRydXN0cy50YXhPZmZzZXROUkFTVG90YWxBbW91bnQsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KVxuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -5,23 +5,22 @@ export class MyTaxPartnershipsAndTrusts {
|
|
|
5
5
|
constructor(transactions, incomeSources) {
|
|
6
6
|
this.transactions = transactions;
|
|
7
7
|
this.incomeSources = incomeSources;
|
|
8
|
-
this.
|
|
9
|
-
this.
|
|
8
|
+
this.partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
|
|
9
|
+
this.partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
|
|
10
10
|
this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
|
|
11
11
|
this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
14
|
-
|
|
15
|
-
this.
|
|
16
|
-
|
|
17
|
-
this.
|
|
18
|
-
this.
|
|
19
|
-
this.partnershipExpenses.sumBy('amount');
|
|
20
|
-
this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -
|
|
21
|
-
this.trustsExpenses.sumBy('amount');
|
|
22
|
-
this.taxPaidTotal = this.transactions
|
|
12
|
+
this.partnershipsIncomeTotalAmount = this.partnershipsIncomes.sumBy('amount');
|
|
13
|
+
this.partnershipsExpenseTotalAmount = this.partnershipsExpenses.sumBy('amount');
|
|
14
|
+
this.trustsIncomeTotalAmount = this.trustsIncomes.sumBy('amount');
|
|
15
|
+
this.trustsExpenseTotalAmount = this.trustsExpenses.sumBy('amount');
|
|
16
|
+
this.partnershipsNetNonPrimaryProductionAmount = this.partnershipsIncomeTotalAmount - this.partnershipsExpenseTotalAmount;
|
|
17
|
+
this.trustsNetNonPrimaryProductionAmount = this.trustsIncomeTotalAmount - this.trustsExpenseTotalAmount;
|
|
18
|
+
this.frankingCreditsTotal = this.transactions
|
|
23
19
|
.filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
|
|
24
|
-
.
|
|
20
|
+
.getTransactionsMetadata()
|
|
21
|
+
.filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.FRANKING_CREDIT)
|
|
22
|
+
.sumBy('value');
|
|
23
|
+
this.trustsIncomeTotalTax = this.trustsIncomes.sumBy('tax');
|
|
25
24
|
this.frankingCreditsTotal = this.transactions
|
|
26
25
|
.filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
|
|
27
26
|
.getTransactionsMetadata()
|
|
@@ -29,21 +28,5 @@ export class MyTaxPartnershipsAndTrusts {
|
|
|
29
28
|
.sumBy('value');
|
|
30
29
|
this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
|
|
31
30
|
}
|
|
32
|
-
/**
|
|
33
|
-
* Get Income source forecast trust type, related to trust income with max amount
|
|
34
|
-
*/
|
|
35
|
-
getTrustType() {
|
|
36
|
-
const filteredTrustIncomes = this.trustsIncomes
|
|
37
|
-
.filterBy('incomeSource.id', this.incomeSources
|
|
38
|
-
.removeBy('actualForecast.trustType', null)
|
|
39
|
-
.getIds());
|
|
40
|
-
if (!filteredTrustIncomes.length) {
|
|
41
|
-
return null;
|
|
42
|
-
}
|
|
43
|
-
return this.incomeSources
|
|
44
|
-
.findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
|
|
45
|
-
.actualForecast
|
|
46
|
-
.trustType;
|
|
47
|
-
}
|
|
48
31
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXBhcnRuZXJzaGlwcy1hbmQtdHJ1c3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9yZXBvcnQvbXktdGF4L215LXRheC1wYXJ0bmVyc2hpcHMtYW5kLXRydXN0cy9teS10YXgtcGFydG5lcnNoaXBzLWFuZC10cnVzdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDdEYsT0FBTyxFQUFFLCtCQUErQixFQUFFLE1BQU0sMERBQTBELENBQUM7QUFDM0csT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sd0RBQXdELENBQUM7QUFHdkcsTUFBTSxPQUFPLDBCQUEwQjtJQWlCckMsWUFDRSxZQUFtQyxFQUNuQyxhQUFxQztRQUVyQyxJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQztRQUNqQyxJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztRQUNuQyxJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUNwSCxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUN2SCxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDM0csSUFBSSxDQUFDLDZCQUE2QixHQUFHLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDOUUsSUFBSSxDQUFDLDhCQUE4QixHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDaEYsSUFBSSxDQUFDLHVCQUF1QixHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMseUNBQXlDLEdBQUcsSUFBSSxDQUFDLDZCQUE2QixHQUFHLElBQUksQ0FBQyw4QkFBOEIsQ0FBQztRQUMxSCxJQUFJLENBQUMsbUNBQW1DLEdBQUcsSUFBSSxDQUFDLHVCQUF1QixHQUFHLElBQUksQ0FBQyx3QkFBd0IsQ0FBQztRQUN4RyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLFlBQVk7YUFDMUMsUUFBUSxDQUFDLDBCQUEwQixFQUFFLCtCQUErQixDQUFDLDhCQUE4QixDQUFDO2FBQ3BHLHVCQUF1QixFQUFFO2FBQ3pCLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSw2QkFBNkIsQ0FBQyxlQUFlLENBQUM7YUFDbkYsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLFlBQVk7YUFDMUMsUUFBUSxDQUFDLDBCQUEwQixFQUFFLCtCQUErQixDQUFDLDhCQUE4QixDQUFDO2FBQ3BHLHVCQUF1QixFQUFFO2FBQ3pCLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSw2QkFBNkIsQ0FBQyxlQUFlLENBQUM7YUFDbkYsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM1SSxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy90cmFuc2FjdGlvbi90cmFuc2FjdGlvbi5jb2xsZWN0aW9uJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLWxpc3QuZW51bSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzSGVhZGluZ1RheGFibGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtaGVhZGluZy10YXhhYmxlLmVudW0nO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9FbnVtcy9jaGFydC1hY2NvdW50cy1tZXRhZGF0YS1saXN0LmVudW0nO1xuaW1wb3J0IHsgSW5jb21lU291cmNlQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL2NvbGxlY3Rpb25zL2luY29tZS1zb3VyY2UuY29sbGVjdGlvbic7XG5cbmV4cG9ydCBjbGFzcyBNeVRheFBhcnRuZXJzaGlwc0FuZFRydXN0cyB7XG4gIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uO1xuICBpbmNvbWVTb3VyY2VzOiBJbmNvbWVTb3VyY2VDb2xsZWN0aW9uO1xuICBwYXJ0bmVyc2hpcHNJbmNvbWVzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHBhcnRuZXJzaGlwc0V4cGVuc2VzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHRydXN0c0luY29tZXM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgdHJ1c3RzRXhwZW5zZXM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgcGFydG5lcnNoaXBzSW5jb21lVG90YWxBbW91bnQ6IG51bWJlcjtcbiAgcGFydG5lcnNoaXBzRXhwZW5zZVRvdGFsQW1vdW50OiBudW1iZXI7XG4gIHRydXN0c0luY29tZVRvdGFsVGF4OiBudW1iZXI7XG4gIHRydXN0c0luY29tZVRvdGFsQW1vdW50OiBudW1iZXI7XG4gIHRydXN0c0V4cGVuc2VUb3RhbEFtb3VudDogbnVtYmVyO1xuICBwYXJ0bmVyc2hpcHNOZXROb25QcmltYXJ5UHJvZHVjdGlvbkFtb3VudDogbnVtYmVyO1xuICB0cnVzdHNOZXROb25QcmltYXJ5UHJvZHVjdGlvbkFtb3VudDogbnVtYmVyO1xuICBmcmFua2luZ0NyZWRpdHNUb3RhbDogbnVtYmVyO1xuICB0YXhPZmZzZXROUkFTVG90YWxBbW91bnQ6IG51bWJlcjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgICBpbmNvbWVTb3VyY2VzOiBJbmNvbWVTb3VyY2VDb2xsZWN0aW9uLFxuICApIHtcbiAgICB0aGlzLnRyYW5zYWN0aW9ucyA9IHRyYW5zYWN0aW9ucztcbiAgICB0aGlzLmluY29tZVNvdXJjZXMgPSBpbmNvbWVTb3VyY2VzO1xuICAgIHRoaXMucGFydG5lcnNoaXBzSW5jb21lcyA9IHRoaXMudHJhbnNhY3Rpb25zLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlBBUlRORVJTSElQX0lOQ09NRSk7XG4gICAgdGhpcy5wYXJ0bmVyc2hpcHNFeHBlbnNlcyA9IHRoaXMudHJhbnNhY3Rpb25zLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlBBUlRORVJTSElQX0VYUEVOU0VTKTtcbiAgICB0aGlzLnRydXN0c0luY29tZXMgPSB0aGlzLnRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5UUlVTVF9JTkNPTUUpO1xuICAgIHRoaXMudHJ1c3RzRXhwZW5zZXMgPSB0aGlzLnRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5UUlVTVF9FWFBFTlNFUyk7XG4gICAgdGhpcy5wYXJ0bmVyc2hpcHNJbmNvbWVUb3RhbEFtb3VudCA9IHRoaXMucGFydG5lcnNoaXBzSW5jb21lcy5zdW1CeSgnYW1vdW50Jyk7XG4gICAgdGhpcy5wYXJ0bmVyc2hpcHNFeHBlbnNlVG90YWxBbW91bnQgPSB0aGlzLnBhcnRuZXJzaGlwc0V4cGVuc2VzLnN1bUJ5KCdhbW91bnQnKTtcbiAgICB0aGlzLnRydXN0c0luY29tZVRvdGFsQW1vdW50ID0gdGhpcy50cnVzdHNJbmNvbWVzLnN1bUJ5KCdhbW91bnQnKTtcbiAgICB0aGlzLnRydXN0c0V4cGVuc2VUb3RhbEFtb3VudCA9IHRoaXMudHJ1c3RzRXhwZW5zZXMuc3VtQnkoJ2Ftb3VudCcpO1xuICAgIHRoaXMucGFydG5lcnNoaXBzTmV0Tm9uUHJpbWFyeVByb2R1Y3Rpb25BbW91bnQgPSB0aGlzLnBhcnRuZXJzaGlwc0luY29tZVRvdGFsQW1vdW50IC0gdGhpcy5wYXJ0bmVyc2hpcHNFeHBlbnNlVG90YWxBbW91bnQ7XG4gICAgdGhpcy50cnVzdHNOZXROb25QcmltYXJ5UHJvZHVjdGlvbkFtb3VudCA9IHRoaXMudHJ1c3RzSW5jb21lVG90YWxBbW91bnQgLSB0aGlzLnRydXN0c0V4cGVuc2VUb3RhbEFtb3VudDtcbiAgICB0aGlzLmZyYW5raW5nQ3JlZGl0c1RvdGFsID0gdGhpcy50cmFuc2FjdGlvbnNcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5oZWFkaW5nLmlkJywgQ2hhcnRBY2NvdW50c0hlYWRpbmdUYXhhYmxlRW51bS5QQVJUTkVSU0hJUFNfQU5EX1RSVVNUU19JTkNPTUUpXG4gICAgICAuZ2V0VHJhbnNhY3Rpb25zTWV0YWRhdGEoKVxuICAgICAgLmZpbHRlckJ5KCdjaGFydEFjY291bnRzTWV0YWRhdGEuaWQnLCBDaGFydEFjY291bnRzTWV0YWRhdGFMaXN0RW51bS5GUkFOS0lOR19DUkVESVQpXG4gICAgICAuc3VtQnkoJ3ZhbHVlJyk7XG4gICAgdGhpcy50cnVzdHNJbmNvbWVUb3RhbFRheCA9IHRoaXMudHJ1c3RzSW5jb21lcy5zdW1CeSgndGF4Jyk7XG4gICAgdGhpcy5mcmFua2luZ0NyZWRpdHNUb3RhbCA9IHRoaXMudHJhbnNhY3Rpb25zXG4gICAgICAuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaGVhZGluZy5pZCcsIENoYXJ0QWNjb3VudHNIZWFkaW5nVGF4YWJsZUVudW0uUEFSVE5FUlNISVBTX0FORF9UUlVTVFNfSU5DT01FKVxuICAgICAgLmdldFRyYW5zYWN0aW9uc01ldGFkYXRhKClcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50c01ldGFkYXRhLmlkJywgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0uRlJBTktJTkdfQ1JFRElUKVxuICAgICAgLnN1bUJ5KCd2YWx1ZScpO1xuICAgIHRoaXMudGF4T2Zmc2V0TlJBU1RvdGFsQW1vdW50ID0gdGhpcy50cmFuc2FjdGlvbnMuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uVEFYX09GRlNFVFNfTl9SX0FfUykuc3VtQnkoJ2Ftb3VudCcpO1xuICB9XG59XG4iXX0=
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -9718,23 +9718,22 @@ class MyTaxPartnershipsAndTrusts {
|
|
|
9718
9718
|
constructor(transactions, incomeSources) {
|
|
9719
9719
|
this.transactions = transactions;
|
|
9720
9720
|
this.incomeSources = incomeSources;
|
|
9721
|
-
this.
|
|
9722
|
-
this.
|
|
9721
|
+
this.partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
|
|
9722
|
+
this.partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
|
|
9723
9723
|
this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
|
|
9724
9724
|
this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
|
|
9725
|
-
this.
|
|
9726
|
-
this.
|
|
9727
|
-
|
|
9728
|
-
this.
|
|
9729
|
-
|
|
9730
|
-
this.
|
|
9731
|
-
this.
|
|
9732
|
-
this.partnershipExpenses.sumBy('amount');
|
|
9733
|
-
this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -
|
|
9734
|
-
this.trustsExpenses.sumBy('amount');
|
|
9735
|
-
this.taxPaidTotal = this.transactions
|
|
9725
|
+
this.partnershipsIncomeTotalAmount = this.partnershipsIncomes.sumBy('amount');
|
|
9726
|
+
this.partnershipsExpenseTotalAmount = this.partnershipsExpenses.sumBy('amount');
|
|
9727
|
+
this.trustsIncomeTotalAmount = this.trustsIncomes.sumBy('amount');
|
|
9728
|
+
this.trustsExpenseTotalAmount = this.trustsExpenses.sumBy('amount');
|
|
9729
|
+
this.partnershipsNetNonPrimaryProductionAmount = this.partnershipsIncomeTotalAmount - this.partnershipsExpenseTotalAmount;
|
|
9730
|
+
this.trustsNetNonPrimaryProductionAmount = this.trustsIncomeTotalAmount - this.trustsExpenseTotalAmount;
|
|
9731
|
+
this.frankingCreditsTotal = this.transactions
|
|
9736
9732
|
.filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
|
|
9737
|
-
.
|
|
9733
|
+
.getTransactionsMetadata()
|
|
9734
|
+
.filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.FRANKING_CREDIT)
|
|
9735
|
+
.sumBy('value');
|
|
9736
|
+
this.trustsIncomeTotalTax = this.trustsIncomes.sumBy('tax');
|
|
9738
9737
|
this.frankingCreditsTotal = this.transactions
|
|
9739
9738
|
.filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
|
|
9740
9739
|
.getTransactionsMetadata()
|
|
@@ -9742,22 +9741,6 @@ class MyTaxPartnershipsAndTrusts {
|
|
|
9742
9741
|
.sumBy('value');
|
|
9743
9742
|
this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
|
|
9744
9743
|
}
|
|
9745
|
-
/**
|
|
9746
|
-
* Get Income source forecast trust type, related to trust income with max amount
|
|
9747
|
-
*/
|
|
9748
|
-
getTrustType() {
|
|
9749
|
-
const filteredTrustIncomes = this.trustsIncomes
|
|
9750
|
-
.filterBy('incomeSource.id', this.incomeSources
|
|
9751
|
-
.removeBy('actualForecast.trustType', null)
|
|
9752
|
-
.getIds());
|
|
9753
|
-
if (!filteredTrustIncomes.length) {
|
|
9754
|
-
return null;
|
|
9755
|
-
}
|
|
9756
|
-
return this.incomeSources
|
|
9757
|
-
.findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
|
|
9758
|
-
.actualForecast
|
|
9759
|
-
.trustType;
|
|
9760
|
-
}
|
|
9761
9744
|
}
|
|
9762
9745
|
|
|
9763
9746
|
class MyTaxRent {
|
|
@@ -17528,21 +17511,24 @@ class MyTaxOtherIncomeForm extends AbstractForm {
|
|
|
17528
17511
|
class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
|
|
17529
17512
|
constructor(partnershipsAndTrusts) {
|
|
17530
17513
|
super({
|
|
17531
|
-
|
|
17532
|
-
value: partnershipsAndTrusts.
|
|
17514
|
+
partnershipsIncomeTotalAmount: new FormControl({
|
|
17515
|
+
value: partnershipsAndTrusts.partnershipsIncomeTotalAmount,
|
|
17516
|
+
disabled: true
|
|
17517
|
+
}),
|
|
17518
|
+
partnershipsExpenseTotalAmount: new FormControl({
|
|
17519
|
+
value: partnershipsAndTrusts.partnershipsExpenseTotalAmount,
|
|
17520
|
+
disabled: true
|
|
17521
|
+
}),
|
|
17522
|
+
trustsIncomeTotalAmount: new FormControl({
|
|
17523
|
+
value: partnershipsAndTrusts.trustsIncomeTotalAmount,
|
|
17533
17524
|
disabled: true
|
|
17534
17525
|
}),
|
|
17535
|
-
|
|
17536
|
-
value: partnershipsAndTrusts.
|
|
17526
|
+
trustsExpenseTotalAmount: new FormControl({
|
|
17527
|
+
value: partnershipsAndTrusts.trustsExpenseTotalAmount,
|
|
17537
17528
|
disabled: true
|
|
17538
17529
|
}),
|
|
17539
|
-
|
|
17540
|
-
|
|
17541
|
-
}, Validators.required)),
|
|
17542
|
-
partnershipsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, Validators.required),
|
|
17543
|
-
trustsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, Validators.required),
|
|
17544
|
-
taxPaidTotal: new FormControl({
|
|
17545
|
-
value: partnershipsAndTrusts.taxPaidTotal,
|
|
17530
|
+
trustsIncomeTotalTax: new FormControl({
|
|
17531
|
+
value: partnershipsAndTrusts.trustsIncomeTotalTax,
|
|
17546
17532
|
disabled: true
|
|
17547
17533
|
}),
|
|
17548
17534
|
frankingCreditsTotal: new FormControl({
|