taxtank-core 3.0.30 → 3.0.32
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.
|
@@ -7556,12 +7556,6 @@ class Transaction extends Transaction$1 {
|
|
|
7556
7556
|
&& rule.property?.id === this.property?.id
|
|
7557
7557
|
&& rule.business?.id === this.business?.id;
|
|
7558
7558
|
}
|
|
7559
|
-
/**
|
|
7560
|
-
* @TODO claimAmount from backend shouldn't include share%(sharedClaimAmount should), the method is workaround
|
|
7561
|
-
*/
|
|
7562
|
-
get grossClaim() {
|
|
7563
|
-
return this.grossAmount * (this.claimPercent / 100);
|
|
7564
|
-
}
|
|
7565
7559
|
}
|
|
7566
7560
|
__decorate([
|
|
7567
7561
|
Type(() => Transaction)
|
|
@@ -9134,8 +9128,14 @@ class PropertyReportItem extends AbstractModel {
|
|
|
9134
9128
|
this.subCode = chartAccounts.taxReturnItem?.subCode;
|
|
9135
9129
|
this.description = chartAccounts.name;
|
|
9136
9130
|
}
|
|
9131
|
+
/**
|
|
9132
|
+
* @TODO remove after tests
|
|
9133
|
+
*/
|
|
9134
|
+
get claimAmount() {
|
|
9135
|
+
return this.amount;
|
|
9136
|
+
}
|
|
9137
9137
|
get shareClaimAmount() {
|
|
9138
|
-
return this.claimAmount * (this.sharePercent /
|
|
9138
|
+
return this.claimAmount * (this.sharePercent * this.claimPercent / 10000);
|
|
9139
9139
|
}
|
|
9140
9140
|
isIncome() {
|
|
9141
9141
|
return CHART_ACCOUNTS_CATEGORIES.income.includes(this.chartAccounts.category);
|
|
@@ -9162,9 +9162,6 @@ class PropertyReportItemDepreciation extends PropertyReportItem {
|
|
|
9162
9162
|
this.amount = Math.abs(depreciations.getCurrentYearForecastAmount(dateRange));
|
|
9163
9163
|
this.description = DEPRECIATION_TYPE_LABELS[depreciations.first.type];
|
|
9164
9164
|
}
|
|
9165
|
-
get claimAmount() {
|
|
9166
|
-
return round(this.amount * (this.claimPercent / 100), 2);
|
|
9167
|
-
}
|
|
9168
9165
|
}
|
|
9169
9166
|
|
|
9170
9167
|
/**
|
|
@@ -9174,12 +9171,10 @@ class PropertyReportItemTransaction extends PropertyReportItem {
|
|
|
9174
9171
|
constructor(transactions, property, chartAccounts) {
|
|
9175
9172
|
super(property, chartAccounts);
|
|
9176
9173
|
this.transactions = transactions;
|
|
9174
|
+
this.property = property;
|
|
9177
9175
|
this.amount = Math.abs(transactions.sumBy('grossAmount'));
|
|
9178
9176
|
this.description = chartAccounts.name;
|
|
9179
9177
|
}
|
|
9180
|
-
get claimAmount() {
|
|
9181
|
-
return Math.abs(this.transactions.sumBy('grossClaim'));
|
|
9182
|
-
}
|
|
9183
9178
|
}
|
|
9184
9179
|
|
|
9185
9180
|
/**
|