taxtank-core 0.32.96 → 0.32.98

package/esm2022/lib/forms/report/my-tax/my-tax-rent.form.mjs

@@ -10,4 +10,4 @@ export class MyTaxRentForm extends AbstractForm {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9yZXBvcnQvbXktdGF4L215LXRheC1yZW50LmZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBR3BELE1BQU0sT0FBTyxhQUFjLFNBQVEsWUFBdUI7SUFDeEQsWUFDRSxJQUFlO1FBRWYsS0FBSyxDQUFDO1lBQ0osZUFBZSxFQUFFLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQztZQUM3RCxrQkFBa0IsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyx3QkFBd0IsQ0FBQztZQUN6RSxzQkFBc0IsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQztZQUNqRiwyQkFBMkIsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQywyQkFBMkIsQ0FBQztTQUN0RixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi8uLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFVudHlwZWRGb3JtQ29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IE15VGF4UmVudCB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQvbXktdGF4L215LXRheC1yZW50L215LXRheC1yZW50JztcblxuZXhwb3J0IGNsYXNzIE15VGF4UmVudEZvcm0gZXh0ZW5kcyBBYnN0cmFjdEZvcm08TXlUYXhSZW50PiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHJlbnQ6IE15VGF4UmVudCxcbiAgKSB7XG4gICAgc3VwZXIoe1xuICAgICAgZ3Jvc3NSZW50QW1vdW50OiBuZXcgVW50eXBlZEZvcm1Db250cm9sKHJlbnQuZ3Jvc3NSZW50QW1vdW50KSxcbiAgICAgIGludGVyZXN0RGVkdWN0aW9uczogbmV3IFVudHlwZWRGb3JtQ29udHJvbChyZW50LmludGVyZXN0RGVkdWN0aW9uc0Ftb3VudCksXG4gICAgICBjYXBpdGFsV29ya3NEZWR1Y3Rpb25zOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKHJlbnQuY2FwaXRhbFdvcmtzRGVkdWN0aW9uc0Ftb3VudCksXG4gICAgICBvdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQ6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2wocmVudC5vdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQpXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9yZXBvcnQvbXktdGF4L215LXRheC1yZW50LmZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBR3BELE1BQU0sT0FBTyxhQUFjLFNBQVEsWUFBdUI7SUFDeEQsWUFDRSxJQUFlO1FBRWYsS0FBSyxDQUFDO1lBQ0osZUFBZSxFQUFFLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQztZQUM3RCxrQkFBa0IsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyx3QkFBd0IsQ0FBQztZQUN6RSxzQkFBc0IsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQztZQUNqRiwyQkFBMkIsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQywyQkFBMkIsQ0FBQztTQUN0RixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi8uLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFVudHlwZWRGb3JtQ29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IE15VGF4UmVudCB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQnO1xuXG5leHBvcnQgY2xhc3MgTXlUYXhSZW50Rm9ybSBleHRlbmRzIEFic3RyYWN0Rm9ybTxNeVRheFJlbnQ+IHtcbiAgY29uc3RydWN0b3IoXG4gICAgcmVudDogTXlUYXhSZW50LFxuICApIHtcbiAgICBzdXBlcih7XG4gICAgICBncm9zc1JlbnRBbW91bnQ6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2wocmVudC5ncm9zc1JlbnRBbW91bnQpLFxuICAgICAgaW50ZXJlc3REZWR1Y3Rpb25zOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKHJlbnQuaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50KSxcbiAgICAgIGNhcGl0YWxXb3Jrc0RlZHVjdGlvbnM6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2wocmVudC5jYXBpdGFsV29ya3NEZWR1Y3Rpb25zQW1vdW50KSxcbiAgICAgIG90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudDogbmV3IFVudHlwZWRGb3JtQ29udHJvbChyZW50Lm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudClcbiAgICB9KTtcbiAgfVxufVxuIl19

package/esm2022/lib/models/report/my-tax/my-tax-rent/my-tax-rent.mjs

@@ -1,5 +1,5 @@
 import { ChartAccountsListEnum } from '../../../../db/Enums';
-import { TaxReturnCategoryListEnum } from '../../../../db/Enums/tax-return/tax-return-category-list.enum';
+import { TaxReturnCategoryListEnum } from '../../../../db/Enums';
 import round from 'lodash/round';
 export class MyTaxRent {
     constructor(transactions, depreciations, taxSummary) {
@@ -8,13 +8,8 @@ export class MyTaxRent {
         this.grossRentAmount = transactions
             .getPropertyTransactions()
             .getIncomeTransactions()
-            .filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)
-            .sumBy('claimAmount') +
-            transactions
-                .getPropertyTransactions()
-                .getIncomeTransactions()
-                .filterBy('chartAccounts.id', ChartAccountsListEnum.OTHER_RENTAL_INCOME)
-                .sumBy('claimAmount');
+            .filterBy('chartAccounts.id', [ChartAccountsListEnum.RENTAL_INCOME, ChartAccountsListEnum.OTHER_RENTAL_INCOME])
+            .sumBy('grossAmount');
         this.interestDeductionsAmount = Math.abs(transactions.getInterestTransactions().sumBy('claimAmount'));
         this.capitalWorksDeductionsAmount = Math.abs(depreciations.getCapitalDepreciations().sumBy('claimAmount'));
         this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
@@ -45,4 +40,4 @@ export class MyTaxRent {
         return round(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount, 2);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9teS10YXgvbXktdGF4LXJlbnQvbXktdGF4LXJlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJN0QsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sK0RBQStELENBQUM7QUFDMUcsT0FBTyxLQUFLLE1BQU0sY0FBYyxDQUFDO0FBRWpDLE1BQU0sT0FBTyxTQUFTO0lBU3BCLFlBQ0UsWUFBbUMsRUFDbkMsYUFBcUMsRUFDckMsVUFBc0I7UUFFdEIsSUFBSSxDQUFDLGdCQUFnQixHQUFHLFlBQVksQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLHNCQUFzQixFQUFFLENBQUM7UUFDeEYsSUFBSSxDQUFDLHlCQUF5QixHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7UUFDckQsSUFBSSxDQUFDLGVBQWUsR0FBRyxZQUFZO2FBQ2hDLHVCQUF1QixFQUFFO2FBQ3pCLHFCQUFxQixFQUFFO2FBQ3ZCLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxhQUFhLENBQUM7YUFDakUsS0FBSyxDQUFDLGFBQWEsQ0FBQztZQUNyQixZQUFZO2lCQUNULHVCQUF1QixFQUFFO2lCQUN6QixxQkFBcUIsRUFBRTtpQkFDdkIsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLG1CQUFtQixDQUFDO2lCQUN2RSxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFFMUIsSUFBSSxDQUFDLHdCQUF3QixHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLHVCQUF1QixFQUFFLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDdEcsSUFBSSxDQUFDLDRCQUE0QixHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLHVCQUF1QixFQUFFLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFFM0csSUFBSSxDQUFDLDJCQUEyQixHQUFHLElBQUksQ0FBQyxvQ0FBb0MsRUFBRSxDQUFDO1FBRS9FOztXQUVHO1FBQ0gsa0hBQWtIO1FBQ2xILHdHQUF3RztRQUN4RywwREFBMEQ7UUFFMUQsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsZUFBZTtZQUNqQyxJQUFJLENBQUMsd0JBQXdCO1lBQzdCLElBQUksQ0FBQyw0QkFBNEI7WUFDakMsSUFBSSxDQUFDLDJCQUEyQixDQUFDO0lBQ3JDLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNLLG9DQUFvQztRQUMxQyxNQUFNLHVCQUF1QixHQUFXLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLHlCQUF5QixDQUFDLEtBQUs7YUFDbEYsTUFBTSxDQUFDLHNCQUFzQixFQUFFLHlCQUF5QixDQUFDLG1CQUFtQixDQUFDLEVBQUUsTUFBTSxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBRS9GLE1BQU0sdUJBQXVCLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FDOUMsSUFBSSxDQUFDLHlCQUF5QixDQUFDLEtBQUs7YUFDakMsTUFBTSxDQUFDLHNCQUFzQixFQUFFLHlCQUF5QixDQUFDLGtCQUFrQixDQUFDLEVBQUUsTUFBTSxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBRWhHLE1BQU0sMkJBQTJCLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUN0RixNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsdUJBQXVCLENBQUMsRUFBRSxNQUFNLElBQUksQ0FBQyxDQUFDLENBQUM7UUFFbkcsT0FBTyxLQUFLLENBQUMsdUJBQXVCLEdBQUcsdUJBQXVCLEdBQUcsMkJBQTJCLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbkcsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50c0xpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMnO1xuaW1wb3J0IHsgRGVwcmVjaWF0aW9uQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL2NvbGxlY3Rpb25zJztcbmltcG9ydCB7IFRheFN1bW1hcnkgfSBmcm9tICcuLi8uLi8uLi90YXgtc3VtbWFyeS90YXgtc3VtbWFyeSc7XG5pbXBvcnQgeyBUYXhTdW1tYXJ5U2VjdGlvbiB9IGZyb20gJy4uLy4uLy4uL3RheC1zdW1tYXJ5L3RheC1zdW1tYXJ5LXNlY3Rpb24nO1xuaW1wb3J0IHsgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL3RheC1yZXR1cm4vdGF4LXJldHVybi1jYXRlZ29yeS1saXN0LmVudW0nO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5cbmV4cG9ydCBjbGFzcyBNeVRheFJlbnQge1xuICBwcm9wZXJ0eUV4cGVuc2VzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb246IFRheFN1bW1hcnlTZWN0aW9uO1xuICBncm9zc1JlbnRBbW91bnQ6IG51bWJlcjtcbiAgaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIGNhcGl0YWxXb3Jrc0RlZHVjdGlvbnNBbW91bnQ6IG51bWJlcjtcbiAgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIG5ldFJlbnQ6IG51bWJlcjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgICBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICAgIHRheFN1bW1hcnk6IFRheFN1bW1hcnlcbiAgKSB7XG4gICAgdGhpcy5wcm9wZXJ0eUV4cGVuc2VzID0gdHJhbnNhY3Rpb25zLmdldFByb3BlcnR5VHJhbnNhY3Rpb25zKCkuZ2V0RXhwZW5zZVRyYW5zYWN0aW9ucygpO1xuICAgIHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbiA9IHRheFN1bW1hcnkucHJvcGVydHk7XG4gICAgdGhpcy5ncm9zc1JlbnRBbW91bnQgPSB0cmFuc2FjdGlvbnNcbiAgICAgIC5nZXRQcm9wZXJ0eVRyYW5zYWN0aW9ucygpXG4gICAgICAuZ2V0SW5jb21lVHJhbnNhY3Rpb25zKClcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5SRU5UQUxfSU5DT01FKVxuICAgICAgLnN1bUJ5KCdjbGFpbUFtb3VudCcpICtcbiAgICAgIHRyYW5zYWN0aW9uc1xuICAgICAgICAuZ2V0UHJvcGVydHlUcmFuc2FjdGlvbnMoKVxuICAgICAgICAuZ2V0SW5jb21lVHJhbnNhY3Rpb25zKClcbiAgICAgICAgLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLk9USEVSX1JFTlRBTF9JTkNPTUUpXG4gICAgICAgIC5zdW1CeSgnY2xhaW1BbW91bnQnKTtcblxuICAgIHRoaXMuaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50ID0gTWF0aC5hYnModHJhbnNhY3Rpb25zLmdldEludGVyZXN0VHJhbnNhY3Rpb25zKCkuc3VtQnkoJ2NsYWltQW1vdW50JykpO1xuICAgIHRoaXMuY2FwaXRhbFdvcmtzRGVkdWN0aW9uc0Ftb3VudCA9IE1hdGguYWJzKGRlcHJlY2lhdGlvbnMuZ2V0Q2FwaXRhbERlcHJlY2lhdGlvbnMoKS5zdW1CeSgnY2xhaW1BbW91bnQnKSk7XG5cbiAgICB0aGlzLm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCA9IHRoaXMuY2FsY3VsYXRlT3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50KCk7XG5cbiAgICAvKipcbiAgICAgKiBAVG9kbyBWaWsgdW5jb21tZW50IHdoZW4gdGFzayBUVC0yMDA5IHdpbGwgYmUgaW1wbGVtZW50ZWRcbiAgICAgKi9cbiAgICAvLyB0aGlzLm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCA9IGRlcHJlY2lhdGlvbnMuZ2V0QnlUYW5rVHlwZShUYW5rVHlwZUVudW0uUFJPUEVSVFkpLmdldEFzc2V0cygpLmNsYWltQW1vdW50ICtcbiAgICAvLyAgIGRlcHJlY2lhdGlvbnMuZ2V0QnlUYW5rVHlwZShUYW5rVHlwZUVudW0uUFJPUEVSVFkpLmdldEJvcnJvd2luZ0V4cGVuc2VEZXByZWNpYXRpb25zKCkuY2xhaW1BbW91bnQgK1xuICAgIC8vICAgTWF0aC5hYnModGhpcy5wcm9wZXJ0eUV4cGVuc2VzLnN1bUJ5KCdjbGFpbUFtb3VudCcpKTtcblxuICAgIHRoaXMubmV0UmVudCA9IHRoaXMuZ3Jvc3NSZW50QW1vdW50IC1cbiAgICAgIHRoaXMuaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50IC1cbiAgICAgIHRoaXMuY2FwaXRhbFdvcmtzRGVkdWN0aW9uc0Ftb3VudCAtXG4gICAgICB0aGlzLm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudDtcbiAgfVxuXG4gIC8qKlxuICAgKiBAVG9kbyBWaWsgcmVtb3ZlIHdoZW4gVFQtMjAwOSB3aWxsIGJlIGltcGxlbWVudGVkLlxuICAgKiBXZSB1c2UgdGF4IHN1bW1hcnkgZGF0YSBoZXJlIGJlY2F1c2UgY2xhaW0gYW1vdW50IGZyb20gZGVwcmVjaWF0aW9uIGlzIGRpZmZlcmVudFxuICAgKiBmcm9tIHRoZSBjbGFpbSBhbW91bnQgdGhhdCB3ZSBnZXQgZnJvbSB0YXggc3VtbWFyeSAoZGVwcmVjaWF0aW9uIGNsYWltIGFtb3VudCBpcyBub3QgYWZmZWN0ZWQgYnkgcHJvcGVydHkgc2hhcmUsXG4gICAqIHByb3BlcnR5IGNvbnRyYWN0IGRhdGUsIGUudC5jLikuIERldGFpbHMgaW4gdGhlIFRULTIwMDkgdGFza1xuICAgKi9cbiAgcHJpdmF0ZSBjYWxjdWxhdGVPdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQoKTogbnVtYmVyIHtcbiAgICBjb25zdCBwbGFudEFuZEVxdWlwbWVudEFtb3VudDogbnVtYmVyID0gTWF0aC5hYnModGhpcy50YXhTdW1tYXJ5UHJvcGVydHlTZWN0aW9uLml0ZW1zXG4gICAgICAuZmluZEJ5KCd0YXhSZXR1cm5DYXRlZ29yeS5pZCcsIFRheFJldHVybkNhdGVnb3J5TGlzdEVudW0uUExBTlRfQU5EX0VRVUlQTUVOVCk/LmFtb3VudCB8fCAwKTtcblxuICAgIGNvbnN0IGJvcnJvd2luZ0V4cGVuc2VzQW1vdW50OiBudW1iZXIgPSBNYXRoLmFicyhcbiAgICAgIHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbi5pdGVtc1xuICAgICAgICAuZmluZEJ5KCd0YXhSZXR1cm5DYXRlZ29yeS5pZCcsIFRheFJldHVybkNhdGVnb3J5TGlzdEVudW0uQk9SUk9XSU5HX0VYUEVOU0VTKT8uYW1vdW50IHx8IDApO1xuXG4gICAgY29uc3Qgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXIgPSBNYXRoLmFicyh0aGlzLnRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb24uaXRlbXNcbiAgICAgIC5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5PVEhFUl9SRU5UQUxfREVEVUNUSU9OUyk/LmFtb3VudCB8fCAwKTtcblxuICAgIHJldHVybiByb3VuZChwbGFudEFuZEVxdWlwbWVudEFtb3VudCArIGJvcnJvd2luZ0V4cGVuc2VzQW1vdW50ICsgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50LCAyKTtcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9teS10YXgvbXktdGF4LXJlbnQvbXktdGF4LXJlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJN0QsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDakUsT0FBTyxLQUFLLE1BQU0sY0FBYyxDQUFDO0FBRWpDLE1BQU0sT0FBTyxTQUFTO0lBU3BCLFlBQ0UsWUFBbUMsRUFDbkMsYUFBcUMsRUFDckMsVUFBc0I7UUFFdEIsSUFBSSxDQUFDLGdCQUFnQixHQUFHLFlBQVksQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLHNCQUFzQixFQUFFLENBQUM7UUFDeEYsSUFBSSxDQUFDLHlCQUF5QixHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7UUFDckQsSUFBSSxDQUFDLGVBQWUsR0FBRyxZQUFZO2FBQ2hDLHVCQUF1QixFQUFFO2FBQ3pCLHFCQUFxQixFQUFFO2FBQ3ZCLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLHFCQUFxQixDQUFDLGFBQWEsRUFBRSxxQkFBcUIsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO2FBQzlHLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUV4QixJQUFJLENBQUMsd0JBQXdCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUN0RyxJQUFJLENBQUMsNEJBQTRCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUUzRyxJQUFJLENBQUMsMkJBQTJCLEdBQUcsSUFBSSxDQUFDLG9DQUFvQyxFQUFFLENBQUM7UUFFL0U7O1dBRUc7UUFDSCxrSEFBa0g7UUFDbEgsd0dBQXdHO1FBQ3hHLDBEQUEwRDtRQUUxRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxlQUFlO1lBQ2pDLElBQUksQ0FBQyx3QkFBd0I7WUFDN0IsSUFBSSxDQUFDLDRCQUE0QjtZQUNqQyxJQUFJLENBQUMsMkJBQTJCLENBQUM7SUFDckMsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ssb0NBQW9DO1FBQzFDLE1BQU0sdUJBQXVCLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUNsRixNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsbUJBQW1CLENBQUMsRUFBRSxNQUFNLElBQUksQ0FBQyxDQUFDLENBQUM7UUFFL0YsTUFBTSx1QkFBdUIsR0FBVyxJQUFJLENBQUMsR0FBRyxDQUM5QyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUNqQyxNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsa0JBQWtCLENBQUMsRUFBRSxNQUFNLElBQUksQ0FBQyxDQUFDLENBQUM7UUFFaEcsTUFBTSwyQkFBMkIsR0FBVyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxLQUFLO2FBQ3RGLE1BQU0sQ0FBQyxzQkFBc0IsRUFBRSx5QkFBeUIsQ0FBQyx1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQztRQUVuRyxPQUFPLEtBQUssQ0FBQyx1QkFBdUIsR0FBRyx1QkFBdUIsR0FBRywyQkFBMkIsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNuRyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzTGlzdEVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9FbnVtcyc7XG5pbXBvcnQgeyBEZXByZWNpYXRpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgVGF4U3VtbWFyeSB9IGZyb20gJy4uLy4uLy4uL3RheC1zdW1tYXJ5L3RheC1zdW1tYXJ5JztcbmltcG9ydCB7IFRheFN1bW1hcnlTZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vdGF4LXN1bW1hcnkvdGF4LXN1bW1hcnktc2VjdGlvbic7XG5pbXBvcnQgeyBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMnO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5cbmV4cG9ydCBjbGFzcyBNeVRheFJlbnQge1xuICBwcm9wZXJ0eUV4cGVuc2VzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb246IFRheFN1bW1hcnlTZWN0aW9uO1xuICBncm9zc1JlbnRBbW91bnQ6IG51bWJlcjtcbiAgaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIGNhcGl0YWxXb3Jrc0RlZHVjdGlvbnNBbW91bnQ6IG51bWJlcjtcbiAgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIG5ldFJlbnQ6IG51bWJlcjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgICBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICAgIHRheFN1bW1hcnk6IFRheFN1bW1hcnlcbiAgKSB7XG4gICAgdGhpcy5wcm9wZXJ0eUV4cGVuc2VzID0gdHJhbnNhY3Rpb25zLmdldFByb3BlcnR5VHJhbnNhY3Rpb25zKCkuZ2V0RXhwZW5zZVRyYW5zYWN0aW9ucygpO1xuICAgIHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbiA9IHRheFN1bW1hcnkucHJvcGVydHk7XG4gICAgdGhpcy5ncm9zc1JlbnRBbW91bnQgPSB0cmFuc2FjdGlvbnNcbiAgICAgIC5nZXRQcm9wZXJ0eVRyYW5zYWN0aW9ucygpXG4gICAgICAuZ2V0SW5jb21lVHJhbnNhY3Rpb25zKClcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIFtDaGFydEFjY291bnRzTGlzdEVudW0uUkVOVEFMX0lOQ09NRSwgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLk9USEVSX1JFTlRBTF9JTkNPTUVdKVxuICAgICAgLnN1bUJ5KCdncm9zc0Ftb3VudCcpO1xuXG4gICAgdGhpcy5pbnRlcmVzdERlZHVjdGlvbnNBbW91bnQgPSBNYXRoLmFicyh0cmFuc2FjdGlvbnMuZ2V0SW50ZXJlc3RUcmFuc2FjdGlvbnMoKS5zdW1CeSgnY2xhaW1BbW91bnQnKSk7XG4gICAgdGhpcy5jYXBpdGFsV29ya3NEZWR1Y3Rpb25zQW1vdW50ID0gTWF0aC5hYnMoZGVwcmVjaWF0aW9ucy5nZXRDYXBpdGFsRGVwcmVjaWF0aW9ucygpLnN1bUJ5KCdjbGFpbUFtb3VudCcpKTtcblxuICAgIHRoaXMub3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50ID0gdGhpcy5jYWxjdWxhdGVPdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQoKTtcblxuICAgIC8qKlxuICAgICAqIEBUb2RvIFZpayB1bmNvbW1lbnQgd2hlbiB0YXNrIFRULTIwMDkgd2lsbCBiZSBpbXBsZW1lbnRlZFxuICAgICAqL1xuICAgIC8vIHRoaXMub3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50ID0gZGVwcmVjaWF0aW9ucy5nZXRCeVRhbmtUeXBlKFRhbmtUeXBlRW51bS5QUk9QRVJUWSkuZ2V0QXNzZXRzKCkuY2xhaW1BbW91bnQgK1xuICAgIC8vICAgZGVwcmVjaWF0aW9ucy5nZXRCeVRhbmtUeXBlKFRhbmtUeXBlRW51bS5QUk9QRVJUWSkuZ2V0Qm9ycm93aW5nRXhwZW5zZURlcHJlY2lhdGlvbnMoKS5jbGFpbUFtb3VudCArXG4gICAgLy8gICBNYXRoLmFicyh0aGlzLnByb3BlcnR5RXhwZW5zZXMuc3VtQnkoJ2NsYWltQW1vdW50JykpO1xuXG4gICAgdGhpcy5uZXRSZW50ID0gdGhpcy5ncm9zc1JlbnRBbW91bnQgLVxuICAgICAgdGhpcy5pbnRlcmVzdERlZHVjdGlvbnNBbW91bnQgLVxuICAgICAgdGhpcy5jYXBpdGFsV29ya3NEZWR1Y3Rpb25zQW1vdW50IC1cbiAgICAgIHRoaXMub3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50O1xuICB9XG5cbiAgLyoqXG4gICAqIEBUb2RvIFZpayByZW1vdmUgd2hlbiBUVC0yMDA5IHdpbGwgYmUgaW1wbGVtZW50ZWQuXG4gICAqIFdlIHVzZSB0YXggc3VtbWFyeSBkYXRhIGhlcmUgYmVjYXVzZSBjbGFpbSBhbW91bnQgZnJvbSBkZXByZWNpYXRpb24gaXMgZGlmZmVyZW50XG4gICAqIGZyb20gdGhlIGNsYWltIGFtb3VudCB0aGF0IHdlIGdldCBmcm9tIHRheCBzdW1tYXJ5IChkZXByZWNpYXRpb24gY2xhaW0gYW1vdW50IGlzIG5vdCBhZmZlY3RlZCBieSBwcm9wZXJ0eSBzaGFyZSxcbiAgICogcHJvcGVydHkgY29udHJhY3QgZGF0ZSwgZS50LmMuKS4gRGV0YWlscyBpbiB0aGUgVFQtMjAwOSB0YXNrXG4gICAqL1xuICBwcml2YXRlIGNhbGN1bGF0ZU90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCgpOiBudW1iZXIge1xuICAgIGNvbnN0IHBsYW50QW5kRXF1aXBtZW50QW1vdW50OiBudW1iZXIgPSBNYXRoLmFicyh0aGlzLnRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb24uaXRlbXNcbiAgICAgIC5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5QTEFOVF9BTkRfRVFVSVBNRU5UKT8uYW1vdW50IHx8IDApO1xuXG4gICAgY29uc3QgYm9ycm93aW5nRXhwZW5zZXNBbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKFxuICAgICAgdGhpcy50YXhTdW1tYXJ5UHJvcGVydHlTZWN0aW9uLml0ZW1zXG4gICAgICAgIC5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5CT1JST1dJTkdfRVhQRU5TRVMpPy5hbW91bnQgfHwgMCk7XG5cbiAgICBjb25zdCBvdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbi5pdGVtc1xuICAgICAgLmZpbmRCeSgndGF4UmV0dXJuQ2F0ZWdvcnkuaWQnLCBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtLk9USEVSX1JFTlRBTF9ERURVQ1RJT05TKT8uYW1vdW50IHx8IDApO1xuXG4gICAgcmV0dXJuIHJvdW5kKHBsYW50QW5kRXF1aXBtZW50QW1vdW50ICsgYm9ycm93aW5nRXhwZW5zZXNBbW91bnQgKyBvdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQsIDIpO1xuICB9XG59XG4iXX0=

package/esm2022/lib/models/tax-summary/tax-summary.mjs

@@ -78,7 +78,8 @@ export class TaxSummary {
      */
     get propertyNetTotal() {
         const depreciation = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.depreciation, TaxSummarySectionEnum.PROPERTY_TANK);
-        return this.propertyNetCash - Math.abs(depreciation);
+        const borrowingExpenses = this.property.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.BORROWING_EXPENSES], TaxSummarySectionEnum.PROPERTY_TANK);
+        return this.propertyNetCash - Math.abs(depreciation) - Math.abs(borrowingExpenses);
     }
     /**
      * Other Net Cash = gross income – expenses – tax withheld - tax instalments
@@ -149,4 +150,4 @@ __decorate([
 __decorate([
     Type(() => TaxSummarySection)
 ], TaxSummary.prototype, "summary", void 0);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tax-summary.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/models/tax-summary/tax-summary.ts"],"names":[],"mappings":"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","sourcesContent":["import { TaxSummarySection } from './tax-summary-section';\nimport { Type } from 'class-transformer';\nimport { ReportItemCollection, TAX_RETURN_CATEGORIES } from '../../collections';\nimport { TaxReturnCategoryListEnum } from '../../db/Enums';\nimport { TaxSummarySectionEnum } from '../../db/Enums/tax-summary-section.enum';\nimport { SoleBusiness } from '../sole';\n\n/**\n * @Todo refactor with base model when it will be provided\n * Tax summary report structure\n */\nexport class TaxSummary {\n  @Type(() => TaxSummarySection)\n  work: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  property: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  other: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  sole: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  summary: TaxSummarySection;\n\n  projectedTaxPosition: number;\n\n  get sections(): TaxSummarySection[] {\n    return [this.work, this.property, this.other, this.sole, this.summary];\n  }\n\n  getReportItems(sections: TaxSummarySection[]): ReportItemCollection {\n    return new ReportItemCollection([].concat(...sections.map((section) => section.items.toArray())));\n  }\n\n  get taxPercent(): number {\n    // Check if netAmount is not 0 to avoid division by zero\n    if (!this.summary.netAmount) {\n      return 0;\n    }\n\n    return this.summary.items.findByCategory(TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE).amount / this.summary.netAmount;\n  }\n\n  /**\n   * Work Net Cash = Income - tax withheld - expenses - interest\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get workNetCash(): number {\n    const taxWithheld: number = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, TaxSummarySectionEnum.WORK_TANK);\n\n    return this.workNetTotal - Math.abs(taxWithheld);\n  }\n\n  get income(): number {\n    return this.getReportItems([this.work, this.property, this.sole, this.other]).sumByCategories([\n      ...TAX_RETURN_CATEGORIES.work.income,\n      ...TAX_RETURN_CATEGORIES.property.income,\n      ...TAX_RETURN_CATEGORIES.sole.income,\n      ...TAX_RETURN_CATEGORIES.other.income,\n    ]);\n  }\n\n  get expense(): number {\n    return this.getReportItems([this.work, this.property, this.sole, this.other]).sumByCategories([\n      ...TAX_RETURN_CATEGORIES.work.expenses,\n      ...TAX_RETURN_CATEGORIES.property.expenses,\n      ...TAX_RETURN_CATEGORIES.sole.expenses,\n      ...TAX_RETURN_CATEGORIES.other.expenses,\n    ]);\n  }\n\n  get netCash(): number {\n    return this.workNetCash + this.propertyNetCash + this.soleNetCash + this.otherNetCash;\n  }\n\n  get netTotal(): number {\n    return this.workNetTotal + this.propertyNetTotal + this.soleNetTotal + this.otherNetTotal;\n  }\n\n  /**\n   * Work Net Total = Income - expenses - interest\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get workNetTotal(): number {\n    const income: number = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.income, TaxSummarySectionEnum.WORK_TANK);\n    const expenses: number = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, TaxSummarySectionEnum.WORK_TANK);\n    const interest: number = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.interest, TaxSummarySectionEnum.WORK_TANK);\n\n    return income - Math.abs(expenses) - Math.abs(interest);\n  }\n\n  /**\n   * Property Net Cash (Cash Position) = Rental Income - expenses - interest\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get propertyNetCash(): number {\n    const income: number = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.income, TaxSummarySectionEnum.PROPERTY_TANK);\n    const expenses: number = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.expenses, TaxSummarySectionEnum.PROPERTY_TANK);\n    const interest: number = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.interest, TaxSummarySectionEnum.PROPERTY_TANK);\n\n    return income - Math.abs(expenses) - Math.abs(interest);\n  }\n\n  /**\n   * Property Net Total (Tax Position) = Rental Income - expenses - interest - depreciation\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get propertyNetTotal(): number {\n    const depreciation: number = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.depreciation, TaxSummarySectionEnum.PROPERTY_TANK);\n\n    return this.propertyNetCash - Math.abs(depreciation);\n  }\n\n  /**\n   * Other Net Cash = gross income – expenses – tax withheld - tax instalments\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get otherNetCash(): number {\n    const income: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);\n    const expenses: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);\n    const taxWithheld: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_WITHHELD], TaxSummarySectionEnum.OTHER_TANK);\n    const taxInstalments: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);\n\n    return income - Math.abs(expenses) - Math.abs(taxWithheld) - Math.abs(taxInstalments);\n  }\n\n  /**\n   * Other Net Total = Gross income - expenses + tax offsets + tax instalments + franking credits\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get otherNetTotal(): number {\n    const income: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);\n    const expenses: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);\n    const taxOffsets: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_OFFSETS], TaxSummarySectionEnum.SUMMARY);\n    const taxInstallments: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);\n    const frankingCredits: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.OTHER_TANK);\n\n    return income - Math.abs(expenses) + Math.abs(taxOffsets) + Math.abs(taxInstallments) + Math.abs(frankingCredits);\n  }\n\n  /**\n   * Sole Net Cash = gross income – expenses\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get soleNetCash(): number {\n    const depreciation: number = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.depreciation);\n    const loss: number = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.loss);\n    const lossCurrent: number = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, TaxSummarySectionEnum.SOLE_TANK);\n\n    return this.soleNetTotal - depreciation - loss + lossCurrent;\n  }\n\n  /**\n   * Sole Net Total = Gross income - expenses\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get soleNetTotal(): number {\n    // income + expenses + depreciation + loss\n    const profit: number = this.sole.items.sumByCategories([TaxReturnCategoryListEnum.BUSINESS_INCOME_OR_LOSS]);\n    const lossCurrent: number = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, TaxSummarySectionEnum.SOLE_TANK);\n\n    return profit - lossCurrent;\n  }\n\n  getDeferredBusinessLoss(business: SoleBusiness): number {\n    return this.sole.items\n      .findByCategory(TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES).items\n      .findBy('title', `Item 15c - ${business.name}`)?.amount;\n  }\n\n  getBusinessCloseBalance(business: SoleBusiness): number {\n    return this.sole.items\n      .findByCategory(TaxReturnCategoryListEnum.BUSINESS_INCOME_OR_LOSS).items\n      .findBy('title', `Item 15c - ${business.name}`)?.amount;\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tax-summary.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/models/tax-summary/tax-summary.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF;;;GAGG;AACH,MAAM,OAAO,UAAU;IAkBrB,IAAI,QAAQ;QACV,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,cAAc,CAAC,QAA6B;QAC1C,OAAO,IAAI,oBAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACpG,CAAC;IAED,IAAI,UAAU;QACZ,wDAAwD;QACxD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC3B,OAAO,CAAC,CAAC;SACV;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACxH,CAAC;IAED;;;OAGG;IACH,IAAI,WAAW;QACb,MAAM,WAAW,GAAW,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAElJ,OAAO,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC;YAC5F,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM;YACpC,GAAG,qBAAqB,CAAC,QAAQ,CAAC,MAAM;YACxC,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM;YACpC,GAAG,qBAAqB,CAAC,KAAK,CAAC,MAAM;SACtC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC;YAC5F,GAAG,qBAAqB,CAAC,IAAI,CAAC,QAAQ;YACtC,GAAG,qBAAqB,CAAC,QAAQ,CAAC,QAAQ;YAC1C,GAAG,qBAAqB,CAAC,IAAI,CAAC,QAAQ;YACtC,GAAG,qBAAqB,CAAC,KAAK,CAAC,QAAQ;SACxC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;IACxF,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;IAC5F,CAAC;IAED;;;OAGG;IACH,IAAI,YAAY;QACd,MAAM,MAAM,GAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACrI,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACzI,MAAM,QAAQ,GAAW,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAE5I,OAAO,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACH,IAAI,eAAe;QACjB,MAAM,MAAM,GAAW,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;QACjJ,MAAM,QAAQ,GAAW,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;QACrJ,MAAM,QAAQ,GAAW,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAErJ,OAAO,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACH,IAAI,gBAAgB;QAClB,MAAM,YAAY,GAAW,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CACxE,qBAAqB,CAAC,QAAQ,CAAC,YAAY,EAC3C,qBAAqB,CAAC,aAAa,CACpC,CAAC;QAEF,MAAM,iBAAiB,GAAW,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAC7E,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,EAC9C,qBAAqB,CAAC,aAAa,CACpC,CAAC;QAEF,OAAO,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrF,CAAC;IAED;;;OAGG;IACH,IAAI,YAAY;QACd,MAAM,MAAM,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACxI,MAAM,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC5I,MAAM,WAAW,GAAW,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACrJ,MAAM,cAAc,GAAW,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAE3J,OAAO,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACxF,CAAC;IAED;;;OAGG;IACH,IAAI,aAAa;QACf,MAAM,MAAM,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACxI,MAAM,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC5I,MAAM,UAAU,GAAW,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,WAAW,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAChJ,MAAM,eAAe,GAAW,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC5J,MAAM,eAAe,GAAW,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAE7J,OAAO,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACpH,CAAC;IAED;;;OAGG;IACH,IAAI,WAAW;QACb,MAAM,YAAY,GAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtG,MAAM,IAAI,GAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtF,MAAM,WAAW,GAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAE/I,OAAO,IAAI,CAAC,YAAY,GAAG,YAAY,GAAG,IAAI,GAAG,WAAW,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACH,IAAI,YAAY;QACd,0CAA0C;QAC1C,MAAM,MAAM,GAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,yBAAyB,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAC5G,MAAM,WAAW,GAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAE/I,OAAO,MAAM,GAAG,WAAW,CAAC;IAC9B,CAAC;IAED,uBAAuB,CAAC,QAAsB;QAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK;aACnB,cAAc,CAAC,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,KAAK;aACxE,MAAM,CAAC,OAAO,EAAE,cAAc,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC;IAC5D,CAAC;IAED,uBAAuB,CAAC,QAAsB;QAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK;aACnB,cAAc,CAAC,yBAAyB,CAAC,uBAAuB,CAAC,CAAC,KAAK;aACvE,MAAM,CAAC,OAAO,EAAE,cAAc,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC;IAC5D,CAAC;CACF;AA7KC;IADC,IAAI,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;wCACN;AAGxB;IADC,IAAI,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;4CACF;AAG5B;IADC,IAAI,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;yCACL;AAGzB;IADC,IAAI,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;wCACN;AAGxB;IADC,IAAI,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;2CACH","sourcesContent":["import { TaxSummarySection } from './tax-summary-section';\nimport { Type } from 'class-transformer';\nimport { ReportItemCollection, TAX_RETURN_CATEGORIES } from '../../collections';\nimport { TaxReturnCategoryListEnum } from '../../db/Enums';\nimport { TaxSummarySectionEnum } from '../../db/Enums/tax-summary-section.enum';\nimport { SoleBusiness } from '../sole';\n\n/**\n * @Todo refactor with base model when it will be provided\n * Tax summary report structure\n */\nexport class TaxSummary {\n  @Type(() => TaxSummarySection)\n  work: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  property: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  other: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  sole: TaxSummarySection;\n\n  @Type(() => TaxSummarySection)\n  summary: TaxSummarySection;\n\n  projectedTaxPosition: number;\n\n  get sections(): TaxSummarySection[] {\n    return [this.work, this.property, this.other, this.sole, this.summary];\n  }\n\n  getReportItems(sections: TaxSummarySection[]): ReportItemCollection {\n    return new ReportItemCollection([].concat(...sections.map((section) => section.items.toArray())));\n  }\n\n  get taxPercent(): number {\n    // Check if netAmount is not 0 to avoid division by zero\n    if (!this.summary.netAmount) {\n      return 0;\n    }\n\n    return this.summary.items.findByCategory(TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE).amount / this.summary.netAmount;\n  }\n\n  /**\n   * Work Net Cash = Income - tax withheld - expenses - interest\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get workNetCash(): number {\n    const taxWithheld: number = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, TaxSummarySectionEnum.WORK_TANK);\n\n    return this.workNetTotal - Math.abs(taxWithheld);\n  }\n\n  get income(): number {\n    return this.getReportItems([this.work, this.property, this.sole, this.other]).sumByCategories([\n      ...TAX_RETURN_CATEGORIES.work.income,\n      ...TAX_RETURN_CATEGORIES.property.income,\n      ...TAX_RETURN_CATEGORIES.sole.income,\n      ...TAX_RETURN_CATEGORIES.other.income,\n    ]);\n  }\n\n  get expense(): number {\n    return this.getReportItems([this.work, this.property, this.sole, this.other]).sumByCategories([\n      ...TAX_RETURN_CATEGORIES.work.expenses,\n      ...TAX_RETURN_CATEGORIES.property.expenses,\n      ...TAX_RETURN_CATEGORIES.sole.expenses,\n      ...TAX_RETURN_CATEGORIES.other.expenses,\n    ]);\n  }\n\n  get netCash(): number {\n    return this.workNetCash + this.propertyNetCash + this.soleNetCash + this.otherNetCash;\n  }\n\n  get netTotal(): number {\n    return this.workNetTotal + this.propertyNetTotal + this.soleNetTotal + this.otherNetTotal;\n  }\n\n  /**\n   * Work Net Total = Income - expenses - interest\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get workNetTotal(): number {\n    const income: number = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.income, TaxSummarySectionEnum.WORK_TANK);\n    const expenses: number = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, TaxSummarySectionEnum.WORK_TANK);\n    const interest: number = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.interest, TaxSummarySectionEnum.WORK_TANK);\n\n    return income - Math.abs(expenses) - Math.abs(interest);\n  }\n\n  /**\n   * Property Net Cash (Cash Position) = Rental Income - expenses - interest\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get propertyNetCash(): number {\n    const income: number = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.income, TaxSummarySectionEnum.PROPERTY_TANK);\n    const expenses: number = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.expenses, TaxSummarySectionEnum.PROPERTY_TANK);\n    const interest: number = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.interest, TaxSummarySectionEnum.PROPERTY_TANK);\n\n    return income - Math.abs(expenses) - Math.abs(interest);\n  }\n\n  /**\n   * Property Net Total (Tax Position) = Rental Income - expenses - interest - depreciation\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get propertyNetTotal(): number {\n    const depreciation: number = this.property.items.sumByCategoriesAndSection(\n      TAX_RETURN_CATEGORIES.property.depreciation,\n      TaxSummarySectionEnum.PROPERTY_TANK\n    );\n\n    const borrowingExpenses: number = this.property.items.sumByCategoriesAndSection(\n      [TaxReturnCategoryListEnum.BORROWING_EXPENSES],\n      TaxSummarySectionEnum.PROPERTY_TANK\n    );\n\n    return this.propertyNetCash - Math.abs(depreciation) - Math.abs(borrowingExpenses);\n  }\n\n  /**\n   * Other Net Cash = gross income – expenses – tax withheld - tax instalments\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get otherNetCash(): number {\n    const income: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);\n    const expenses: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);\n    const taxWithheld: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_WITHHELD], TaxSummarySectionEnum.OTHER_TANK);\n    const taxInstalments: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);\n\n    return income - Math.abs(expenses) - Math.abs(taxWithheld) - Math.abs(taxInstalments);\n  }\n\n  /**\n   * Other Net Total = Gross income - expenses + tax offsets + tax instalments + franking credits\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get otherNetTotal(): number {\n    const income: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);\n    const expenses: number = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);\n    const taxOffsets: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_OFFSETS], TaxSummarySectionEnum.SUMMARY);\n    const taxInstallments: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);\n    const frankingCredits: number = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.OTHER_TANK);\n\n    return income - Math.abs(expenses) + Math.abs(taxOffsets) + Math.abs(taxInstallments) + Math.abs(frankingCredits);\n  }\n\n  /**\n   * Sole Net Cash = gross income – expenses\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get soleNetCash(): number {\n    const depreciation: number = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.depreciation);\n    const loss: number = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.loss);\n    const lossCurrent: number = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, TaxSummarySectionEnum.SOLE_TANK);\n\n    return this.soleNetTotal - depreciation - loss + lossCurrent;\n  }\n\n  /**\n   * Sole Net Total = Gross income - expenses\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main\n   */\n  get soleNetTotal(): number {\n    // income + expenses + depreciation + loss\n    const profit: number = this.sole.items.sumByCategories([TaxReturnCategoryListEnum.BUSINESS_INCOME_OR_LOSS]);\n    const lossCurrent: number = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, TaxSummarySectionEnum.SOLE_TANK);\n\n    return profit - lossCurrent;\n  }\n\n  getDeferredBusinessLoss(business: SoleBusiness): number {\n    return this.sole.items\n      .findByCategory(TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES).items\n      .findBy('title', `Item 15c - ${business.name}`)?.amount;\n  }\n\n  getBusinessCloseBalance(business: SoleBusiness): number {\n    return this.sole.items\n      .findByCategory(TaxReturnCategoryListEnum.BUSINESS_INCOME_OR_LOSS).items\n      .findBy('title', `Item 15c - ${business.name}`)?.amount;\n  }\n}\n"]}

package/esm2022/lib/services/http/vehicle/vehicle-claim.service.mjs

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { VehicleClaim } from '../../../models';
 import { RestService } from '../rest/rest-old.service';
 import { AppEventTypeEnum } from '../../../models';
@@ -9,11 +9,18 @@ import { plainToClass } from 'class-transformer';
 import { UserRolesEnum } from '../../../db/Enums/user-roles.enum';
 import * as i0 from "@angular/core";
 export class VehicleClaimService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = VehicleClaim;
         this.url = 'vehicle-claims';
         this.roles = [UserRolesEnum.WORK_TANK, UserRolesEnum.SOLE_TANK];
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.eventDispatcherService.on([AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED]).subscribe(() => {
+            this.refreshCache();
+        });
     }
     add(model) {
         return super.add(model).pipe(map((vehicleClaim) => {
@@ -38,7 +45,7 @@ export class VehicleClaimService extends RestService {
         });
         return combineLatest(batch$);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, decorators: [{
@@ -46,5 +53,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1jbGFpbS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvdmVoaWNsZS92ZWhpY2xlLWNsYWltLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ25ELE9BQU8sRUFBYyxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDakQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFDOztBQU1sRSxNQUFNLE9BQU8sbUJBQW9CLFNBQVEsV0FBMkM7SUFIcEY7O1FBSUUsZUFBVSxHQUF3QixZQUFZLENBQUM7UUFDL0MsUUFBRyxHQUFHLGdCQUFnQixDQUFDO1FBQ3ZCLFVBQUssR0FBRyxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0tBc0M1RDtJQXBDQyxHQUFHLENBQUMsS0FBbUI7UUFDckIsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FDMUIsR0FBRyxDQUFDLENBQUMsWUFBMEIsRUFBRSxFQUFFO1lBQ2pDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsZ0JBQWdCLENBQUMscUJBQXFCLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUV6RyxPQUFPLFlBQVksQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFtQixFQUFFLGNBQXNCLEVBQUU7UUFDbEQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQzFDLEdBQUcsQ0FBQyxDQUFDLFlBQTBCLEVBQUUsRUFBRTtZQUNqQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxDQUFDLGdCQUFnQixDQUFDLHFCQUFxQixFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFFekcsT0FBTyxZQUFZLENBQUM7UUFDdEIsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7SUFFRDs7O09BR0c7SUFDSCxlQUFlLENBQUMsWUFBMEM7UUFDeEQsTUFBTSxNQUFNLEdBQStCLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFtQixFQUFFLEVBQUU7WUFDeEYsTUFBTSxhQUFhLEdBQWlCLFlBQVksQ0FDOUMsWUFBWSxFQUNaLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FDMUUsQ0FBQztZQUVGLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQyxDQUFDLENBQUMsQ0FBQTtRQUVGLE9BQU8sYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQy9CLENBQUM7K0dBeENVLG1CQUFtQjttSEFBbkIsbUJBQW1CLGNBRmxCLE1BQU07OzRGQUVQLG1CQUFtQjtrQkFIL0IsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBWZWhpY2xlQ2xhaW0gYXMgVmVoaWNsZUNsYWltQmFzZSB9IGZyb20gJy4uLy4uLy4uL2RiL01vZGVscy92ZWhpY2xlL3ZlaGljbGUtY2xhaW0nO1xuaW1wb3J0IHsgVmVoaWNsZUNsYWltIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFJlc3RTZXJ2aWNlIH0gZnJvbSAnLi4vcmVzdC9yZXN0LW9sZC5zZXJ2aWNlJztcbmltcG9ydCB7IEFwcEV2ZW50VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgY29tYmluZUxhdGVzdCB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgQXBwRXZlbnQgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgVXNlclJvbGVzRW51bSB9IGZyb20gJy4uLy4uLy4uL2RiL0VudW1zL3VzZXItcm9sZXMuZW51bSc7XG5pbXBvcnQgeyBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBWZWhpY2xlQ2xhaW1TZXJ2aWNlIGV4dGVuZHMgUmVzdFNlcnZpY2U8VmVoaWNsZUNsYWltQmFzZSwgVmVoaWNsZUNsYWltPiB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBWZWhpY2xlQ2xhaW0gPSBWZWhpY2xlQ2xhaW07XG4gIHVybCA9ICd2ZWhpY2xlLWNsYWltcyc7XG4gIHJvbGVzID0gW1VzZXJSb2xlc0VudW0uV09SS19UQU5LLCBVc2VyUm9sZXNFbnVtLlNPTEVfVEFOS107XG5cbiAgYWRkKG1vZGVsOiBWZWhpY2xlQ2xhaW0pOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbT4ge1xuICAgIHJldHVybiBzdXBlci5hZGQobW9kZWwpLnBpcGUoXG4gICAgICBtYXAoKHZlaGljbGVDbGFpbTogVmVoaWNsZUNsYWltKSA9PiB7XG4gICAgICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5kaXNwYXRjaChuZXcgQXBwRXZlbnQoQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX0NSRUFURUQsIHZlaGljbGVDbGFpbSkpO1xuXG4gICAgICAgIHJldHVybiB2ZWhpY2xlQ2xhaW07XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICB1cGRhdGUobW9kZWw6IFZlaGljbGVDbGFpbSwgcXVlcnlQYXJhbXM6IG9iamVjdCA9IHt9KTogT2JzZXJ2YWJsZTxWZWhpY2xlQ2xhaW0+IHtcbiAgICByZXR1cm4gc3VwZXIudXBkYXRlKG1vZGVsLCBxdWVyeVBhcmFtcykucGlwZShcbiAgICAgIG1hcCgodmVoaWNsZUNsYWltOiBWZWhpY2xlQ2xhaW0pID0+IHtcbiAgICAgICAgdGhpcy5ldmVudERpc3BhdGNoZXJTZXJ2aWNlLmRpc3BhdGNoKG5ldyBBcHBFdmVudChBcHBFdmVudFR5cGVFbnVtLlZFSElDTEVfQ0xBSU1fVVBEQVRFRCwgdmVoaWNsZUNsYWltKSk7XG5cbiAgICAgICAgcmV0dXJuIHZlaGljbGVDbGFpbTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBVcGRhdGUgd29ya1VzYWdlIGZvciBhbGwgdmVoaWNsZSBjbGFpbXMgaWYgbG9nYm9vayBiZXN0IHBlcmlvZCBjaGFuZ2VkXG4gICAqIEBUT0RPIFZpazogQmVzdCBwZXJpb2QgbW92ZSB0aGlzIGFuZCByZWxhdGVkIGxvZ2ljIHRvIGJhY2tlbmRcbiAgICovXG4gIHVwZGF0ZVdvcmtVc2FnZShiZXN0TG9nYm9va3M6IEJlc3RWZWhpY2xlTG9nYm9va0NvbGxlY3Rpb24pOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbVtdPiB7XG4gICAgY29uc3QgYmF0Y2gkOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbT5bXSA9ICh0aGlzLmNhY2hlID8/IFtdKS5tYXAoKGNsYWltOiBWZWhpY2xlQ2xhaW0pID0+IHtcbiAgICAgIGNvbnN0IGNsYWltVG9VcGRhdGU6IFZlaGljbGVDbGFpbSA9IHBsYWluVG9DbGFzcyhcbiAgICAgICAgVmVoaWNsZUNsYWltLFxuICAgICAgICBPYmplY3QuYXNzaWduKHt9LCBjbGFpbSwgeyB3b3JrVXNhZ2U6IGJlc3RMb2dib29rcy5nZXRXb3JrVXNhZ2UoY2xhaW0pIH0pXG4gICAgICApO1xuXG4gICAgICByZXR1cm4gdGhpcy51cGRhdGUoY2xhaW1Ub1VwZGF0ZSk7XG4gICAgfSlcblxuICAgIHJldHVybiBjb21iaW5lTGF0ZXN0KGJhdGNoJCk7XG4gIH1cbn1cbiJdfQ==
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1jbGFpbS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvdmVoaWNsZS92ZWhpY2xlLWNsYWltLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNuRCxPQUFPLEVBQWMsYUFBYSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ2pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0MsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQzs7QUFPbEUsTUFBTSxPQUFPLG1CQUFvQixTQUFRLFdBQTJDO0lBS2xGLFlBQTZDLFdBQWdCO1FBQzNELEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUR3QixnQkFBVyxHQUFYLFdBQVcsQ0FBSztRQUo3RCxlQUFVLEdBQXdCLFlBQVksQ0FBQztRQUMvQyxRQUFHLEdBQUcsZ0JBQWdCLENBQUM7UUFDdkIsVUFBSyxHQUFHLENBQUMsYUFBYSxDQUFDLFNBQVMsRUFBRSxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUM7UUFJekQsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEVBQUUsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQzlGLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxHQUFHLENBQUMsS0FBbUI7UUFDckIsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FDMUIsR0FBRyxDQUFDLENBQUMsWUFBMEIsRUFBRSxFQUFFO1lBQ2pDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsZ0JBQWdCLENBQUMscUJBQXFCLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUV6RyxPQUFPLFlBQVksQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFtQixFQUFFLGNBQXNCLEVBQUU7UUFDbEQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQzFDLEdBQUcsQ0FBQyxDQUFDLFlBQTBCLEVBQUUsRUFBRTtZQUNqQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxDQUFDLGdCQUFnQixDQUFDLHFCQUFxQixFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFFekcsT0FBTyxZQUFZLENBQUM7UUFDdEIsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7SUFFRDs7O09BR0c7SUFDSCxlQUFlLENBQUMsWUFBMEM7UUFDeEQsTUFBTSxNQUFNLEdBQStCLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFtQixFQUFFLEVBQUU7WUFDeEYsTUFBTSxhQUFhLEdBQWlCLFlBQVksQ0FDOUMsWUFBWSxFQUNaLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FDMUUsQ0FBQztZQUVGLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQyxDQUFDLENBQUMsQ0FBQTtRQUVGLE9BQU8sYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQy9CLENBQUM7K0dBbkRVLG1CQUFtQixrQkFLVixhQUFhO21IQUx0QixtQkFBbUIsY0FGbEIsTUFBTTs7NEZBRVAsbUJBQW1CO2tCQUgvQixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7MEJBTWMsTUFBTTsyQkFBQyxhQUFhIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBWZWhpY2xlQ2xhaW0gYXMgVmVoaWNsZUNsYWltQmFzZSB9IGZyb20gJy4uLy4uLy4uL2RiL01vZGVscy92ZWhpY2xlL3ZlaGljbGUtY2xhaW0nO1xuaW1wb3J0IHsgVmVoaWNsZUNsYWltIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFJlc3RTZXJ2aWNlIH0gZnJvbSAnLi4vcmVzdC9yZXN0LW9sZC5zZXJ2aWNlJztcbmltcG9ydCB7IEFwcEV2ZW50VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgY29tYmluZUxhdGVzdCB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgQXBwRXZlbnQgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgVXNlclJvbGVzRW51bSB9IGZyb20gJy4uLy4uLy4uL2RiL0VudW1zL3VzZXItcm9sZXMuZW51bSc7XG5pbXBvcnQgeyBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgSUV2ZW50TGlzdGVuZXIgfSBmcm9tICcuLi8uLi8uLi9pbnRlcmZhY2VzJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgVmVoaWNsZUNsYWltU2VydmljZSBleHRlbmRzIFJlc3RTZXJ2aWNlPFZlaGljbGVDbGFpbUJhc2UsIFZlaGljbGVDbGFpbT4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBWZWhpY2xlQ2xhaW0gPSBWZWhpY2xlQ2xhaW07XG4gIHVybCA9ICd2ZWhpY2xlLWNsYWltcyc7XG4gIHJvbGVzID0gW1VzZXJSb2xlc0VudW0uV09SS19UQU5LLCBVc2VyUm9sZXNFbnVtLlNPTEVfVEFOS107XG5cbiAgY29uc3RydWN0b3IoQEluamVjdCgnZW52aXJvbm1lbnQnKSBwcm90ZWN0ZWQgZW52aXJvbm1lbnQ6IGFueSkge1xuICAgIHN1cGVyKGVudmlyb25tZW50KTtcbiAgICB0aGlzLmxpc3RlbkV2ZW50cygpO1xuICB9XG5cbiAgbGlzdGVuRXZlbnRzKCkge1xuICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5vbihbQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX0RFVEFJTFNfVVBEQVRFRF0pLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICB0aGlzLnJlZnJlc2hDYWNoZSgpO1xuICAgIH0pO1xuICB9XG5cbiAgYWRkKG1vZGVsOiBWZWhpY2xlQ2xhaW0pOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbT4ge1xuICAgIHJldHVybiBzdXBlci5hZGQobW9kZWwpLnBpcGUoXG4gICAgICBtYXAoKHZlaGljbGVDbGFpbTogVmVoaWNsZUNsYWltKSA9PiB7XG4gICAgICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5kaXNwYXRjaChuZXcgQXBwRXZlbnQoQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX0NSRUFURUQsIHZlaGljbGVDbGFpbSkpO1xuXG4gICAgICAgIHJldHVybiB2ZWhpY2xlQ2xhaW07XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICB1cGRhdGUobW9kZWw6IFZlaGljbGVDbGFpbSwgcXVlcnlQYXJhbXM6IG9iamVjdCA9IHt9KTogT2JzZXJ2YWJsZTxWZWhpY2xlQ2xhaW0+IHtcbiAgICByZXR1cm4gc3VwZXIudXBkYXRlKG1vZGVsLCBxdWVyeVBhcmFtcykucGlwZShcbiAgICAgIG1hcCgodmVoaWNsZUNsYWltOiBWZWhpY2xlQ2xhaW0pID0+IHtcbiAgICAgICAgdGhpcy5ldmVudERpc3BhdGNoZXJTZXJ2aWNlLmRpc3BhdGNoKG5ldyBBcHBFdmVudChBcHBFdmVudFR5cGVFbnVtLlZFSElDTEVfQ0xBSU1fVVBEQVRFRCwgdmVoaWNsZUNsYWltKSk7XG5cbiAgICAgICAgcmV0dXJuIHZlaGljbGVDbGFpbTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBVcGRhdGUgd29ya1VzYWdlIGZvciBhbGwgdmVoaWNsZSBjbGFpbXMgaWYgbG9nYm9vayBiZXN0IHBlcmlvZCBjaGFuZ2VkXG4gICAqIEBUT0RPIFZpazogQmVzdCBwZXJpb2QgbW92ZSB0aGlzIGFuZCByZWxhdGVkIGxvZ2ljIHRvIGJhY2tlbmRcbiAgICovXG4gIHVwZGF0ZVdvcmtVc2FnZShiZXN0TG9nYm9va3M6IEJlc3RWZWhpY2xlTG9nYm9va0NvbGxlY3Rpb24pOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbVtdPiB7XG4gICAgY29uc3QgYmF0Y2gkOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbT5bXSA9ICh0aGlzLmNhY2hlID8/IFtdKS5tYXAoKGNsYWltOiBWZWhpY2xlQ2xhaW0pID0+IHtcbiAgICAgIGNvbnN0IGNsYWltVG9VcGRhdGU6IFZlaGljbGVDbGFpbSA9IHBsYWluVG9DbGFzcyhcbiAgICAgICAgVmVoaWNsZUNsYWltLFxuICAgICAgICBPYmplY3QuYXNzaWduKHt9LCBjbGFpbSwgeyB3b3JrVXNhZ2U6IGJlc3RMb2dib29rcy5nZXRXb3JrVXNhZ2UoY2xhaW0pIH0pXG4gICAgICApO1xuXG4gICAgICByZXR1cm4gdGhpcy51cGRhdGUoY2xhaW1Ub1VwZGF0ZSk7XG4gICAgfSlcblxuICAgIHJldHVybiBjb21iaW5lTGF0ZXN0KGJhdGNoJCk7XG4gIH1cbn1cbiJdfQ==

package/esm2022/lib/services/report/property/property-transaction-report.service.mjs

@@ -37,7 +37,8 @@ export class PropertyTransactionReportService {
      */
     getTransactions() {
         return this.transactionService.get().pipe(map((transactions) => new TransactionCollection(transactions)
-            .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)));
+            .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
+            .filter(transaction => transaction.claimPercent > 0)));
     }
     /**
      * Get list of asset & capital property depreciations
@@ -57,4 +58,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: i1.PropertyService }, { type: i1.TransactionService }, { type: i1.DepreciationService }, { type: i1.ChartAccountsService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktdHJhbnNhY3Rpb24tcmVwb3J0LnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvcmVwb3J0L3Byb3BlcnR5L3Byb3BlcnR5LXRyYW5zYWN0aW9uLXJlcG9ydC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFjLGFBQWEsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNqRCxPQUFPLEVBQUUseUJBQXlCLEVBQXlCLE1BQU0saUJBQWlCLENBQUM7QUFDbkYsT0FBTyxFQUtMLDRCQUE0QixFQUM1Qix3Q0FBd0MsRUFDeEMsdUNBQXVDLEVBQ3ZDLHFCQUFxQixHQUN0QixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7O0FBRXJDOztHQUVHO0FBSUgsTUFBTSxPQUFPLGdDQUFnQztJQU0zQyxZQUNVLGVBQWdDLEVBQ2hDLGtCQUFzQyxFQUN0QyxtQkFBd0MsRUFDeEMsb0JBQTBDO1FBSDFDLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ3RDLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBcUI7UUFDeEMseUJBQW9CLEdBQXBCLG9CQUFvQixDQUFzQjtJQUVwRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxHQUFHO1FBQ0QsT0FBTyxhQUFhLENBQUM7WUFDbkIsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQW9DO1lBQzVELElBQUksQ0FBQyxlQUFlLEVBQXVDO1lBQzNELElBQUksQ0FBQyxnQkFBZ0IsRUFBd0M7WUFDN0QsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEdBQUcsRUFBeUM7U0FDdkUsQ0FBQyxDQUFDLElBQUksQ0FDTCxHQUFHLENBQUMsQ0FBQyxDQUFDLFVBQVUsRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLGFBQWEsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUM3SixDQUFBO0lBQ0gsQ0FBQztJQUVPLE1BQU0sQ0FDWixZQUFtQyxFQUNuQyxhQUFxQyxFQUNyQyxVQUE4QixFQUM5QixhQUFzQztRQUV0QyxPQUFPLElBQUksNEJBQTRCLENBQUM7WUFDdEMsR0FBRyxJQUFJLHVDQUF1QyxDQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUMsS0FBSztZQUM3RixHQUFHLElBQUksd0NBQXdDLENBQUMsYUFBYSxFQUFFLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQyxLQUFLO1NBQ2hHLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7T0FFRztJQUNLLGVBQWU7UUFDckIsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUN2QyxHQUFHLENBQUMsQ0FBQyxZQUEyQixFQUFFLEVBQUUsQ0FBQyxJQUFJLHFCQUFxQixDQUFDLFlBQVksQ0FBQzthQUN6RSw0QkFBNEIsQ0FBQyx5QkFBeUIsQ0FBQyxRQUFRLENBQUMsQ0FDbEUsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ssZ0JBQWdCO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FDeEMsR0FBRyxDQUFDLENBQUMsYUFBcUMsRUFBRSxFQUFFLENBQUMsYUFBYTthQUN6RCw0QkFBNEIsQ0FBQyx5QkFBeUIsQ0FBQyxRQUFRLENBQUM7WUFDakUsbURBQW1EO2FBQ2xELDJCQUEyQixFQUFFLENBQUMsQ0FDbEMsQ0FBQTtJQUNILENBQUM7K0dBN0RVLGdDQUFnQzttSEFBaEMsZ0NBQWdDLGNBRi9CLE1BQU07OzRGQUVQLGdDQUFnQztrQkFINUMsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzU2VydmljZSwgRGVwcmVjaWF0aW9uU2VydmljZSwgUHJvcGVydHlTZXJ2aWNlLCBUcmFuc2FjdGlvblNlcnZpY2UsIH0gZnJvbSAnLi4vLi4vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBjb21iaW5lTGF0ZXN0IH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBDSEFSVF9BQ0NPVU5UU19DQVRFR09SSUVTLCBQcm9wZXJ0eSwgVHJhbnNhY3Rpb24gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHtcbiAgQ2hhcnRBY2NvdW50c0NvbGxlY3Rpb24sXG4gIENvbGxlY3Rpb25EaWN0aW9uYXJ5LFxuICBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICBQcm9wZXJ0eUNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbURlcHJlY2lhdGlvbkNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbVRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgVHJhbnNhY3Rpb25Db2xsZWN0aW9uLFxufSBmcm9tICcuLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbi8qKlxuICogU2VydmljZSB0byBoYW5kbGUgUHJvcGVydHkgdHJhbnNhY3Rpb25zIHJlcG9ydCBpdGVtcyBkYXRhIChnZXQgaW5jb21lIC8gZXhwZW5zZSByZXBvcnQgaXRlbXMsIGUudC5jLilcbiAqL1xuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgUHJvcGVydHlUcmFuc2FjdGlvblJlcG9ydFNlcnZpY2Uge1xuICBwcm9wZXJ0aWVzOiBQcm9wZXJ0eVtdO1xuICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbjtcbiAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50c0NvbGxlY3Rpb247XG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBwcm9wZXJ0eVNlcnZpY2U6IFByb3BlcnR5U2VydmljZSxcbiAgICBwcml2YXRlIHRyYW5zYWN0aW9uU2VydmljZTogVHJhbnNhY3Rpb25TZXJ2aWNlLFxuICAgIHByaXZhdGUgZGVwcmVjaWF0aW9uU2VydmljZTogRGVwcmVjaWF0aW9uU2VydmljZSxcbiAgICBwcml2YXRlIGNoYXJ0QWNjb3VudHNTZXJ2aWNlOiBDaGFydEFjY291bnRzU2VydmljZVxuICApIHtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgY29sbGVjdGlvbiBvZiByZXBvcnQgaXRlbXMgYmFzZWQgb24gdHJhbnNhY3Rpb25zICYgZGVwcmVjaWF0aW9uc1xuICAgKi9cbiAgZ2V0KCk6IE9ic2VydmFibGU8Q29sbGVjdGlvbkRpY3Rpb25hcnk8UHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbj4+IHtcbiAgICByZXR1cm4gY29tYmluZUxhdGVzdChbXG4gICAgICB0aGlzLnByb3BlcnR5U2VydmljZS5nZXQoKSBhcyBPYnNlcnZhYmxlPFByb3BlcnR5Q29sbGVjdGlvbj4sXG4gICAgICB0aGlzLmdldFRyYW5zYWN0aW9ucygpIGFzIE9ic2VydmFibGU8VHJhbnNhY3Rpb25Db2xsZWN0aW9uPixcbiAgICAgIHRoaXMuZ2V0RGVwcmVjaWF0aW9ucygpIGFzIE9ic2VydmFibGU8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4sXG4gICAgICB0aGlzLmNoYXJ0QWNjb3VudHNTZXJ2aWNlLmdldCgpIGFzIE9ic2VydmFibGU8Q2hhcnRBY2NvdW50c0NvbGxlY3Rpb24+XG4gICAgXSkucGlwZShcbiAgICAgIG1hcCgoW3Byb3BlcnRpZXMsIHRyYW5zYWN0aW9ucywgZGVwcmVjaWF0aW9ucywgY2hhcnRBY2NvdW50c10pID0+IHRoaXMuY3JlYXRlKHRyYW5zYWN0aW9ucywgZGVwcmVjaWF0aW9ucywgcHJvcGVydGllcywgY2hhcnRBY2NvdW50cykuZ3JvdXBCeSgncHJvcGVydHlJZCcpKVxuICAgIClcbiAgfVxuXG4gIHByaXZhdGUgY3JlYXRlKFxuICAgIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLFxuICAgIGRlcHJlY2lhdGlvbnM6IERlcHJlY2lhdGlvbkNvbGxlY3Rpb24sXG4gICAgcHJvcGVydGllczogUHJvcGVydHlDb2xsZWN0aW9uLFxuICAgIGNoYXJ0QWNjb3VudHM6IENoYXJ0QWNjb3VudHNDb2xsZWN0aW9uXG4gICk6IFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24ge1xuICAgIHJldHVybiBuZXcgUHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbihbXG4gICAgICAuLi5uZXcgUHJvcGVydHlSZXBvcnRJdGVtVHJhbnNhY3Rpb25Db2xsZWN0aW9uKHRyYW5zYWN0aW9ucywgcHJvcGVydGllcywgY2hhcnRBY2NvdW50cykuaXRlbXMsXG4gICAgICAuLi5uZXcgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uQ29sbGVjdGlvbihkZXByZWNpYXRpb25zLCBwcm9wZXJ0aWVzLCBjaGFydEFjY291bnRzKS5pdGVtcyxcbiAgICBdKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgY29sbGVjdGlvbiBvZiBwcm9wZXJ0eSB0cmFuc2FjdGlvbnNcbiAgICovXG4gIHByaXZhdGUgZ2V0VHJhbnNhY3Rpb25zKCk6IE9ic2VydmFibGU8VHJhbnNhY3Rpb25Db2xsZWN0aW9uPiB7XG4gICAgcmV0dXJuIHRoaXMudHJhbnNhY3Rpb25TZXJ2aWNlLmdldCgpLnBpcGUoXG4gICAgICBtYXAoKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25bXSkgPT4gbmV3IFRyYW5zYWN0aW9uQ29sbGVjdGlvbih0cmFuc2FjdGlvbnMpXG4gICAgICAgIC5nZXRCeUNoYXJ0QWNjb3VudHNDYXRlZ29yaWVzKENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMucHJvcGVydHkpXG4gICAgICApXG4gICAgKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgbGlzdCBvZiBhc3NldCAmIGNhcGl0YWwgcHJvcGVydHkgZGVwcmVjaWF0aW9uc1xuICAgKi9cbiAgcHJpdmF0ZSBnZXREZXByZWNpYXRpb25zKCk6IE9ic2VydmFibGU8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4ge1xuICAgIHJldHVybiB0aGlzLmRlcHJlY2lhdGlvblNlcnZpY2UuZ2V0KCkucGlwZShcbiAgICAgIG1hcCgoZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbikgPT4gZGVwcmVjaWF0aW9uc1xuICAgICAgICAuZ2V0QnlDaGFydEFjY291bnRzQ2F0ZWdvcmllcyhDSEFSVF9BQ0NPVU5UU19DQVRFR09SSUVTLnByb3BlcnR5KVxuICAgICAgICAvLyB3ZSBkb24ndCBuZWVkIGJvcnJvd2luZyBleHBlbnNlcyBmb3IgdGhpcyByZXBvcnRcbiAgICAgICAgLmdldFdpdGhvdXRCb3Jyb3dpbmdFeHBlbnNlcygpKVxuICAgIClcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktdHJhbnNhY3Rpb24tcmVwb3J0LnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvcmVwb3J0L3Byb3BlcnR5L3Byb3BlcnR5LXRyYW5zYWN0aW9uLXJlcG9ydC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFjLGFBQWEsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNqRCxPQUFPLEVBQUUseUJBQXlCLEVBQXlCLE1BQU0saUJBQWlCLENBQUM7QUFDbkYsT0FBTyxFQUtMLDRCQUE0QixFQUM1Qix3Q0FBd0MsRUFDeEMsdUNBQXVDLEVBQ3ZDLHFCQUFxQixHQUN0QixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7O0FBRXJDOztHQUVHO0FBSUgsTUFBTSxPQUFPLGdDQUFnQztJQU0zQyxZQUNVLGVBQWdDLEVBQ2hDLGtCQUFzQyxFQUN0QyxtQkFBd0MsRUFDeEMsb0JBQTBDO1FBSDFDLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ3RDLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBcUI7UUFDeEMseUJBQW9CLEdBQXBCLG9CQUFvQixDQUFzQjtJQUVwRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxHQUFHO1FBQ0QsT0FBTyxhQUFhLENBQUM7WUFDbkIsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQW9DO1lBQzVELElBQUksQ0FBQyxlQUFlLEVBQXVDO1lBQzNELElBQUksQ0FBQyxnQkFBZ0IsRUFBd0M7WUFDN0QsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEdBQUcsRUFBeUM7U0FDdkUsQ0FBQyxDQUFDLElBQUksQ0FDTCxHQUFHLENBQUMsQ0FBQyxDQUFDLFVBQVUsRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLGFBQWEsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUM3SixDQUFBO0lBQ0gsQ0FBQztJQUVPLE1BQU0sQ0FDWixZQUFtQyxFQUNuQyxhQUFxQyxFQUNyQyxVQUE4QixFQUM5QixhQUFzQztRQUV0QyxPQUFPLElBQUksNEJBQTRCLENBQUM7WUFDdEMsR0FBRyxJQUFJLHVDQUF1QyxDQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUMsS0FBSztZQUM3RixHQUFHLElBQUksd0NBQXdDLENBQUMsYUFBYSxFQUFFLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQyxLQUFLO1NBQ2hHLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7T0FFRztJQUNLLGVBQWU7UUFDckIsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUN2QyxHQUFHLENBQUMsQ0FBQyxZQUEyQixFQUFFLEVBQUUsQ0FBQyxJQUFJLHFCQUFxQixDQUFDLFlBQVksQ0FBQzthQUN6RSw0QkFBNEIsQ0FBQyx5QkFBeUIsQ0FBQyxRQUFRLENBQUM7YUFDaEUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLFlBQVksR0FBRyxDQUFDLENBQUMsQ0FDckQsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ssZ0JBQWdCO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FDeEMsR0FBRyxDQUFDLENBQUMsYUFBcUMsRUFBRSxFQUFFLENBQUMsYUFBYTthQUN6RCw0QkFBNEIsQ0FBQyx5QkFBeUIsQ0FBQyxRQUFRLENBQUM7WUFDakUsbURBQW1EO2FBQ2xELDJCQUEyQixFQUFFLENBQUMsQ0FDbEMsQ0FBQTtJQUNILENBQUM7K0dBOURVLGdDQUFnQzttSEFBaEMsZ0NBQWdDLGNBRi9CLE1BQU07OzRGQUVQLGdDQUFnQztrQkFINUMsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzU2VydmljZSwgRGVwcmVjaWF0aW9uU2VydmljZSwgUHJvcGVydHlTZXJ2aWNlLCBUcmFuc2FjdGlvblNlcnZpY2UsIH0gZnJvbSAnLi4vLi4vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBjb21iaW5lTGF0ZXN0IH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBDSEFSVF9BQ0NPVU5UU19DQVRFR09SSUVTLCBQcm9wZXJ0eSwgVHJhbnNhY3Rpb24gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHtcbiAgQ2hhcnRBY2NvdW50c0NvbGxlY3Rpb24sXG4gIENvbGxlY3Rpb25EaWN0aW9uYXJ5LFxuICBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICBQcm9wZXJ0eUNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbURlcHJlY2lhdGlvbkNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbVRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgVHJhbnNhY3Rpb25Db2xsZWN0aW9uLFxufSBmcm9tICcuLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbi8qKlxuICogU2VydmljZSB0byBoYW5kbGUgUHJvcGVydHkgdHJhbnNhY3Rpb25zIHJlcG9ydCBpdGVtcyBkYXRhIChnZXQgaW5jb21lIC8gZXhwZW5zZSByZXBvcnQgaXRlbXMsIGUudC5jLilcbiAqL1xuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgUHJvcGVydHlUcmFuc2FjdGlvblJlcG9ydFNlcnZpY2Uge1xuICBwcm9wZXJ0aWVzOiBQcm9wZXJ0eVtdO1xuICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbjtcbiAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50c0NvbGxlY3Rpb247XG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBwcm9wZXJ0eVNlcnZpY2U6IFByb3BlcnR5U2VydmljZSxcbiAgICBwcml2YXRlIHRyYW5zYWN0aW9uU2VydmljZTogVHJhbnNhY3Rpb25TZXJ2aWNlLFxuICAgIHByaXZhdGUgZGVwcmVjaWF0aW9uU2VydmljZTogRGVwcmVjaWF0aW9uU2VydmljZSxcbiAgICBwcml2YXRlIGNoYXJ0QWNjb3VudHNTZXJ2aWNlOiBDaGFydEFjY291bnRzU2VydmljZVxuICApIHtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgY29sbGVjdGlvbiBvZiByZXBvcnQgaXRlbXMgYmFzZWQgb24gdHJhbnNhY3Rpb25zICYgZGVwcmVjaWF0aW9uc1xuICAgKi9cbiAgZ2V0KCk6IE9ic2VydmFibGU8Q29sbGVjdGlvbkRpY3Rpb25hcnk8UHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbj4+IHtcbiAgICByZXR1cm4gY29tYmluZUxhdGVzdChbXG4gICAgICB0aGlzLnByb3BlcnR5U2VydmljZS5nZXQoKSBhcyBPYnNlcnZhYmxlPFByb3BlcnR5Q29sbGVjdGlvbj4sXG4gICAgICB0aGlzLmdldFRyYW5zYWN0aW9ucygpIGFzIE9ic2VydmFibGU8VHJhbnNhY3Rpb25Db2xsZWN0aW9uPixcbiAgICAgIHRoaXMuZ2V0RGVwcmVjaWF0aW9ucygpIGFzIE9ic2VydmFibGU8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4sXG4gICAgICB0aGlzLmNoYXJ0QWNjb3VudHNTZXJ2aWNlLmdldCgpIGFzIE9ic2VydmFibGU8Q2hhcnRBY2NvdW50c0NvbGxlY3Rpb24+XG4gICAgXSkucGlwZShcbiAgICAgIG1hcCgoW3Byb3BlcnRpZXMsIHRyYW5zYWN0aW9ucywgZGVwcmVjaWF0aW9ucywgY2hhcnRBY2NvdW50c10pID0+IHRoaXMuY3JlYXRlKHRyYW5zYWN0aW9ucywgZGVwcmVjaWF0aW9ucywgcHJvcGVydGllcywgY2hhcnRBY2NvdW50cykuZ3JvdXBCeSgncHJvcGVydHlJZCcpKVxuICAgIClcbiAgfVxuXG4gIHByaXZhdGUgY3JlYXRlKFxuICAgIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLFxuICAgIGRlcHJlY2lhdGlvbnM6IERlcHJlY2lhdGlvbkNvbGxlY3Rpb24sXG4gICAgcHJvcGVydGllczogUHJvcGVydHlDb2xsZWN0aW9uLFxuICAgIGNoYXJ0QWNjb3VudHM6IENoYXJ0QWNjb3VudHNDb2xsZWN0aW9uXG4gICk6IFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24ge1xuICAgIHJldHVybiBuZXcgUHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbihbXG4gICAgICAuLi5uZXcgUHJvcGVydHlSZXBvcnRJdGVtVHJhbnNhY3Rpb25Db2xsZWN0aW9uKHRyYW5zYWN0aW9ucywgcHJvcGVydGllcywgY2hhcnRBY2NvdW50cykuaXRlbXMsXG4gICAgICAuLi5uZXcgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uQ29sbGVjdGlvbihkZXByZWNpYXRpb25zLCBwcm9wZXJ0aWVzLCBjaGFydEFjY291bnRzKS5pdGVtcyxcbiAgICBdKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgY29sbGVjdGlvbiBvZiBwcm9wZXJ0eSB0cmFuc2FjdGlvbnNcbiAgICovXG4gIHByaXZhdGUgZ2V0VHJhbnNhY3Rpb25zKCk6IE9ic2VydmFibGU8VHJhbnNhY3Rpb25Db2xsZWN0aW9uPiB7XG4gICAgcmV0dXJuIHRoaXMudHJhbnNhY3Rpb25TZXJ2aWNlLmdldCgpLnBpcGUoXG4gICAgICBtYXAoKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25bXSkgPT4gbmV3IFRyYW5zYWN0aW9uQ29sbGVjdGlvbih0cmFuc2FjdGlvbnMpXG4gICAgICAgIC5nZXRCeUNoYXJ0QWNjb3VudHNDYXRlZ29yaWVzKENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMucHJvcGVydHkpXG4gICAgICAgIC5maWx0ZXIodHJhbnNhY3Rpb24gPT4gdHJhbnNhY3Rpb24uY2xhaW1QZXJjZW50ID4gMClcbiAgICAgIClcbiAgICApO1xuICB9XG5cbiAgLyoqXG4gICAqIEdldCBsaXN0IG9mIGFzc2V0ICYgY2FwaXRhbCBwcm9wZXJ0eSBkZXByZWNpYXRpb25zXG4gICAqL1xuICBwcml2YXRlIGdldERlcHJlY2lhdGlvbnMoKTogT2JzZXJ2YWJsZTxEZXByZWNpYXRpb25Db2xsZWN0aW9uPiB7XG4gICAgcmV0dXJuIHRoaXMuZGVwcmVjaWF0aW9uU2VydmljZS5nZXQoKS5waXBlKFxuICAgICAgbWFwKChkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uKSA9PiBkZXByZWNpYXRpb25zXG4gICAgICAgIC5nZXRCeUNoYXJ0QWNjb3VudHNDYXRlZ29yaWVzKENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMucHJvcGVydHkpXG4gICAgICAgIC8vIHdlIGRvbid0IG5lZWQgYm9ycm93aW5nIGV4cGVuc2VzIGZvciB0aGlzIHJlcG9ydFxuICAgICAgICAuZ2V0V2l0aG91dEJvcnJvd2luZ0V4cGVuc2VzKCkpXG4gICAgKVxuICB9XG59XG4iXX0=

package/fesm2022/taxtank-core.mjs

@@ -8074,13 +8074,8 @@ class MyTaxRent {
         this.grossRentAmount = transactions
             .getPropertyTransactions()
             .getIncomeTransactions()
-            .filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)
-            .sumBy('claimAmount') +
-            transactions
-                .getPropertyTransactions()
-                .getIncomeTransactions()
-                .filterBy('chartAccounts.id', ChartAccountsListEnum.OTHER_RENTAL_INCOME)
-                .sumBy('claimAmount');
+            .filterBy('chartAccounts.id', [ChartAccountsListEnum.RENTAL_INCOME, ChartAccountsListEnum.OTHER_RENTAL_INCOME])
+            .sumBy('grossAmount');
         this.interestDeductionsAmount = Math.abs(transactions.getInterestTransactions().sumBy('claimAmount'));
         this.capitalWorksDeductionsAmount = Math.abs(depreciations.getCapitalDepreciations().sumBy('claimAmount'));
         this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
@@ -14814,7 +14809,8 @@ class TaxSummary {
      */
     get propertyNetTotal() {
         const depreciation = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.depreciation, TaxSummarySectionEnum.PROPERTY_TANK);
-        return this.propertyNetCash - Math.abs(depreciation);
+        const borrowingExpenses = this.property.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.BORROWING_EXPENSES], TaxSummarySectionEnum.PROPERTY_TANK);
+        return this.propertyNetCash - Math.abs(depreciation) - Math.abs(borrowingExpenses);
     }
     /**
      * Other Net Cash = gross income – expenses – tax withheld - tax instalments
@@ -15420,11 +15416,18 @@ var VehicleMessagesEnum;
 })(VehicleMessagesEnum || (VehicleMessagesEnum = {}));
 
 class VehicleClaimService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = VehicleClaim;
         this.url = 'vehicle-claims';
         this.roles = [UserRolesEnum.WORK_TANK, UserRolesEnum.SOLE_TANK];
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.eventDispatcherService.on([AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED]).subscribe(() => {
+            this.refreshCache();
+        });
     }
     add(model) {
         return super.add(model).pipe(map((vehicleClaim) => {
@@ -15449,7 +15452,7 @@ class VehicleClaimService extends RestService {
         });
         return combineLatest(batch$);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, decorators: [{
@@ -15457,7 +15460,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * @TODO TT-1777 Alex: extend from rest service when it refactored
@@ -19165,7 +19171,8 @@ class PropertyTransactionReportService {
      */
     getTransactions() {
         return this.transactionService.get().pipe(map((transactions) => new TransactionCollection(transactions)
-            .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)));
+            .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
+            .filter(transaction => transaction.claimPercent > 0)));
     }
     /**
      * Get list of asset & capital property depreciations