taxtank-core 3.0.36 → 3.0.37

package/fesm2022/taxtank-core.mjs

@@ -7497,25 +7497,28 @@ class Transaction extends Transaction$1 {
         return this.grossAmount - untaxableAdjustment;
     }
     get grossAmountWithoutGst() {
-        let grossAmount = this.amount + this.tax;
+        return this.calculateGrossAmountWithoutGst(this.amount);
+    }
+    get grossClaimAmountWithoutGst() {
+        return this.calculateGrossAmountWithoutGst(this.claimAmount);
+    }
+    calculateGrossAmountWithoutGst(amount) {
+        let grossAmount = amount + this.tax;
         if (this.isExpense()) {
             return grossAmount;
         }
-        // included transactions affect parent transaction amount and as a result grossAmount, skip to avoid double sum
+        // Included transactions already affect the parent amount.
         const adjustments = new Collection(this.transactions)
             .filter(transaction => !transaction.chartAccounts?.isAdjustmentIncluded());
         const income = adjustments.filter(transaction => transaction.isIncome()).sumBy('amount');
         const expense = adjustments.filter(transaction => transaction.isExpense()).sumBy('amount', true);
-        // all adjustments except property income increase grossIncome
+        // All adjustments except property income increase gross income.
         grossAmount += expense + (this.isPropertyTank() ? -income : income);
         if (this.isWorkTank() || this.isHoldingTank()) {
             grossAmount += this.frankingCredit - this.taxFreeComponent - this.eligibleForReduction;
         }
         return grossAmount;
     }
-    get grossClaimAmountWithoutGst() {
-        return this.grossAmountWithoutGst * this.claimRatio;
-    }
     /**
      * @TODO vik confusing logic demanded by Nicole, we need a better ux to fix it
      * netAmount matches received payment (bankTransaction amount), includes gst and salary included adjustments
@@ -9176,7 +9179,7 @@ class PropertyReportItemTransaction extends PropertyReportItem {
         this.description = chartAccounts.name;
     }
     get shareClaimAmount() {
-        return this.transactions.claimAmount;
+        return this.transactions.sumBy('grossClaimAmountWithoutGst');
     }
 }