taxtank-core 0.16.12 → 0.17.1

package/bundles/taxtank-core.umd.js

@@ -1188,6 +1188,22 @@
         CollectionDictionary.prototype.length = function () {
             return this.keys.length;
         };
+        /**
+         * @Todo find a better solution to get list of the sorted keys
+         * Get array of the "keys" by provided order
+         */
+        CollectionDictionary.prototype.getSortedKeys = function (isDesc) {
+            if (isDesc === void 0) { isDesc = false; }
+            return this.keys.sort(function (a, b) {
+                if (a > b) {
+                    return !isDesc ? 1 : -1;
+                }
+                if (a < b) {
+                    return !isDesc ? -1 : 1;
+                }
+                return 0;
+            });
+        };
         /**
          * Group collection items by passed path into items object
          */
@@ -1860,6 +1876,50 @@
         TankTypeEnum[TankTypeEnum["SOLE"] = 4] = "SOLE";
     })(exports.TankTypeEnum || (exports.TankTypeEnum = {}));
 
+    /**
+     * export table column
+     */
+    var ExportCell = /** @class */ (function () {
+        function ExportCell() {
+        }
+        return ExportCell;
+    }());
+
+    /**
+     * type of export table column value
+     */
+    var ExportCellTypeEnum;
+    (function (ExportCellTypeEnum) {
+        ExportCellTypeEnum[ExportCellTypeEnum["STRING"] = 0] = "STRING";
+        ExportCellTypeEnum[ExportCellTypeEnum["CURRENCY"] = 1] = "CURRENCY";
+        ExportCellTypeEnum[ExportCellTypeEnum["DATE"] = 2] = "DATE";
+    })(ExportCellTypeEnum || (ExportCellTypeEnum = {}));
+
+    var ExportDataTable = /** @class */ (function () {
+        function ExportDataTable() {
+        }
+        return ExportDataTable;
+    }());
+
+    var ExportableCollection = /** @class */ (function (_super) {
+        __extends(ExportableCollection, _super);
+        function ExportableCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ExportableCollection.prototype.getExportFooter = function (type) {
+            return [];
+        };
+        ;
+        ExportableCollection.prototype.export = function (type) {
+            return classTransformer.plainToClass(ExportDataTable, {
+                header: this.getExportHeader(type),
+                body: this.getExportBody(type),
+                footer: [this.getExportFooter(type)]
+            });
+        };
+        return ExportableCollection;
+    }(Collection));
+
     /**
      * Collection of transactions
      */
@@ -2031,8 +2091,29 @@
                 }
             }));
         };
+        TransactionCollection.prototype.getExportHeader = function () {
+            return ['Date', 'Description', 'Debit', 'Credit'];
+        };
+        TransactionCollection.prototype.getExportFooter = function () {
+            return [
+                classTransformer.plainToClass(ExportCell, { value: 'Total', type: ExportCellTypeEnum.STRING }),
+                classTransformer.plainToClass(ExportCell, { value: '', type: ExportCellTypeEnum.STRING }),
+                classTransformer.plainToClass(ExportCell, { value: this.sumBy('debit'), type: ExportCellTypeEnum.CURRENCY }),
+                classTransformer.plainToClass(ExportCell, { value: this.sumBy('credit'), type: ExportCellTypeEnum.CURRENCY })
+            ];
+        };
+        TransactionCollection.prototype.getExportBody = function () {
+            return this.items.map(function (transaction) {
+                return [
+                    classTransformer.plainToClass(ExportCell, { value: transaction.date, type: ExportCellTypeEnum.DATE }),
+                    classTransformer.plainToClass(ExportCell, { value: transaction.description, type: ExportCellTypeEnum.STRING }),
+                    classTransformer.plainToClass(ExportCell, { value: transaction.debit, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: transaction.credit, type: ExportCellTypeEnum.CURRENCY })
+                ];
+            });
+        };
         return TransactionCollection;
-    }(Collection));
+    }(ExportableCollection));
 
     var DepreciationCollection = /** @class */ (function (_super) {
         __extends(DepreciationCollection, _super);
@@ -2243,6 +2324,38 @@
         return LoanCollection;
     }(Collection));
 
+    var LoanPaymentCollection = /** @class */ (function (_super) {
+        __extends(LoanPaymentCollection, _super);
+        function LoanPaymentCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        LoanPaymentCollection.prototype.getExportHeader = function () {
+            return [
+                'Pmt No.',
+                'Date',
+                'Payment Due',
+                'Interest Accrued',
+                'Principal Paid',
+                'Principal Balance',
+                'Payout'
+            ];
+        };
+        LoanPaymentCollection.prototype.getExportBody = function () {
+            return this.items.map(function (payment) {
+                return [
+                    classTransformer.plainToClass(ExportCell, { value: payment.number, type: ExportCellTypeEnum.STRING }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.date, type: ExportCellTypeEnum.DATE }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.paymentDue, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.interestAccrued, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.principalPaid, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.principalBalance, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.payout, type: ExportCellTypeEnum.CURRENCY }),
+                ];
+            });
+        };
+        return LoanPaymentCollection;
+    }(ExportableCollection));
+
     var MessageCollection = /** @class */ (function (_super) {
         __extends(MessageCollection, _super);
         function MessageCollection() {
@@ -4568,34 +4681,6 @@
         LoanVehicleTypeEnum[LoanVehicleTypeEnum["COMMERCIAL_HIRE_PURCHASE"] = 10] = "COMMERCIAL_HIRE_PURCHASE";
     })(exports.LoanVehicleTypeEnum || (exports.LoanVehicleTypeEnum = {}));
 
-    /**
-     * Class with structure of the data-table rows
-     */
-    var ExportRow = /** @class */ (function () {
-        function ExportRow() {
-        }
-        return ExportRow;
-    }());
-
-    /**
-     * Enum which shows what type (in terms of business logic) of the data-table row item
-     */
-    var ExportRowDataTypeEnum;
-    (function (ExportRowDataTypeEnum) {
-        ExportRowDataTypeEnum[ExportRowDataTypeEnum["STRING"] = 0] = "STRING";
-        ExportRowDataTypeEnum[ExportRowDataTypeEnum["CURRENCY"] = 1] = "CURRENCY";
-        ExportRowDataTypeEnum[ExportRowDataTypeEnum["DATE"] = 2] = "DATE";
-    })(ExportRowDataTypeEnum || (ExportRowDataTypeEnum = {}));
-
-    var EXPORT_DATA_TABLE_COLUMNS = [
-        'Pmt No.',
-        'Date',
-        'Payment Due',
-        'Interest Accrued',
-        'Principal Paid',
-        'Principal Balance',
-        'Payout'
-    ];
     // @Todo no base model from backend list
     /**
      * Loan payment class
@@ -4603,17 +4688,6 @@
     var LoanPayment = /** @class */ (function () {
         function LoanPayment() {
         }
-        LoanPayment.prototype.toDataTableRows = function () {
-            return [
-                classTransformer.plainToClass(ExportRow, { data: this.number, type: ExportRowDataTypeEnum.STRING }),
-                classTransformer.plainToClass(ExportRow, { data: this.date, type: ExportRowDataTypeEnum.DATE }),
-                classTransformer.plainToClass(ExportRow, { data: this.paymentDue, type: ExportRowDataTypeEnum.CURRENCY }),
-                classTransformer.plainToClass(ExportRow, { data: this.interestAccrued, type: ExportRowDataTypeEnum.CURRENCY }),
-                classTransformer.plainToClass(ExportRow, { data: this.principalPaid, type: ExportRowDataTypeEnum.CURRENCY }),
-                classTransformer.plainToClass(ExportRow, { data: this.principalBalance, type: ExportRowDataTypeEnum.CURRENCY }),
-                classTransformer.plainToClass(ExportRow, { data: this.payout, type: ExportRowDataTypeEnum.CURRENCY }),
-            ];
-        };
         return LoanPayment;
     }());
     __decorate([
@@ -5482,265 +5556,219 @@
         return ServiceSubscriptionCollection;
     }(Collection));
 
+    /**
+     * collection for tax return category items
+     */
+    var ReportItemCollection = /** @class */ (function (_super) {
+        __extends(ReportItemCollection, _super);
+        function ReportItemCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * Recursively get collection of report items by Tax Summary Section.
+         * Search items which has details
+         */
+        ReportItemCollection.prototype.getBySection = function (section) {
+            var e_1, _a;
+            var result = [];
+            try {
+                for (var _b = __values(this.items), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var reportItem = _c.value;
+                    if (reportItem.details.length && reportItem.taxReturnCategory.section === section) {
+                        result.push(reportItem);
+                    }
+                    else {
+                        result.push.apply(result, __spreadArray([], __read(reportItem.items.getBySection(section).toArray())));
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return this.create(result);
+        };
+        /**
+         * Recursively find report item by Tax Return Category ID
+         */
+        ReportItemCollection.prototype.findByCategory = function (categoryId) {
+            var e_2, _a;
+            var result;
+            try {
+                for (var _b = __values(this.items), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var reportItem = _c.value;
+                    if (result) {
+                        break;
+                    }
+                    if (reportItem.taxReturnCategory.id === categoryId) {
+                        result = reportItem;
+                    }
+                    else {
+                        result = reportItem.items.findByCategory(categoryId);
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return result;
+        };
+        /**
+         * Get Collection of report items by Tax Return Categories IDs
+         */
+        ReportItemCollection.prototype.getByCategories = function (categories) {
+            var _this = this;
+            return this.create(compact__default["default"](categories.map(function (category) { return _this.findByCategory(category); })));
+        };
+        /**
+         * A short call to a chain of methods that we often use.
+         * Get total amount of report items by Tax Return categories and Tax Summary Section.
+         */
+        ReportItemCollection.prototype.sumByCategoriesAndSection = function (categories, section) {
+            return this.getByCategories(categories).getBySection(section).sumBy('amount');
+        };
+        /**
+         * Get collection of all report item details related to passed income source
+         * @TODO Alex: consider to create and move to ReportItemDetailsCollection
+         */
+        ReportItemCollection.prototype.getDetailsByIncomeSource = function (incomeSource) {
+            var e_3, _a;
+            var result = [];
+            try {
+                for (var _b = __values(this.items), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var reportItem = _c.value;
+                    if (reportItem.details.length) {
+                        result.push.apply(result, __spreadArray([], __read(reportItem.details.filter(function (details) { return details.name === incomeSource.name; }))));
+                    }
+                    else {
+                        result.push.apply(result, __spreadArray([], __read(reportItem.items.getDetailsByIncomeSource(incomeSource).toArray())));
+                    }
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            return new Collection(result);
+        };
+        return ReportItemCollection;
+    }(Collection));
+
     exports.TaxReturnCategoryListEnum = void 0;
     (function (TaxReturnCategoryListEnum) {
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SALARY"] = 1] = "SALARY";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES"] = 30] = "ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["EMPLOYER_LUMP_SUM_PAYMENTS"] = 31] = "EMPLOYER_LUMP_SUM_PAYMENTS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ETP"] = 32] = "ETP";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GOVERNMENT_ALLOWANCES"] = 2] = "GOVERNMENT_ALLOWANCES";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GOVERNMENT_PENSIONS"] = 33] = "GOVERNMENT_PENSIONS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ANNUITIES_SUPER_INCOME_STREAMS"] = 3] = "ANNUITIES_SUPER_INCOME_STREAMS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_LUMP_SUM_PAYMENTS"] = 34] = "SUPERANNUATION_LUMP_SUM_PAYMENTS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ATTRIBUTED_PSI_INCOME"] = 4] = "ATTRIBUTED_PSI_INCOME";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION"] = 11] = "DEPRECIATION";
-        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
-        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_INTEREST"] = 5] = "GROSS_INTEREST";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DIVIDENDS"] = 6] = "DIVIDENDS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SHARE_SCHEMES"] = 35] = "SHARE_SCHEMES";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS_TRUSTS"] = 13] = "PARTNERSHIPS_TRUSTS";
-        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PCI_SBE_INCOME"] = 14] = "PCI_SBE_INCOME";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PSI_SBE_INCOME"] = 14] = "PSI_SBE_INCOME";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SOLE_TRADER_BUSINESS_INCOME"] = 38] = "SOLE_TRADER_BUSINESS_INCOME";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_GAINS"] = 15] = "CAPITAL_GAINS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FOREIGN_SOURCE_INCOME"] = 16] = "FOREIGN_SOURCE_INCOME";
-        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_INCOME"] = 17] = "OTHER_INCOME";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BONUSES_FROM_LIFE_INSURANCE"] = 17] = "BONUSES_FROM_LIFE_INSURANCE";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES"] = 39] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_INCOME"] = 40] = "OTHER_INCOME";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_TAX_PAYABLE"] = 19] = "GROSS_TAX_PAYABLE";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_ON_TAXABLE_INCOME"] = 20] = "TAX_ON_TAXABLE_INCOME";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MEDICARE"] = 21] = "MEDICARE";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["STUDENT_LOAN_REPAYMENT"] = 22] = "STUDENT_LOAN_REPAYMENT";
-        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_WITHHELD"] = 24] = "TAX_WITHHELD";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_INSTALMENTS"] = 25] = "TAX_INSTALMENTS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FRANKING_CREDITS"] = 26] = "FRANKING_CREDITS";
-        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_PAYABLE"] = 28] = "TAX_PAYABLE";
     })(exports.TaxReturnCategoryListEnum || (exports.TaxReturnCategoryListEnum = {}));
 
-    exports.TaxReturnCategorySectionEnum = void 0;
-    (function (TaxReturnCategorySectionEnum) {
-        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
-        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
-        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
-        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 4] = "SUMMARY";
-    })(exports.TaxReturnCategorySectionEnum || (exports.TaxReturnCategorySectionEnum = {}));
-
-    /**
-     * collection for tax return category items
-     */
-    var ReportItemCollection = /** @class */ (function (_super) {
-        __extends(ReportItemCollection, _super);
-        function ReportItemCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
+    var TAX_RETURN_CATEGORIES = {
+        work: {
+            income: [
+                exports.TaxReturnCategoryListEnum.SALARY,
+                exports.TaxReturnCategoryListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES,
+                exports.TaxReturnCategoryListEnum.EMPLOYER_LUMP_SUM_PAYMENTS,
+                exports.TaxReturnCategoryListEnum.ETP,
+                exports.TaxReturnCategoryListEnum.GOVERNMENT_ALLOWANCES,
+                exports.TaxReturnCategoryListEnum.GOVERNMENT_PENSIONS,
+                exports.TaxReturnCategoryListEnum.ANNUITIES_SUPER_INCOME_STREAMS,
+                exports.TaxReturnCategoryListEnum.SUPERANNUATION_LUMP_SUM_PAYMENTS,
+                exports.TaxReturnCategoryListEnum.ATTRIBUTED_PSI_INCOME
+            ],
+            expenses: [
+                exports.TaxReturnCategoryListEnum.WORK_EXPENSES
+            ],
+            interest: [
+                exports.TaxReturnCategoryListEnum.GROSS_INTEREST
+            ],
+            taxWithheld: [
+                exports.TaxReturnCategoryListEnum.TAX_WITHHELD
+            ]
+        },
+        property: {
+            income: [
+                exports.TaxReturnCategoryListEnum.GROSS_RENT
+            ],
+            expenses: [
+                exports.TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS
+            ],
+            interest: [
+                exports.TaxReturnCategoryListEnum.INTEREST_DEDUCTIONS
+            ],
+            depreciation: [
+                exports.TaxReturnCategoryListEnum.CAPITAL_WORKS,
+                exports.TaxReturnCategoryListEnum.DEPRECIATION
+            ]
+        },
+        other: {
+            income: [
+                exports.TaxReturnCategoryListEnum.GROSS_INTEREST,
+                exports.TaxReturnCategoryListEnum.DIVIDENDS,
+                exports.TaxReturnCategoryListEnum.SHARE_SCHEMES,
+                exports.TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS,
+                exports.TaxReturnCategoryListEnum.PSI_SBE_INCOME,
+                exports.TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
+                exports.TaxReturnCategoryListEnum.CAPITAL_GAINS,
+                exports.TaxReturnCategoryListEnum.FOREIGN_SOURCE_INCOME,
+                exports.TaxReturnCategoryListEnum.BONUSES_FROM_LIFE_INSURANCE,
+                exports.TaxReturnCategoryListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES,
+                exports.TaxReturnCategoryListEnum.OTHER_INCOME
+            ],
+            expenses: [
+                exports.TaxReturnCategoryListEnum.OTHER_DEDUCTIONS
+            ],
+            taxCredits: [
+                exports.TaxReturnCategoryListEnum.TAX_CREDITS
+            ],
+            taxOffsets: [
+                exports.TaxReturnCategoryListEnum.TAX_OFFSETS
+            ]
         }
-        Object.defineProperty(ReportItemCollection.prototype, "salary", {
-            /**
-             * Work income
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.SALARY)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "workExpenses", {
-            /**
-             * Work expenses
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.WORK_EXPENSES)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "rentalIncome", {
-            /**
-             * Property income
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.GROSS_RENT)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "rentalDeductions", {
-            /**
-             * Property rental deductions
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "propertyExpenses", {
-            /**
-             * Property expenses
-             */
-            get: function () {
-                return this.rentalDeductions + this.borrowingExpenses;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "interestDeductions", {
-            /**
-             * Property interest
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.INTEREST_DEDUCTIONS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "capitalWorks", {
-            /**
-             * Property capital works depreciations
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.CAPITAL_WORKS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "plantEquipment", {
-            /**
-             * Property plant & equipment depreciations
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.DEPRECIATION)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "propertyDepreciations", {
-            /**
-             * Total property depreciaions
-             */
-            get: function () {
-                return this.capitalWorks + this.plantEquipment;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "partnershipsAndTrusts", {
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "pciAndSbeIncome", {
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.PCI_SBE_INCOME)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "capitalGains", {
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.CAPITAL_GAINS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "foreignSourceIncome", {
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.FOREIGN_SOURCE_INCOME)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "otherIncome", {
-            /**
-             * Other income
-             */
-            get: function () {
-                var _a;
-                return (((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.OTHER_INCOME)) === null || _a === void 0 ? void 0 : _a.amount) || 0) +
-                    this.partnershipsAndTrusts +
-                    this.pciAndSbeIncome +
-                    this.capitalGains +
-                    this.foreignSourceIncome;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "otherDeductions", {
-            /**
-             * Other expenses
-             */
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.OTHER_DEDUCTIONS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "taxInstalments", {
-            get: function () {
-                var _a;
-                return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "frankingCredits", {
-            get: function () {
-                var _a;
-                return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.FRANKING_CREDITS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "taxOffsets", {
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_OFFSETS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "borrowingExpenses", {
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(ReportItemCollection.prototype, "grossTaxPayable", {
-            get: function () {
-                var _a;
-                return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        /**
-         * taxWithheld by section (work or other)
-         */
-        ReportItemCollection.prototype.getTaxWithheld = function (section) {
-            if (section === void 0) { section = exports.TaxReturnCategorySectionEnum.WORK_TANK; }
-            var _a;
-            return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.TAX_WITHHELD)) === null || _a === void 0 ? void 0 : _a.details.filter(function (details) { return details.section === section; }).reduce(function (sum, details) { return sum + details.amount; }, 0)) || 0;
-        };
-        ReportItemCollection.prototype.getTaxCreditsCollection = function () {
-            var _a;
-            return new ReportItemCollection(((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_CREDITS)) === null || _a === void 0 ? void 0 : _a.items) || []);
-        };
-        ReportItemCollection.prototype.getTotalAmountByIncomeSourceName = function (name) {
-            return this.items.reduce((function (sum, item) { return sum + item.getAmountByIncomeSourceName(name); }), 0);
-        };
-        ReportItemCollection.prototype.getByCategory = function (category) {
-            return this.items.find(function (item) { return item.taxReturnCategory.id === category; });
-        };
-        return ReportItemCollection;
-    }(Collection));
+    };
 
     /**
      * Collection of tax review
@@ -6241,6 +6269,14 @@
         TaxCalculationTypeEnum[TaxCalculationTypeEnum["ETP_TAX_FREE"] = 9] = "ETP_TAX_FREE";
     })(exports.TaxCalculationTypeEnum || (exports.TaxCalculationTypeEnum = {}));
 
+    exports.TaxReturnCategorySectionEnum = void 0;
+    (function (TaxReturnCategorySectionEnum) {
+        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
+        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
+        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
+        TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 4] = "SUMMARY";
+    })(exports.TaxReturnCategorySectionEnum || (exports.TaxReturnCategorySectionEnum = {}));
+
     exports.TaxReviewStatusEnum = void 0;
     (function (TaxReviewStatusEnum) {
         TaxReviewStatusEnum[TaxReviewStatusEnum["NEW"] = 0] = "NEW";
@@ -7618,16 +7654,6 @@
         AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 42] = "VEHICLE_LOGBOOK_DELETED";
     })(exports.AppEventTypeEnum || (exports.AppEventTypeEnum = {}));
 
-    /**
-     * Data table structure suitable for export
-     */
-    var ExportDataTable = /** @class */ (function () {
-        function ExportDataTable() {
-            this.footer = [];
-        }
-        return ExportDataTable;
-    }());
-
     exports.ExportFormatEnum = void 0;
     (function (ExportFormatEnum) {
         ExportFormatEnum["PDF"] = "PDF";
@@ -8518,6 +8544,13 @@
         };
         return ReportItem;
     }());
+    __decorate([
+        classTransformer.Type(function () { return ReportItem; }),
+        classTransformer.Transform(function (_b) {
+            var value = _b.value;
+            return new ReportItemCollection(value);
+        })
+    ], ReportItem.prototype, "items", void 0);
 
     /**
      * Used in tax summary reports to show specific details relating to an amount in the report.
@@ -8579,7 +8612,7 @@
         });
         Object.defineProperty(TaxSummary.prototype, "taxPercent", {
             get: function () {
-                return this.summary.items.grossTaxPayable / this.summary.netAmount;
+                return this.summary.items.findByCategory(exports.TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE).amount / this.summary.netAmount;
             },
             enumerable: false,
             configurable: true
@@ -8590,7 +8623,8 @@
              * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
              */
             get: function () {
-                return this.workNetTotal - Math.abs(this.summary.items.getTaxWithheld(exports.TaxReturnCategorySectionEnum.WORK_TANK));
+                var taxWithheld = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, exports.TaxSummarySectionEnum.WORK_TANK);
+                return this.workNetTotal - Math.abs(taxWithheld);
             },
             enumerable: false,
             configurable: true
@@ -8601,7 +8635,10 @@
              * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
              */
             get: function () {
-                return this.work.items.salary - Math.abs(this.work.items.workExpenses);
+                var income = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.income, exports.TaxSummarySectionEnum.WORK_TANK);
+                var expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, exports.TaxSummarySectionEnum.WORK_TANK);
+                var interest = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.interest, exports.TaxSummarySectionEnum.WORK_TANK);
+                return income - Math.abs(expenses) - Math.abs(interest);
             },
             enumerable: false,
             configurable: true
@@ -8612,7 +8649,10 @@
              * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
              */
             get: function () {
-                return this.property.items.rentalIncome - Math.abs(this.property.items.rentalDeductions) - Math.abs(this.property.items.interestDeductions);
+                var income = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.income, exports.TaxSummarySectionEnum.PROPERTY_TANK);
+                var expenses = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.expenses, exports.TaxSummarySectionEnum.PROPERTY_TANK);
+                var interest = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.interest, exports.TaxSummarySectionEnum.PROPERTY_TANK);
+                return income - Math.abs(expenses) - Math.abs(interest);
             },
             enumerable: false,
             configurable: true
@@ -8623,7 +8663,8 @@
              * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
              */
             get: function () {
-                return this.propertyNetCash - Math.abs(this.property.items.propertyDepreciations);
+                var depreciation = this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.depreciation, exports.TaxSummarySectionEnum.PROPERTY_TANK);
+                return this.propertyNetCash - Math.abs(depreciation);
             },
             enumerable: false,
             configurable: true
@@ -8634,7 +8675,11 @@
              * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
              */
             get: function () {
-                return this.otherIncome.items.otherIncome - Math.abs(this.otherIncome.items.otherDeductions) - Math.abs(this.summary.items.getTaxWithheld(exports.TaxReturnCategorySectionEnum.OTHER_INCOME)) - Math.abs(this.summary.items.taxInstalments);
+                var income = this.otherIncome.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_INCOME);
+                var expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_INCOME);
+                var taxWithheld = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_WITHHELD], exports.TaxSummarySectionEnum.OTHER_INCOME);
+                var taxInstalments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_INCOME);
+                return income - Math.abs(expenses) - Math.abs(taxWithheld) - Math.abs(taxInstalments);
             },
             enumerable: false,
             configurable: true
@@ -8645,7 +8690,12 @@
              * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
              */
             get: function () {
-                return this.otherIncome.items.otherIncome - Math.abs(this.otherIncome.items.otherDeductions) + Math.abs(this.summary.items.taxOffsets) + Math.abs(this.summary.items.taxInstalments) + Math.abs(this.summary.items.frankingCredits);
+                var income = this.otherIncome.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_INCOME);
+                var expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_INCOME);
+                var taxOffsets = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_OFFSETS], exports.TaxSummarySectionEnum.SUMMARY);
+                var taxInstallments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_INCOME);
+                var frankingCredits = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.FRANKING_CREDITS], exports.TaxSummarySectionEnum.OTHER_INCOME);
+                return income - Math.abs(expenses) + Math.abs(taxOffsets) + Math.abs(taxInstallments) + Math.abs(frankingCredits);
             },
             enumerable: false,
             configurable: true
@@ -11686,43 +11736,29 @@
                         }] }];
         } });
 
-    /**
-     * Service to handle array-like data table logic
-     */
-    var DataTableService = /** @class */ (function () {
-        function DataTableService(currencyPipe, datePipe) {
+    var ExportFormatterService = /** @class */ (function () {
+        function ExportFormatterService(currencyPipe, datePipe) {
             this.currencyPipe = currencyPipe;
             this.datePipe = datePipe;
         }
-        DataTableService.prototype.initDataTable = function (exportableModels, headerColumns) {
-            return classTransformer.plainToClass(ExportDataTable, {
-                header: headerColumns,
-                rows: this.getDataTableRows(exportableModels),
-            });
-        };
-        /**
-         * Get data for the exporting table rows
-         */
-        DataTableService.prototype.getDataTableRows = function (exportableModels) {
+        ExportFormatterService.prototype.format = function (rows) {
             var _this = this;
-            return exportableModels.map(function (model) {
-                return model.toDataTableRows().map(function (row) {
-                    switch (row.type) {
-                        case ExportRowDataTypeEnum.DATE:
-                            return _this.datePipe.transform(row.data, 'dd/MM/YYYY').toString();
-                        case ExportRowDataTypeEnum.CURRENCY:
-                            return _this.currencyPipe.transform(row.data).toString();
-                        default:
-                            return row.data.toString();
-                    }
-                });
-            });
+            return rows.map(function (row) { return row.map(function (column) {
+                switch (column.type) {
+                    case ExportCellTypeEnum.DATE:
+                        return _this.datePipe.transform(column.value, 'dd/MM/YYYY').toString();
+                    case ExportCellTypeEnum.CURRENCY:
+                        return _this.currencyPipe.transform(column.value).toString();
+                    default:
+                        return column.value.toString();
+                }
+            }); });
         };
-        return DataTableService;
+        return ExportFormatterService;
     }());
-    DataTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DataTableService, deps: [{ token: i1__namespace$1.CurrencyPipe }, { token: i1__namespace$1.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DataTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DataTableService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DataTableService, decorators: [{
+    ExportFormatterService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, deps: [{ token: i1__namespace$1.CurrencyPipe }, { token: i1__namespace$1.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ExportFormatterService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12285,10 +12321,12 @@
     };
 
     /**
+     * @TODO vik refactor
      * Service to work with PDF (generate, download, e.t.c.)
      */
     var PdfService = /** @class */ (function () {
-        function PdfService() {
+        function PdfService(formatter) {
+            this.formatter = formatter;
         }
         /**
          * Export file from provided HTML tables
@@ -12313,7 +12351,7 @@
             this.setDocumentTitle(pdf, title);
             this.setDocumentLogo(pdf);
             dataTables.forEach(function (dataTable) {
-                autoTable__default["default"](pdf, Object.assign({ head: [dataTable.header], body: dataTable.rows, foot: [dataTable.footer || []] }, _this.setTableOptions(pdf, dataTable.caption)));
+                autoTable__default["default"](pdf, Object.assign({ head: [dataTable.header], body: _this.formatter.format(dataTable.body), foot: _this.formatter.format(dataTable.footer) }, _this.setTableOptions(pdf, dataTable.caption)));
             });
             return pdf;
         };
@@ -12370,14 +12408,14 @@
         };
         return PdfService;
     }());
-    PdfService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfService, deps: [{ token: ExportFormatterService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     PdfService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }] });
+            }], ctorParameters: function () { return [{ type: ExportFormatterService }]; } });
 
     /**
      * Service to handle Property transactions report items data (get income / expense report items, e.t.c.)
@@ -12568,54 +12606,6 @@
                     }]
             }] });
 
-    /**
-     * Service to work with holding costs (transactions related to vacant land property)
-     */
-    var PropertyHoldingCostsService = /** @class */ (function () {
-        function PropertyHoldingCostsService(pdfService, currencyPipe, datePipe) {
-            this.pdfService = pdfService;
-            this.currencyPipe = currencyPipe;
-            this.datePipe = datePipe;
-            this.url = 'transactions';
-            this.modelClass = Transaction;
-        }
-        PropertyHoldingCostsService.prototype.initDataTable = function (holdingCosts) {
-            return classTransformer.plainToClass(ExportDataTable, {
-                header: ['Date', 'Description', 'Debit', 'Credit'],
-                rows: this.getDataTableRows(holdingCosts),
-                footer: [
-                    'Total',
-                    '',
-                    this.currencyPipe.transform(holdingCosts.sumBy('debit')).toString(),
-                    this.currencyPipe.transform(holdingCosts.sumBy('credit')).toString(),
-                ]
-            });
-        };
-        /**
-         * Get data for the exporting table rows
-         */
-        PropertyHoldingCostsService.prototype.getDataTableRows = function (holdingCosts) {
-            var _this = this;
-            return holdingCosts.items.map(function (transaction) {
-                return [
-                    _this.datePipe.transform(transaction.date, 'dd/MM/YYYY').toString(),
-                    transaction.description,
-                    _this.currencyPipe.transform(transaction.debit).toString(),
-                    _this.currencyPipe.transform(transaction.credit).toString()
-                ];
-            });
-        };
-        return PropertyHoldingCostsService;
-    }());
-    PropertyHoldingCostsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyHoldingCostsService, deps: [{ token: PdfService }, { token: i1__namespace$1.CurrencyPipe }, { token: i1__namespace$1.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyHoldingCostsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyHoldingCostsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyHoldingCostsService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () { return [{ type: PdfService }, { type: i1__namespace$1.CurrencyPipe }, { type: i1__namespace$1.DatePipe }]; } });
-
     /**
      * Service for work with Property Categories
      */
@@ -14100,10 +14090,6 @@
         return VehicleClaimForm;
     }(AbstractForm));
 
-    /**
-     * Public API Surface of tt-core
-     */
-
     /**
      * Generated bundle index. Do not edit.
      */
@@ -14176,7 +14162,6 @@
     exports.DEFAULT_VEHICLE_EXPENSE = DEFAULT_VEHICLE_EXPENSE;
     exports.DEPRECIATION_GROUPS = DEPRECIATION_GROUPS;
     exports.DOCUMENT_FILE_TYPES = DOCUMENT_FILE_TYPES;
-    exports.DataTableService = DataTableService;
     exports.Depreciation = Depreciation;
     exports.DepreciationCapitalProject = DepreciationCapitalProject;
     exports.DepreciationCapitalProjectService = DepreciationCapitalProjectService;
@@ -14195,7 +14180,6 @@
     exports.DocumentFolder = DocumentFolder;
     exports.DocumentFolderService = DocumentFolderService;
     exports.ENDPOINTS = ENDPOINTS;
-    exports.EXPORT_DATA_TABLE_COLUMNS = EXPORT_DATA_TABLE_COLUMNS;
     exports.EmployeeCollection = EmployeeCollection;
     exports.EmployeeDetails = EmployeeDetails;
     exports.EmployeeInvite = EmployeeInvite;
@@ -14205,6 +14189,8 @@
     exports.EquityPositionChartService = EquityPositionChartService;
     exports.EventDispatcherService = EventDispatcherService;
     exports.ExportDataTable = ExportDataTable;
+    exports.ExportFormatterService = ExportFormatterService;
+    exports.ExportableCollection = ExportableCollection;
     exports.FinancialYear = FinancialYear;
     exports.Firm = Firm;
     exports.FirmService = FirmService;
@@ -14224,6 +14210,7 @@
     exports.Loan = Loan;
     exports.LoanCollection = LoanCollection;
     exports.LoanPayment = LoanPayment;
+    exports.LoanPaymentCollection = LoanPaymentCollection;
     exports.LoanPayout = LoanPayout;
     exports.LoanService = LoanService;
     exports.LogbookPeriod = LogbookPeriod;
@@ -14257,7 +14244,6 @@
     exports.PropertyEquityChartData = PropertyEquityChartData;
     exports.PropertyEquityChartItem = PropertyEquityChartItem;
     exports.PropertyForecast = PropertyForecast;
-    exports.PropertyHoldingCostsService = PropertyHoldingCostsService;
     exports.PropertyReportItem = PropertyReportItem;
     exports.PropertyReportItemCollection = PropertyReportItemCollection;
     exports.PropertyReportItemDepreciationCollection = PropertyReportItemDepreciationCollection;
@@ -14295,6 +14281,7 @@
     exports.SoleForecastService = SoleForecastService;
     exports.SseService = SseService;
     exports.SubscriptionService = SubscriptionService;
+    exports.TAX_RETURN_CATEGORIES = TAX_RETURN_CATEGORIES;
     exports.TYPE_LOAN = TYPE_LOAN;
     exports.TaxExemption = TaxExemption;
     exports.TaxExemptionMetadata = TaxExemptionMetadata;