Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-10-08
JC58979e5ad5a91
diff --git a/THANKS.md b/THANKS.mdindex 2839b6f7f6..e4e9d01869 100755--- a/THANKS.md+++ b/THANKS.md@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not alPlease find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.## 2025+- codearena-bot- Nicky De Maeyer- Denis Iskandarov- Lompidiff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.phpindex f5802bc2ed..72f7228f20 100644--- a/app/TransactionRules/Engine/SearchRuleEngine.php+++ b/app/TransactionRules/Engine/SearchRuleEngine.php@@ -506,20 +506,21 @@ class SearchRuleEngine implements RuleEngineInterface*/private function fireGroup(RuleGroup $group): void{- $rules =[];- if($group->relationLoaded('rules')) {+ $rules = [];+ if ($group->relationLoaded('rules')) {Log::debug('Group rules have been pre-loaded, do not reload them.');$rules = $group->rules;}- if(!$group->relationLoaded('rules')) {+ if (!$group->relationLoaded('rules')) {Log::debug('Group rules have NOT been pre-loaded, load them NOW.');$rules = $group->rules()- ->orderBy('rules.order', 'ASC')+ ->orderBy('rules.order', 'ASC')// ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')// ->where('rule_triggers.trigger_type', 'user_action')// ->where('rule_triggers.trigger_value', 'store-journal')- ->where('rules.active', true)- ->get(['rules.*']);+ ->where('rules.active', true)+ ->get(['rules.*'])+ ;}Log::debug(sprintf('Going to fire group #%d with %d rule(s)', $group->id, $rules->count()));diff --git a/config/firefly.php b/config/firefly.phpindex c2872fa1b5..ef01270bb8 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2025-10-08',- 'build_time' => 1759908015,+ 'build_time' => 1759931348,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex af16b7af1a..00f94f6f7a 100644--- a/package-lock.json+++ b/package-lock.json@@ -7908,13 +7908,17 @@"license": "MIT"},"node_modules/loader-runner": {- "version": "4.3.0",- "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",- "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",+ "version": "4.3.1",+ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",+ "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==","dev": true,"license": "MIT","engines": {"node": ">=6.11.5"+ },+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/webpack"}},"node_modules/loader-utils": {