taxtank-core 0.28.102 → 0.28.104
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/bundles/taxtank-core.umd.js +10 -5
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/forms/report/my-tax/my-tax-deductions.form.js +5 -1
- package/esm2015/lib/models/report/my-tax/my-tax-business-income-or-losses/my-tax-business-income/my-tax-business-income.js +4 -5
- package/esm2015/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.js +5 -2
- package/fesm2015/taxtank-core.js +10 -5
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/models/report/my-tax/my-tax-business-income-or-losses/my-tax-business-income/my-tax-business-income.d.ts +2 -1
- package/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.d.ts +1 -0
- package/package.json +1 -1
|
@@ -11454,7 +11454,7 @@
|
|
|
11454
11454
|
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
|
|
11455
11455
|
*/
|
|
11456
11456
|
var MyTaxBusinessIncome = /** @class */ (function () {
|
|
11457
|
-
function MyTaxBusinessIncome(psiIncome, soleIncome) {
|
|
11457
|
+
function MyTaxBusinessIncome(psiIncome, soleIncome, taxSummary) {
|
|
11458
11458
|
this.psiIncomeAmount = psiIncome.filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.PSI).amount;
|
|
11459
11459
|
this.psiVoluntaryAgreementAmount = psiIncome
|
|
11460
11460
|
.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_VOLUNTARY_AGREEMENT)
|
|
@@ -11504,9 +11504,7 @@
|
|
|
11504
11504
|
this.assessibleGovernmentPaymentsAmount = soleIncome
|
|
11505
11505
|
.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ASSESSIBLE_GOVERNMENT_PAYMENTS)
|
|
11506
11506
|
.amount;
|
|
11507
|
-
this.otherBusinessIncomeAmount =
|
|
11508
|
-
.filterBy('chartAccounts.id', BUSINESS_INCOME_OR_LOSSES_CATEGORIES.otherBusinessIncome)
|
|
11509
|
-
.amount;
|
|
11507
|
+
this.otherBusinessIncomeAmount = taxSummary.sole.items.sumByCategories([exports.TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME]);
|
|
11510
11508
|
this.nonPrimaryProductionTotalAmount = soleIncome
|
|
11511
11509
|
.filterBy('chartAccounts.category', exports.ChartAccountsCategoryEnum.SOLE_INCOME)
|
|
11512
11510
|
.amount;
|
|
@@ -11767,6 +11765,9 @@
|
|
|
11767
11765
|
this.otherDeductionsTotalAmount = this.transactions
|
|
11768
11766
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherDeductions)
|
|
11769
11767
|
.sumBy('claimAmount');
|
|
11768
|
+
this.depreciationAndCapitalAllowancesTotalAmount = this.depreciations
|
|
11769
|
+
.filter(function (depreciation) { return !depreciation.isLVP(); })
|
|
11770
|
+
.sumBy('claimAmount');
|
|
11770
11771
|
}
|
|
11771
11772
|
MyTaxDeductions.prototype.getVehicleExpensesTotalAmount = function () {
|
|
11772
11773
|
if (this.vehicleClaimDetails) {
|
|
@@ -11784,7 +11785,7 @@
|
|
|
11784
11785
|
MyTaxDeductions.prototype.setOtherWorkRelatedExpensesTotalAmount = function () {
|
|
11785
11786
|
var otherIncomeRelatedExpenses = this.transactions
|
|
11786
11787
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
|
|
11787
|
-
this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount'))
|
|
11788
|
+
this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -
|
|
11788
11789
|
this.depreciations.filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
|
|
11789
11790
|
};
|
|
11790
11791
|
MyTaxDeductions.prototype.calculateWorkRelatedSelfEducationTotalAmount = function () {
|
|
@@ -20377,6 +20378,10 @@
|
|
|
20377
20378
|
otherDeductionsTotalAmount: new forms.FormControl({
|
|
20378
20379
|
value: deductions.otherDeductionsTotalAmount,
|
|
20379
20380
|
disabled: true
|
|
20381
|
+
}),
|
|
20382
|
+
depreciationAndCapitalAllowancesTotalAmount: new forms.FormControl({
|
|
20383
|
+
value: deductions.depreciationAndCapitalAllowancesTotalAmount,
|
|
20384
|
+
disabled: true
|
|
20380
20385
|
})
|
|
20381
20386
|
}) || this;
|
|
20382
20387
|
return _this;
|