taxtank-core 0.32.112 → 0.32.114
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/db/Json/chart-accounts/chart-accounts-value.json +59 -4
- package/esm2022/lib/services/json/chart-accounts/chart-accounts-value.service.mjs +1 -1
- package/esm2022/lib/services/report/property/property-transaction-report.service.mjs +3 -3
- package/fesm2022/taxtank-core.mjs +71 -6
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -458,8 +458,8 @@
|
|
|
458
458
|
"endDate": null,
|
|
459
459
|
"value": 0.67,
|
|
460
460
|
"unitOfMeasure": "hours",
|
|
461
|
-
"createdAt": "2024-01
|
|
462
|
-
"updatedAt": "2024-01
|
|
461
|
+
"createdAt": "2024-02-01 15:15:00",
|
|
462
|
+
"updatedAt": "2024-02-01 15:15:00"
|
|
463
463
|
},
|
|
464
464
|
{
|
|
465
465
|
"id": 55,
|
|
@@ -469,7 +469,62 @@
|
|
|
469
469
|
"endDate": null,
|
|
470
470
|
"value": 0.67,
|
|
471
471
|
"unitOfMeasure": "hours",
|
|
472
|
-
"createdAt": "2024-01
|
|
473
|
-
"updatedAt": "2024-01
|
|
472
|
+
"createdAt": "2024-02-01 15:15:00",
|
|
473
|
+
"updatedAt": "2024-02-01 15:15:00"
|
|
474
|
+
},
|
|
475
|
+
{
|
|
476
|
+
"id": 56,
|
|
477
|
+
"chartAccounts": { "id": 24 },
|
|
478
|
+
"financialYear": 2025,
|
|
479
|
+
"startDate": null,
|
|
480
|
+
"endDate": null,
|
|
481
|
+
"value": 0.88,
|
|
482
|
+
"unitOfMeasure": "kilometres",
|
|
483
|
+
"createdAt": "2024-06-25 00:00:00",
|
|
484
|
+
"updatedAt": "2024-06-25 00:00:00"
|
|
485
|
+
},
|
|
486
|
+
{
|
|
487
|
+
"id": 57,
|
|
488
|
+
"chartAccounts": { "id": 87 },
|
|
489
|
+
"financialYear": 2025,
|
|
490
|
+
"startDate": null,
|
|
491
|
+
"endDate": null,
|
|
492
|
+
"value": 0.67,
|
|
493
|
+
"unitOfMeasure": "hours",
|
|
494
|
+
"createdAt": "2024-06-25 00:00:00",
|
|
495
|
+
"updatedAt": "2024-06-25 00:00:00"
|
|
496
|
+
},
|
|
497
|
+
{
|
|
498
|
+
"id": 58,
|
|
499
|
+
"chartAccounts": { "id": 103 },
|
|
500
|
+
"financialYear": 2025,
|
|
501
|
+
"startDate": null,
|
|
502
|
+
"endDate": null,
|
|
503
|
+
"value": 0.67,
|
|
504
|
+
"unitOfMeasure": "hours",
|
|
505
|
+
"createdAt": "2024-06-25 00:00:00",
|
|
506
|
+
"updatedAt": "2024-06-25 00:00:00"
|
|
507
|
+
},
|
|
508
|
+
{
|
|
509
|
+
"id": 59,
|
|
510
|
+
"chartAccounts": { "id": 683 },
|
|
511
|
+
"financialYear": 2025,
|
|
512
|
+
"startDate": null,
|
|
513
|
+
"endDate": null,
|
|
514
|
+
"value": 0.88,
|
|
515
|
+
"unitOfMeasure": "kilometres",
|
|
516
|
+
"createdAt": "2024-06-25 00:00:00",
|
|
517
|
+
"updatedAt": "2024-06-25 00:00:00"
|
|
518
|
+
},
|
|
519
|
+
{
|
|
520
|
+
"id": 60,
|
|
521
|
+
"chartAccounts": { "id": 888 },
|
|
522
|
+
"financialYear": 2025,
|
|
523
|
+
"startDate": null,
|
|
524
|
+
"endDate": null,
|
|
525
|
+
"value": 0.67,
|
|
526
|
+
"unitOfMeasure": "hours",
|
|
527
|
+
"createdAt": "2024-06-25 00:00:00",
|
|
528
|
+
"updatedAt": "2024-06-25 00:00:00"
|
|
474
529
|
}
|
|
475
530
|
]
|
|
@@ -28,4 +28,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
28
28
|
providedIn: 'root'
|
|
29
29
|
}]
|
|
30
30
|
}], ctorParameters: function () { return []; } });
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtYWNjb3VudHMtdmFsdWUuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9zZXJ2aWNlcy9qc29uL2NoYXJ0LWFjY291bnRzL2NoYXJ0LWFjY291bnRzLXZhbHVlLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGFBQWEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3BFLE9BQU8sbUJBQW1CLE1BQU0sMkRBQTJELENBQUM7QUFDNUYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDOztBQUsxRCxNQUFNLE9BQU8seUJBQTBCLFNBQVEsV0FBdUY7SUFJcEk7UUFDRSxLQUFLLEVBQUUsQ0FBQztRQUpWLGVBQVUsR0FBOEIsa0JBQWtCLENBQUM7UUFDM0Qsb0JBQWUsR0FBc0IsVUFBVSxDQUFDO1FBSTlDLElBQUksQ0FBQyxRQUFRLENBQUMsbUJBQW1CLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxVQUFVLENBQUMsTUFBZTtRQUN4QixNQUFNLGVBQWUsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLHFCQUFxQixDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMscUJBQXFCLENBQUMsdUJBQXVCLENBQUM7UUFDdEgsT0FBTyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUN6QixDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxFQUFFLEtBQUssZUFBZSxJQUFJLElBQUksYUFBYSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxhQUFhLENBQ2pHLENBQUMsS0FBSyxDQUFDO0lBQ1YsQ0FBQzsrR0FqQlUseUJBQXlCO21IQUF6Qix5QkFBeUIsY0FGeEIsTUFBTTs7NEZBRVAseUJBQXlCO2tCQUhyQyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNWYWx1ZSBhcyBDaGFydEFjY291bnRzVmFsdWVCYXNlIH0gZnJvbSAnLi4vLi4vLi4vZGIvTW9kZWxzJztcbmltcG9ydCB7IENvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzVmFsdWUsIEZpbmFuY2lhbFllYXIgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IENoYXJ0QWNjb3VudHNWYWx1ZXMgZnJvbSAnLi4vLi4vLi4vZGIvSnNvbi9jaGFydC1hY2NvdW50cy9jaGFydC1hY2NvdW50cy12YWx1ZS5qc29uJztcbmltcG9ydCB7IERhdGFTZXJ2aWNlIH0gZnJvbSAnLi4vLi4vZGF0YS5zZXJ2aWNlJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uL2RiL0VudW1zJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgQ2hhcnRBY2NvdW50c1ZhbHVlU2VydmljZSBleHRlbmRzIERhdGFTZXJ2aWNlPENoYXJ0QWNjb3VudHNWYWx1ZUJhc2UsIENoYXJ0QWNjb3VudHNWYWx1ZSwgQ29sbGVjdGlvbjxDaGFydEFjY291bnRzVmFsdWU+PiB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBDaGFydEFjY291bnRzVmFsdWUgPSBDaGFydEFjY291bnRzVmFsdWU7XG4gIGNvbGxlY3Rpb25DbGFzczogdHlwZW9mIENvbGxlY3Rpb24gPSBDb2xsZWN0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIHN1cGVyKCk7XG4gICAgdGhpcy5zZXRDYWNoZShDaGFydEFjY291bnRzVmFsdWVzKTtcbiAgfVxuXG4gIC8qKlxuICAgKiAkIGFtb3VudCB1IGNhbiBjbGFpbSBwZXIgMWttXG4gICAqL1xuICBnZXRLbXNSYXRlKGlzU29sZTogYm9vbGVhbik6IG51bWJlciB7XG4gICAgY29uc3QgY2hhcnRBY2NvdW50c0lkID0gaXNTb2xlID8gQ2hhcnRBY2NvdW50c0xpc3RFbnVtLktMTVNfVFJBVkVMTEVEIDogQ2hhcnRBY2NvdW50c0xpc3RFbnVtLktMTVNfVFJBVkVMTEVEX0ZPUl9XT1JLO1xuICAgIHJldHVybiB0aGlzLmdldENhY2hlKCkuZmluZChcbiAgICAgIChjYSkgPT4gY2EuY2hhcnRBY2NvdW50cy5pZCA9PT0gY2hhcnRBY2NvdW50c0lkICYmIG5ldyBGaW5hbmNpYWxZZWFyKCkueWVhciA9PT0gY2EuZmluYW5jaWFsWWVhclxuICAgICkudmFsdWU7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -26,10 +26,10 @@ export class PropertyTransactionReportService {
|
|
|
26
26
|
this.chartAccountsService.get()
|
|
27
27
|
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
28
28
|
this.properties = properties;
|
|
29
|
-
this.transactions = transactions;
|
|
29
|
+
this.transactions = transactions.filter(transaction => !transaction.chartAccounts.isDepreciation());
|
|
30
30
|
this.depreciations = depreciations;
|
|
31
31
|
this.chartAccounts = chartAccounts;
|
|
32
|
-
return this.create(transactions, depreciations, properties, chartAccounts);
|
|
32
|
+
return this.create(this.transactions, depreciations, properties, chartAccounts);
|
|
33
33
|
}));
|
|
34
34
|
}
|
|
35
35
|
filter(filterForm) {
|
|
@@ -67,4 +67,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
67
67
|
providedIn: 'root'
|
|
68
68
|
}]
|
|
69
69
|
}], ctorParameters: function () { return [{ type: i1.PropertyService }, { type: i1.TransactionService }, { type: i1.DepreciationService }, { type: i1.ChartAccountsService }]; } });
|
|
70
|
-
//# 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.filter(transaction => !transaction.chartAccounts.isDepreciation());\n        this.depreciations = depreciations;\n        this.chartAccounts = chartAccounts;\n        return this.create(this.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"]}
|
|
@@ -3328,8 +3328,8 @@ var ChartAccountsValues = [
|
|
|
3328
3328
|
endDate: null,
|
|
3329
3329
|
value: 0.67,
|
|
3330
3330
|
unitOfMeasure: "hours",
|
|
3331
|
-
createdAt: "2024-01
|
|
3332
|
-
updatedAt: "2024-01
|
|
3331
|
+
createdAt: "2024-02-01 15:15:00",
|
|
3332
|
+
updatedAt: "2024-02-01 15:15:00"
|
|
3333
3333
|
},
|
|
3334
3334
|
{
|
|
3335
3335
|
id: 55,
|
|
@@ -3341,8 +3341,73 @@ var ChartAccountsValues = [
|
|
|
3341
3341
|
endDate: null,
|
|
3342
3342
|
value: 0.67,
|
|
3343
3343
|
unitOfMeasure: "hours",
|
|
3344
|
-
createdAt: "2024-01
|
|
3345
|
-
updatedAt: "2024-01
|
|
3344
|
+
createdAt: "2024-02-01 15:15:00",
|
|
3345
|
+
updatedAt: "2024-02-01 15:15:00"
|
|
3346
|
+
},
|
|
3347
|
+
{
|
|
3348
|
+
id: 56,
|
|
3349
|
+
chartAccounts: {
|
|
3350
|
+
id: 24
|
|
3351
|
+
},
|
|
3352
|
+
financialYear: 2025,
|
|
3353
|
+
startDate: null,
|
|
3354
|
+
endDate: null,
|
|
3355
|
+
value: 0.88,
|
|
3356
|
+
unitOfMeasure: "kilometres",
|
|
3357
|
+
createdAt: "2024-06-25 00:00:00",
|
|
3358
|
+
updatedAt: "2024-06-25 00:00:00"
|
|
3359
|
+
},
|
|
3360
|
+
{
|
|
3361
|
+
id: 57,
|
|
3362
|
+
chartAccounts: {
|
|
3363
|
+
id: 87
|
|
3364
|
+
},
|
|
3365
|
+
financialYear: 2025,
|
|
3366
|
+
startDate: null,
|
|
3367
|
+
endDate: null,
|
|
3368
|
+
value: 0.67,
|
|
3369
|
+
unitOfMeasure: "hours",
|
|
3370
|
+
createdAt: "2024-06-25 00:00:00",
|
|
3371
|
+
updatedAt: "2024-06-25 00:00:00"
|
|
3372
|
+
},
|
|
3373
|
+
{
|
|
3374
|
+
id: 58,
|
|
3375
|
+
chartAccounts: {
|
|
3376
|
+
id: 103
|
|
3377
|
+
},
|
|
3378
|
+
financialYear: 2025,
|
|
3379
|
+
startDate: null,
|
|
3380
|
+
endDate: null,
|
|
3381
|
+
value: 0.67,
|
|
3382
|
+
unitOfMeasure: "hours",
|
|
3383
|
+
createdAt: "2024-06-25 00:00:00",
|
|
3384
|
+
updatedAt: "2024-06-25 00:00:00"
|
|
3385
|
+
},
|
|
3386
|
+
{
|
|
3387
|
+
id: 59,
|
|
3388
|
+
chartAccounts: {
|
|
3389
|
+
id: 683
|
|
3390
|
+
},
|
|
3391
|
+
financialYear: 2025,
|
|
3392
|
+
startDate: null,
|
|
3393
|
+
endDate: null,
|
|
3394
|
+
value: 0.88,
|
|
3395
|
+
unitOfMeasure: "kilometres",
|
|
3396
|
+
createdAt: "2024-06-25 00:00:00",
|
|
3397
|
+
updatedAt: "2024-06-25 00:00:00"
|
|
3398
|
+
},
|
|
3399
|
+
{
|
|
3400
|
+
id: 60,
|
|
3401
|
+
chartAccounts: {
|
|
3402
|
+
id: 888
|
|
3403
|
+
},
|
|
3404
|
+
financialYear: 2025,
|
|
3405
|
+
startDate: null,
|
|
3406
|
+
endDate: null,
|
|
3407
|
+
value: 0.67,
|
|
3408
|
+
unitOfMeasure: "hours",
|
|
3409
|
+
createdAt: "2024-06-25 00:00:00",
|
|
3410
|
+
updatedAt: "2024-06-25 00:00:00"
|
|
3346
3411
|
}
|
|
3347
3412
|
];
|
|
3348
3413
|
|
|
@@ -19297,10 +19362,10 @@ class PropertyTransactionReportService {
|
|
|
19297
19362
|
this.chartAccountsService.get()
|
|
19298
19363
|
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
19299
19364
|
this.properties = properties;
|
|
19300
|
-
this.transactions = transactions;
|
|
19365
|
+
this.transactions = transactions.filter(transaction => !transaction.chartAccounts.isDepreciation());
|
|
19301
19366
|
this.depreciations = depreciations;
|
|
19302
19367
|
this.chartAccounts = chartAccounts;
|
|
19303
|
-
return this.create(transactions, depreciations, properties, chartAccounts);
|
|
19368
|
+
return this.create(this.transactions, depreciations, properties, chartAccounts);
|
|
19304
19369
|
}));
|
|
19305
19370
|
}
|
|
19306
19371
|
filter(filterForm) {
|