taxtank-core 0.32.9 → 0.32.10
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/esm2022/lib/collections/report/vehicle-expense/vehicle-expense.collection.mjs +2 -2
- package/esm2022/lib/forms/client/annual-client-details.form.mjs +2 -2
- package/esm2022/lib/models/report/property/property-report-item.mjs +2 -2
- package/fesm2022/taxtank-core.mjs +3 -3
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -10,8 +10,8 @@ export class VehicleExpenseCollection extends Collection {
|
|
|
10
10
|
const transactionsByChartAccounts = transactions.groupBy('chartAccounts.name');
|
|
11
11
|
const transactionExpenses = transactionsByChartAccounts.keys.map((chartAccountsName) => new VehicleExpense(transactionsByChartAccounts.get(chartAccountsName).amount, transactionsByChartAccounts.get(chartAccountsName).first.claimPercent, chartAccountsName));
|
|
12
12
|
// group all depreciations into one expense item
|
|
13
|
-
const depreciationExpense = new VehicleExpense(-depreciations.getCurrentYearForecastAmount(), depreciations.first?.claimPercent ?? 0, 'Depreciation');
|
|
13
|
+
const depreciationExpense = new VehicleExpense(-depreciations.getCurrentYearForecastAmount(), depreciations.first?.currentYearForecast?.claimPercent ?? 0, 'Depreciation');
|
|
14
14
|
this.items.push(...[depreciationExpense, ...transactionExpenses]);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1leHBlbnNlLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvcmVwb3J0L3ZlaGljbGUtZXhwZW5zZS92ZWhpY2xlLWV4cGVuc2UuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBSXhELE1BQU0sT0FBTyx3QkFBeUIsU0FBUSxVQUEwQjtJQUN0RSxZQUFZLFlBQW1DLEVBQUUsYUFBcUM7UUFDcEYsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksRUFBRSxhQUFhLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRU8sUUFBUSxDQUFDLFlBQW1DLEVBQUUsYUFBcUM7UUFDekYsSUFBSSxDQUFDLEtBQUssR0FBRyxFQUFFLENBQUM7UUFFaEIsTUFBTSwyQkFBMkIsR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFFL0UsTUFBTSxtQkFBbUIsR0FBcUIsMkJBQTJCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLGlCQUF5QixFQUFFLEVBQUUsQ0FBQyxJQUFJLGNBQWMsQ0FDbEksMkJBQTJCLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUMsTUFBTSxFQUN6RCwyQkFBMkIsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUNyRSxpQkFBaUIsQ0FDbEIsQ0FBQyxDQUFDO1FBRUgsZ0RBQWdEO1FBQ2hELE1BQU0sbUJBQW1CLEdBQW1CLElBQUksY0FBYyxDQUM1RCxDQUFDLGFBQWEsQ0FBQyw0QkFBNEIsRUFBRSxFQUM3QyxhQUFhLENBQUMsS0FBSyxFQUFFLG1CQUFtQixFQUFFLFlBQVksSUFBSSxDQUFDLEVBQzNELGNBQWMsQ0FDZixDQUFDO1FBRUYsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixFQUFFLEdBQUcsbUJBQW1CLENBQUMsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi9jb2xsZWN0aW9uJztcbmltcG9ydCB7IFZlaGljbGVFeHBlbnNlIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL3JlcG9ydCc7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi90cmFuc2FjdGlvbic7XG5pbXBvcnQgeyBEZXByZWNpYXRpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24nO1xuXG5leHBvcnQgY2xhc3MgVmVoaWNsZUV4cGVuc2VDb2xsZWN0aW9uIGV4dGVuZHMgQ29sbGVjdGlvbjxWZWhpY2xlRXhwZW5zZT4ge1xuICBjb25zdHJ1Y3Rvcih0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiwgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbikge1xuICAgIHN1cGVyKCk7XG4gICAgdGhpcy5zZXRJdGVtcyh0cmFuc2FjdGlvbnMsIGRlcHJlY2lhdGlvbnMpO1xuICB9XG5cbiAgcHJpdmF0ZSBzZXRJdGVtcyh0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiwgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbik6IHZvaWQge1xuICAgIHRoaXMuaXRlbXMgPSBbXTtcblxuICAgIGNvbnN0IHRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cyA9IHRyYW5zYWN0aW9ucy5ncm91cEJ5KCdjaGFydEFjY291bnRzLm5hbWUnKTtcblxuICAgIGNvbnN0IHRyYW5zYWN0aW9uRXhwZW5zZXM6IFZlaGljbGVFeHBlbnNlW10gPSB0cmFuc2FjdGlvbnNCeUNoYXJ0QWNjb3VudHMua2V5cy5tYXAoKGNoYXJ0QWNjb3VudHNOYW1lOiBzdHJpbmcpID0+IG5ldyBWZWhpY2xlRXhwZW5zZShcbiAgICAgIHRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cy5nZXQoY2hhcnRBY2NvdW50c05hbWUpLmFtb3VudCxcbiAgICAgIHRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cy5nZXQoY2hhcnRBY2NvdW50c05hbWUpLmZpcnN0LmNsYWltUGVyY2VudCxcbiAgICAgIGNoYXJ0QWNjb3VudHNOYW1lXG4gICAgKSk7XG5cbiAgICAvLyBncm91cCBhbGwgZGVwcmVjaWF0aW9ucyBpbnRvIG9uZSBleHBlbnNlIGl0ZW1cbiAgICBjb25zdCBkZXByZWNpYXRpb25FeHBlbnNlOiBWZWhpY2xlRXhwZW5zZSA9IG5ldyBWZWhpY2xlRXhwZW5zZShcbiAgICAgIC1kZXByZWNpYXRpb25zLmdldEN1cnJlbnRZZWFyRm9yZWNhc3RBbW91bnQoKSxcbiAgICAgIGRlcHJlY2lhdGlvbnMuZmlyc3Q/LmN1cnJlbnRZZWFyRm9yZWNhc3Q/LmNsYWltUGVyY2VudCA/PyAwLFxuICAgICAgJ0RlcHJlY2lhdGlvbidcbiAgICApO1xuXG4gICAgdGhpcy5pdGVtcy5wdXNoKC4uLltkZXByZWNpYXRpb25FeHBlbnNlLCAuLi50cmFuc2FjdGlvbkV4cGVuc2VzXSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -10,7 +10,7 @@ export class AnnualClientDetailsForm extends AbstractForm {
|
|
|
10
10
|
privateHealthCare: new UntypedFormControl(annualClientDetails.privateHealthCare, Validators.required),
|
|
11
11
|
spouse: new UntypedFormControl(annualClientDetails.spouse, Validators.required),
|
|
12
12
|
spouseAnnualIncome: new UntypedFormControl(annualClientDetails.spouseAnnualIncome, conditionalValidator(() => this.get('spouse').value, Validators.required)),
|
|
13
|
-
hasDependants: new UntypedFormControl(!!annualClientDetails.
|
|
13
|
+
hasDependants: new UntypedFormControl(!!annualClientDetails.dependants, Validators.required),
|
|
14
14
|
dependants: new UntypedFormControl(annualClientDetails.dependants, conditionalValidator(() => this.get('hasDependants').value, Validators.required)),
|
|
15
15
|
hasStudentLoan: new UntypedFormControl(!!annualClientDetails.studentLoanAmount, Validators.required),
|
|
16
16
|
studentLoanAmount: new UntypedFormControl(annualClientDetails.studentLoanAmount, conditionalValidator(() => this.get('hasStudentLoan').value, Validators.required)),
|
|
@@ -36,4 +36,4 @@ export class AnnualClientDetailsForm extends AbstractForm {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5udWFsLWNsaWVudC1kZXRhaWxzLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvY2xpZW50L2FubnVhbC1jbGllbnQtZGV0YWlscy5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ25ELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxNQUFNLE9BQU8sdUJBQXdCLFNBQVEsWUFBaUM7SUFDNUUsWUFBb0Isc0JBQTJDLFlBQVksQ0FBQyxtQkFBbUIsRUFBRSxFQUFFLENBQUM7UUFDbEcsS0FBSyxDQUFDO1lBQ0osV0FBVyxFQUFFLElBQUksa0JBQWtCLENBQUMsbUJBQW1CLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDekYsaUJBQWlCLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyxpQkFBaUIsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ3JHLE1BQU0sRUFBRSxJQUFJLGtCQUFrQixDQUFDLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQy9FLGtCQUFrQixFQUFFLElBQUksa0JBQWtCLENBQUMsbUJBQW1CLENBQUMsa0JBQWtCLEVBQUUsb0JBQW9CLENBQ3JHLEdBQVksRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxFQUN2QyxVQUFVLENBQUMsUUFBUSxDQUNwQixDQUFDO1lBQ0YsYUFBYSxFQUFFLElBQUksa0JBQWtCLENBQUMsQ0FBQyxDQUFDLG1CQUFtQixDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQzVGLFVBQVUsRUFBRSxJQUFJLGtCQUFrQixDQUFDLG1CQUFtQixDQUFDLFVBQVUsRUFBRSxvQkFBb0IsQ0FDckYsR0FBWSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxLQUFLLEVBQzlDLFVBQVUsQ0FBQyxRQUFRLENBQ3BCLENBQUM7WUFDRixjQUFjLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsaUJBQWlCLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztZQUNwRyxpQkFBaUIsRUFBRSxJQUFJLGtCQUFrQixDQUFDLG1CQUFtQixDQUFDLGlCQUFpQixFQUFFLG9CQUFvQixDQUNuRyxHQUFZLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUMsS0FBSyxFQUMvQyxVQUFVLENBQUMsUUFBUSxDQUNwQixDQUFDO1lBQ0Ysd0JBQXdCLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyx3QkFBd0IsSUFBSSxDQUFDLENBQUM7WUFDbkcsNkJBQTZCLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyw2QkFBNkIsSUFBSSxDQUFDLENBQUM7U0FDOUcsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO1FBckJOLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBNkQ7UUF1QmxHLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsbUJBQW1CLENBQUMsZUFBZSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ3hELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO1FBQ2hFLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwQixDQUFDO0lBRU8sbUJBQW1CLENBQUMsS0FBYSxFQUFFLGNBQXNCO1FBQy9ELElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQWMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7SUFDdkcsQ0FBQztJQUVPLFdBQVcsQ0FBQyxLQUFhLEVBQUUsTUFBZTtRQUNoRCxJQUFJLE1BQU0sRUFBRTtZQUNWLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7U0FDMUI7YUFBTTtZQUNMLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzVCLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7U0FDM0I7SUFDSCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFVudHlwZWRGb3JtQ29udHJvbCwgVmFsaWRhdG9ycyB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IEFubnVhbENsaWVudERldGFpbHMgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgY29uZGl0aW9uYWxWYWxpZGF0b3IgfSBmcm9tICcuLi8uLi92YWxpZGF0b3JzJztcblxuZXhwb3J0IGNsYXNzIEFubnVhbENsaWVudERldGFpbHNGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPEFubnVhbENsaWVudERldGFpbHM+IHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBhbm51YWxDbGllbnREZXRhaWxzOiBBbm51YWxDbGllbnREZXRhaWxzID0gcGxhaW5Ub0NsYXNzKEFubnVhbENsaWVudERldGFpbHMsIHt9KSkge1xuICAgIHN1cGVyKHtcbiAgICAgIGNhcGl0YWxMb3NzOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKGFubnVhbENsaWVudERldGFpbHMuY2FwaXRhbExvc3MsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgcHJpdmF0ZUhlYWx0aENhcmU6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYW5udWFsQ2xpZW50RGV0YWlscy5wcml2YXRlSGVhbHRoQ2FyZSwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICBzcG91c2U6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYW5udWFsQ2xpZW50RGV0YWlscy5zcG91c2UsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgc3BvdXNlQW5udWFsSW5jb21lOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKGFubnVhbENsaWVudERldGFpbHMuc3BvdXNlQW5udWFsSW5jb21lLCBjb25kaXRpb25hbFZhbGlkYXRvcihcbiAgICAgICAgKCk6IGJvb2xlYW4gPT4gdGhpcy5nZXQoJ3Nwb3VzZScpLnZhbHVlLFxuICAgICAgICBWYWxpZGF0b3JzLnJlcXVpcmVkXG4gICAgICApKSxcbiAgICAgIGhhc0RlcGVuZGFudHM6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woISFhbm51YWxDbGllbnREZXRhaWxzLmRlcGVuZGFudHMsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgZGVwZW5kYW50czogbmV3IFVudHlwZWRGb3JtQ29udHJvbChhbm51YWxDbGllbnREZXRhaWxzLmRlcGVuZGFudHMsIGNvbmRpdGlvbmFsVmFsaWRhdG9yKFxuICAgICAgICAoKTogYm9vbGVhbiA9PiB0aGlzLmdldCgnaGFzRGVwZW5kYW50cycpLnZhbHVlLFxuICAgICAgICBWYWxpZGF0b3JzLnJlcXVpcmVkXG4gICAgICApKSxcbiAgICAgIGhhc1N0dWRlbnRMb2FuOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKCEhYW5udWFsQ2xpZW50RGV0YWlscy5zdHVkZW50TG9hbkFtb3VudCwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICBzdHVkZW50TG9hbkFtb3VudDogbmV3IFVudHlwZWRGb3JtQ29udHJvbChhbm51YWxDbGllbnREZXRhaWxzLnN0dWRlbnRMb2FuQW1vdW50LCBjb25kaXRpb25hbFZhbGlkYXRvcihcbiAgICAgICAgKCk6IGJvb2xlYW4gPT4gdGhpcy5nZXQoJ2hhc1N0dWRlbnRMb2FuJykudmFsdWUsXG4gICAgICAgIFZhbGlkYXRvcnMucmVxdWlyZWRcbiAgICAgICkpLFxuICAgICAgcmVwb3J0YWJsZUZyaW5nZUJlbmVmaXRzOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKGFubnVhbENsaWVudERldGFpbHMucmVwb3J0YWJsZUZyaW5nZUJlbmVmaXRzIHx8IDApLFxuICAgICAgZXhlbXB0Rm9yZWlnbkVtcGxveW1lbnRJbmNvbWU6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYW5udWFsQ2xpZW50RGV0YWlscy5leGVtcHRGb3JlaWduRW1wbG95bWVudEluY29tZSB8fCAwKSxcbiAgICB9LCBhbm51YWxDbGllbnREZXRhaWxzKTtcblxuICAgIHRoaXMud2F0Y2hGaWVsZEZvclRvZ2dsZSgnc3BvdXNlJywgJ3Nwb3VzZUFubnVhbEluY29tZScpO1xuICAgIHRoaXMud2F0Y2hGaWVsZEZvclRvZ2dsZSgnaGFzRGVwZW5kYW50cycsICdkZXBlbmRhbnRzJyk7XG4gICAgdGhpcy53YXRjaEZpZWxkRm9yVG9nZ2xlKCdoYXNTdHVkZW50TG9hbicsICdzdHVkZW50TG9hbkFtb3VudCcpO1xuICAgIHRoaXMuZW1pdFZhbHVlcygpO1xuICB9XG5cbiAgcHJpdmF0ZSB3YXRjaEZpZWxkRm9yVG9nZ2xlKGZpZWxkOiBzdHJpbmcsIGRlcGVuZGFudEZpZWxkOiBzdHJpbmcpOiB2b2lkIHtcbiAgICB0aGlzLmdldChmaWVsZCkudmFsdWVDaGFuZ2VzLnN1YnNjcmliZSgodmFsdWU6IGJvb2xlYW4pID0+IHRoaXMudG9nZ2xlRmllbGQoZGVwZW5kYW50RmllbGQsICEhdmFsdWUpKVxuICB9XG5cbiAgcHJpdmF0ZSB0b2dnbGVGaWVsZChmaWVsZDogc3RyaW5nLCBlbmFibGU6IGJvb2xlYW4pOiB2b2lkIHtcbiAgICBpZiAoZW5hYmxlKSB7XG4gICAgICB0aGlzLmdldChmaWVsZCkuZW5hYmxlKCk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuZ2V0KGZpZWxkKS5zZXRWYWx1ZSgwKTtcbiAgICAgIHRoaXMuZ2V0KGZpZWxkKS5kaXNhYmxlKCk7XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -11,7 +11,7 @@ export class PropertyReportItem extends AbstractModel {
|
|
|
11
11
|
this.propertyId = property.id;
|
|
12
12
|
this.claimPercent = property.claimPercent;
|
|
13
13
|
this.sharePercent = property.sharePercent;
|
|
14
|
-
this.subCode = chartAccounts.taxReturnItem
|
|
14
|
+
this.subCode = chartAccounts.taxReturnItem?.subCode;
|
|
15
15
|
this.description = chartAccounts.name;
|
|
16
16
|
}
|
|
17
17
|
get claimAmount() {
|
|
@@ -27,4 +27,4 @@ export class PropertyReportItem extends AbstractModel {
|
|
|
27
27
|
return CHART_ACCOUNTS_CATEGORIES.expense.includes(this.chartAccounts.category);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9wcm9wZXJ0eS9wcm9wZXJ0eS1yZXBvcnQtaXRlbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUseUJBQXlCLEVBQWlCLE1BQU0sc0JBQXNCLENBQUM7QUFDaEYsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxNQUFNLGNBQWMsQ0FBQztBQUVqQzs7R0FFRztBQUNILE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxhQUFhO0lBYW5ELFlBQ0UsUUFBa0IsRUFDbEIsYUFBNEI7UUFFNUIsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztRQUNuQyxJQUFJLENBQUMsVUFBVSxHQUFHLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDOUIsSUFBSSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFDO1FBQzFDLElBQUksQ0FBQyxZQUFZLEdBQUcsUUFBUSxDQUFDLFlBQVksQ0FBQztRQUMxQyxJQUFJLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDO1FBQ3BELElBQUksQ0FBQyxXQUFXLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBQTtJQUN2QyxDQUFDO0lBRUQsSUFBSSxXQUFXO1FBQ2IsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksQ0FBQyxZQUFZLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUVELElBQUksZ0JBQWdCO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLFdBQVcsR0FBRyxDQUFDLElBQUksQ0FBQyxZQUFZLEdBQUcsR0FBRyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLHlCQUF5QixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRixDQUFDO0lBRUQsU0FBUztRQUNQLE9BQU8seUJBQXlCLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pGLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFByb3BlcnR5IH0gZnJvbSAnLi4vLi4vcHJvcGVydHknO1xuaW1wb3J0IHsgQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUywgQ2hhcnRBY2NvdW50cyB9IGZyb20gJy4uLy4uL2NoYXJ0LWFjY291bnRzJztcbmltcG9ydCB7IEFic3RyYWN0TW9kZWwgfSBmcm9tICcuLi8uLi8uLi9kYi9Nb2RlbHMnO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5cbi8qKlxuICogQ2xhc3Mgd2l0aCBwcm9wZXJ0eSB0cmFuc2FjdGlvbnMgcmVwb3J0IGVudGl0aWVzXG4gKi9cbmV4cG9ydCBjbGFzcyBQcm9wZXJ0eVJlcG9ydEl0ZW0gZXh0ZW5kcyBBYnN0cmFjdE1vZGVsIHtcbiAgYW1vdW50OiBudW1iZXI7XG4gIGRlc2NyaXB0aW9uOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFRheCByZXR1cm4gaXRlbSBzdWItY29kZVxuICAgKi9cbiAgc3ViQ29kZTogc3RyaW5nO1xuICBzaGFyZVBlcmNlbnQ6IG51bWJlcjtcbiAgY2xhaW1QZXJjZW50OiBudW1iZXI7XG4gIHByb3BlcnR5SWQ6IG51bWJlcjtcbiAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50cztcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcm9wZXJ0eTogUHJvcGVydHksXG4gICAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50c1xuICApIHtcbiAgICBzdXBlcigpO1xuICAgIHRoaXMuY2hhcnRBY2NvdW50cyA9IGNoYXJ0QWNjb3VudHM7XG4gICAgdGhpcy5wcm9wZXJ0eUlkID0gcHJvcGVydHkuaWQ7XG4gICAgdGhpcy5jbGFpbVBlcmNlbnQgPSBwcm9wZXJ0eS5jbGFpbVBlcmNlbnQ7XG4gICAgdGhpcy5zaGFyZVBlcmNlbnQgPSBwcm9wZXJ0eS5zaGFyZVBlcmNlbnQ7XG4gICAgdGhpcy5zdWJDb2RlID0gY2hhcnRBY2NvdW50cy50YXhSZXR1cm5JdGVtPy5zdWJDb2RlO1xuICAgIHRoaXMuZGVzY3JpcHRpb24gPSBjaGFydEFjY291bnRzLm5hbWVcbiAgfVxuXG4gIGdldCBjbGFpbUFtb3VudCgpOiBudW1iZXIge1xuICAgIHJldHVybiByb3VuZCh0aGlzLmFtb3VudCAqICh0aGlzLmNsYWltUGVyY2VudCAvIDEwMCksIDIpO1xuICB9XG5cbiAgZ2V0IHNoYXJlQ2xhaW1BbW91bnQoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5jbGFpbUFtb3VudCAqICh0aGlzLnNoYXJlUGVyY2VudCAvIDEwMCk7XG4gIH1cblxuICBpc0luY29tZSgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUy5pbmNvbWUuaW5jbHVkZXModGhpcy5jaGFydEFjY291bnRzLmNhdGVnb3J5KTtcbiAgfVxuXG4gIGlzRXhwZW5zZSgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUy5leHBlbnNlLmluY2x1ZGVzKHRoaXMuY2hhcnRBY2NvdW50cy5jYXRlZ29yeSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -7204,7 +7204,7 @@ class PropertyReportItem extends AbstractModel {
|
|
|
7204
7204
|
this.propertyId = property.id;
|
|
7205
7205
|
this.claimPercent = property.claimPercent;
|
|
7206
7206
|
this.sharePercent = property.sharePercent;
|
|
7207
|
-
this.subCode = chartAccounts.taxReturnItem
|
|
7207
|
+
this.subCode = chartAccounts.taxReturnItem?.subCode;
|
|
7208
7208
|
this.description = chartAccounts.name;
|
|
7209
7209
|
}
|
|
7210
7210
|
get claimAmount() {
|
|
@@ -8180,7 +8180,7 @@ class VehicleExpenseCollection extends Collection {
|
|
|
8180
8180
|
const transactionsByChartAccounts = transactions.groupBy('chartAccounts.name');
|
|
8181
8181
|
const transactionExpenses = transactionsByChartAccounts.keys.map((chartAccountsName) => new VehicleExpense(transactionsByChartAccounts.get(chartAccountsName).amount, transactionsByChartAccounts.get(chartAccountsName).first.claimPercent, chartAccountsName));
|
|
8182
8182
|
// group all depreciations into one expense item
|
|
8183
|
-
const depreciationExpense = new VehicleExpense(-depreciations.getCurrentYearForecastAmount(), depreciations.first?.claimPercent ?? 0, 'Depreciation');
|
|
8183
|
+
const depreciationExpense = new VehicleExpense(-depreciations.getCurrentYearForecastAmount(), depreciations.first?.currentYearForecast?.claimPercent ?? 0, 'Depreciation');
|
|
8184
8184
|
this.items.push(...[depreciationExpense, ...transactionExpenses]);
|
|
8185
8185
|
}
|
|
8186
8186
|
}
|
|
@@ -21624,7 +21624,7 @@ class AnnualClientDetailsForm extends AbstractForm {
|
|
|
21624
21624
|
privateHealthCare: new UntypedFormControl(annualClientDetails.privateHealthCare, Validators.required),
|
|
21625
21625
|
spouse: new UntypedFormControl(annualClientDetails.spouse, Validators.required),
|
|
21626
21626
|
spouseAnnualIncome: new UntypedFormControl(annualClientDetails.spouseAnnualIncome, conditionalValidator(() => this.get('spouse').value, Validators.required)),
|
|
21627
|
-
hasDependants: new UntypedFormControl(!!annualClientDetails.
|
|
21627
|
+
hasDependants: new UntypedFormControl(!!annualClientDetails.dependants, Validators.required),
|
|
21628
21628
|
dependants: new UntypedFormControl(annualClientDetails.dependants, conditionalValidator(() => this.get('hasDependants').value, Validators.required)),
|
|
21629
21629
|
hasStudentLoan: new UntypedFormControl(!!annualClientDetails.studentLoanAmount, Validators.required),
|
|
21630
21630
|
studentLoanAmount: new UntypedFormControl(annualClientDetails.studentLoanAmount, conditionalValidator(() => this.get('hasStudentLoan').value, Validators.required)),
|