Skip to content

Firefly III: a personal finances manager

🤖 Auto commit for release 'develop' on 2026-09-25

JC5bbad932caf1a
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php
index 94be2ae461..df99eef909 100644
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -158,10 +158,7 @@ final class TagController extends Controller
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
- $response[$foreignKey]['difference'] = bcadd(
- (string) $response[$foreignKey]['difference'],
- Steam::positive($journal['foreign_amount'])
- );
+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}
}
diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
index b7b85fd376..f92a7aa9f0 100644
--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
@@ -155,10 +155,7 @@ final class TagController extends Controller
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
- $response[$foreignKey]['difference'] = bcadd(
- (string) $response[$foreignKey]['difference'],
- Steam::positive($journal['foreign_amount'])
- );
+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
}
}
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index d461374baa..2edb4f5531 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -198,13 +198,7 @@ final class BudgetLimitController extends Controller
if ($request->expectsJson()) {
$array = $limit->toArray();
// add some extra metadata:
- $spentArr = $this->opsRepository->sumExpenses(
- $limit->start_date,
- $limit->end_date,
- null,
- new Collection()->push($budget),
- $currency
- );
+ $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';
$array['left_formatted'] = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));
$array['amount_formatted'] = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);
diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php
index 52c6f900e3..65429e59c1 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -272,10 +272,7 @@ final class IndexController extends Controller
if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
$array['spent'][$currency->id]['spent'] = $spentArr[$currency->id]['sum'];
- $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub(
- $spentInLimits[$currency->id],
- $spentArr[$currency->id]['sum']
- ));
+ $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));
$array['spent'][$currency->id]['currency_id'] = $currency->id;
$array['spent'][$currency->id]['currency_symbol'] = $currency->symbol;
$array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index f4b32fe5c5..ad724137dc 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -539,13 +539,7 @@ final class BudgetController extends Controller
}
// get spent amount in this period for this currency.
- $sum = $this->opsRepository->sumExpenses(
- $currentStart,
- $currentEnd,
- $accounts,
- new Collection()->push($budget),
- $currency
- );
+ $sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');
$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);
diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.php
index affea656a0..476da65ac3 100644
--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@@ -132,13 +132,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
// if has one, calculate expenses and use that as a base.
$repository = app(OperationsRepositoryInterface::class);
$repository->setUser($autoBudget->budget->user);
- $spent = $repository->sumExpenses(
- $previousStart,
- $previousEnd,
- null,
- new Collection()->push($autoBudget->budget),
- $autoBudget->transactionCurrency
- );
+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
$currencyId = $autoBudget->transaction_currency_id;
$spentAmount = $spent[$currencyId]['sum'] ?? '0';
Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@@ -228,13 +222,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
// if has one, calculate expenses and use that as a base.
$repository = app(OperationsRepositoryInterface::class);
$repository->setUser($autoBudget->budget->user);
- $spent = $repository->sumExpenses(
- $previousStart,
- $previousEnd,
- null,
- new Collection()->push($autoBudget->budget),
- $autoBudget->transactionCurrency
- );
+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
$currencyId = $autoBudget->transaction_currency_id;
$spentAmount = $spent[$currencyId]['sum'] ?? '0';
Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.php
index a507156873..a3a940b1ba 100644
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -222,14 +222,7 @@ trait AugumentData
$currentEnd->addMonth();
}
// primary currency amount.
- $expenses = $opsRepository->sumExpenses(
- $currentStart,
- $currentEnd,
- null,
- $budgetCollection,
- $entry->transactionCurrency,
- $this->convertToPrimary
- );
+ $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);
$spent = $expenses[$currency->id]['sum'] ?? '0';
$entry->pc_spent = $spent;
diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
index 2428353cb0..d0c09bf027 100644
--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
@@ -354,11 +354,7 @@ class RecurringEnrichment implements EnrichmentInterface
/** @var RecurrenceRepetition $repetition */
foreach ($set as $repetition) {
- $recurrence = $this->collection->filter(
- static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id
- )
- ->first()
- ;
+ $recurrence = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();
$fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);
$recurrenceId = (int) $repetition->recurrence_id;
$repId = (int) $repetition->id;
diff --git a/changelog.md b/changelog.md
index 372216f0bc..b81dfbfea7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,21 +16,21 @@ Many issues fixed with [some lingering issues](https://github.com/firefly-iii/fi
### Fixed
-- Many issues from #12746
-- #12793
+- Many issues from [Discussion 12746](https://github.com/orgs/firefly-iii/discussions/12746) (New UI feedback) started by @Insprill
+- [Issue 12793](https://github.com/firefly-iii/firefly-iii/issues/12793) (v6.7: Printing Reports to PDF creates huge files (40 MB), blank first page and artefacts) reported by @tofublock
- [Issue 12819](https://github.com/firefly-iii/firefly-iii/issues/12819) (Suscriptions with attachment in show page returns 500 error page) reported by @jsaneu
-- #12822
-- #12823
-- #12824
-- #12825
-- #12827
-- #12828
-- #12848
-- #12851
-- #12855
-- #12859
-- #12862
-- #12864
+- [Issue 12822](https://github.com/firefly-iii/firefly-iii/issues/12822) (Dashboard - long text breaks alignment in top boxes) reported by @kirby0025
+- [Issue 12823](https://github.com/firefly-iii/firefly-iii/issues/12823) (Date range selector doesn't account for today's date) reported by @adam50hhh
+- [Issue 12824](https://github.com/firefly-iii/firefly-iii/issues/12824) (Can not create or modify any transaction) reported by @somethingGoneWrong
+- [Issue 12825](https://github.com/firefly-iii/firefly-iii/issues/12825) (Finish editing a post does not redirect) reported by @gthbusrr
+- [Issue 12827](https://github.com/firefly-iii/firefly-iii/issues/12827) (Bulk category change broken on 6.7.3) reported by @vitaliprenger
+- [Issue 12828](https://github.com/firefly-iii/firefly-iii/issues/12828) (Tag report: Average expense per destination account) reported by @marc22polo
+- [Issue 12848](https://github.com/firefly-iii/firefly-iii/issues/12848) (Dashboard graph - multi currency) reported by @marc22polo
+- [Issue 12851](https://github.com/firefly-iii/firefly-iii/issues/12851) (Date selector Month to Date start date inaccurate month selection) reported by @ppslim
+- [Issue 12855](https://github.com/firefly-iii/firefly-iii/issues/12855) (Currency exchange transfers missing foreign amount and foreign currency fields) reported by @absdjfh
+- [Issue 12859](https://github.com/firefly-iii/firefly-iii/issues/12859) (Using debt account as source account doesn't automatically get registered as withdrawal transaction on v6.7.x UI) reported by @CinnamonPyro
+- [Issue 12862](https://github.com/firefly-iii/firefly-iii/issues/12862) (Wrong running balance: new transaction on a later date uses the first transaction of the previous day as its previous balance) reported by @Jerem59
+- [Issue 12864](https://github.com/firefly-iii/firefly-iii/issues/12864) (Undoing reconciliation on v6.7.x UI causes 405 Method Not Allowed response) reported by @CinnamonPyro
### API
diff --git a/composer.lock b/composer.lock
index 288c8d798d..8368d88f43 100644
--- a/composer.lock
+++ b/composer.lock
@@ -11638,11 +11638,11 @@
},
{
"name": "phpstan/phpstan",
- "version": "2.2.15",
+ "version": "2.2.16",
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b158556ffd26825cf615a1c1f72fb5157a2301b7",
- "reference": "b158556ffd26825cf615a1c1f72fb5157a2301b7",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46a6d9060e5a7763adfcc21ebcb8b504ebdbcb92",
+ "reference": "46a6d9060e5a7763adfcc21ebcb8b504ebdbcb92",
"shasum": ""
},
"require": {
@@ -11698,7 +11698,7 @@
"type": "github"
}
],
- "time": "2026-09-23T12:23:07+00:00"
+ "time": "2026-09-25T09:31:51+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -11805,16 +11805,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "14.3.4",
+ "version": "14.3.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "93bd0e0cbe90030d2b734fd6df6ef61a7c1230e8"
+ "reference": "96af7aaa1e15561a67b2fa5b98906b063ebec9c2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/93bd0e0cbe90030d2b734fd6df6ef61a7c1230e8",
- "reference": "93bd0e0cbe90030d2b734fd6df6ef61a7c1230e8",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/96af7aaa1e15561a67b2fa5b98906b063ebec9c2",
+ "reference": "96af7aaa1e15561a67b2fa5b98906b063ebec9c2",
"shasum": ""
},
"require": {
@@ -11871,7 +11871,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.3.4"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.3.5"
},
"funding": [
{
@@ -11891,7 +11891,7 @@
"type": "tidelift"
}
],
- "time": "2026-09-25T03:17:09+00:00"
+ "time": "2026-09-25T08:28:49+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -12188,16 +12188,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "13.3.4",
+ "version": "13.3.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "d19d90cf860efb7e4d96cee8243e06a248578085"
+ "reference": "1b482b9a77774705a5c4a47ab7d60819d2589e90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d19d90cf860efb7e4d96cee8243e06a248578085",
- "reference": "d19d90cf860efb7e4d96cee8243e06a248578085",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b482b9a77774705a5c4a47ab7d60819d2589e90",
+ "reference": "1b482b9a77774705a5c4a47ab7d60819d2589e90",
"shasum": ""
},
"require": {
@@ -12211,7 +12211,7 @@
"phar-io/manifest": "^2.0.4",
"phar-io/version": "^3.2.1",
"php": ">=8.4.1",
- "phpunit/php-code-coverage": "^14.3.3",
+ "phpunit/php-code-coverage": "^14.3.5",
"phpunit/php-file-iterator": "^7.0.2",
"phpunit/php-invoker": "^7.0.0",
"phpunit/php-text-template": "^6.0.0",
@@ -12268,7 +12268,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/13.3.4"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/13.3.5"
},
"funding": [
{
@@ -12276,7 +12276,7 @@
"type": "other"
}
],
- "time": "2026-09-15T07:37:05+00:00"
+ "time": "2026-09-25T08:41:20+00:00"
},
{
"name": "rector/rector",
diff --git a/config/firefly.php b/config/firefly.php
index 43c35c7ddc..e7f6249ffe 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-09-25',
-'build_time' => 1790315013,
+'build_time' => 1790346485,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.
diff --git a/resources/assets/v3/js/pages/transactions/shared/detect-transaction-type.js b/resources/assets/v3/js/pages/transactions/shared/detect-transaction-type.js
index 5c3d2323d9..ba9e5c461e 100644
--- a/resources/assets/v3/js/pages/transactions/shared/detect-transaction-type.js
+++ b/resources/assets/v3/js/pages/transactions/shared/detect-transaction-type.js
@@ -38,8 +38,6 @@ export function detectTransactionType() {
// and the foreign amount (if different) in that of the destination account.
console.log("filter down currencies for transfer:");
-
-
this.determineAmountCurrency(this.entries[0].source_account.account_currency_code);
this.filterForeignCurrencies(this.entries[0].destination_account.account_currency_code);
this.disableSplitInputs();
diff --git a/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js b/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js
index efde69db9b..83c728d135 100644
--- a/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js
+++ b/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js
@@ -22,39 +22,44 @@
import Autocomplete from "bootstrap5-autocomplete";
export function disableSplitInputs() {
- let isTransferOrWithdrawal = "transfer" === this.groupProperties.transactionType || "withdrawal" === this.groupProperties.transactionType;
- let isTransferOrDeposit = "transfer" === this.groupProperties.transactionType || "deposit" === this.groupProperties.transactionType;
+ let isTransferOrWithdrawal =
+ "transfer" === this.groupProperties.transactionType || "withdrawal" === this.groupProperties.transactionType;
+ let isTransferOrDeposit =
+ "transfer" === this.groupProperties.transactionType || "deposit" === this.groupProperties.transactionType;
//console.log('Activate disableSplitInputs');
// disable source and/or destination, based on account type.
for (let i = 0; i < this.entries.length; i++) {
// is withdrawal? limit destination types to expense, loan debt mortgage
- if("withdrawal" === this.groupProperties.transactionType) {
+ if ("withdrawal" === this.groupProperties.transactionType) {
const el = document.getElementById("dest_" + i);
const inst = Autocomplete.getInstance(el);
- if(null !== inst) {
- let params = inst.getConfig('serverParams');
- params.types = ["Expense account", "Loan", "Debt", "Mortgage"];
- inst.setConfig('serverParams', params);
+ if (null !== inst) {
+ let params = inst.getConfig("serverParams");
+ params.types = ["Expense account", "Loan", "Debt", "Mortgage"];
+ inst.setConfig("serverParams", params);
}
}
// is deposit? limit destination types.
- if("deposit" === this.groupProperties.transactionType) {
+ if ("deposit" === this.groupProperties.transactionType) {
const el = document.getElementById("dest_" + i);
const inst = Autocomplete.getInstance(el);
- if(null !== inst) {
- let params = inst.getConfig('serverParams');
+ if (null !== inst) {
+ let params = inst.getConfig("serverParams");
params.types = ["Asset account", "Loan", "Debt", "Mortgage"];
- inst.setConfig('serverParams', params);
+ inst.setConfig("serverParams", params);
}
}
// is transfer? No limit to source types.
- if("deposit" !== this.groupProperties.transactionType && "withdrawal" === this.groupProperties.transactionType) {
+ if (
+ "deposit" !== this.groupProperties.transactionType &&
+ "withdrawal" === this.groupProperties.transactionType
+ ) {
const el = document.getElementById("dest_" + i);
const inst = Autocomplete.getInstance(el);
- if(null !== inst) {
- let params = inst.getConfig('serverParams');
+ if (null !== inst) {
+ let params = inst.getConfig("serverParams");
params.types = [];
- inst.setConfig('serverParams', params);
+ inst.setConfig("serverParams", params);
}
}
@@ -64,7 +69,7 @@ export function disableSplitInputs() {
// if is withdrawal, pre-fill the destination account with the first entry's destination account.
if ("withdrawal" === this.groupProperties.transactionType) {
- this.entries[i].destination_account = this.entries[i-1].destination_account;
+ this.entries[i].destination_account = this.entries[i - 1].destination_account;
}
// disable source when withdrawal or transfer
diff --git a/resources/assets/v3/js/shared/draw-chart.js b/resources/assets/v3/js/shared/draw-chart.js
index 2b90ebf546..66de704b64 100644
--- a/resources/assets/v3/js/shared/draw-chart.js
+++ b/resources/assets/v3/js/shared/draw-chart.js
@@ -571,19 +571,19 @@ function colorizeAllData(data) {
let index = i % colors.length;
if (data.datasets[i].label.startsWith("budgeted")) {
index = 0;
- transparency =0.5;
+ transparency = 0.5;
}
if (data.datasets[i].label.startsWith("overspent")) {
index = 5;
- transparency =0.5;
+ transparency = 0.5;
}
if (data.datasets[i].label.startsWith("spent")) {
index = 5;
- transparency =0.5;
+ transparency = 0.5;
}
if (data.datasets[i].label.startsWith("left")) {
index = 2;
- transparency =0.5;
+ transparency = 0.5;
}
let color = colors[index];
// grab color from colors, use modulo to make sure we don't go out of bounds.