taxtank-core 2.1.28 → 2.1.30

package/fesm2022/taxtank-core.mjs

@@ -613,6 +613,7 @@ let SoleBusiness$1 = class SoleBusiness extends ObservableModel {
         super(...arguments);
         this.isPrimaryProduction = false;
         this.isTaxFree = false;
+        this.isGST = false;
     }
     static { this.className = 'SoleBusiness'; }
 };
@@ -8782,16 +8783,18 @@ class SoleBusinessLossReport extends AbstractModel {
  * profit/loss report item
  */
 class SolePlItem {
-    constructor(transactions, priorTransactions) {
-        this.chartAccounts = (transactions.first ?? priorTransactions.first).chartAccounts;
-        this.amount = Math.abs(transactions.claimAmount);
-        this.priorAmount = Math.abs(priorTransactions.claimAmount);
+    constructor(transactions, data = {}) {
+        this.chartAccounts = transactions.first.chartAccounts;
+        this.name = transactions.first.chartAccounts.name;
+        this.amount = Math.abs(transactions.filterByFinancialYear('date').claimAmount);
+        this.priorAmount = Math.abs(transactions.filterByFinancialYear('date', null, FinancialYear.prev()).claimAmount);
         if (!this.priorAmount) {
             this.varianceRatio = NaN;
         }
         else {
             this.varianceRatio = (this.amount - this.priorAmount) / this.priorAmount;
         }
+        Object.assign(this, data);
     }
 }
 
@@ -9155,10 +9158,13 @@ class BudgetRuleItemCollection extends Collection {
 }
 
 class SolePlItemCollection extends Collection {
-    static fromTransactions(transactions, priorTransactions) {
+    static fromTransactions(transactions) {
         const transactionsByChartAccounts = transactions.groupBy('chartAccounts.id');
-        const priorTransactionsByChartAccounts = priorTransactions.groupBy('chartAccounts.id');
-        return new SolePlItemCollection([...new Set([...transactionsByChartAccounts.keys, ...priorTransactionsByChartAccounts.keys])].map(chartAccountsId => new SolePlItem(transactionsByChartAccounts.get(chartAccountsId), priorTransactionsByChartAccounts.get(chartAccountsId))));
+        const collection = new SolePlItemCollection(transactionsByChartAccounts.keys.map(chartAccountsId => new SolePlItem(transactionsByChartAccounts.get(chartAccountsId))));
+        // collection.push(
+        //   new SolePlItem(transactions.filterBy('chartAccounts.category', ChartAccountsCategoryEnum.SOLE_DEPRECIATION))
+        // );
+        return collection;
     }
     get amount() {
         return this.sumBy('amount');
@@ -9168,7 +9174,7 @@ class SolePlItemCollection extends Collection {
     }
     get varianceRatio() {
         const priorAmount = this.priorAmount;
-        return this.priorAmount ? (this.amount - priorAmount) / priorAmount : NaN;
+        return priorAmount ? (this.amount - priorAmount) / priorAmount : NaN;
     }
 }