Skip to content

Firefly III: a personal finances manager

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

JC5feb09f8d84d2
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php
index df99eef909..94be2ae461 100644
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -158,7 +158,10 @@ 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 f92a7aa9f0..b7b85fd376 100644
--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
@@ -155,7 +155,10 @@ 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 2edb4f5531..d461374baa 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -198,7 +198,13 @@ 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 65429e59c1..52c6f900e3 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -272,7 +272,10 @@ 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 ad724137dc..f4b32fe5c5 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -539,7 +539,13 @@ 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 476da65ac3..affea656a0 100644
--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@@ -132,7 +132,13 @@ 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));
@@ -222,7 +228,13 @@ 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 a3a940b1ba..a507156873 100644
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -222,7 +222,14 @@ 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 d0c09bf027..2428353cb0 100644
--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
@@ -354,7 +354,11 @@ 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 f031310071..b996e7b12a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -24,8 +24,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- [Issue 12878](https://github.com/firefly-iii/firefly-iii/issues/12878) (Reconciling Accounts directly from Assets Account page causes 404) reported by @DipeshAggarwal
-- #12860
-- #12885
+- [Issue 12860](https://github.com/firefly-iii/firefly-iii/issues/12860) (Not yet stored attachments, return false) reported by @Tealk
+- [Issue 12885](https://github.com/firefly-iii/firefly-iii/issues/12885) (Some fields on the Extra Information are blank when editing a transaction) reported by @rvelasq
### Security
diff --git a/config/firefly.php b/config/firefly.php
index e155ccaf57..76b1def6dd 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-26',
-'build_time' => 1790391085,
+'build_time' => 1790392684,
'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/accounts/index.js b/resources/assets/v3/js/pages/accounts/index.js
index 5f5bf6dca6..584c15611b 100644
--- a/resources/assets/v3/js/pages/accounts/index.js
+++ b/resources/assets/v3/js/pages/accounts/index.js
@@ -69,15 +69,15 @@ let index = function () {
if ("inactive-accounts" === page[page.length - 2]) {
this.active = false;
}
- let defaultSortColumn = 'order';
+ let defaultSortColumn = "order";
this.objectType = page[page.length - 1].substring(0, 15);
this.pageNavUrl = "./accounts/" + this.objectType;
const params = new Proxy(new URLSearchParams(window.location.search), {
get: (searchParams, prop) => searchParams.get(prop),
});
- if('expense' === this.objectType || 'revenue' === this.objectType) {
- defaultSortColumn = 'name';
+ if ("expense" === this.objectType || "revenue" === this.objectType) {
+ defaultSortColumn = "name";
}
this.sortColumn = params.column ?? defaultSortColumn;
diff --git a/resources/assets/v3/js/pages/dashboard/boxes.js b/resources/assets/v3/js/pages/dashboard/boxes.js
index 7535240da2..9d8dadbce9 100644
--- a/resources/assets/v3/js/pages/dashboard/boxes.js
+++ b/resources/assets/v3/js/pages/dashboard/boxes.js
@@ -98,7 +98,9 @@ export default () => ({
}
let key = current.key;
if (key.startsWith("balance-in-")) {
- this.balanceBox.amounts.push(formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code),);
+ this.balanceBox.amounts.push(
+ formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code),
+ );
continue;
}
// spent info is used in subtitle:
@@ -108,7 +110,9 @@ export default () => ({
subtitles[current.currency_code] = "";
}
// append the amount spent.
- subtitles[current.currency_code] = subtitles[current.currency_code] + formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code);
+ subtitles[current.currency_code] =
+ subtitles[current.currency_code] +
+ formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code);
continue;
}
// earned info is used in subtitle:
@@ -118,12 +122,17 @@ export default () => ({
subtitles[current.currency_code] = "";
}
// prepend the amount earned.
- subtitles[current.currency_code] = formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code) + " + " + subtitles[current.currency_code];
+ subtitles[current.currency_code] =
+ formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code) +
+ " + " +
+ subtitles[current.currency_code];
continue;
}
if (key.startsWith("bills-unpaid-in-")) {
- this.billBox.unpaid.push(formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code),);
+ this.billBox.unpaid.push(
+ formatMoney(this.anonymous ? 0 : current.monetary_value, current.currency_code),
+ );
continue;
}
if (key.startsWith("bills-paid-in-")) {
diff --git a/resources/assets/v3/js/pages/transactions/create.js b/resources/assets/v3/js/pages/transactions/create.js
index dbec94bfec..a2fe33ebf4 100644
--- a/resources/assets/v3/js/pages/transactions/create.js
+++ b/resources/assets/v3/js/pages/transactions/create.js
@@ -236,7 +236,7 @@ let create = function () {
processUpload() {
// console.log("Now in processUpload()");
this.formStates.storedAttachments = true;
- this.showMessageOrRedirectUser('create.js processUpload');
+ this.showMessageOrRedirectUser("create.js processUpload");
},
clearDescription(index) {
this.entries[index].description = "";
@@ -405,7 +405,7 @@ let create = function () {
return;
}
- this.showMessageOrRedirectUser('save Post>then submission');
+ this.showMessageOrRedirectUser("save Post>then submission");
})
.catch((error) => {
this.formStates.isSubmitting = true;
diff --git a/resources/assets/v3/js/pages/transactions/edit.js b/resources/assets/v3/js/pages/transactions/edit.js
index 826a70dc71..6727d95496 100644
--- a/resources/assets/v3/js/pages/transactions/edit.js
+++ b/resources/assets/v3/js/pages/transactions/edit.js
@@ -359,7 +359,7 @@ let transactions = function () {
// TODO is a duplicate
processUpload() {
this.formStates.storedAttachments = true;
- this.showMessageOrRedirectUser('edit.js processUpload');
+ this.showMessageOrRedirectUser("edit.js processUpload");
},
// submit the transaction form.
@@ -429,7 +429,7 @@ let transactions = function () {
}
// if not, respond to user options:
- this.showMessageOrRedirectUser('edit.js save Put submission');
+ this.showMessageOrRedirectUser("edit.js save Put submission");
})
.catch((error) => {
console.error(error);
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 44808d8399..89c0e13908 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
@@ -60,7 +60,7 @@ export function detectTransactionType() {
}
if (["Debt", "Loan", "Mortgage"].includes(sourceType) && "Expense account" === destType) {
this.groupProperties.transactionType = "withdrawal";
- console.log('[c] Transaction type is detected to be "' + this.groupProperties.transactionType + '".',);
+ console.log('[c] Transaction type is detected to be "' + this.groupProperties.transactionType + '".');
this.determineAmountCurrency(this.entries[0].source_account.account_currency_code);
this.disableSplitInputs();
return;
@@ -69,14 +69,14 @@ export function detectTransactionType() {
// deposits:
if ("Revenue account" === sourceType && ["Asset account", "Debt", "Loan", "Mortgage"].includes(destType)) {
this.groupProperties.transactionType = "deposit";
- console.log('Transaction type is detected to be "' + this.groupProperties.transactionType + '".',);
+ console.log('Transaction type is detected to be "' + this.groupProperties.transactionType + '".');
this.disableSplitInputs();
this.determineAmountCurrency(this.entries[0].destination_account.account_currency_code);
return;
}
if ("unknown" === sourceType && ["Asset account", "Debt", "Loan", "Mortgage"].includes(destType)) {
this.groupProperties.transactionType = "deposit";
- console.log('Transaction type is detected to be "' + this.groupProperties.transactionType + '".',);
+ console.log('Transaction type is detected to be "' + this.groupProperties.transactionType + '".');
this.determineAmountCurrency(this.entries[0].destination_account.account_currency_code);
this.disableSplitInputs();
return;
@@ -91,7 +91,7 @@ export function detectTransactionType() {
}
if (["Debt", "Loan", "Mortgage"].includes(sourceType) && "Asset account" === destType) {
this.groupProperties.transactionType = "deposit";
- console.log('Transaction type is detected to be "' + this.groupProperties.transactionType + '".',);
+ console.log('Transaction type is detected to be "' + this.groupProperties.transactionType + '".');
this.determineAmountCurrency(this.entries[0].destination_account.account_currency_code);
this.disableSplitInputs();
return;
diff --git a/resources/assets/v3/js/pages/transactions/shared/process-attachments.js b/resources/assets/v3/js/pages/transactions/shared/process-attachments.js
index 2826d12dfd..2b55eb0732 100644
--- a/resources/assets/v3/js/pages/transactions/shared/process-attachments.js
+++ b/resources/assets/v3/js/pages/transactions/shared/process-attachments.js
@@ -85,7 +85,11 @@ export function processAttachments(groupId, transactions) {
for (const key in attachments) {
if (Object.hasOwn(attachments, key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
for (const fileKey in attachments[key].files) {
- if (Object.hasOwn(attachments[key].files, fileKey) && /^0$|^[1-9]\d*$/.test(fileKey) && fileKey <= 4294967294) {
+ if (
+ Object.hasOwn(attachments[key].files, fileKey) &&
+ /^0$|^[1-9]\d*$/.test(fileKey) &&
+ fileKey <= 4294967294
+ ) {
// include journal thing.
toBeUploaded.push({
journal: transactions[key].transaction_journal_id,