taxtank-core 0.28.103 → 0.28.105

package/esm2015/lib/forms/report/my-tax/my-tax-deductions.form.js

@@ -75,8 +75,12 @@ export class MyTaxDeductionsForm extends AbstractForm {
             otherDeductionsTotalAmount: new FormControl({
                 value: deductions.otherDeductionsTotalAmount,
                 disabled: true
+            }),
+            depreciationAndCapitalAllowancesTotalAmount: new FormControl({
+                value: deductions.depreciationAndCapitalAllowancesTotalAmount,
+                disabled: true
             })
         });
     }
 }
-//# 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":"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","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.vehicleClaimDetails?.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"]}
+//# 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":"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","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.vehicleClaimDetails?.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      depreciationAndCapitalAllowancesTotalAmount: new FormControl({\n        value: deductions.depreciationAndCapitalAllowancesTotalAmount,\n        disabled: true\n      })\n    });\n  }\n}\n"]}

package/esm2015/lib/forms/report/my-tax/my-tax-partnerships-and-trusts.form.js

@@ -1,24 +1,26 @@
 import { AbstractForm } from '../../abstract.form';
-import { FormControl, Validators } from '@angular/forms';
-import { conditionalValidator } from '../../../validators';
+import { FormControl } from '@angular/forms';
 export class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
     constructor(partnershipsAndTrusts) {
         super({
-            partnershipsNetIncome: new FormControl({
-                value: partnershipsAndTrusts.partnershipsNetIncome,
+            partnershipsIncomeTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.partnershipsIncomeTotalAmount,
                 disabled: true
             }),
-            trustsNetIncome: new FormControl({
-                value: partnershipsAndTrusts.trustsNetIncome,
+            partnershipsExpenseTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.partnershipsExpenseTotalAmount,
                 disabled: true
             }),
-            trustType: new FormControl(partnershipsAndTrusts.trustType, conditionalValidator((control) => {
-                return !!partnershipsAndTrusts.trustsIncomes.length;
-            }, Validators.required)),
-            partnershipsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, Validators.required),
-            trustsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, Validators.required),
-            taxPaidTotal: new FormControl({
-                value: partnershipsAndTrusts.taxPaidTotal,
+            trustsIncomeTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.trustsIncomeTotalAmount,
+                disabled: true
+            }),
+            trustsExpenseTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.trustsExpenseTotalAmount,
+                disabled: true
+            }),
+            trustsIncomeTotalTax: new FormControl({
+                value: partnershipsAndTrusts.trustsIncomeTotalTax,
                 disabled: true
             }),
             frankingCreditsTotal: new FormControl({
@@ -32,4 +34,4 @@ export class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXBhcnRuZXJzaGlwcy1hbmQtdHJ1c3RzLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvcmVwb3J0L215LXRheC9teS10YXgtcGFydG5lcnNoaXBzLWFuZC10cnVzdHMuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxFQUFtQixXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFMUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFM0QsTUFBTSxPQUFPLDhCQUErQixTQUFRLFlBQXdDO0lBQzFGLFlBQ0UscUJBQWlEO1FBRWpELEtBQUssQ0FBQztZQUNKLHFCQUFxQixFQUFFLElBQUksV0FBVyxDQUFDO2dCQUNyQyxLQUFLLEVBQUUscUJBQXFCLENBQUMscUJBQXFCO2dCQUNsRCxRQUFRLEVBQUUsSUFBSTthQUNmLENBQUM7WUFDRixlQUFlLEVBQUUsSUFBSSxXQUFXLENBQUM7Z0JBQy9CLEtBQUssRUFBRSxxQkFBcUIsQ0FBQyxlQUFlO2dCQUM1QyxRQUFRLEVBQUUsSUFBSTthQUNmLENBQUM7WUFDRixTQUFTLEVBQUUsSUFBSSxXQUFXLENBQUMscUJBQXFCLENBQUMsU0FBUyxFQUFFLG9CQUFvQixDQUM5RSxDQUFDLE9BQXdCLEVBQVcsRUFBRTtnQkFDcEMsT0FBTyxDQUFDLENBQUMscUJBQXFCLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQTtZQUNyRCxDQUFDLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzFCLGtDQUFrQyxFQUFFLElBQUksV0FBVyxDQUNqRCxxQkFBcUIsQ0FBQyxrQ0FBa0MsRUFDeEQsVUFBVSxDQUFDLFFBQVEsQ0FDcEI7WUFDRCw0QkFBNEIsRUFBRSxJQUFJLFdBQVcsQ0FDM0MscUJBQXFCLENBQUMsNEJBQTRCLEVBQ2xELFVBQVUsQ0FBQyxRQUFRLENBQ3BCO1lBQ0QsWUFBWSxFQUFFLElBQUksV0FBVyxDQUFDO2dCQUM1QixLQUFLLEVBQUUscUJBQXFCLENBQUMsWUFBWTtnQkFDekMsUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDO1lBQ0Ysb0JBQW9CLEVBQUUsSUFBSSxXQUFXLENBQUM7Z0JBQ3BDLEtBQUssRUFBRSxxQkFBcUIsQ0FBQyxvQkFBb0I7Z0JBQ2pELFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQztZQUNGLHdCQUF3QixFQUFFLElBQUksV0FBVyxDQUFDO2dCQUN4QyxLQUFLLEVBQUUscUJBQXFCLENBQUMsd0JBQXdCO2dCQUNyRCxRQUFRLEVBQUUsSUFBSTthQUNmLENBQUM7U0FDSCxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi8uLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IEFic3RyYWN0Q29udHJvbCwgRm9ybUNvbnRyb2wsIFZhbGlkYXRvcnMgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQgeyBNeVRheFBhcnRuZXJzaGlwc0FuZFRydXN0cyB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQvbXktdGF4JztcbmltcG9ydCB7IGNvbmRpdGlvbmFsVmFsaWRhdG9yIH0gZnJvbSAnLi4vLi4vLi4vdmFsaWRhdG9ycyc7XG5cbmV4cG9ydCBjbGFzcyBNeVRheFBhcnRuZXJzaGlwc0FuZFRydXN0c0Zvcm0gZXh0ZW5kcyBBYnN0cmFjdEZvcm08TXlUYXhQYXJ0bmVyc2hpcHNBbmRUcnVzdHM+IHtcbiAgY29uc3RydWN0b3IoXG4gICAgcGFydG5lcnNoaXBzQW5kVHJ1c3RzOiBNeVRheFBhcnRuZXJzaGlwc0FuZFRydXN0cyxcbiAgKSB7XG4gICAgc3VwZXIoe1xuICAgICAgcGFydG5lcnNoaXBzTmV0SW5jb21lOiBuZXcgRm9ybUNvbnRyb2woe1xuICAgICAgICB2YWx1ZTogcGFydG5lcnNoaXBzQW5kVHJ1c3RzLnBhcnRuZXJzaGlwc05ldEluY29tZSxcbiAgICAgICAgZGlzYWJsZWQ6IHRydWVcbiAgICAgIH0pLFxuICAgICAgdHJ1c3RzTmV0SW5jb21lOiBuZXcgRm9ybUNvbnRyb2woe1xuICAgICAgICB2YWx1ZTogcGFydG5lcnNoaXBzQW5kVHJ1c3RzLnRydXN0c05ldEluY29tZSxcbiAgICAgICAgZGlzYWJsZWQ6IHRydWVcbiAgICAgIH0pLFxuICAgICAgdHJ1c3RUeXBlOiBuZXcgRm9ybUNvbnRyb2wocGFydG5lcnNoaXBzQW5kVHJ1c3RzLnRydXN0VHlwZSwgY29uZGl0aW9uYWxWYWxpZGF0b3IoXG4gICAgICAgIChjb250cm9sOiBBYnN0cmFjdENvbnRyb2wpOiBib29sZWFuID0+IHtcbiAgICAgICAgICByZXR1cm4gISFwYXJ0bmVyc2hpcHNBbmRUcnVzdHMudHJ1c3RzSW5jb21lcy5sZW5ndGhcbiAgICAgICAgfSwgVmFsaWRhdG9ycy5yZXF1aXJlZCkpLFxuICAgICAgcGFydG5lcnNoaXBzU21hbGxCdXNpbmVzc05ldEluY29tZTogbmV3IEZvcm1Db250cm9sKFxuICAgICAgICBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMucGFydG5lcnNoaXBzU21hbGxCdXNpbmVzc05ldEluY29tZSxcbiAgICAgICAgVmFsaWRhdG9ycy5yZXF1aXJlZFxuICAgICAgKSxcbiAgICAgIHRydXN0c1NtYWxsQnVzaW5lc3NOZXRJbmNvbWU6IG5ldyBGb3JtQ29udHJvbChcbiAgICAgICAgcGFydG5lcnNoaXBzQW5kVHJ1c3RzLnRydXN0c1NtYWxsQnVzaW5lc3NOZXRJbmNvbWUsXG4gICAgICAgIFZhbGlkYXRvcnMucmVxdWlyZWRcbiAgICAgICksXG4gICAgICB0YXhQYWlkVG90YWw6IG5ldyBGb3JtQ29udHJvbCh7XG4gICAgICAgIHZhbHVlOiBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMudGF4UGFpZFRvdGFsLFxuICAgICAgICBkaXNhYmxlZDogdHJ1ZVxuICAgICAgfSksXG4gICAgICBmcmFua2luZ0NyZWRpdHNUb3RhbDogbmV3IEZvcm1Db250cm9sKHtcbiAgICAgICAgdmFsdWU6IHBhcnRuZXJzaGlwc0FuZFRydXN0cy5mcmFua2luZ0NyZWRpdHNUb3RhbCxcbiAgICAgICAgZGlzYWJsZWQ6IHRydWVcbiAgICAgIH0pLFxuICAgICAgdGF4T2Zmc2V0TlJBU1RvdGFsQW1vdW50OiBuZXcgRm9ybUNvbnRyb2woe1xuICAgICAgICB2YWx1ZTogcGFydG5lcnNoaXBzQW5kVHJ1c3RzLnRheE9mZnNldE5SQVNUb3RhbEFtb3VudCxcbiAgICAgICAgZGlzYWJsZWQ6IHRydWVcbiAgICAgIH0pXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXBhcnRuZXJzaGlwcy1hbmQtdHJ1c3RzLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvcmVwb3J0L215LXRheC9teS10YXgtcGFydG5lcnNoaXBzLWFuZC10cnVzdHMuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRzdDLE1BQU0sT0FBTyw4QkFBK0IsU0FBUSxZQUF3QztJQUMxRixZQUNFLHFCQUFpRDtRQUVqRCxLQUFLLENBQUM7WUFDSiw2QkFBNkIsRUFBRSxJQUFJLFdBQVcsQ0FBQztnQkFDN0MsS0FBSyxFQUFFLHFCQUFxQixDQUFDLDZCQUE2QjtnQkFDMUQsUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDO1lBQ0YsOEJBQThCLEVBQUUsSUFBSSxXQUFXLENBQUM7Z0JBQzlDLEtBQUssRUFBRSxxQkFBcUIsQ0FBQyw4QkFBOEI7Z0JBQzNELFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQztZQUNGLHVCQUF1QixFQUFFLElBQUksV0FBVyxDQUFDO2dCQUN2QyxLQUFLLEVBQUUscUJBQXFCLENBQUMsdUJBQXVCO2dCQUNwRCxRQUFRLEVBQUUsSUFBSTthQUNmLENBQUM7WUFDRix3QkFBd0IsRUFBRSxJQUFJLFdBQVcsQ0FBQztnQkFDeEMsS0FBSyxFQUFFLHFCQUFxQixDQUFDLHdCQUF3QjtnQkFDckQsUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDO1lBQ0Ysb0JBQW9CLEVBQUUsSUFBSSxXQUFXLENBQUM7Z0JBQ3BDLEtBQUssRUFBRSxxQkFBcUIsQ0FBQyxvQkFBb0I7Z0JBQ2pELFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQztZQUNGLG9CQUFvQixFQUFFLElBQUksV0FBVyxDQUFDO2dCQUNwQyxLQUFLLEVBQUUscUJBQXFCLENBQUMsb0JBQW9CO2dCQUNqRCxRQUFRLEVBQUUsSUFBSTthQUNmLENBQUM7WUFDRix3QkFBd0IsRUFBRSxJQUFJLFdBQVcsQ0FBQztnQkFDeEMsS0FBSyxFQUFFLHFCQUFxQixDQUFDLHdCQUF3QjtnQkFDckQsUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDO1NBQ0gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQWJzdHJhY3RGb3JtIH0gZnJvbSAnLi4vLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQgeyBGb3JtQ29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IE15VGF4UGFydG5lcnNoaXBzQW5kVHJ1c3RzIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL3JlcG9ydC9teS10YXgnO1xuXG5leHBvcnQgY2xhc3MgTXlUYXhQYXJ0bmVyc2hpcHNBbmRUcnVzdHNGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPE15VGF4UGFydG5lcnNoaXBzQW5kVHJ1c3RzPiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHBhcnRuZXJzaGlwc0FuZFRydXN0czogTXlUYXhQYXJ0bmVyc2hpcHNBbmRUcnVzdHNcbiAgKSB7XG4gICAgc3VwZXIoe1xuICAgICAgcGFydG5lcnNoaXBzSW5jb21lVG90YWxBbW91bnQ6IG5ldyBGb3JtQ29udHJvbCh7XG4gICAgICAgIHZhbHVlOiBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMucGFydG5lcnNoaXBzSW5jb21lVG90YWxBbW91bnQsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KSxcbiAgICAgIHBhcnRuZXJzaGlwc0V4cGVuc2VUb3RhbEFtb3VudDogbmV3IEZvcm1Db250cm9sKHtcbiAgICAgICAgdmFsdWU6IHBhcnRuZXJzaGlwc0FuZFRydXN0cy5wYXJ0bmVyc2hpcHNFeHBlbnNlVG90YWxBbW91bnQsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KSxcbiAgICAgIHRydXN0c0luY29tZVRvdGFsQW1vdW50OiBuZXcgRm9ybUNvbnRyb2woe1xuICAgICAgICB2YWx1ZTogcGFydG5lcnNoaXBzQW5kVHJ1c3RzLnRydXN0c0luY29tZVRvdGFsQW1vdW50LFxuICAgICAgICBkaXNhYmxlZDogdHJ1ZVxuICAgICAgfSksXG4gICAgICB0cnVzdHNFeHBlbnNlVG90YWxBbW91bnQ6IG5ldyBGb3JtQ29udHJvbCh7XG4gICAgICAgIHZhbHVlOiBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMudHJ1c3RzRXhwZW5zZVRvdGFsQW1vdW50LFxuICAgICAgICBkaXNhYmxlZDogdHJ1ZVxuICAgICAgfSksXG4gICAgICB0cnVzdHNJbmNvbWVUb3RhbFRheDogbmV3IEZvcm1Db250cm9sKHtcbiAgICAgICAgdmFsdWU6IHBhcnRuZXJzaGlwc0FuZFRydXN0cy50cnVzdHNJbmNvbWVUb3RhbFRheCxcbiAgICAgICAgZGlzYWJsZWQ6IHRydWVcbiAgICAgIH0pLFxuICAgICAgZnJhbmtpbmdDcmVkaXRzVG90YWw6IG5ldyBGb3JtQ29udHJvbCh7XG4gICAgICAgIHZhbHVlOiBwYXJ0bmVyc2hpcHNBbmRUcnVzdHMuZnJhbmtpbmdDcmVkaXRzVG90YWwsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KSxcbiAgICAgIHRheE9mZnNldE5SQVNUb3RhbEFtb3VudDogbmV3IEZvcm1Db250cm9sKHtcbiAgICAgICAgdmFsdWU6IHBhcnRuZXJzaGlwc0FuZFRydXN0cy50YXhPZmZzZXROUkFTVG90YWxBbW91bnQsXG4gICAgICAgIGRpc2FibGVkOiB0cnVlXG4gICAgICB9KVxuICAgIH0pO1xuICB9XG59XG4iXX0=

package/esm2015/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.js

@@ -58,6 +58,9 @@ export class MyTaxDeductions {
         this.otherDeductionsTotalAmount = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherDeductions)
             .sumBy('claimAmount');
+        this.depreciationAndCapitalAllowancesTotalAmount = this.depreciations
+            .filter((depreciation) => !depreciation.isLVP())
+            .sumBy('claimAmount');
     }
     getVehicleExpensesTotalAmount() {
         if (this.vehicleClaimDetails) {
@@ -78,7 +81,7 @@ export class MyTaxDeductions {
     setOtherWorkRelatedExpensesTotalAmount() {
         const otherIncomeRelatedExpenses = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
-        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
+        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -
             this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
     }
     calculateWorkRelatedSelfEducationTotalAmount() {
@@ -90,4 +93,4 @@ export class MyTaxDeductions {
  * can't claim the first $250 of self-education expenses (Item code D4)
  */
 MyTaxDeductions.selfEducationNotDeductibleAmount = -250;
-//# 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 { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\nimport { VehicleClaim, VehicleClaimDetails } from '../../../vehicle';\n\nexport class MyTaxDeductions {\n  /**\n   * can't claim the first $250 of self-education expenses (Item code D4)\n   */\n  static selfEducationNotDeductibleAmount = -250;\n\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimDetails: VehicleClaimDetails;\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    vehicleClaimDetails: VehicleClaimDetails,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimDetails = vehicleClaimDetails;\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.calculateWorkRelatedSelfEducationTotalAmount();\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLVPDepreciations().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.heading.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('claimAmount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaimDetails) {\n      return this.vehicleClaimDetails.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKMSClaimAmount(this.vehicleClaimRate);\n    this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(\n      new TransactionCollection([\n        ...this.transactions.getByTankType(this.vehicleClaim.tankType),\n        ...this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()\n      ])\n    );\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  private calculateWorkRelatedSelfEducationTotalAmount(): number {\n    return !this.workRelatedSelfEducationExpenses ? 0 :\n      this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount;\n  }\n}\n"]}
+//# 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 { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\nimport { VehicleClaim, VehicleClaimDetails } from '../../../vehicle';\nimport { Depreciation } from '../../../depreciation/depreciation';\n\nexport class MyTaxDeductions {\n  /**\n   * can't claim the first $250 of self-education expenses (Item code D4)\n   */\n  static selfEducationNotDeductibleAmount = -250;\n\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimDetails: VehicleClaimDetails;\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  depreciationAndCapitalAllowancesTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    vehicleClaim: VehicleClaim,\n    vehicleClaimDetails: VehicleClaimDetails,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimDetails = vehicleClaimDetails;\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.calculateWorkRelatedSelfEducationTotalAmount();\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLVPDepreciations().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.heading.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('claimAmount');\n    this.depreciationAndCapitalAllowancesTotalAmount = this.depreciations\n      .filter((depreciation: Depreciation) => !depreciation.isLVP())\n      .sumBy('claimAmount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaimDetails) {\n      return this.vehicleClaimDetails.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKMSClaimAmount(this.vehicleClaimRate);\n    this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(\n      new TransactionCollection([\n        ...this.transactions.getByTankType(this.vehicleClaim.tankType),\n        ...this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()\n      ])\n    );\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    this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n\n  private calculateWorkRelatedSelfEducationTotalAmount(): number {\n    return !this.workRelatedSelfEducationExpenses ? 0 :\n      this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount;\n  }\n}\n"]}

package/esm2015/lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts.js

@@ -5,23 +5,22 @@ export class MyTaxPartnershipsAndTrusts {
     constructor(transactions, incomeSources) {
         this.transactions = transactions;
         this.incomeSources = incomeSources;
-        this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
-        this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
+        this.partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
+        this.partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
         this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
         this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
-        this.trustType = this.getTrustType();
-        this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +
-            (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));
-        this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -
-            this.partnershipExpenses.sumBy('amount');
-        this.trustsNetIncome = this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount');
-        this.partnershipsSmallBusinessNetIncome = this.partnershipIncomes.sumBy('amount') -
-            this.partnershipExpenses.sumBy('amount');
-        this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -
-            this.trustsExpenses.sumBy('amount');
-        this.taxPaidTotal = this.transactions
+        this.partnershipsIncomeTotalAmount = this.partnershipsIncomes.sumBy('amount');
+        this.partnershipsExpenseTotalAmount = this.partnershipsExpenses.sumBy('amount');
+        this.trustsIncomeTotalAmount = this.trustsIncomes.sumBy('amount');
+        this.trustsExpenseTotalAmount = this.trustsExpenses.sumBy('amount');
+        this.partnershipsNetNonPrimaryProductionAmount = this.partnershipsIncomeTotalAmount - this.partnershipsExpenseTotalAmount;
+        this.trustsNetNonPrimaryProductionAmount = this.trustsIncomeTotalAmount - this.trustsExpenseTotalAmount;
+        this.frankingCreditsTotal = this.transactions
             .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
-            .sumBy('tax');
+            .getTransactionsMetadata()
+            .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.FRANKING_CREDIT)
+            .sumBy('value');
+        this.trustsIncomeTotalTax = this.trustsIncomes.sumBy('tax');
         this.frankingCreditsTotal = this.transactions
             .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
             .getTransactionsMetadata()
@@ -29,21 +28,5 @@ export class MyTaxPartnershipsAndTrusts {
             .sumBy('value');
         this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
     }
-    /**
-     * Get Income source forecast trust type, related to trust income with max amount
-     */
-    getTrustType() {
-        const filteredTrustIncomes = this.trustsIncomes
-            .filterBy('incomeSource.id', this.incomeSources
-            .removeBy('actualForecast.trustType', null)
-            .getIds());
-        if (!filteredTrustIncomes.length) {
-            return null;
-        }
-        return this.incomeSources
-            .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
-            .actualForecast
-            .trustType;
-    }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-partnerships-and-trusts.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EAAE,+BAA+B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,EAAE,6BAA6B,EAAE,MAAM,wDAAwD,CAAC;AAIvG,MAAM,OAAO,0BAA0B;IAiBrC,YACE,YAAmC,EACnC,aAAqC;QAErC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACnH,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;QACtH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,YAAY,CAAC,CAAC;QACxG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAC3G,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,IAAI,CAAC,6BAA6B,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvH,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7E,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC;YAClE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChG,IAAI,CAAC,kCAAkC,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC/E,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC;YACpE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY;aAClC,QAAQ,CAAC,0BAA0B,EAAE,+BAA+B,CAAC,8BAA8B,CAAC;aACpG,KAAK,CAAC,KAAK,CAAC,CAAC;QAChB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,YAAY;aAC1C,QAAQ,CAAC,0BAA0B,EAAE,+BAA+B,CAAC,8BAA8B,CAAC;aACpG,uBAAuB,EAAE;aACzB,QAAQ,CAAC,0BAA0B,EAAE,6BAA6B,CAAC,eAAe,CAAC;aACnF,KAAK,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC5I,CAAC;IAED;;OAEG;IACK,YAAY;QAClB,MAAM,oBAAoB,GAA0B,IAAI,CAAC,aAAa;aACnE,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa;aAC5C,QAAQ,CAAC,0BAA0B,EAAE,IAAI,CAAC;aAC1C,MAAM,EAAE,CACV,CAAC;QAEJ,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE;YAChC,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,CAAC,aAAa;aACtB,MAAM,CAAC,IAAI,EAAE,oBAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC;aAClE,cAAc;aACd,SAAS,CAAC;IACf,CAAC;CACF","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { ChartAccountsListEnum } from '../../../../db/Enums/chart-accounts-list.enum';\nimport { ChartAccountsHeadingTaxableEnum } from '../../../../db/Enums/chart-accounts-heading-taxable.enum';\nimport { ChartAccountsMetadataListEnum } from '../../../../db/Enums/chart-accounts-metadata-list.enum';\nimport { IncomeSourceForecastTrustTypeEnum } from '../../../../db/Enums/income-source-forecast-trust-type.enum';\nimport { IncomeSourceCollection } from '../../../../collections/income-source.collection';\n\nexport class MyTaxPartnershipsAndTrusts {\n  transactions: TransactionCollection;\n  incomeSources: IncomeSourceCollection;\n  partnershipIncomes: TransactionCollection;\n  partnershipExpenses: TransactionCollection;\n  trustsIncomes: TransactionCollection;\n  trustsExpenses: TransactionCollection;\n  trustType: IncomeSourceForecastTrustTypeEnum;\n  netNonPrimaryProductionAmount: number;\n  partnershipsNetIncome: number;\n  trustsNetIncome: number;\n  partnershipsSmallBusinessNetIncome: number;\n  trustsSmallBusinessNetIncome: number;\n  taxPaidTotal: number;\n  frankingCreditsTotal: number;\n  taxOffsetNRASTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    incomeSources: IncomeSourceCollection,\n  ) {\n    this.transactions = transactions;\n    this.incomeSources = incomeSources;\n    this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);\n    this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);\n    this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);\n    this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);\n    this.trustType = this.getTrustType();\n    this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +\n      (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));\n    this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -\n      this.partnershipExpenses.sumBy('amount');\n    this.trustsNetIncome = this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount');\n    this.partnershipsSmallBusinessNetIncome = this.partnershipIncomes.sumBy('amount') -\n      this.partnershipExpenses.sumBy('amount');\n    this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -\n      this.trustsExpenses.sumBy('amount');\n    this.taxPaidTotal = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)\n      .sumBy('tax');\n    this.frankingCreditsTotal = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)\n      .getTransactionsMetadata()\n      .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.FRANKING_CREDIT)\n      .sumBy('value');\n    this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');\n  }\n\n  /**\n   * Get Income source forecast trust type, related to trust income with max amount\n   */\n  private getTrustType(): IncomeSourceForecastTrustTypeEnum {\n    const filteredTrustIncomes: TransactionCollection = this.trustsIncomes\n      .filterBy('incomeSource.id', this.incomeSources\n        .removeBy('actualForecast.trustType', null)\n        .getIds()\n      );\n\n    if (!filteredTrustIncomes.length) {\n      return null;\n    }\n\n    return this.incomeSources\n      .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)\n      .actualForecast\n      .trustType;\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXBhcnRuZXJzaGlwcy1hbmQtdHJ1c3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9yZXBvcnQvbXktdGF4L215LXRheC1wYXJ0bmVyc2hpcHMtYW5kLXRydXN0cy9teS10YXgtcGFydG5lcnNoaXBzLWFuZC10cnVzdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDdEYsT0FBTyxFQUFFLCtCQUErQixFQUFFLE1BQU0sMERBQTBELENBQUM7QUFDM0csT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sd0RBQXdELENBQUM7QUFHdkcsTUFBTSxPQUFPLDBCQUEwQjtJQWlCckMsWUFDRSxZQUFtQyxFQUNuQyxhQUFxQztRQUVyQyxJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQztRQUNqQyxJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztRQUNuQyxJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUNwSCxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUN2SCxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDM0csSUFBSSxDQUFDLDZCQUE2QixHQUFHLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDOUUsSUFBSSxDQUFDLDhCQUE4QixHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDaEYsSUFBSSxDQUFDLHVCQUF1QixHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMseUNBQXlDLEdBQUcsSUFBSSxDQUFDLDZCQUE2QixHQUFHLElBQUksQ0FBQyw4QkFBOEIsQ0FBQztRQUMxSCxJQUFJLENBQUMsbUNBQW1DLEdBQUcsSUFBSSxDQUFDLHVCQUF1QixHQUFHLElBQUksQ0FBQyx3QkFBd0IsQ0FBQztRQUN4RyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLFlBQVk7YUFDMUMsUUFBUSxDQUFDLDBCQUEwQixFQUFFLCtCQUErQixDQUFDLDhCQUE4QixDQUFDO2FBQ3BHLHVCQUF1QixFQUFFO2FBQ3pCLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSw2QkFBNkIsQ0FBQyxlQUFlLENBQUM7YUFDbkYsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLFlBQVk7YUFDMUMsUUFBUSxDQUFDLDBCQUEwQixFQUFFLCtCQUErQixDQUFDLDhCQUE4QixDQUFDO2FBQ3BHLHVCQUF1QixFQUFFO2FBQ3pCLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSw2QkFBNkIsQ0FBQyxlQUFlLENBQUM7YUFDbkYsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM1SSxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy90cmFuc2FjdGlvbi90cmFuc2FjdGlvbi5jb2xsZWN0aW9uJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLWxpc3QuZW51bSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzSGVhZGluZ1RheGFibGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtaGVhZGluZy10YXhhYmxlLmVudW0nO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9FbnVtcy9jaGFydC1hY2NvdW50cy1tZXRhZGF0YS1saXN0LmVudW0nO1xuaW1wb3J0IHsgSW5jb21lU291cmNlQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL2NvbGxlY3Rpb25zL2luY29tZS1zb3VyY2UuY29sbGVjdGlvbic7XG5cbmV4cG9ydCBjbGFzcyBNeVRheFBhcnRuZXJzaGlwc0FuZFRydXN0cyB7XG4gIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uO1xuICBpbmNvbWVTb3VyY2VzOiBJbmNvbWVTb3VyY2VDb2xsZWN0aW9uO1xuICBwYXJ0bmVyc2hpcHNJbmNvbWVzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHBhcnRuZXJzaGlwc0V4cGVuc2VzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHRydXN0c0luY29tZXM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgdHJ1c3RzRXhwZW5zZXM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgcGFydG5lcnNoaXBzSW5jb21lVG90YWxBbW91bnQ6IG51bWJlcjtcbiAgcGFydG5lcnNoaXBzRXhwZW5zZVRvdGFsQW1vdW50OiBudW1iZXI7XG4gIHRydXN0c0luY29tZVRvdGFsVGF4OiBudW1iZXI7XG4gIHRydXN0c0luY29tZVRvdGFsQW1vdW50OiBudW1iZXI7XG4gIHRydXN0c0V4cGVuc2VUb3RhbEFtb3VudDogbnVtYmVyO1xuICBwYXJ0bmVyc2hpcHNOZXROb25QcmltYXJ5UHJvZHVjdGlvbkFtb3VudDogbnVtYmVyO1xuICB0cnVzdHNOZXROb25QcmltYXJ5UHJvZHVjdGlvbkFtb3VudDogbnVtYmVyO1xuICBmcmFua2luZ0NyZWRpdHNUb3RhbDogbnVtYmVyO1xuICB0YXhPZmZzZXROUkFTVG90YWxBbW91bnQ6IG51bWJlcjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgICBpbmNvbWVTb3VyY2VzOiBJbmNvbWVTb3VyY2VDb2xsZWN0aW9uLFxuICApIHtcbiAgICB0aGlzLnRyYW5zYWN0aW9ucyA9IHRyYW5zYWN0aW9ucztcbiAgICB0aGlzLmluY29tZVNvdXJjZXMgPSBpbmNvbWVTb3VyY2VzO1xuICAgIHRoaXMucGFydG5lcnNoaXBzSW5jb21lcyA9IHRoaXMudHJhbnNhY3Rpb25zLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlBBUlRORVJTSElQX0lOQ09NRSk7XG4gICAgdGhpcy5wYXJ0bmVyc2hpcHNFeHBlbnNlcyA9IHRoaXMudHJhbnNhY3Rpb25zLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlBBUlRORVJTSElQX0VYUEVOU0VTKTtcbiAgICB0aGlzLnRydXN0c0luY29tZXMgPSB0aGlzLnRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5UUlVTVF9JTkNPTUUpO1xuICAgIHRoaXMudHJ1c3RzRXhwZW5zZXMgPSB0aGlzLnRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5UUlVTVF9FWFBFTlNFUyk7XG4gICAgdGhpcy5wYXJ0bmVyc2hpcHNJbmNvbWVUb3RhbEFtb3VudCA9IHRoaXMucGFydG5lcnNoaXBzSW5jb21lcy5zdW1CeSgnYW1vdW50Jyk7XG4gICAgdGhpcy5wYXJ0bmVyc2hpcHNFeHBlbnNlVG90YWxBbW91bnQgPSB0aGlzLnBhcnRuZXJzaGlwc0V4cGVuc2VzLnN1bUJ5KCdhbW91bnQnKTtcbiAgICB0aGlzLnRydXN0c0luY29tZVRvdGFsQW1vdW50ID0gdGhpcy50cnVzdHNJbmNvbWVzLnN1bUJ5KCdhbW91bnQnKTtcbiAgICB0aGlzLnRydXN0c0V4cGVuc2VUb3RhbEFtb3VudCA9IHRoaXMudHJ1c3RzRXhwZW5zZXMuc3VtQnkoJ2Ftb3VudCcpO1xuICAgIHRoaXMucGFydG5lcnNoaXBzTmV0Tm9uUHJpbWFyeVByb2R1Y3Rpb25BbW91bnQgPSB0aGlzLnBhcnRuZXJzaGlwc0luY29tZVRvdGFsQW1vdW50IC0gdGhpcy5wYXJ0bmVyc2hpcHNFeHBlbnNlVG90YWxBbW91bnQ7XG4gICAgdGhpcy50cnVzdHNOZXROb25QcmltYXJ5UHJvZHVjdGlvbkFtb3VudCA9IHRoaXMudHJ1c3RzSW5jb21lVG90YWxBbW91bnQgLSB0aGlzLnRydXN0c0V4cGVuc2VUb3RhbEFtb3VudDtcbiAgICB0aGlzLmZyYW5raW5nQ3JlZGl0c1RvdGFsID0gdGhpcy50cmFuc2FjdGlvbnNcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5oZWFkaW5nLmlkJywgQ2hhcnRBY2NvdW50c0hlYWRpbmdUYXhhYmxlRW51bS5QQVJUTkVSU0hJUFNfQU5EX1RSVVNUU19JTkNPTUUpXG4gICAgICAuZ2V0VHJhbnNhY3Rpb25zTWV0YWRhdGEoKVxuICAgICAgLmZpbHRlckJ5KCdjaGFydEFjY291bnRzTWV0YWRhdGEuaWQnLCBDaGFydEFjY291bnRzTWV0YWRhdGFMaXN0RW51bS5GUkFOS0lOR19DUkVESVQpXG4gICAgICAuc3VtQnkoJ3ZhbHVlJyk7XG4gICAgdGhpcy50cnVzdHNJbmNvbWVUb3RhbFRheCA9IHRoaXMudHJ1c3RzSW5jb21lcy5zdW1CeSgndGF4Jyk7XG4gICAgdGhpcy5mcmFua2luZ0NyZWRpdHNUb3RhbCA9IHRoaXMudHJhbnNhY3Rpb25zXG4gICAgICAuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaGVhZGluZy5pZCcsIENoYXJ0QWNjb3VudHNIZWFkaW5nVGF4YWJsZUVudW0uUEFSVE5FUlNISVBTX0FORF9UUlVTVFNfSU5DT01FKVxuICAgICAgLmdldFRyYW5zYWN0aW9uc01ldGFkYXRhKClcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50c01ldGFkYXRhLmlkJywgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0uRlJBTktJTkdfQ1JFRElUKVxuICAgICAgLnN1bUJ5KCd2YWx1ZScpO1xuICAgIHRoaXMudGF4T2Zmc2V0TlJBU1RvdGFsQW1vdW50ID0gdGhpcy50cmFuc2FjdGlvbnMuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uVEFYX09GRlNFVFNfTl9SX0FfUykuc3VtQnkoJ2Ftb3VudCcpO1xuICB9XG59XG4iXX0=

package/fesm2015/taxtank-core.js

@@ -9474,6 +9474,9 @@ class MyTaxDeductions {
         this.otherDeductionsTotalAmount = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherDeductions)
             .sumBy('claimAmount');
+        this.depreciationAndCapitalAllowancesTotalAmount = this.depreciations
+            .filter((depreciation) => !depreciation.isLVP())
+            .sumBy('claimAmount');
     }
     getVehicleExpensesTotalAmount() {
         if (this.vehicleClaimDetails) {
@@ -9494,7 +9497,7 @@ class MyTaxDeductions {
     setOtherWorkRelatedExpensesTotalAmount() {
         const otherIncomeRelatedExpenses = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
-        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
+        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -
             this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
     }
     calculateWorkRelatedSelfEducationTotalAmount() {
@@ -9715,23 +9718,22 @@ class MyTaxPartnershipsAndTrusts {
     constructor(transactions, incomeSources) {
         this.transactions = transactions;
         this.incomeSources = incomeSources;
-        this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
-        this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
+        this.partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
+        this.partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
         this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
         this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
-        this.trustType = this.getTrustType();
-        this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +
-            (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));
-        this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -
-            this.partnershipExpenses.sumBy('amount');
-        this.trustsNetIncome = this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount');
-        this.partnershipsSmallBusinessNetIncome = this.partnershipIncomes.sumBy('amount') -
-            this.partnershipExpenses.sumBy('amount');
-        this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -
-            this.trustsExpenses.sumBy('amount');
-        this.taxPaidTotal = this.transactions
+        this.partnershipsIncomeTotalAmount = this.partnershipsIncomes.sumBy('amount');
+        this.partnershipsExpenseTotalAmount = this.partnershipsExpenses.sumBy('amount');
+        this.trustsIncomeTotalAmount = this.trustsIncomes.sumBy('amount');
+        this.trustsExpenseTotalAmount = this.trustsExpenses.sumBy('amount');
+        this.partnershipsNetNonPrimaryProductionAmount = this.partnershipsIncomeTotalAmount - this.partnershipsExpenseTotalAmount;
+        this.trustsNetNonPrimaryProductionAmount = this.trustsIncomeTotalAmount - this.trustsExpenseTotalAmount;
+        this.frankingCreditsTotal = this.transactions
             .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
-            .sumBy('tax');
+            .getTransactionsMetadata()
+            .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.FRANKING_CREDIT)
+            .sumBy('value');
+        this.trustsIncomeTotalTax = this.trustsIncomes.sumBy('tax');
         this.frankingCreditsTotal = this.transactions
             .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
             .getTransactionsMetadata()
@@ -9739,22 +9741,6 @@ class MyTaxPartnershipsAndTrusts {
             .sumBy('value');
         this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
     }
-    /**
-     * Get Income source forecast trust type, related to trust income with max amount
-     */
-    getTrustType() {
-        const filteredTrustIncomes = this.trustsIncomes
-            .filterBy('incomeSource.id', this.incomeSources
-            .removeBy('actualForecast.trustType', null)
-            .getIds());
-        if (!filteredTrustIncomes.length) {
-            return null;
-        }
-        return this.incomeSources
-            .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
-            .actualForecast
-            .trustType;
-    }
 }
 
 class MyTaxRent {
@@ -17294,6 +17280,10 @@ class MyTaxDeductionsForm extends AbstractForm {
             otherDeductionsTotalAmount: new FormControl({
                 value: deductions.otherDeductionsTotalAmount,
                 disabled: true
+            }),
+            depreciationAndCapitalAllowancesTotalAmount: new FormControl({
+                value: deductions.depreciationAndCapitalAllowancesTotalAmount,
+                disabled: true
             })
         });
     }
@@ -17521,21 +17511,24 @@ class MyTaxOtherIncomeForm extends AbstractForm {
 class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
     constructor(partnershipsAndTrusts) {
         super({
-            partnershipsNetIncome: new FormControl({
-                value: partnershipsAndTrusts.partnershipsNetIncome,
+            partnershipsIncomeTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.partnershipsIncomeTotalAmount,
+                disabled: true
+            }),
+            partnershipsExpenseTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.partnershipsExpenseTotalAmount,
+                disabled: true
+            }),
+            trustsIncomeTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.trustsIncomeTotalAmount,
                 disabled: true
             }),
-            trustsNetIncome: new FormControl({
-                value: partnershipsAndTrusts.trustsNetIncome,
+            trustsExpenseTotalAmount: new FormControl({
+                value: partnershipsAndTrusts.trustsExpenseTotalAmount,
                 disabled: true
             }),
-            trustType: new FormControl(partnershipsAndTrusts.trustType, conditionalValidator((control) => {
-                return !!partnershipsAndTrusts.trustsIncomes.length;
-            }, Validators.required)),
-            partnershipsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, Validators.required),
-            trustsSmallBusinessNetIncome: new FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, Validators.required),
-            taxPaidTotal: new FormControl({
-                value: partnershipsAndTrusts.taxPaidTotal,
+            trustsIncomeTotalTax: new FormControl({
+                value: partnershipsAndTrusts.trustsIncomeTotalTax,
                 disabled: true
             }),
             frankingCreditsTotal: new FormControl({