taxtank-core 0.32.108 → 0.32.109
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/collections/report/property/property-report-item-depreciation.collection.mjs +2 -2
- package/esm2022/lib/collections/report/property/property-report-item-transaction.collection.mjs +2 -2
- package/esm2022/lib/collections/report/property/property-report-item.collection.mjs +1 -1
- package/esm2022/lib/models/report/property/property-report-item-transaction.mjs +1 -1
- package/esm2022/lib/services/report/property/property-transaction-report.service.mjs +12 -3
- package/fesm2022/taxtank-core.mjs +117 -108
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/collections/report/property/property-report-item-depreciation.collection.d.ts +2 -2
- package/lib/collections/report/property/property-report-item-transaction.collection.d.ts +3 -3
- package/lib/collections/report/property/property-report-item.collection.d.ts +1 -1
- package/lib/models/report/property/property-report-item-transaction.d.ts +3 -3
- package/lib/services/report/property/property-transaction-report.service.d.ts +4 -3
- package/package.json +1 -1
package/esm2022/lib/collections/report/property/property-report-item-depreciation.collection.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PropertyReportItemDepreciation } from '../../../models/report
|
|
1
|
+
import { PropertyReportItemDepreciation } from '../../../models/report';
|
|
2
2
|
import { PropertyReportItemCollection } from './property-report-item.collection';
|
|
3
3
|
/**
|
|
4
4
|
* Collection to work with depreciation-based property report items
|
|
@@ -18,4 +18,4 @@ export class PropertyReportItemDepreciationCollection extends PropertyReportItem
|
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0tZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvcmVwb3J0L3Byb3BlcnR5L3Byb3BlcnR5LXJlcG9ydC1pdGVtLWRlcHJlY2lhdGlvbi5jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3hFLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBR2pGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHdDQUF5QyxTQUFRLDRCQUE0QjtJQUN4RixZQUNFLGFBQXFDLEVBQ3JDLFVBQThCLEVBQzlCLGFBQXdDO1FBRXhDLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQ3pELENBQUM7SUFFTyxRQUFRLENBQUMsYUFBcUMsRUFBRSxVQUE4QixFQUFFLGFBQXdDO1FBQzlILElBQUksQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBRWhCLFVBQVUsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsUUFBa0IsRUFBRSxFQUFFO1lBQzlDLE1BQU0sbUJBQW1CLEdBQUcsYUFBYSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUUvRixtQkFBbUIsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBWSxFQUFFLEVBQUU7Z0JBQzVDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksOEJBQThCLENBQ2hELG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFDN0IsUUFBUSxFQUNSLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQyxDQUNqRixDQUFDLENBQUM7WUFDTCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50cywgUHJvcGVydHkgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgRGVwcmVjaWF0aW9uQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uL2RlcHJlY2lhdGlvbi5jb2xsZWN0aW9uJztcbmltcG9ydCB7IFByb3BlcnR5UmVwb3J0SXRlbURlcHJlY2lhdGlvbiB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQnO1xuaW1wb3J0IHsgUHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbiB9IGZyb20gJy4vcHJvcGVydHktcmVwb3J0LWl0ZW0uY29sbGVjdGlvbic7XG5pbXBvcnQgeyBQcm9wZXJ0eUNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi9wcm9wZXJ0eSc7XG5cbi8qKlxuICogQ29sbGVjdGlvbiB0byB3b3JrIHdpdGggZGVwcmVjaWF0aW9uLWJhc2VkIHByb3BlcnR5IHJlcG9ydCBpdGVtc1xuICovXG5leHBvcnQgY2xhc3MgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uQ29sbGVjdGlvbiBleHRlbmRzIFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24ge1xuICBjb25zdHJ1Y3RvcihcbiAgICBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICAgIHByb3BlcnRpZXM6IFByb3BlcnR5Q29sbGVjdGlvbixcbiAgICBjaGFydEFjY291bnRzOiBDb2xsZWN0aW9uPENoYXJ0QWNjb3VudHM+XG4gICkge1xuICAgIHN1cGVyKCk7XG4gICAgdGhpcy5zZXRJdGVtcyhkZXByZWNpYXRpb25zLCBwcm9wZXJ0aWVzLCBjaGFydEFjY291bnRzKVxuICB9XG5cbiAgcHJpdmF0ZSBzZXRJdGVtcyhkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLCBwcm9wZXJ0aWVzOiBQcm9wZXJ0eUNvbGxlY3Rpb24sIGNoYXJ0QWNjb3VudHM6IENvbGxlY3Rpb248Q2hhcnRBY2NvdW50cz4pOiB2b2lkIHtcbiAgICB0aGlzLml0ZW1zID0gW107XG5cbiAgICBwcm9wZXJ0aWVzLml0ZW1zLmZvckVhY2goKHByb3BlcnR5OiBQcm9wZXJ0eSkgPT4ge1xuICAgICAgY29uc3QgZGVwcmVjaWF0aW9uc0J5VHlwZSA9IGRlcHJlY2lhdGlvbnMuZmlsdGVyQnkoJ3Byb3BlcnR5LmlkJywgcHJvcGVydHkuaWQpLmdyb3VwQnkoJ3R5cGUnKTtcblxuICAgICAgZGVwcmVjaWF0aW9uc0J5VHlwZS5rZXlzLm1hcCgodHlwZTogc3RyaW5nKSA9PiB7XG4gICAgICAgIHRoaXMuaXRlbXMucHVzaChuZXcgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uKFxuICAgICAgICAgIGRlcHJlY2lhdGlvbnNCeVR5cGUuZ2V0KHR5cGUpLFxuICAgICAgICAgIHByb3BlcnR5LFxuICAgICAgICAgIGNoYXJ0QWNjb3VudHMuZmluZEJ5KCdpZCcsIGRlcHJlY2lhdGlvbnNCeVR5cGUuZ2V0KHR5cGUpLmZpcnN0LmNoYXJ0QWNjb3VudHMuaWQpXG4gICAgICAgICkpO1xuICAgICAgfSk7XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
package/esm2022/lib/collections/report/property/property-report-item-transaction.collection.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PropertyReportItemTransaction } from '../../../models/report
|
|
1
|
+
import { PropertyReportItemTransaction } from '../../../models/report';
|
|
2
2
|
import { PropertyReportItemCollection } from './property-report-item.collection';
|
|
3
3
|
/**
|
|
4
4
|
* Collection to work with transaction-based property report items
|
|
@@ -18,4 +18,4 @@ export class PropertyReportItemTransactionCollection extends PropertyReportItemC
|
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0tdHJhbnNhY3Rpb24uY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9jb2xsZWN0aW9ucy9yZXBvcnQvcHJvcGVydHkvcHJvcGVydHktcmVwb3J0LWl0ZW0tdHJhbnNhY3Rpb24uY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUdqRjs7R0FFRztBQUNILE1BQU0sT0FBTyx1Q0FBd0MsU0FBUSw0QkFBNEI7SUFDdkYsWUFDRSxZQUFtQyxFQUNuQyxVQUE4QixFQUM5QixhQUF3QztRQUV4QyxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxFQUFFLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRU8sUUFBUSxDQUFDLFlBQW1DLEVBQUUsVUFBOEIsRUFBRSxhQUF3QztRQUM1SCxJQUFJLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUNoQixVQUFVLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLFFBQWtCLEVBQUUsRUFBRTtZQUM5QyxNQUFNLHNCQUFzQixHQUFHLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1lBRTFHLHNCQUFzQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxjQUFzQixFQUFFLEVBQUU7Z0JBQ3pELElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksNkJBQTZCLENBQy9DLHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsRUFDMUMsUUFBUSxFQUNSLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsY0FBYyxDQUFDLENBQzVDLENBQUMsQ0FBQztZQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vY29sbGVjdGlvbic7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi90cmFuc2FjdGlvbic7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzLCBQcm9wZXJ0eSB9IGZyb20gJy4uLy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBQcm9wZXJ0eVJlcG9ydEl0ZW1UcmFuc2FjdGlvbiB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQnO1xuaW1wb3J0IHsgUHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbiB9IGZyb20gJy4vcHJvcGVydHktcmVwb3J0LWl0ZW0uY29sbGVjdGlvbic7XG5pbXBvcnQgeyBQcm9wZXJ0eUNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi9wcm9wZXJ0eSc7XG5cbi8qKlxuICogQ29sbGVjdGlvbiB0byB3b3JrIHdpdGggdHJhbnNhY3Rpb24tYmFzZWQgcHJvcGVydHkgcmVwb3J0IGl0ZW1zXG4gKi9cbmV4cG9ydCBjbGFzcyBQcm9wZXJ0eVJlcG9ydEl0ZW1UcmFuc2FjdGlvbkNvbGxlY3Rpb24gZXh0ZW5kcyBQcm9wZXJ0eVJlcG9ydEl0ZW1Db2xsZWN0aW9uIHtcbiAgY29uc3RydWN0b3IoXG4gICAgdHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24sXG4gICAgcHJvcGVydGllczogUHJvcGVydHlDb2xsZWN0aW9uLFxuICAgIGNoYXJ0QWNjb3VudHM6IENvbGxlY3Rpb248Q2hhcnRBY2NvdW50cz5cbiAgKSB7XG4gICAgc3VwZXIoKTtcbiAgICB0aGlzLnNldEl0ZW1zKHRyYW5zYWN0aW9ucywgcHJvcGVydGllcywgY2hhcnRBY2NvdW50cyk7XG4gIH1cblxuICBwcml2YXRlIHNldEl0ZW1zKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLCBwcm9wZXJ0aWVzOiBQcm9wZXJ0eUNvbGxlY3Rpb24sIGNoYXJ0QWNjb3VudHM6IENvbGxlY3Rpb248Q2hhcnRBY2NvdW50cz4pOiB2b2lkIHtcbiAgICB0aGlzLml0ZW1zID0gW107XG4gICAgcHJvcGVydGllcy5pdGVtcy5mb3JFYWNoKChwcm9wZXJ0eTogUHJvcGVydHkpID0+IHtcbiAgICAgIGNvbnN0IHRyYW5zYWN0aW9uc0RpY3Rpb25hcnkgPSB0cmFuc2FjdGlvbnMuZ2V0QnlQcm9wZXJ0aWVzSWRzKFtwcm9wZXJ0eS5pZF0pLmdyb3VwQnkoJ2NoYXJ0QWNjb3VudHMuaWQnKTtcblxuICAgICAgdHJhbnNhY3Rpb25zRGljdGlvbmFyeS5rZXlzLm1hcCgoY2hhcnRBY2NvdW50SWQ6IHN0cmluZykgPT4ge1xuICAgICAgICB0aGlzLml0ZW1zLnB1c2gobmV3IFByb3BlcnR5UmVwb3J0SXRlbVRyYW5zYWN0aW9uKFxuICAgICAgICAgIHRyYW5zYWN0aW9uc0RpY3Rpb25hcnkuZ2V0KGNoYXJ0QWNjb3VudElkKSxcbiAgICAgICAgICBwcm9wZXJ0eSxcbiAgICAgICAgICBjaGFydEFjY291bnRzLmZpbmRCeSgnaWQnLCArY2hhcnRBY2NvdW50SWQpXG4gICAgICAgICkpO1xuICAgICAgfSk7XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -10,4 +10,4 @@ export class PropertyReportItemCollection extends Collection {
|
|
|
10
10
|
return this.create(this.items.filter((item) => item.isExpense()));
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0uY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9jb2xsZWN0aW9ucy9yZXBvcnQvcHJvcGVydHkvcHJvcGVydHktcmVwb3J0LWl0ZW0uY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUM7O0dBRUc7QUFDSCxNQUFNLE9BQU8sNEJBQTZCLFNBQVEsVUFBOEI7SUFDOUUsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FDaEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUF3QixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FDakUsQ0FBQztJQUNKLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUNoQixJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQXdCLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUNsRSxDQUFDO0lBQ0osQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgUHJvcGVydHlSZXBvcnRJdGVtIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL3JlcG9ydCc7XG5cbi8qKlxuICogQmFzZSBjb2xsZWN0aW9uIHRvIHdvcmsgd2l0aCBwcm9wZXJ0eSByZXBvcnQgaXRlbXNcbiAqL1xuZXhwb3J0IGNsYXNzIFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24gZXh0ZW5kcyBDb2xsZWN0aW9uPFByb3BlcnR5UmVwb3J0SXRlbT4ge1xuICBnZXRJbmNvbWVzKCk6IHRoaXMge1xuICAgIHJldHVybiB0aGlzLmNyZWF0ZShcbiAgICAgIHRoaXMuaXRlbXMuZmlsdGVyKChpdGVtOiBQcm9wZXJ0eVJlcG9ydEl0ZW0pID0+IGl0ZW0uaXNJbmNvbWUoKSlcbiAgICApO1xuICB9XG5cbiAgZ2V0RXhwZW5zZXMoKTogdGhpcyB7XG4gICAgcmV0dXJuIHRoaXMuY3JlYXRlKFxuICAgICAgdGhpcy5pdGVtcy5maWx0ZXIoKGl0ZW06IFByb3BlcnR5UmVwb3J0SXRlbSkgPT4gaXRlbS5pc0V4cGVuc2UoKSlcbiAgICApO1xuICB9XG59XG4iXX0=
|
|
@@ -9,4 +9,4 @@ export class PropertyReportItemTransaction extends PropertyReportItem {
|
|
|
9
9
|
this.description = chartAccounts.name;
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0tdHJhbnNhY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9wcm9wZXJ0eS9wcm9wZXJ0eS1yZXBvcnQtaXRlbS10cmFuc2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUs1RDs7R0FFRztBQUNILE1BQU0sT0FBTyw2QkFBOEIsU0FBUSxrQkFBa0I7SUFDbkUsWUFDRSxZQUFtQyxFQUNuQyxRQUFrQixFQUNsQixhQUE0QjtRQUU1QixLQUFLLENBQUMsUUFBUSxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBQy9CLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDMUQsSUFBSSxDQUFDLFdBQVcsR0FBRyxhQUFhLENBQUMsSUFBSSxDQUFBO0lBQ3ZDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFByb3BlcnR5UmVwb3J0SXRlbSB9IGZyb20gJy4vcHJvcGVydHktcmVwb3J0LWl0ZW0nO1xuaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgUHJvcGVydHkgfSBmcm9tICcuLi8uLi9wcm9wZXJ0eSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzIH0gZnJvbSAnLi4vLi4vY2hhcnQtYWNjb3VudHMnO1xuXG4vKipcbiAqIENsYXNzIHdpdGggdHJhbnNhY3Rpb24tYmFzZWQgcHJvcGVydHkgdHJhbnNhY3Rpb25zIHJlcG9ydCBlbnRpdGllc1xuICovXG5leHBvcnQgY2xhc3MgUHJvcGVydHlSZXBvcnRJdGVtVHJhbnNhY3Rpb24gZXh0ZW5kcyBQcm9wZXJ0eVJlcG9ydEl0ZW0ge1xuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgICBwcm9wZXJ0eTogUHJvcGVydHksXG4gICAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50c1xuICApIHtcbiAgICBzdXBlcihwcm9wZXJ0eSwgY2hhcnRBY2NvdW50cyk7XG4gICAgdGhpcy5hbW91bnQgPSBNYXRoLmFicyh0cmFuc2FjdGlvbnMuc3VtQnkoJ2dyb3NzQW1vdW50JykpO1xuICAgIHRoaXMuZGVzY3JpcHRpb24gPSBjaGFydEFjY291bnRzLm5hbWVcbiAgfVxufVxuIl19
|
|
@@ -24,13 +24,22 @@ export class PropertyTransactionReportService {
|
|
|
24
24
|
this.getTransactions(),
|
|
25
25
|
this.getDepreciations(),
|
|
26
26
|
this.chartAccountsService.get()
|
|
27
|
-
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) =>
|
|
27
|
+
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
28
|
+
this.properties = properties;
|
|
29
|
+
this.transactions = transactions;
|
|
30
|
+
this.depreciations = depreciations;
|
|
31
|
+
this.chartAccounts = chartAccounts;
|
|
32
|
+
return this.create(transactions, depreciations, properties, chartAccounts);
|
|
33
|
+
}));
|
|
34
|
+
}
|
|
35
|
+
filter(filterForm) {
|
|
36
|
+
return this.create(filterForm.filter(this.transactions), filterForm.filter(this.depreciations), this.properties, this.chartAccounts);
|
|
28
37
|
}
|
|
29
38
|
create(transactions, depreciations, properties, chartAccounts) {
|
|
30
39
|
return new PropertyReportItemCollection([
|
|
31
40
|
...new PropertyReportItemTransactionCollection(transactions, properties, chartAccounts).items,
|
|
32
41
|
...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts).items,
|
|
33
|
-
]);
|
|
42
|
+
]).sortBy('subCode', 'asc').groupBy('propertyId');
|
|
34
43
|
}
|
|
35
44
|
/**
|
|
36
45
|
* Get collection of property transactions
|
|
@@ -58,4 +67,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
58
67
|
providedIn: 'root'
|
|
59
68
|
}]
|
|
60
69
|
}], ctorParameters: function () { return [{ type: i1.PropertyService }, { type: i1.TransactionService }, { type: i1.DepreciationService }, { type: i1.ChartAccountsService }]; } });
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property-transaction-report.service.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/services/report/property/property-transaction-report.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { ChartAccountsService, DepreciationService, PropertyService, TransactionService, } from '../../http';\nimport { Observable, combineLatest } from 'rxjs';\nimport { CHART_ACCOUNTS_CATEGORIES, Transaction } from '../../../models';\nimport {\n  ChartAccountsCollection,\n  CollectionDictionary,\n  DepreciationCollection,\n  PropertyCollection,\n  PropertyReportItemCollection,\n  PropertyReportItemDepreciationCollection,\n  PropertyReportItemTransactionCollection,\n  TransactionCollection,\n} from '../../../collections';\nimport { map } from 'rxjs/operators';\nimport { TransactionBaseFilterForm } from '../../../forms';\n\n/**\n * Service to handle Property transactions report items data (get income / expense report items, e.t.c.)\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class PropertyTransactionReportService {\n  properties: PropertyCollection;\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  chartAccounts: ChartAccountsCollection;\n\n  constructor(\n    private propertyService: PropertyService,\n    private transactionService: TransactionService,\n    private depreciationService: DepreciationService,\n    private chartAccountsService: ChartAccountsService\n  ) {\n  }\n\n  /**\n   * Get collection of report items based on transactions & depreciations\n   */\n  get(): Observable<CollectionDictionary<PropertyReportItemCollection>> {\n    return combineLatest([\n      this.propertyService.get() as Observable<PropertyCollection>,\n      this.getTransactions() as Observable<TransactionCollection>,\n      this.getDepreciations() as Observable<DepreciationCollection>,\n      this.chartAccountsService.get() as Observable<ChartAccountsCollection>\n    ]).pipe(\n      map(([properties, transactions, depreciations, chartAccounts]) => {\n        this.properties = properties;\n        this.transactions = transactions;\n        this.depreciations = depreciations;\n        this.chartAccounts = chartAccounts;\n        return this.create(transactions, depreciations, properties, chartAccounts);\n      })\n    );\n  }\n\n  filter(filterForm: TransactionBaseFilterForm): CollectionDictionary<PropertyReportItemCollection> {\n    return this.create(\n      filterForm.filter(this.transactions),\n      filterForm.filter(this.depreciations),\n      this.properties,\n      this.chartAccounts\n    );\n  }\n\n  private create(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    properties: PropertyCollection,\n    chartAccounts: ChartAccountsCollection\n  ): CollectionDictionary<PropertyReportItemCollection> {\n    return new PropertyReportItemCollection([\n      ...new PropertyReportItemTransactionCollection(transactions, properties, chartAccounts).items,\n      ...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts).items,\n    ]).sortBy('subCode', 'asc').groupBy('propertyId');\n  }\n\n  /**\n   * Get collection of property transactions\n   */\n  private getTransactions(): Observable<TransactionCollection> {\n    return this.transactionService.get().pipe(\n      map((transactions: Transaction[]) => new TransactionCollection(transactions)\n        .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)\n        .filter(transaction => transaction.claimPercent > 0)\n      )\n    );\n  }\n\n  /**\n   * Get list of asset & capital property depreciations\n   */\n  private getDepreciations(): Observable<DepreciationCollection> {\n    return this.depreciationService.get().pipe(\n      map((depreciations: DepreciationCollection) => depreciations\n        .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)\n        // we don't need borrowing expenses for this report\n        .getWithoutBorrowingExpenses())\n    )\n  }\n}\n"]}
|
|
@@ -7342,112 +7342,6 @@ class DepreciationReportItemCollection extends DepreciationCollection {
|
|
|
7342
7342
|
}
|
|
7343
7343
|
}
|
|
7344
7344
|
|
|
7345
|
-
/**
|
|
7346
|
-
* Class with property transactions report entities
|
|
7347
|
-
*/
|
|
7348
|
-
class PropertyReportItem extends AbstractModel {
|
|
7349
|
-
constructor(property, chartAccounts) {
|
|
7350
|
-
super();
|
|
7351
|
-
this.chartAccounts = chartAccounts;
|
|
7352
|
-
this.propertyId = property.id;
|
|
7353
|
-
this.claimPercent = property.claimPercent;
|
|
7354
|
-
this.sharePercent = property.sharePercent;
|
|
7355
|
-
this.subCode = chartAccounts.taxReturnItem?.subCode;
|
|
7356
|
-
this.description = chartAccounts.name;
|
|
7357
|
-
}
|
|
7358
|
-
get claimAmount() {
|
|
7359
|
-
return round(this.amount * (this.claimPercent / 100), 2);
|
|
7360
|
-
}
|
|
7361
|
-
get shareClaimAmount() {
|
|
7362
|
-
return this.claimAmount * (this.sharePercent / 100);
|
|
7363
|
-
}
|
|
7364
|
-
isIncome() {
|
|
7365
|
-
return CHART_ACCOUNTS_CATEGORIES.income.includes(this.chartAccounts.category);
|
|
7366
|
-
}
|
|
7367
|
-
isExpense() {
|
|
7368
|
-
return CHART_ACCOUNTS_CATEGORIES.expense.includes(this.chartAccounts.category);
|
|
7369
|
-
}
|
|
7370
|
-
}
|
|
7371
|
-
|
|
7372
|
-
/**
|
|
7373
|
-
* Const with labels based on depreciation type
|
|
7374
|
-
*/
|
|
7375
|
-
const DEPRECIATION_TYPE_LABELS = {
|
|
7376
|
-
1: 'Plant & Equipment',
|
|
7377
|
-
2: 'Building & Improvements'
|
|
7378
|
-
};
|
|
7379
|
-
/**
|
|
7380
|
-
* Class with depreciation-based property transactions report entities
|
|
7381
|
-
*/
|
|
7382
|
-
class PropertyReportItemDepreciation extends PropertyReportItem {
|
|
7383
|
-
constructor(depreciations, property, chartAccounts) {
|
|
7384
|
-
super(property, chartAccounts);
|
|
7385
|
-
this.amount = Math.abs(depreciations.getCurrentYearForecastAmount());
|
|
7386
|
-
this.description = DEPRECIATION_TYPE_LABELS[depreciations.first.type];
|
|
7387
|
-
}
|
|
7388
|
-
}
|
|
7389
|
-
|
|
7390
|
-
/**
|
|
7391
|
-
* Base collection to work with property report items
|
|
7392
|
-
*/
|
|
7393
|
-
class PropertyReportItemCollection extends Collection {
|
|
7394
|
-
getIncomes() {
|
|
7395
|
-
return this.create(this.items.filter((item) => item.isIncome()));
|
|
7396
|
-
}
|
|
7397
|
-
getExpenses() {
|
|
7398
|
-
return this.create(this.items.filter((item) => item.isExpense()));
|
|
7399
|
-
}
|
|
7400
|
-
}
|
|
7401
|
-
|
|
7402
|
-
/**
|
|
7403
|
-
* Collection to work with depreciation-based property report items
|
|
7404
|
-
*/
|
|
7405
|
-
class PropertyReportItemDepreciationCollection extends PropertyReportItemCollection {
|
|
7406
|
-
constructor(depreciations, properties, chartAccounts) {
|
|
7407
|
-
super();
|
|
7408
|
-
this.setItems(depreciations, properties, chartAccounts);
|
|
7409
|
-
}
|
|
7410
|
-
setItems(depreciations, properties, chartAccounts) {
|
|
7411
|
-
this.items = [];
|
|
7412
|
-
properties.items.forEach((property) => {
|
|
7413
|
-
const depreciationsByType = depreciations.filterBy('property.id', property.id).groupBy('type');
|
|
7414
|
-
depreciationsByType.keys.map((type) => {
|
|
7415
|
-
this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
|
|
7416
|
-
});
|
|
7417
|
-
});
|
|
7418
|
-
}
|
|
7419
|
-
}
|
|
7420
|
-
|
|
7421
|
-
/**
|
|
7422
|
-
* Class with transaction-based property transactions report entities
|
|
7423
|
-
*/
|
|
7424
|
-
class PropertyReportItemTransaction extends PropertyReportItem {
|
|
7425
|
-
constructor(transactions, property, chartAccounts) {
|
|
7426
|
-
super(property, chartAccounts);
|
|
7427
|
-
this.amount = Math.abs(transactions.sumBy('grossAmount'));
|
|
7428
|
-
this.description = chartAccounts.name;
|
|
7429
|
-
}
|
|
7430
|
-
}
|
|
7431
|
-
|
|
7432
|
-
/**
|
|
7433
|
-
* Collection to work with transaction-based property report items
|
|
7434
|
-
*/
|
|
7435
|
-
class PropertyReportItemTransactionCollection extends PropertyReportItemCollection {
|
|
7436
|
-
constructor(transactions, properties, chartAccounts) {
|
|
7437
|
-
super();
|
|
7438
|
-
this.setItems(transactions, properties, chartAccounts);
|
|
7439
|
-
}
|
|
7440
|
-
setItems(transactions, properties, chartAccounts) {
|
|
7441
|
-
this.items = [];
|
|
7442
|
-
properties.items.forEach((property) => {
|
|
7443
|
-
const transactionsDictionary = transactions.getByPropertiesIds([property.id]).groupBy('chartAccounts.id');
|
|
7444
|
-
transactionsDictionary.keys.map((chartAccountId) => {
|
|
7445
|
-
this.items.push(new PropertyReportItemTransaction(transactionsDictionary.get(chartAccountId), property, chartAccounts.findBy('id', +chartAccountId)));
|
|
7446
|
-
});
|
|
7447
|
-
});
|
|
7448
|
-
}
|
|
7449
|
-
}
|
|
7450
|
-
|
|
7451
7345
|
/**
|
|
7452
7346
|
* Enum with type of business for My Tax report
|
|
7453
7347
|
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form
|
|
@@ -8169,6 +8063,62 @@ const atoLinks = {
|
|
|
8169
8063
|
* 'My Tax' report related data (classes, enums, const, e.t.c)
|
|
8170
8064
|
*/
|
|
8171
8065
|
|
|
8066
|
+
/**
|
|
8067
|
+
* Class with property transactions report entities
|
|
8068
|
+
*/
|
|
8069
|
+
class PropertyReportItem extends AbstractModel {
|
|
8070
|
+
constructor(property, chartAccounts) {
|
|
8071
|
+
super();
|
|
8072
|
+
this.chartAccounts = chartAccounts;
|
|
8073
|
+
this.propertyId = property.id;
|
|
8074
|
+
this.claimPercent = property.claimPercent;
|
|
8075
|
+
this.sharePercent = property.sharePercent;
|
|
8076
|
+
this.subCode = chartAccounts.taxReturnItem?.subCode;
|
|
8077
|
+
this.description = chartAccounts.name;
|
|
8078
|
+
}
|
|
8079
|
+
get claimAmount() {
|
|
8080
|
+
return round(this.amount * (this.claimPercent / 100), 2);
|
|
8081
|
+
}
|
|
8082
|
+
get shareClaimAmount() {
|
|
8083
|
+
return this.claimAmount * (this.sharePercent / 100);
|
|
8084
|
+
}
|
|
8085
|
+
isIncome() {
|
|
8086
|
+
return CHART_ACCOUNTS_CATEGORIES.income.includes(this.chartAccounts.category);
|
|
8087
|
+
}
|
|
8088
|
+
isExpense() {
|
|
8089
|
+
return CHART_ACCOUNTS_CATEGORIES.expense.includes(this.chartAccounts.category);
|
|
8090
|
+
}
|
|
8091
|
+
}
|
|
8092
|
+
|
|
8093
|
+
/**
|
|
8094
|
+
* Const with labels based on depreciation type
|
|
8095
|
+
*/
|
|
8096
|
+
const DEPRECIATION_TYPE_LABELS = {
|
|
8097
|
+
1: 'Plant & Equipment',
|
|
8098
|
+
2: 'Building & Improvements'
|
|
8099
|
+
};
|
|
8100
|
+
/**
|
|
8101
|
+
* Class with depreciation-based property transactions report entities
|
|
8102
|
+
*/
|
|
8103
|
+
class PropertyReportItemDepreciation extends PropertyReportItem {
|
|
8104
|
+
constructor(depreciations, property, chartAccounts) {
|
|
8105
|
+
super(property, chartAccounts);
|
|
8106
|
+
this.amount = Math.abs(depreciations.getCurrentYearForecastAmount());
|
|
8107
|
+
this.description = DEPRECIATION_TYPE_LABELS[depreciations.first.type];
|
|
8108
|
+
}
|
|
8109
|
+
}
|
|
8110
|
+
|
|
8111
|
+
/**
|
|
8112
|
+
* Class with transaction-based property transactions report entities
|
|
8113
|
+
*/
|
|
8114
|
+
class PropertyReportItemTransaction extends PropertyReportItem {
|
|
8115
|
+
constructor(transactions, property, chartAccounts) {
|
|
8116
|
+
super(property, chartAccounts);
|
|
8117
|
+
this.amount = Math.abs(transactions.sumBy('grossAmount'));
|
|
8118
|
+
this.description = chartAccounts.name;
|
|
8119
|
+
}
|
|
8120
|
+
}
|
|
8121
|
+
|
|
8172
8122
|
/**
|
|
8173
8123
|
* Class with business loss details
|
|
8174
8124
|
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4641357930/Rules+when+a+business+makes+a+loss+Tax+Summary
|
|
@@ -8199,6 +8149,56 @@ class VehicleExpense extends AbstractModel {
|
|
|
8199
8149
|
}
|
|
8200
8150
|
}
|
|
8201
8151
|
|
|
8152
|
+
/**
|
|
8153
|
+
* Base collection to work with property report items
|
|
8154
|
+
*/
|
|
8155
|
+
class PropertyReportItemCollection extends Collection {
|
|
8156
|
+
getIncomes() {
|
|
8157
|
+
return this.create(this.items.filter((item) => item.isIncome()));
|
|
8158
|
+
}
|
|
8159
|
+
getExpenses() {
|
|
8160
|
+
return this.create(this.items.filter((item) => item.isExpense()));
|
|
8161
|
+
}
|
|
8162
|
+
}
|
|
8163
|
+
|
|
8164
|
+
/**
|
|
8165
|
+
* Collection to work with depreciation-based property report items
|
|
8166
|
+
*/
|
|
8167
|
+
class PropertyReportItemDepreciationCollection extends PropertyReportItemCollection {
|
|
8168
|
+
constructor(depreciations, properties, chartAccounts) {
|
|
8169
|
+
super();
|
|
8170
|
+
this.setItems(depreciations, properties, chartAccounts);
|
|
8171
|
+
}
|
|
8172
|
+
setItems(depreciations, properties, chartAccounts) {
|
|
8173
|
+
this.items = [];
|
|
8174
|
+
properties.items.forEach((property) => {
|
|
8175
|
+
const depreciationsByType = depreciations.filterBy('property.id', property.id).groupBy('type');
|
|
8176
|
+
depreciationsByType.keys.map((type) => {
|
|
8177
|
+
this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
|
|
8178
|
+
});
|
|
8179
|
+
});
|
|
8180
|
+
}
|
|
8181
|
+
}
|
|
8182
|
+
|
|
8183
|
+
/**
|
|
8184
|
+
* Collection to work with transaction-based property report items
|
|
8185
|
+
*/
|
|
8186
|
+
class PropertyReportItemTransactionCollection extends PropertyReportItemCollection {
|
|
8187
|
+
constructor(transactions, properties, chartAccounts) {
|
|
8188
|
+
super();
|
|
8189
|
+
this.setItems(transactions, properties, chartAccounts);
|
|
8190
|
+
}
|
|
8191
|
+
setItems(transactions, properties, chartAccounts) {
|
|
8192
|
+
this.items = [];
|
|
8193
|
+
properties.items.forEach((property) => {
|
|
8194
|
+
const transactionsDictionary = transactions.getByPropertiesIds([property.id]).groupBy('chartAccounts.id');
|
|
8195
|
+
transactionsDictionary.keys.map((chartAccountId) => {
|
|
8196
|
+
this.items.push(new PropertyReportItemTransaction(transactionsDictionary.get(chartAccountId), property, chartAccounts.findBy('id', +chartAccountId)));
|
|
8197
|
+
});
|
|
8198
|
+
});
|
|
8199
|
+
}
|
|
8200
|
+
}
|
|
8201
|
+
|
|
8202
8202
|
class VehicleExpenseCollection extends Collection {
|
|
8203
8203
|
constructor(transactions, depreciations) {
|
|
8204
8204
|
super();
|
|
@@ -19273,13 +19273,22 @@ class PropertyTransactionReportService {
|
|
|
19273
19273
|
this.getTransactions(),
|
|
19274
19274
|
this.getDepreciations(),
|
|
19275
19275
|
this.chartAccountsService.get()
|
|
19276
|
-
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) =>
|
|
19276
|
+
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
19277
|
+
this.properties = properties;
|
|
19278
|
+
this.transactions = transactions;
|
|
19279
|
+
this.depreciations = depreciations;
|
|
19280
|
+
this.chartAccounts = chartAccounts;
|
|
19281
|
+
return this.create(transactions, depreciations, properties, chartAccounts);
|
|
19282
|
+
}));
|
|
19283
|
+
}
|
|
19284
|
+
filter(filterForm) {
|
|
19285
|
+
return this.create(filterForm.filter(this.transactions), filterForm.filter(this.depreciations), this.properties, this.chartAccounts);
|
|
19277
19286
|
}
|
|
19278
19287
|
create(transactions, depreciations, properties, chartAccounts) {
|
|
19279
19288
|
return new PropertyReportItemCollection([
|
|
19280
19289
|
...new PropertyReportItemTransactionCollection(transactions, properties, chartAccounts).items,
|
|
19281
19290
|
...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts).items,
|
|
19282
|
-
]);
|
|
19291
|
+
]).sortBy('subCode', 'asc').groupBy('propertyId');
|
|
19283
19292
|
}
|
|
19284
19293
|
/**
|
|
19285
19294
|
* Get collection of property transactions
|