Merge pull request #10210 from firefly-iii/release-1745681629

🤖 Automatically merge the PR into the develop branch.

app/Console/Commands/System/RecalculatesRunningBalance.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * RecalculatesRunningBalance.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Support\Models\AccountBalanceCalculator;
+use Illuminate\Console\Command;
+
+class RecalculatesRunningBalance extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:refresh-running-balance {--F|force : Force the execution of this command.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Refreshes all running balances. May take a long time to run if forced.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        if (true === config('firefly.feature_flags.running_balance_column')) {
+            $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
+            $this->correctBalanceAmounts($this->option('force'));
+            $this->friendlyInfo('Done recalculating account balances.');
+
+            return 0;
+        }
+        $this->friendlyWarning('This command has been disabled.');
+    }
+
+    private function correctBalanceAmounts(bool $forced): void
+    {
+        AccountBalanceCalculator::recalculateAll($forced);
+    }
+}

app/Support/Models/AccountBalanceCalculator.php

@@ -89,6 +89,7 @@ class AccountBalanceCalculator
         }
 
         $set      = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']);
+        Log::debug(sprintf('Counted %d transaction(s)', $set->count()));
 
         // the balance value is an array.
         // first entry is the balance, second is the date.

package-lock.json

@@ -5635,9 +5635,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.142",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.142.tgz",
-            "integrity": "sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w==",
+            "version": "1.5.143",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.143.tgz",
+            "integrity": "sha512-QqklJMOFBMqe46k8iIOwA9l2hz57V2OKMmP5eSWcUvwx+mASAsbU+wkF1pHjn9ZVSBPrsYWr4/W/95y5SwYg2g==",
             "dev": true,
             "license": "ISC"
         },

resources/views/list/groups.twig

@@ -266,6 +266,12 @@
                             {% else %}
                                 {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% endif %}
+                        {% elseif transaction.transaction_type_type == 'Transfer' %}
+                            {% if account.id == transaction.source_account_id %}
+                                {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% else %}
+                                {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% endif %}
                         {% else %}
                              
                         {% endif %}