taxtank-core 0.32.7 → 0.32.8
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/collection.mjs +1 -1
- package/esm2022/lib/db/Enums/chart-accounts/chart-accounts-list.enum.mjs +1 -3
- package/esm2022/lib/forms/transaction/allocation-rule.form.mjs +2 -2
- package/esm2022/lib/models/chart-accounts/chart-accounts.mjs +6 -21
- package/esm2022/lib/services/http/rest/rest-old.service.mjs +8 -1
- package/esm2022/lib/services/http/transaction/transaction-allocation/transaction-allocation.service.mjs +1 -1
- package/fesm2022/taxtank-core.mjs +12 -22
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/db/Enums/chart-accounts/chart-accounts-list.enum.d.ts +1 -3
- package/lib/models/chart-accounts/chart-accounts.d.ts +1 -7
- package/lib/services/http/rest/rest-old.service.d.ts +5 -0
- package/package.json +1 -1
|
@@ -1180,8 +1180,6 @@ var ChartAccountsListEnum;
|
|
|
1180
1180
|
ChartAccountsListEnum[ChartAccountsListEnum["PSI_DEDUCTION_OTHER"] = 860] = "PSI_DEDUCTION_OTHER";
|
|
1181
1181
|
ChartAccountsListEnum[ChartAccountsListEnum["AUSTRALIAN_GOVERNMENT_SPECIAL_PAYMENTS"] = 871] = "AUSTRALIAN_GOVERNMENT_SPECIAL_PAYMENTS";
|
|
1182
1182
|
ChartAccountsListEnum[ChartAccountsListEnum["FHSS"] = 872] = "FHSS";
|
|
1183
|
-
ChartAccountsListEnum[ChartAccountsListEnum["PROGRESS_PAYMENTS"] = 884] = "PROGRESS_PAYMENTS";
|
|
1184
|
-
ChartAccountsListEnum[ChartAccountsListEnum["LOAN_PAYMENT"] = 885] = "LOAN_PAYMENT";
|
|
1185
1183
|
})(ChartAccountsListEnum || (ChartAccountsListEnum = {}));
|
|
1186
1184
|
|
|
1187
1185
|
var ChartAccountsMetaFieldListEnum;
|
|
@@ -3150,12 +3148,6 @@ class ChartAccounts extends ChartAccounts$1 {
|
|
|
3150
3148
|
isProperty() {
|
|
3151
3149
|
return CHART_ACCOUNTS_CATEGORIES.property.includes(this.category);
|
|
3152
3150
|
}
|
|
3153
|
-
isWork() {
|
|
3154
|
-
return CHART_ACCOUNTS_CATEGORIES.work.includes(this.category);
|
|
3155
|
-
}
|
|
3156
|
-
isSole() {
|
|
3157
|
-
return CHART_ACCOUNTS_CATEGORIES.soleIncome.includes(this.category);
|
|
3158
|
-
}
|
|
3159
3151
|
isWorkExpense() {
|
|
3160
3152
|
return [ChartAccountsCategoryEnum.WORK_EXPENSE, ChartAccountsCategoryEnum.OTHER_EXPENSE, ChartAccountsCategoryEnum.WORK_DEPRECIATION]
|
|
3161
3153
|
.includes(this.category);
|
|
@@ -3188,6 +3180,9 @@ class ChartAccounts extends ChartAccounts$1 {
|
|
|
3188
3180
|
isDepreciation() {
|
|
3189
3181
|
return CHART_ACCOUNTS_CATEGORIES.depreciation.includes(this.category);
|
|
3190
3182
|
}
|
|
3183
|
+
isSoleIncome() {
|
|
3184
|
+
return CHART_ACCOUNTS_CATEGORIES.soleIncome.includes(this.category);
|
|
3185
|
+
}
|
|
3191
3186
|
/**
|
|
3192
3187
|
* Check if transaction chart account is work related car expenses
|
|
3193
3188
|
*/
|
|
@@ -3261,11 +3256,8 @@ class ChartAccounts extends ChartAccounts$1 {
|
|
|
3261
3256
|
isPropertyCapitalWorks() {
|
|
3262
3257
|
return this.category === ChartAccountsCategoryEnum.PROPERTY_CAPITAL_WORKS;
|
|
3263
3258
|
}
|
|
3264
|
-
hasTaxField() {
|
|
3265
|
-
return !this.isNRAS() && this.isWorkIncome();
|
|
3266
|
-
}
|
|
3267
3259
|
isTaxable() {
|
|
3268
|
-
return this.
|
|
3260
|
+
return !this.isNRAS() && this.isWorkIncome();
|
|
3269
3261
|
}
|
|
3270
3262
|
isTransfer() {
|
|
3271
3263
|
return this.id === ChartAccountsListEnum.TRANSFER;
|
|
@@ -3276,15 +3268,6 @@ class ChartAccounts extends ChartAccounts$1 {
|
|
|
3276
3268
|
isHomeOfficeWorkHours() {
|
|
3277
3269
|
return this.id === ChartAccountsListEnum.HOME_OFFICE_WORK_HOURS;
|
|
3278
3270
|
}
|
|
3279
|
-
/**
|
|
3280
|
-
* income requiring extra data like adjustments/payer/etc
|
|
3281
|
-
*/
|
|
3282
|
-
isIncomeWithMeta() {
|
|
3283
|
-
if (!this.isIncome() || this.isSole()) {
|
|
3284
|
-
return false;
|
|
3285
|
-
}
|
|
3286
|
-
return this.isWork() || this.isTaxable();
|
|
3287
|
-
}
|
|
3288
3271
|
}
|
|
3289
3272
|
__decorate([
|
|
3290
3273
|
Type(() => ChartAccountsHeading)
|
|
@@ -12579,6 +12562,7 @@ class RestService {
|
|
|
12579
12562
|
}));
|
|
12580
12563
|
}
|
|
12581
12564
|
/**
|
|
12565
|
+
* @deprecated use removeBatch
|
|
12582
12566
|
* delete multiple instances of class
|
|
12583
12567
|
* @param models Class instances array for deleting
|
|
12584
12568
|
*/
|
|
@@ -12592,6 +12576,12 @@ class RestService {
|
|
|
12592
12576
|
}
|
|
12593
12577
|
}));
|
|
12594
12578
|
}
|
|
12579
|
+
/**
|
|
12580
|
+
* collect array of redo transactions requests observable
|
|
12581
|
+
*/
|
|
12582
|
+
removeBatch(models) {
|
|
12583
|
+
return models.map(model => this.delete(model));
|
|
12584
|
+
}
|
|
12595
12585
|
/**
|
|
12596
12586
|
* clear service cache
|
|
12597
12587
|
*/
|
|
@@ -22936,7 +22926,7 @@ class AllocationRuleForm extends AbstractForm {
|
|
|
22936
22926
|
}
|
|
22937
22927
|
isTaxFieldHidden() {
|
|
22938
22928
|
const chartAccounts = this.transactionFormGroup.get('chartAccounts').value;
|
|
22939
|
-
return !chartAccounts || !chartAccounts.
|
|
22929
|
+
return !chartAccounts || !chartAccounts.isTaxable();
|
|
22940
22930
|
}
|
|
22941
22931
|
/**
|
|
22942
22932
|
* TODO Alex: disable sole tank in form control when income selected
|