taxtank-core 0.21.11 → 0.21.12
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 +11 -14
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/forms/bank/bank-account/bank-account-allocation.form.js +1 -1
- package/esm2015/lib/forms/report/my-tax/my-tax-deductions.form.js +2 -2
- package/esm2015/lib/models/report/my-tax/my-tax-deductions/deduction-fields.const.js +2 -3
- package/esm2015/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.js +3 -3
- package/esm2015/lib/models/report/my-tax/my-tax-rent/my-tax-rent.js +8 -10
- package/fesm2015/taxtank-core.js +11 -14
- package/fesm2015/taxtank-core.js.map +1 -1
- package/package.json +1 -1
|
@@ -28,4 +28,4 @@ export class BankAccountAllocationForm extends AbstractForm {
|
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuay1hY2NvdW50LWFsbG9jYXRpb24uZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9iYW5rL2JhbmstYWNjb3VudC9iYW5rLWFjY291bnQtYWxsb2NhdGlvbi5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBQyxZQUFZLEVBQUMsTUFBTSxxQkFBcUIsQ0FBQztBQUNqRCxPQUFPLEVBQUMsV0FBVyxFQUFDLE1BQU0sbUNBQW1DLENBQUM7QUFDOUQsT0FBTyxFQUFDLFdBQVcsRUFBRSxVQUFVLEVBQUMsTUFBTSxnQkFBZ0IsQ0FBQztBQUN2RCxPQUFPLEVBQUMsWUFBWSxFQUFDLE1BQU0sbUJBQW1CLENBQUM7QUFDL0MsT0FBTyxFQUFDLFlBQVksRUFBQyxNQUFNLGtDQUFrQyxDQUFDO0FBQzlELE9BQU8sRUFBQyx5QkFBeUIsRUFBQyxNQUFNLGdDQUFnQyxDQUFDO0FBRXpFLE1BQU0sT0FBTyx5QkFBMEIsU0FBUSxZQUF5QjtJQUN0RSxZQUFvQixXQUF5QjtRQUMzQyxLQUFLLENBQUM7WUFDSixRQUFRLEVBQUUsSUFBSSxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztTQUUxRixFQUFFLFlBQVksQ0FBQyxXQUFXLEVBQUUsV0FBVyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFKL0IsZ0JBQVcsR0FBWCxXQUFXLENBQWM7UUFNM0MsSUFBSSxXQUFXLGFBQVgsV0FBVyx1QkFBWCxXQUFXLENBQUUsY0FBYyxFQUFFLEVBQUU7WUFDakMsSUFBSSxDQUFDLFVBQVUsQ0FBQyx1QkFBdUIsRUFBRSxJQUFJLHlCQUF5QixDQUFDLFdBQVcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUM7U0FDNUc7UUFFRCxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDdkIsQ0FBQztJQUVELGFBQWE7UUFDWCxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxRQUFzQixFQUFFLEVBQUU7O1lBQ3JFLG1DQUFtQztZQUNuQyxJQUFJLFFBQVEsS0FBSyxZQUFZLENBQUMsUUFBUSxFQUFFO2dCQUN0QyxJQUFJLENBQUMsVUFBVSxDQUFDLHVCQUF1QixFQUFFLElBQUkseUJBQXlCLENBQUMsTUFBQSxJQUFJLENBQUMsV0FBVywwQ0FBRSxxQkFBcUIsQ0FBQyxDQUFDLENBQUM7YUFDbEg7aUJBQU07Z0JBQ0wsSUFBSSxDQUFDLGFBQWEsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO2FBQzdDO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0Fic3RyYWN0Rm9ybX0gZnJvbSAnLi4vLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQge0JhbmtBY2NvdW50fSBmcm9tICcuLi8uLi8uLi9tb2RlbHMvYmFuay9iYW5rLWFjY291bnQnO1xuaW1wb3J0IHtGb3JtQ29udHJvbCwgVmFsaWRhdG9yc30gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHtwbGFpblRvQ2xhc3N9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7VGFua1R5cGVFbnVtfSBmcm9tICcuLi8uLi8uLi9kYi9FbnVtcy90YW5rLXR5cGUuZW51bSc7XG5pbXBvcnQge0JhbmtBY2NvdW50UHJvcGVydGllc0Zvcm19IGZyb20gJy4vYmFuay1hY2NvdW50LXByb3BlcnRpZXMuZm9ybSc7XG5cbmV4cG9ydCBjbGFzcyBCYW5rQWNjb3VudEFsbG9jYXRpb25Gb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPEJhbmtBY2NvdW50PiB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgYmFua0FjY291bnQ/OiBCYW5rQWNjb3VudCkge1xuICAgIHN1cGVyKHtcbiAgICAgIHRhbmtUeXBlOiBuZXcgRm9ybUNvbnRyb2woYmFua0FjY291bnQgPyBiYW5rQWNjb3VudC50YW5rVHlwZSA6IG51bGwsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuXG4gICAgfSwgcGxhaW5Ub0NsYXNzKEJhbmtBY2NvdW50LCBiYW5rQWNjb3VudCB8fCB7fSkpO1xuXG4gICAgaWYgKGJhbmtBY2NvdW50Py5pc1Byb3BlcnR5VGFuaygpKSB7XG4gICAgICB0aGlzLmFkZENvbnRyb2woJ2JhbmtBY2NvdW50UHJvcGVydGllcycsIG5ldyBCYW5rQWNjb3VudFByb3BlcnRpZXNGb3JtKGJhbmtBY2NvdW50LmJhbmtBY2NvdW50UHJvcGVydGllcykpO1xuICAgIH1cblxuICAgIHRoaXMud2F0Y2hUYW5rVHlwZSgpO1xuICB9XG5cbiAgd2F0Y2hUYW5rVHlwZSgpOiB2b2lkIHtcbiAgICB0aGlzLmdldCgndGFua1R5cGUnKS52YWx1ZUNoYW5nZXMuc3Vic2NyaWJlKCh0YW5rVHlwZTogVGFua1R5cGVFbnVtKSA9PiB7XG4gICAgICAvLyBAVE9ETyB2aWsgYWRkIGJ1c2luZXNzQWxsb2NhdGlvblxuICAgICAgaWYgKHRhbmtUeXBlID09PSBUYW5rVHlwZUVudW0uUFJPUEVSVFkpIHtcbiAgICAgICAgdGhpcy5hZGRDb250cm9sKCdiYW5rQWNjb3VudFByb3BlcnRpZXMnLCBuZXcgQmFua0FjY291bnRQcm9wZXJ0aWVzRm9ybSh0aGlzLmJhbmtBY2NvdW50Py5iYW5rQWNjb3VudFByb3BlcnRpZXMpKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHRoaXMucmVtb3ZlQ29udHJvbCgnYmFua0FjY291bnRQcm9wZXJ0aWVzJyk7XG4gICAgICB9XG4gICAgfSlcbiAgfVxufVxuIl19
|
|
@@ -60,7 +60,7 @@ export class MyTaxDeductionsForm extends AbstractForm {
|
|
|
60
60
|
disabled: true
|
|
61
61
|
}),
|
|
62
62
|
fundName: new FormControl(''),
|
|
63
|
-
hasFund: new FormControl(
|
|
63
|
+
hasFund: new FormControl(true),
|
|
64
64
|
fundABN: new FormControl(''),
|
|
65
65
|
fundTFN: new FormControl(''),
|
|
66
66
|
fundAccountNumber: new FormControl(''),
|
|
@@ -79,4 +79,4 @@ export class MyTaxDeductionsForm extends AbstractForm {
|
|
|
79
79
|
});
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-deductions.form.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/forms/report/my-tax/my-tax-deductions.form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,OAAO,mBAAoB,SAAQ,YAA6B;IACpE,YACE,UAA2B;;QAE3B,KAAK,CAAC;YACJ,kBAAkB,EAAE,IAAI,WAAW,CAAC;gBAClC,KAAK,EAAE,MAAA,UAAU,CAAC,YAAY,0CAAE,MAAM;gBACtC,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,0BAA0B,EAAE,IAAI,WAAW,CAAC;gBAC1C,KAAK,EAAE,UAAU,CAAC,0BAA0B;gBAC5C,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,oCAAoC,EAAE,IAAI,WAAW,CAAC;gBACpD,KAAK,EAAE,UAAU,CAAC,oCAAoC;gBACtD,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,uBAAuB,EAAE,IAAI,WAAW,CACtC,UAAU,CAAC,uBAAuB,EAClC,oBAAoB,CAClB,GAAY,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,8BAA8B,EAC1D,UAAU,CAAC,QAAQ,CACpB,CACF;YACD,8BAA8B,EAAE,IAAI,WAAW,CAAC;gBAC9C,KAAK,EAAE,UAAU,CAAC,8BAA8B;gBAChD,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,4BAA4B,EAAE,IAAI,WAAW,CAC3C,UAAU,CAAC,4BAA4B,EACvC,oBAAoB,CAClB,GAAY,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,mCAAmC,EAC/D,UAAU,CAAC,QAAQ,CACpB,CACF;YACD,mCAAmC,EAAE,IAAI,WAAW,CAAC;gBACnD,KAAK,EAAE,UAAU,CAAC,mCAAmC;gBACrD,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,wCAAwC,EAAE,IAAI,WAAW,CAAC;gBACxD,KAAK,EAAE,UAAU,CAAC,mCAAmC;gBACrD,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,gCAAgC,EAAE,IAAI,WAAW,CAAC;gBAChD,KAAK,EAAE,UAAU,CAAC,gCAAgC;gBAClD,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAA2B,EAAE,IAAI,WAAW,CAAC;gBAC3C,KAAK,EAAE,UAAU,CAAC,2BAA2B;gBAC7C,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAA2B,EAAE,IAAI,WAAW,CAAC;gBAC3C,KAAK,EAAE,UAAU,CAAC,2BAA2B;gBAC7C,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,oBAAoB,EAAE,IAAI,WAAW,CAAC;gBACpC,KAAK,EAAE,UAAU,CAAC,oBAAoB;gBACtC,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,gCAAgC,EAAE,IAAI,WAAW,CAAC;gBAChD,KAAK,EAAE,UAAU,CAAC,gCAAgC;gBAClD,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,0BAA0B,EAAE,IAAI,WAAW,CAAC;gBAC1C,KAAK,EAAE,UAAU,CAAC,0BAA0B;gBAC5C,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,6BAA6B,EAAE,IAAI,WAAW,CAAC;gBAC7C,KAAK,EAAE,UAAU,CAAC,6BAA6B;gBAC/C,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,QAAQ,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC;YAC9B,OAAO,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC;YAC5B,iBAAiB,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC;YACtC,qCAAqC,EAAE,IAAI,WAAW,CAAC;gBACrD,KAAK,EAAE,UAAU,CAAC,qCAAqC;gBACvD,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,qDAAqD,EAAE,IAAI,WAAW,CAAC;gBACrE,KAAK,EAAE,UAAU,CAAC,qDAAqD;gBACvE,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,0BAA0B,EAAE,IAAI,WAAW,CAAC;gBAC1C,KAAK,EAAE,UAAU,CAAC,0BAA0B;gBAC5C,QAAQ,EAAE,IAAI;aACf,CAAC;SACH,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import { AbstractForm } from '../../abstract.form';\nimport { FormControl, Validators } from '@angular/forms';\nimport { MyTaxDeductions } from '../../../models/report/my-tax';\nimport { conditionalValidator } from '../../../validators';\n\nexport class MyTaxDeductionsForm extends AbstractForm<MyTaxDeductions> {\n  constructor(\n    deductions: MyTaxDeductions,\n  ) {\n    super({\n      vehicleClaimMethod: new FormControl({\n        value: deductions.vehicleClaim?.method,\n        disabled: true\n      }),\n      vehicleExpensesTotalAmount: new FormControl({\n        value: deductions.vehicleExpensesTotalAmount,\n        disabled: true\n      }),\n      workRelatedTravelExpensesTotalAmount: new FormControl({\n        value: deductions.workRelatedTravelExpensesTotalAmount,\n        disabled: true\n      }),\n      workRelatedClothingType: new FormControl(\n        deductions.workRelatedClothingType,\n        conditionalValidator(\n          (): boolean => !!deductions.workRelatedClothingTotalAmount,\n          Validators.required\n        )\n      ),\n      workRelatedClothingTotalAmount: new FormControl({\n        value: deductions.workRelatedClothingTotalAmount,\n        disabled: true\n      }),\n      workRelatedSelfEducationType: new FormControl(\n        deductions.workRelatedSelfEducationType,\n        conditionalValidator(\n          (): boolean => !!deductions.workRelatedSelfEducationTotalAmount,\n          Validators.required\n        )\n      ),\n      workRelatedSelfEducationTotalAmount: new FormControl({\n        value: deductions.workRelatedSelfEducationTotalAmount,\n        disabled: true\n      }),\n      otherWorkRelatedSelfEducationTotalAmount: new FormControl({\n        value: deductions.otherWorkRelatedExpensesTotalAmount,\n        disabled: true\n      }),\n      lowValuePoolDeductionTotalAmount: new FormControl({\n        value: deductions.lowValuePoolDeductionTotalAmount,\n        disabled: true\n      }),\n      interestExpensesTotalAmount: new FormControl({\n        value: deductions.interestExpensesTotalAmount,\n        disabled: true\n      }),\n      dividendExpensesTotalAmount: new FormControl({\n        value: deductions.dividendExpensesTotalAmount,\n        disabled: true\n      }),\n      donationsTotalAmount: new FormControl({\n        value: deductions.donationsTotalAmount,\n        disabled: true\n      }),\n      interestsChargedByATOTotalAmount: new FormControl({\n        value: deductions.interestsChargedByATOTotalAmount,\n        disabled: true\n      }),\n      litigationCostsTotalAmount: new FormControl({\n        value: deductions.litigationCostsTotalAmount,\n        disabled: true\n      }),\n      otherManagingCostsTotalAmount: new FormControl({\n        value: deductions.otherManagingCostsTotalAmount,\n        disabled: true\n      }),\n      fundName: new FormControl(''),\n      hasFund: new FormControl(true),\n      fundABN: new FormControl(''),\n      fundTFN: new FormControl(''),\n      fundAccountNumber: new FormControl(''),\n      personalSuperContributionsTotalAmount: new FormControl({\n        value: deductions.personalSuperContributionsTotalAmount,\n        disabled: true\n      }),\n      forestryManagedInvestmentSchemesDeductionsTotalAmount: new FormControl({\n        value: deductions.forestryManagedInvestmentSchemesDeductionsTotalAmount,\n        disabled: true\n      }),\n      otherDeductionsTotalAmount: new FormControl({\n        value: deductions.otherDeductionsTotalAmount,\n        disabled: true\n      })\n    });\n  }\n}\n"]}
|
|
@@ -9,8 +9,7 @@ export const DEDUCTION_CATEGORIES = {
|
|
|
9
9
|
workRelatedClothingExpenses: [
|
|
10
10
|
ChartAccountsHeadingListEnum.COMPULSORY_WORK_UNIFORM,
|
|
11
11
|
ChartAccountsHeadingListEnum.PROTECTION_CLOTHING,
|
|
12
|
-
ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING
|
|
13
|
-
ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
|
|
12
|
+
ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING
|
|
14
13
|
],
|
|
15
14
|
otherIncomeRelatedExpenses: [
|
|
16
15
|
ChartAccountsHeadingListEnum.OTHER_WORK_RELATED_EXPENSES,
|
|
@@ -61,4 +60,4 @@ export const DEDUCTION_CATEGORIES = {
|
|
|
61
60
|
ChartAccountsListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION
|
|
62
61
|
]
|
|
63
62
|
};
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVkdWN0aW9uLWZpZWxkcy5jb25zdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvcmVwb3J0L215LXRheC9teS10YXgtZGVkdWN0aW9ucy9kZWR1Y3Rpb24tZmllbGRzLmNvbnN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHVEQUF1RCxDQUFDO0FBQ3JHLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXRGOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBOEI7SUFDN0QsMkJBQTJCLEVBQUU7UUFDM0IsNEJBQTRCLENBQUMsdUJBQXVCO1FBQ3BELDRCQUE0QixDQUFDLG1CQUFtQjtRQUNoRCw0QkFBNEIsQ0FBQyw4QkFBOEI7S0FDNUQ7SUFDRCwwQkFBMEIsRUFBRTtRQUMxQiw0QkFBNEIsQ0FBQywyQkFBMkI7UUFDeEQsNEJBQTRCLENBQUMsYUFBYTtRQUMxQyw0QkFBNEIsQ0FBQyxtQkFBbUI7UUFDaEQsNEJBQTRCLENBQUMscUJBQXFCO1FBQ2xELDRCQUE0QixDQUFDLHFDQUFxQztRQUNsRSw0QkFBNEIsQ0FBQyxTQUFTO1FBQ3RDLDRCQUE0QixDQUFDLDJCQUEyQjtRQUN4RCw0QkFBNEIsQ0FBQyxZQUFZO1FBQ3pDLDRCQUE0QixDQUFDLFNBQVM7UUFDdEMsNEJBQTRCLENBQUMsVUFBVTtRQUN2Qyw0QkFBNEIsQ0FBQyxLQUFLO0tBQ25DO0lBQ0QsZ0NBQWdDLEVBQUU7UUFDaEMsNEJBQTRCLENBQUMseUJBQXlCO0tBQ3ZEO0lBQ0QsZ0JBQWdCLEVBQUU7UUFDaEIsNEJBQTRCLENBQUMsbUJBQW1CO0tBQ2pEO0lBQ0QsZ0JBQWdCLEVBQUU7UUFDaEIsNEJBQTRCLENBQUMsbUJBQW1CO0tBQ2pEO0lBQ0QsU0FBUyxFQUFFO1FBQ1QsNEJBQTRCLENBQUMsU0FBUztLQUN2QztJQUNELGVBQWUsRUFBRTtRQUNmLDRCQUE0QixDQUFDLGdCQUFnQjtLQUM5QztJQUNELHFCQUFxQixFQUFFO1FBQ3JCLHFCQUFxQixDQUFDLHVCQUF1QjtLQUM5QztJQUNELGVBQWUsRUFBRTtRQUNmLHFCQUFxQixDQUFDLGdCQUFnQjtLQUN2QztJQUNELGtCQUFrQixFQUFFO1FBQ2xCLHFCQUFxQixDQUFDLHlCQUF5QjtRQUMvQyxxQkFBcUIsQ0FBQywyQ0FBMkM7UUFDakUscUJBQXFCLENBQUMsd0JBQXdCO1FBQzlDLHFCQUFxQixDQUFDLFlBQVk7UUFDbEMscUJBQXFCLENBQUMsb0JBQW9CO1FBQzFDLHFCQUFxQixDQUFDLHFCQUFxQjtLQUM1QztJQUNELDBCQUEwQixFQUFFO1FBQzFCLHFCQUFxQixDQUFDLHVDQUF1QztLQUM5RDtJQUNELDBDQUEwQyxFQUFFO1FBQzFDLHFCQUFxQixDQUFDLDZDQUE2QztLQUNwRTtDQUNGLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtaGVhZGluZy1saXN0LmVudW0nO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50c0xpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtbGlzdC5lbnVtJztcblxuLyoqXG4gKiBDb25zdCB3aXRoIHRoZSBjYXRlZ29yaWVzIGZvciBteS10YXggJ0RlZHVjdGlvbnMnIHJlcG9ydC5cbiAqIEdyb3VwZWQgYnkgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bSAvIENoYXJ0QWNjb3VudHNMaXN0RW51bSBiYXNlZCBvbiBydWxlcyBmcm9tIGRvY3VtZW50YXRpb25cbiAqIGh0dHBzOi8vdGF4dGFuay5hdGxhc3NpYW4ubmV0L3dpa2kvc3BhY2VzL1RBWFRBTksvcGFnZXMvNDY0NDExMDQ2Ni9UYXgrUmV0dXJuK015VGF4Ky0rT25saW5lK0Zvcm0gKHNlY3Rpb24gXCJEZWR1Y3Rpb25cIilcbiAqL1xuZXhwb3J0IGNvbnN0IERFRFVDVElPTl9DQVRFR09SSUVTOiB7W2tleTogc3RyaW5nXTogbnVtYmVyW119ID0ge1xuICB3b3JrUmVsYXRlZENsb3RoaW5nRXhwZW5zZXM6IFtcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLkNPTVBVTFNPUllfV09SS19VTklGT1JNLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uUFJPVEVDVElPTl9DTE9USElORyxcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLk9DQ1VQQVRJT05BTF9TUEVDSUZJQ19DTE9USElOR1xuICBdLFxuICBvdGhlckluY29tZVJlbGF0ZWRFeHBlbnNlczogW1xuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uT1RIRVJfV09SS19SRUxBVEVEX0VYUEVOU0VTLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uU1VCU0NSSVBUSU9OUyxcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLkhPTUVfT0ZGSUNFX1JVTk5JTkcsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5IT01FX09GRklDRV9PQ0NVUEFOQ1ksXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5BV0FSRF9PVkVSVElNRV9NRUFMX0FMTE9XQU5DRV9FWFBFTlNFLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uTkVXU1BBUEVSLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uUFJJTlRJTkdfUE9TVEFHRV9TVEFUSU9ORVJZLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uU0VNSU5BUlNfRVRDLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uVEVMRVBIT05FLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uVU5JT05fRkVFUyxcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLk9USEVSXG4gIF0sXG4gIHdvcmtSZWxhdGVkU2VsZkVkdWNhdGlvbkV4cGVuc2VzOiBbXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5TRUxGX0VEVUNBVElPTkFMX0VYUEVOU0VTXG4gIF0sXG4gIGludGVyZXN0RXhwZW5zZXM6IFtcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLklOVEVSRVNUX0RFRFVDVElPTlNcbiAgXSxcbiAgZGl2aWRlbmRFeHBlbnNlczogW1xuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uRElWSURFTkRfREVEVUNUSU9OU1xuICBdLFxuICBkb25hdGlvbnM6IFtcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLkRPTkFUSU9OU1xuICBdLFxuICBvdGhlckRlZHVjdGlvbnM6IFtcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLk9USEVSX0RFRFVDVElPTlNcbiAgXSxcbiAgaW50ZXJlc3RzQ2hhcmdlZEJ5QVRPOiBbXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLklOVEVSRVNUX0NIQVJHRURfQllfQVRPXG4gIF0sXG4gIGxpdGlnYXRpb25Db3N0czogW1xuICAgIENoYXJ0QWNjb3VudHNMaXN0RW51bS5MSVRJR0FUSU9OX0NPU1RTXG4gIF0sXG4gIG90aGVyTWFuYWdpbmdDb3N0czogW1xuICAgIENoYXJ0QWNjb3VudHNMaXN0RW51bS5BQ0NPVU5UQU5UX1RBWF9BR0VOVF9GRUVTLFxuICAgIENoYXJ0QWNjb3VudHNMaXN0RW51bS5UUkFWRUxfQ09TVFNfVE9fU0VFX1lPVVJfQUNDT1VOVEFOVF9BRFZJU09SLFxuICAgIENoYXJ0QWNjb3VudHNMaXN0RW51bS5BQ0NPVU5USU5HX1NPRlRXQVJFX0ZFRVMsXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkFEVklTT1JfRkVFUyxcbiAgICBDaGFydEFjY291bnRzTGlzdEVudW0uSU5DT01FX1RBWF9WQVJJQVRJT04sXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlNPRlRXQVJFX0ZFRVNfVEFYVEFOS1xuICBdLFxuICBwZXJzb25hbFN1cGVyQ29udHJpYnV0aW9uczogW1xuICAgIENoYXJ0QWNjb3VudHNMaXN0RW51bS5QRVJTT05BTF9TVVBFUl9DT05UUklCVVRJT05TX0RFRFVDVElCTEVcbiAgXSxcbiAgZm9yZXN0cnlNYW5hZ2VkSW52ZXN0bWVudFNjaGVtZXNEZWR1Y3Rpb25zOiBbXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkZPUkVTVFJZX01BTkFHRURfSU5WRVNUTUVOVF9TQ0hFTUVTX0RFRFVDVElPTlxuICBdXG59O1xuIl19
|
|
@@ -67,7 +67,7 @@ export class MyTaxDeductions {
|
|
|
67
67
|
}
|
|
68
68
|
setVehicleClaimData() {
|
|
69
69
|
this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
|
|
70
|
-
this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('
|
|
70
|
+
this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('amount');
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
73
73
|
* Total amount from Other work related expenses and Tools & equipment depreciations
|
|
@@ -75,8 +75,8 @@ export class MyTaxDeductions {
|
|
|
75
75
|
setOtherWorkRelatedExpensesTotalAmount() {
|
|
76
76
|
const otherIncomeRelatedExpenses = this.transactions
|
|
77
77
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
|
|
78
|
-
this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
|
|
78
|
+
this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
|
|
79
79
|
this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-deductions.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { DepreciationCollection } from '../../../../collections/depreciation.collection';\nimport { VehicleClaim } from '../../../logbook/vehicle-claim';\nimport { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { VehicleExpenseCollection } from '../../../../collections/report/vehicle-expense/vehicle-expense.collection';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\n\nexport class MyTaxDeductions {\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimRate: number;\n  workRelatedClothingExpenses: TransactionCollection;\n  workRelatedSelfEducationExpenses: TransactionCollection;\n  personalSuperContributions: TransactionCollection;\n  otherWorkRelatedExpensesTotalAmount: number;\n  klmsMethodClaimAmount: number;\n  totalExpensesAmount: number;\n  vehicleExpensesTotalAmount: number;\n  workRelatedTravelExpensesTotalAmount: number;\n  workRelatedClothingType: DeductionClothingTypeEnum;\n  workRelatedClothingTotalAmount: number;\n  workRelatedSelfEducationType: DeductionSelfEducationTypeEnum;\n  workRelatedSelfEducationTotalAmount: number;\n  lowValuePoolDeductionTotalAmount: number;\n  interestExpensesTotalAmount: number;\n  dividendExpensesTotalAmount: number;\n  donationsTotalAmount: number;\n  interestsChargedByATOTotalAmount: number;\n  litigationCostsTotalAmount: number;\n  otherManagingCostsTotalAmount: number;\n  personalSuperContributionsTotalAmount: number;\n  forestryManagedInvestmentSchemesDeductionsTotalAmount: number;\n  otherDeductionsTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    vehicleClaim: VehicleClaim,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimRate = vehicleClaimRate;\n\n    // user can have no selected vehicle claim\n    if (this.vehicleClaim) {\n      this.setVehicleClaimData();\n    }\n\n    this.setOtherWorkRelatedExpensesTotalAmount();\n\n    this.workRelatedClothingExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);\n    this.personalSuperContributions = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.personalSuperContributions);\n    this.workRelatedSelfEducationExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);\n    this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();\n    this.workRelatedTravelExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)\n      .sumBy('claimAmount');\n    this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? DeductionClothingTypeEnum.COMPULSORY_C : null;\n    this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');\n    this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?\n      DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;\n    this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('claimAmount');\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLowValuePoolDepreciations().sumBy('claimAmount');\n    this.interestExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)\n      .sumBy('claimAmount');\n    this.dividendExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.dividendExpenses)\n      .sumBy('claimAmount');\n    this.donationsTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.donations)\n      .sumBy('claimAmount');\n    this.interestsChargedByATOTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.interestsChargedByATO)\n      .sumBy('claimAmount');\n    this.litigationCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.litigationCosts)\n      .sumBy('claimAmount');\n    this.otherManagingCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherManagingCosts)\n      .sumBy('claimAmount');\n    this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('claimAmount');\n    this.forestryManagedInvestmentSchemesDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)\n      .sumBy('claimAmount');\n    this.otherDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('claimAmount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaim) {\n      return this.vehicleClaim?.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);\n\n    this.totalExpensesAmount = new VehicleExpenseCollection(\n      this.transactions.getByTankType(this.vehicleClaim.tankType),\n      this.depreciations.getByTankType(this.vehicleClaim.tankType),\n      this.vehicleClaim\n    ).sumBy('claimAmount');\n  }\n\n  /**\n   * Total amount from Other work related expenses and Tools & equipment depreciations\n   */\n  private setOtherWorkRelatedExpensesTotalAmount(): void {\n    const otherIncomeRelatedExpenses: TransactionCollection = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);\n\n    this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n}\n"]}
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-deductions.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { DepreciationCollection } from '../../../../collections/depreciation.collection';\nimport { VehicleClaim } from '../../../logbook/vehicle-claim';\nimport { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { VehicleExpenseCollection } from '../../../../collections/report/vehicle-expense/vehicle-expense.collection';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\n\nexport class MyTaxDeductions {\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimRate: number;\n  workRelatedClothingExpenses: TransactionCollection;\n  workRelatedSelfEducationExpenses: TransactionCollection;\n  personalSuperContributions: TransactionCollection;\n  otherWorkRelatedExpensesTotalAmount: number;\n  klmsMethodClaimAmount: number;\n  totalExpensesAmount: number;\n  vehicleExpensesTotalAmount: number;\n  workRelatedTravelExpensesTotalAmount: number;\n  workRelatedClothingType: DeductionClothingTypeEnum;\n  workRelatedClothingTotalAmount: number;\n  workRelatedSelfEducationType: DeductionSelfEducationTypeEnum;\n  workRelatedSelfEducationTotalAmount: number;\n  lowValuePoolDeductionTotalAmount: number;\n  interestExpensesTotalAmount: number;\n  dividendExpensesTotalAmount: number;\n  donationsTotalAmount: number;\n  interestsChargedByATOTotalAmount: number;\n  litigationCostsTotalAmount: number;\n  otherManagingCostsTotalAmount: number;\n  personalSuperContributionsTotalAmount: number;\n  forestryManagedInvestmentSchemesDeductionsTotalAmount: number;\n  otherDeductionsTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    vehicleClaim: VehicleClaim,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimRate = vehicleClaimRate;\n\n    // user can have no selected vehicle claim\n    if (this.vehicleClaim) {\n      this.setVehicleClaimData();\n    }\n\n    this.setOtherWorkRelatedExpensesTotalAmount();\n\n    this.workRelatedClothingExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);\n    this.personalSuperContributions = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.personalSuperContributions);\n    this.workRelatedSelfEducationExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);\n    this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();\n    this.workRelatedTravelExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)\n      .sumBy('claimAmount');\n    this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? DeductionClothingTypeEnum.COMPULSORY_C : null;\n    this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');\n    this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?\n      DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;\n    this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('claimAmount');\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLowValuePoolDepreciations().sumBy('claimAmount');\n    this.interestExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)\n      .sumBy('claimAmount');\n    this.dividendExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.dividendExpenses)\n      .sumBy('claimAmount');\n    this.donationsTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.donations)\n      .sumBy('claimAmount');\n    this.interestsChargedByATOTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.interestsChargedByATO)\n      .sumBy('claimAmount');\n    this.litigationCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.litigationCosts)\n      .sumBy('claimAmount');\n    this.otherManagingCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherManagingCosts)\n      .sumBy('claimAmount');\n    this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('claimAmount');\n    this.forestryManagedInvestmentSchemesDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)\n      .sumBy('claimAmount');\n    this.otherDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('claimAmount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaim) {\n      return this.vehicleClaim?.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);\n\n    this.totalExpensesAmount = new VehicleExpenseCollection(\n      this.transactions.getByTankType(this.vehicleClaim.tankType),\n      this.depreciations.getByTankType(this.vehicleClaim.tankType),\n      this.vehicleClaim\n    ).sumBy('amount');\n  }\n\n  /**\n   * Total amount from Other work related expenses and Tools & equipment depreciations\n   */\n  private setOtherWorkRelatedExpensesTotalAmount(): void {\n    const otherIncomeRelatedExpenses: TransactionCollection = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);\n\n    this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n}\n"]}
|
|
@@ -35,16 +35,14 @@ export class MyTaxRent {
|
|
|
35
35
|
* property contract date, e.t.c.). Details in the TT-2009 task
|
|
36
36
|
*/
|
|
37
37
|
calculateOtherRentalDeductionsAmount() {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
.amount);
|
|
41
|
-
const borrowingExpensesAmount = Math.abs(this.taxSummaryPropertySection.items
|
|
42
|
-
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)
|
|
46
|
-
.amount);
|
|
38
|
+
var _a, _b, _c;
|
|
39
|
+
const plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
|
|
40
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.DEPRECIATION)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
|
|
41
|
+
const borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
|
|
42
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
|
|
43
|
+
const otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
|
|
44
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)) === null || _c === void 0 ? void 0 : _c.amount) || 0);
|
|
47
45
|
return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
|
|
48
46
|
}
|
|
49
47
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9teS10YXgvbXktdGF4LXJlbnQvbXktdGF4LXJlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFLdEYsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0RBQW9ELENBQUM7QUFFL0YsTUFBTSxPQUFPLFNBQVM7SUFTcEIsWUFDRSxZQUFtQyxFQUNuQyxhQUFxQyxFQUNyQyxVQUFzQjtRQUV0QixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsWUFBWSxDQUFDLHVCQUF1QixFQUFFLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUN4RixJQUFJLENBQUMseUJBQXlCLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUNyRCxJQUFJLENBQUMsZUFBZSxHQUFHLFlBQVk7YUFDOUIsdUJBQXVCLEVBQUU7YUFDekIscUJBQXFCLEVBQUU7YUFDdkIsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLGFBQWEsQ0FBQzthQUNqRSxLQUFLLENBQUMsYUFBYSxDQUFDO1lBQ3ZCLFlBQVk7aUJBQ1QsdUJBQXVCLEVBQUU7aUJBQ3pCLHFCQUFxQixFQUFFO2lCQUN2QixRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsbUJBQW1CLENBQUM7aUJBQ3ZFLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUUxQixJQUFJLENBQUMsd0JBQXdCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNqRyxJQUFJLENBQUMsNEJBQTRCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUUzRyxJQUFJLENBQUMsMkJBQTJCLEdBQUcsSUFBSSxDQUFDLG9DQUFvQyxFQUFFLENBQUM7UUFFL0U7O1dBRUc7UUFDSCxrSEFBa0g7UUFDbEgsd0dBQXdHO1FBQ3hHLDBEQUEwRDtRQUUxRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxlQUFlO1lBQ2pDLElBQUksQ0FBQyx3QkFBd0I7WUFDN0IsSUFBSSxDQUFDLDRCQUE0QjtZQUNqQyxJQUFJLENBQUMsMkJBQTJCLENBQUM7SUFDckMsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ssb0NBQW9DOztRQUMxQyxNQUFNLHVCQUF1QixHQUFXLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQSxNQUFBLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxLQUFLO2FBQ2xGLE1BQU0sQ0FBQyxzQkFBc0IsRUFBRSx5QkFBeUIsQ0FBQyxZQUFZLENBQUMsMENBQUUsTUFBTSxLQUFJLENBQUMsQ0FBQyxDQUFDO1FBRXhGLE1BQU0sdUJBQXVCLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FDOUMsQ0FBQSxNQUFBLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxLQUFLO2FBQ25DLE1BQU0sQ0FBQyxzQkFBc0IsRUFBRSx5QkFBeUIsQ0FBQyxrQkFBa0IsQ0FBQywwQ0FBRSxNQUFNLEtBQUksQ0FBQyxDQUFDLENBQUM7UUFFOUYsTUFBTSwyQkFBMkIsR0FBVyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUEsTUFBQSxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUN0RixNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsdUJBQXVCLENBQUMsMENBQUUsTUFBTSxLQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ25HLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLHVCQUF1QixHQUFHLHVCQUF1QixHQUFHLDJCQUEyQixDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pILENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL2NvbGxlY3Rpb25zL3RyYW5zYWN0aW9uL3RyYW5zYWN0aW9uLmNvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50c0xpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtbGlzdC5lbnVtJztcbmltcG9ydCB7IERlcHJlY2lhdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy9kZXByZWNpYXRpb24uY29sbGVjdGlvbic7XG5pbXBvcnQgeyBUYW5rVHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9FbnVtcy90YW5rLXR5cGUuZW51bSc7XG5pbXBvcnQgeyBUYXhTdW1tYXJ5IH0gZnJvbSAnLi4vLi4vLi4vdGF4LXN1bW1hcnkvdGF4LXN1bW1hcnknO1xuaW1wb3J0IHsgVGF4U3VtbWFyeVNlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi90YXgtc3VtbWFyeS90YXgtc3VtbWFyeS1zZWN0aW9uJztcbmltcG9ydCB7IFRheFJldHVybkNhdGVnb3J5TGlzdEVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9FbnVtcy90YXgtcmV0dXJuLWNhdGVnb3J5LWxpc3QuZW51bSc7XG5cbmV4cG9ydCBjbGFzcyBNeVRheFJlbnQge1xuICBwcm9wZXJ0eUV4cGVuc2VzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb246IFRheFN1bW1hcnlTZWN0aW9uO1xuICBncm9zc1JlbnRBbW91bnQ6IG51bWJlcjtcbiAgaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIGNhcGl0YWxXb3Jrc0RlZHVjdGlvbnNBbW91bnQ6IG51bWJlcjtcbiAgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIG5ldFJlbnQ6IG51bWJlcjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgICBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICAgIHRheFN1bW1hcnk6IFRheFN1bW1hcnlcbiAgKSB7XG4gICAgdGhpcy5wcm9wZXJ0eUV4cGVuc2VzID0gdHJhbnNhY3Rpb25zLmdldFByb3BlcnR5VHJhbnNhY3Rpb25zKCkuZ2V0RXhwZW5zZVRyYW5zYWN0aW9ucygpO1xuICAgIHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbiA9IHRheFN1bW1hcnkucHJvcGVydHk7XG4gICAgdGhpcy5ncm9zc1JlbnRBbW91bnQgPSB0cmFuc2FjdGlvbnNcbiAgICAgICAgLmdldFByb3BlcnR5VHJhbnNhY3Rpb25zKClcbiAgICAgICAgLmdldEluY29tZVRyYW5zYWN0aW9ucygpXG4gICAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5SRU5UQUxfSU5DT01FKVxuICAgICAgICAuc3VtQnkoJ2NsYWltQW1vdW50JykgK1xuICAgICAgdHJhbnNhY3Rpb25zXG4gICAgICAgIC5nZXRQcm9wZXJ0eVRyYW5zYWN0aW9ucygpXG4gICAgICAgIC5nZXRJbmNvbWVUcmFuc2FjdGlvbnMoKVxuICAgICAgICAuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uT1RIRVJfUkVOVEFMX0lOQ09NRSlcbiAgICAgICAgLnN1bUJ5KCdjbGFpbUFtb3VudCcpO1xuXG4gICAgdGhpcy5pbnRlcmVzdERlZHVjdGlvbnNBbW91bnQgPSBNYXRoLmFicyh0cmFuc2FjdGlvbnMuZ2V0SW50ZXJlc3RUcmFuc2FjdGlvbnMoKS5zdW1CeSgnYW1vdW50JykpO1xuICAgIHRoaXMuY2FwaXRhbFdvcmtzRGVkdWN0aW9uc0Ftb3VudCA9IE1hdGguYWJzKGRlcHJlY2lhdGlvbnMuZ2V0Q2FwaXRhbERlcHJlY2lhdGlvbnMoKS5zdW1CeSgnY2xhaW1BbW91bnQnKSk7XG5cbiAgICB0aGlzLm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCA9IHRoaXMuY2FsY3VsYXRlT3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50KCk7XG5cbiAgICAvKipcbiAgICAgKiBAVG9kbyBWaWsgdW5jb21tZW50IHdoZW4gdGFzayBUVC0yMDA5IHdpbGwgYmUgaW1wbGVtZW50ZWRcbiAgICAgKi9cbiAgICAvLyB0aGlzLm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCA9IGRlcHJlY2lhdGlvbnMuZ2V0QnlUYW5rVHlwZShUYW5rVHlwZUVudW0uUFJPUEVSVFkpLmdldEFzc2V0cygpLmNsYWltQW1vdW50ICtcbiAgICAvLyAgIGRlcHJlY2lhdGlvbnMuZ2V0QnlUYW5rVHlwZShUYW5rVHlwZUVudW0uUFJPUEVSVFkpLmdldEJvcnJvd2luZ0V4cGVuc2VEZXByZWNpYXRpb25zKCkuY2xhaW1BbW91bnQgK1xuICAgIC8vICAgTWF0aC5hYnModGhpcy5wcm9wZXJ0eUV4cGVuc2VzLnN1bUJ5KCdjbGFpbUFtb3VudCcpKTtcblxuICAgIHRoaXMubmV0UmVudCA9IHRoaXMuZ3Jvc3NSZW50QW1vdW50IC1cbiAgICAgIHRoaXMuaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50IC1cbiAgICAgIHRoaXMuY2FwaXRhbFdvcmtzRGVkdWN0aW9uc0Ftb3VudCAtXG4gICAgICB0aGlzLm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudDtcbiAgfVxuXG4gIC8qKlxuICAgKiBAVG9kbyBWaWsgcmVtb3ZlIHdoZW4gVFQtMjAwOSB3aWxsIGJlIGltcGxlbWVudGVkLlxuICAgKiBXZSB1c2UgdGF4IHN1bW1hcnkgZGF0YSBoZXJlIGJlY2F1c2UgY2xhaW0gYW1vdW50IGZyb20gZGVwcmVjaWF0aW9uIGlzIGRpZmZlcmVudFxuICAgKiBmcm9tIHRoZSBjbGFpbSBhbW91bnQgdGhhdCB3ZSBnZXQgZnJvbSB0YXggc3VtbWFyeSAoZGVwcmVjaWF0aW9uIGNsYWltIGFtb3VudCBpcyBub3QgYWZmZWN0ZWQgYnkgcHJvcGVydHkgc2hhcmUsXG4gICAqIHByb3BlcnR5IGNvbnRyYWN0IGRhdGUsIGUudC5jLikuIERldGFpbHMgaW4gdGhlIFRULTIwMDkgdGFza1xuICAgKi9cbiAgcHJpdmF0ZSBjYWxjdWxhdGVPdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQoKTogbnVtYmVyIHtcbiAgICBjb25zdCBwbGFudEFuZEVxdWlwbWVudEFtb3VudDogbnVtYmVyID0gTWF0aC5hYnModGhpcy50YXhTdW1tYXJ5UHJvcGVydHlTZWN0aW9uLml0ZW1zXG4gICAgICAuZmluZEJ5KCd0YXhSZXR1cm5DYXRlZ29yeS5pZCcsIFRheFJldHVybkNhdGVnb3J5TGlzdEVudW0uREVQUkVDSUFUSU9OKT8uYW1vdW50IHx8IDApO1xuXG4gICAgY29uc3QgYm9ycm93aW5nRXhwZW5zZXNBbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKFxuICAgICAgdGhpcy50YXhTdW1tYXJ5UHJvcGVydHlTZWN0aW9uLml0ZW1zXG4gICAgICAuZmluZEJ5KCd0YXhSZXR1cm5DYXRlZ29yeS5pZCcsIFRheFJldHVybkNhdGVnb3J5TGlzdEVudW0uQk9SUk9XSU5HX0VYUEVOU0VTKT8uYW1vdW50IHx8IDApO1xuXG4gICAgY29uc3Qgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXIgPSBNYXRoLmFicyh0aGlzLnRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb24uaXRlbXNcbiAgICAgIC5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5PVEhFUl9SRU5UQUxfREVEVUNUSU9OUyk/LmFtb3VudCB8fCAwKTtcbiAgICByZXR1cm4gK01hdGguZmxvb3IocGxhbnRBbmRFcXVpcG1lbnRBbW91bnQgKyBib3Jyb3dpbmdFeHBlbnNlc0Ftb3VudCArIG90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCkudG9GaXhlZCgyKTtcbiAgfVxufVxuIl19
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -7450,8 +7450,7 @@ const DEDUCTION_CATEGORIES = {
|
|
|
7450
7450
|
workRelatedClothingExpenses: [
|
|
7451
7451
|
ChartAccountsHeadingListEnum.COMPULSORY_WORK_UNIFORM,
|
|
7452
7452
|
ChartAccountsHeadingListEnum.PROTECTION_CLOTHING,
|
|
7453
|
-
ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING
|
|
7454
|
-
ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
|
|
7453
|
+
ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING
|
|
7455
7454
|
],
|
|
7456
7455
|
otherIncomeRelatedExpenses: [
|
|
7457
7456
|
ChartAccountsHeadingListEnum.OTHER_WORK_RELATED_EXPENSES,
|
|
@@ -7589,7 +7588,7 @@ class MyTaxDeductions {
|
|
|
7589
7588
|
}
|
|
7590
7589
|
setVehicleClaimData() {
|
|
7591
7590
|
this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
|
|
7592
|
-
this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('
|
|
7591
|
+
this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('amount');
|
|
7593
7592
|
}
|
|
7594
7593
|
/**
|
|
7595
7594
|
* Total amount from Other work related expenses and Tools & equipment depreciations
|
|
@@ -7597,7 +7596,7 @@ class MyTaxDeductions {
|
|
|
7597
7596
|
setOtherWorkRelatedExpensesTotalAmount() {
|
|
7598
7597
|
const otherIncomeRelatedExpenses = this.transactions
|
|
7599
7598
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
|
|
7600
|
-
this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
|
|
7599
|
+
this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
|
|
7601
7600
|
this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
|
|
7602
7601
|
}
|
|
7603
7602
|
}
|
|
@@ -7885,15 +7884,13 @@ class MyTaxRent {
|
|
|
7885
7884
|
* property contract date, e.t.c.). Details in the TT-2009 task
|
|
7886
7885
|
*/
|
|
7887
7886
|
calculateOtherRentalDeductionsAmount() {
|
|
7888
|
-
|
|
7889
|
-
|
|
7890
|
-
.amount);
|
|
7891
|
-
const borrowingExpensesAmount = Math.abs(this.taxSummaryPropertySection.items
|
|
7892
|
-
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)
|
|
7893
|
-
|
|
7894
|
-
|
|
7895
|
-
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)
|
|
7896
|
-
.amount);
|
|
7887
|
+
var _a, _b, _c;
|
|
7888
|
+
const plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
|
|
7889
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.DEPRECIATION)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
|
|
7890
|
+
const borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
|
|
7891
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
|
|
7892
|
+
const otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
|
|
7893
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)) === null || _c === void 0 ? void 0 : _c.amount) || 0);
|
|
7897
7894
|
return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
|
|
7898
7895
|
}
|
|
7899
7896
|
}
|
|
@@ -13266,7 +13263,7 @@ class MyTaxDeductionsForm extends AbstractForm {
|
|
|
13266
13263
|
disabled: true
|
|
13267
13264
|
}),
|
|
13268
13265
|
fundName: new FormControl(''),
|
|
13269
|
-
hasFund: new FormControl(
|
|
13266
|
+
hasFund: new FormControl(true),
|
|
13270
13267
|
fundABN: new FormControl(''),
|
|
13271
13268
|
fundTFN: new FormControl(''),
|
|
13272
13269
|
fundAccountNumber: new FormControl(''),
|