taxtank-core 0.29.3 → 0.29.5

package/bundles/taxtank-core.umd.js

@@ -8637,8 +8637,9 @@
         /**
          * @TODO vik business transactions calculated differently, separated collection?
          */
-        TransactionCollection.prototype.getBusinessClaimAmount = function (businessId, allocations) {
-            var transactions = this.filterBy('business.id', businessId);
+        TransactionCollection.prototype.getBusinessClaimAmount = function (allocations, businessId) {
+            if (businessId === void 0) { businessId = null; }
+            var transactions = businessId ? this.filterBy('business.id', businessId) : this;
             var expenses = transactions.getExpenseTransactions();
             var incomes = transactions.getIncomeTransactions();
             return incomes.calculateAllocatedClaimAmount(allocations) + expenses.sumBy('claimAmount');
@@ -9112,7 +9113,7 @@
                 var lossOffsetRule = (_a = _this.findBy('business.id', +businessId)) === null || _a === void 0 ? void 0 : _a.offsetRule;
                 var businessClaimAmount = transactionsByBusinessId
                     .get(businessId)
-                    .getBusinessClaimAmount(+businessId, allocations);
+                    .getBusinessClaimAmount(allocations, +businessId);
                 // @TODO vik it has nothing to do with getClaimAmountsByBusinessId
                 // no way to apply loss for business without profit if offset rules not met
                 if (businessClaimAmount < 0 && !lossOffsetRule) {
@@ -9383,14 +9384,14 @@
                 exports.TaxReturnCategoryListEnum.GOVERNMENT_PENSIONS,
                 exports.TaxReturnCategoryListEnum.ANNUITIES_SUPER_INCOME_STREAMS,
                 exports.TaxReturnCategoryListEnum.SUPERANNUATION_LUMP_SUM_PAYMENTS,
-                exports.TaxReturnCategoryListEnum.ATTRIBUTED_PSI_INCOME
+                exports.TaxReturnCategoryListEnum.ATTRIBUTED_PSI_INCOME,
+                exports.TaxReturnCategoryListEnum.DIVIDENDS,
+                exports.TaxReturnCategoryListEnum.GROSS_INTEREST
             ],
             expenses: [
                 exports.TaxReturnCategoryListEnum.WORK_EXPENSES
             ],
-            interest: [
-                exports.TaxReturnCategoryListEnum.GROSS_INTEREST
-            ],
+            interest: [],
             taxWithheld: [
                 exports.TaxReturnCategoryListEnum.TAX_WITHHELD
             ]
@@ -9414,9 +9415,9 @@
         other: {
             income: [
                 exports.TaxReturnCategoryListEnum.GROSS_INTEREST,
-                exports.TaxReturnCategoryListEnum.DIVIDENDS,
                 exports.TaxReturnCategoryListEnum.SHARE_SCHEMES,
                 exports.TaxReturnCategoryListEnum.PARTNERSHIPS,
+                exports.TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS,
                 exports.TaxReturnCategoryListEnum.TRUSTS,
                 exports.TaxReturnCategoryListEnum.PSI_SBE_INCOME,
                 exports.TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
@@ -11959,9 +11960,8 @@
             this.deductionsForGeneralSmallBusinessPoolAmount = depreciations
                 .getSBPDepreciations()
                 .sumBy('claimAmount');
-            this.currentYearNetNonPrimaryIncomeOrLossesAmount = +(allocations.filterBy('transaction.id', transactions.getIds()).sumBy('amount') -
-                depreciations.sumBy('claimAmount'))
-                .toFixed(2);
+            this.currentYearNetNonPrimaryIncomeOrLossesAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
+                .getBusinessClaimAmount(allocations);
             this.priorYearsNonPrimaryLossesAmount = businessLosses.sumBy('openBalance');
             this.netNonPrimaryIncomeOrLossesAmount = this.currentYearNetNonPrimaryIncomeOrLossesAmount -
                 this.priorYearsNonPrimaryLossesAmount;
@@ -12496,7 +12496,7 @@
             var _this = _super.call(this) || this;
             _this.openBalance = loss.openBalance;
             var claimAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
-                .getBusinessClaimAmount(loss.business.id, new TransactionAllocationCollection(allocations));
+                .getBusinessClaimAmount(new TransactionAllocationCollection(allocations), loss.business.id);
             _this.netIncome = claimAmount;
             _this.closeBalance = loss.offsetRule ? 0 : claimAmount - _this.openBalance;
             return _this;
@@ -19099,11 +19099,11 @@
                 openBalance: new forms.FormControl(loss.openBalance, [forms.Validators.required, forms.Validators.min(0)]),
                 offsetRule: new forms.FormControl((_a = loss.offsetRule) === null || _a === void 0 ? void 0 : _a.id),
                 // sum of depreciations/transactions claim amount - openBalance
-                balance: new forms.FormControl({ value: profit - loss.openBalance, disabled: true }),
+                balance: new forms.FormControl({ value: (profit - loss.openBalance).toFixed(2), disabled: true }),
             }, loss) || this;
             _this.loss = loss;
             _this.get('openBalance').valueChanges.subscribe(function (openBalance) {
-                _this.get('balance').setValue(profit - openBalance);
+                _this.get('balance').setValue((profit - openBalance).toFixed(2));
             });
             return _this;
         }
@@ -20165,9 +20165,6 @@
         return MyTaxBusinessLossesForm;
     }(AbstractForm));
 
-    /**
-     * @Todo waiting for the Sole tank implementation
-     */
     var MyTaxBusinessIncomeOrLossesForm = /** @class */ (function (_super) {
         __extends(MyTaxBusinessIncomeOrLossesForm, _super);
         function MyTaxBusinessIncomeOrLossesForm(businessDetails, businessIncome, businessLosses) {