taxtank-core 0.28.104 → 0.28.105

package/bundles/taxtank-core.umd.js

@@ -12017,23 +12017,22 @@
         function MyTaxPartnershipsAndTrusts(transactions, incomeSources) {
             this.transactions = transactions;
             this.incomeSources = incomeSources;
-            this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_INCOME);
-            this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
+            this.partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_INCOME);
+            this.partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
             this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TRUST_INCOME);
             this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TRUST_EXPENSES);
-            this.trustType = this.getTrustType();
-            this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +
-                (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));
-            this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -
-                this.partnershipExpenses.sumBy('amount');
-            this.trustsNetIncome = this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount');
-            this.partnershipsSmallBusinessNetIncome = this.partnershipIncomes.sumBy('amount') -
-                this.partnershipExpenses.sumBy('amount');
-            this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -
-                this.trustsExpenses.sumBy('amount');
-            this.taxPaidTotal = this.transactions
+            this.partnershipsIncomeTotalAmount = this.partnershipsIncomes.sumBy('amount');
+            this.partnershipsExpenseTotalAmount = this.partnershipsExpenses.sumBy('amount');
+            this.trustsIncomeTotalAmount = this.trustsIncomes.sumBy('amount');
+            this.trustsExpenseTotalAmount = this.trustsExpenses.sumBy('amount');
+            this.partnershipsNetNonPrimaryProductionAmount = this.partnershipsIncomeTotalAmount - this.partnershipsExpenseTotalAmount;
+            this.trustsNetNonPrimaryProductionAmount = this.trustsIncomeTotalAmount - this.trustsExpenseTotalAmount;
+            this.frankingCreditsTotal = this.transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
-                .sumBy('tax');
+                .getTransactionsMetadata()
+                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.FRANKING_CREDIT)
+                .sumBy('value');
+            this.trustsIncomeTotalTax = this.trustsIncomes.sumBy('tax');
             this.frankingCreditsTotal = this.transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
                 .getTransactionsMetadata()
@@ -12041,22 +12040,6 @@
                 .sumBy('value');
             this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
         }
-        /**
-         * Get Income source forecast trust type, related to trust income with max amount
-         */
-        MyTaxPartnershipsAndTrusts.prototype.getTrustType = function () {
-            var filteredTrustIncomes = this.trustsIncomes
-                .filterBy('incomeSource.id', this.incomeSources
-                .removeBy('actualForecast.trustType', null)
-                .getIds());
-            if (!filteredTrustIncomes.length) {
-                return null;
-            }
-            return this.incomeSources
-                .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
-                .actualForecast
-                .trustType;
-        };
         return MyTaxPartnershipsAndTrusts;
     }());
 
@@ -20632,21 +20615,24 @@
         __extends(MyTaxPartnershipsAndTrustsForm, _super);
         function MyTaxPartnershipsAndTrustsForm(partnershipsAndTrusts) {
             return _super.call(this, {
-                partnershipsNetIncome: new forms.FormControl({
-                    value: partnershipsAndTrusts.partnershipsNetIncome,
+                partnershipsIncomeTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.partnershipsIncomeTotalAmount,
+                    disabled: true
+                }),
+                partnershipsExpenseTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.partnershipsExpenseTotalAmount,
+                    disabled: true
+                }),
+                trustsIncomeTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.trustsIncomeTotalAmount,
                     disabled: true
                 }),
-                trustsNetIncome: new forms.FormControl({
-                    value: partnershipsAndTrusts.trustsNetIncome,
+                trustsExpenseTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.trustsExpenseTotalAmount,
                     disabled: true
                 }),
-                trustType: new forms.FormControl(partnershipsAndTrusts.trustType, conditionalValidator(function (control) {
-                    return !!partnershipsAndTrusts.trustsIncomes.length;
-                }, forms.Validators.required)),
-                partnershipsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, forms.Validators.required),
-                trustsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, forms.Validators.required),
-                taxPaidTotal: new forms.FormControl({
-                    value: partnershipsAndTrusts.taxPaidTotal,
+                trustsIncomeTotalTax: new forms.FormControl({
+                    value: partnershipsAndTrusts.trustsIncomeTotalTax,
                     disabled: true
                 }),
                 frankingCreditsTotal: new forms.FormControl({