taxtank-core 2.0.81 → 2.0.83

package/fesm2022/taxtank-core.mjs

@@ -8632,7 +8632,18 @@ class BudgetRuleItem {
         this.tankType = TankTypeEnum[rule.chartAccounts.tankType];
         this.frequency = DailyFrequencyEnum[rule.frequency] ?? 'Once';
         this.forecast = rule.amount;
+        if (rule.business) {
+            transactions = transactions.filterBy('business.id', rule.business.id);
+        }
+        if (rule.incomeSource) {
+            transactions = transactions.filterBy('incomeSource.id', rule.incomeSource.id);
+        }
+        if (rule.property) {
+            transactions = transactions.filterBy('property.id', rule.property.id);
+        }
         this.actual = Math.abs(transactions.sumBy('amount'));
+        this.startDate = rule.startDate;
+        this.endDate = rule.endDate;
     }
 }
 
@@ -9404,6 +9415,10 @@ class BudgetRuleCollection extends Collection {
     getByMonth(index) {
         return new BudgetRuleCollection(this.items.filter(rule => rule.inMonth(index)));
     }
+    getByChartAccountsName(name) {
+        const searchQuery = name.toLowerCase().trim();
+        return this.filter(rule => rule.chartAccounts.name.toLowerCase().includes(searchQuery));
+    }
 }
 
 class AllocationGroupCollection extends Collection {
@@ -23642,7 +23657,7 @@ class BudgetRuleForm extends AbstractForm {
             inCalendar: new FormControl(rule.inCalendar),
             frequency: new FormControl(rule.frequency),
             description: new FormControl(rule.description),
-            bankAccount: new FormControl(rule.endDate, conditionalValidator(() => !!this.value.inCalendar, Validators.required)),
+            bankAccount: new FormControl(rule.bankAccount, conditionalValidator(() => !!this.value.inCalendar, Validators.required)),
             property: new FormControl(rule.property, conditionalValidator(() => this.value.tankType === TankTypeEnum.PROPERTY, Validators.required)),
             business: new FormControl(rule.business, conditionalValidator(() => this.value.tankType === TankTypeEnum.SOLE, Validators.required)),
             incomeSource: new FormControl(rule.incomeSource, conditionalValidator(() => this.value.chartAccounts?.isWorkIncome(), Validators.required)),