Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-07
JC50ee6250e1387
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex 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.phpindex 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/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.phpindex 30a71af7fe..01b3c939e2 100644--- a/app/Http/Controllers/Admin/ConfigurationController.php+++ b/app/Http/Controllers/Admin/ConfigurationController.php@@ -61,40 +61,40 @@ final class ConfigurationController extends Controller*/public function index(): Factory|\Illuminate\Contracts\View\View{- $subTitle = (string) trans('firefly.instance_configuration');- $subTitleIcon = 'bi-wrench';+ $subTitle = (string) trans('firefly.instance_configuration');+ $subTitleIcon = 'bi-wrench';Log::channel('audit')->info('User visits admin config index.');// all available configuration and their default value in case// they don't exist yet.- $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;- $isDemoSite = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;- $siteOwner = config('firefly.site_owner');-- $enableExchangeRates = AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data;- $useRunningBalance = AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;- $enableExternalMap = AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;- $enableExternalRates = AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data;- $allowWebhooks = AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data;- $enableBatchProcessing = AppConfiguration::get('enable_batch_processing', true)->data;- $validUrlProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;+ $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;+ $isDemoSite = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;+ $siteOwner = config('firefly.site_owner');++ $enableExchangeRates = AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data;+ $useRunningBalance = AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;+ $enableExternalMap = AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;+ $enableExternalRates = AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data;+ $allowWebhooks = AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data;+ $enableBatchProcessing = AppConfiguration::get('enable_batch_processing', true)->data;+ $validUrlProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;$enableExpressionEngine = AppConfiguration::get('enable_expression_engine', false)->data;return view('settings.configuration.index', [- 'subTitle' => $subTitle,- 'subTitleIcon' => $subTitleIcon,- 'singleUserMode' => $singleUserMode,- 'isDemoSite' => $isDemoSite,+ 'subTitle' => $subTitle,+ 'subTitleIcon' => $subTitleIcon,+ 'singleUserMode' => $singleUserMode,+ 'isDemoSite' => $isDemoSite,'enableExpressionEngine' => $enableExpressionEngine,- 'siteOwner' => $siteOwner,- 'enableExchangeRates' => $enableExchangeRates,- 'useRunningBalance' => $useRunningBalance,- 'enableExternalMap' => $enableExternalMap,- 'enableExternalRates' => $enableExternalRates,- 'allowWebhooks' => $allowWebhooks,- 'enableBatchProcessing' => $enableBatchProcessing,- 'validUrlProtocols' => $validUrlProtocols,+ 'siteOwner' => $siteOwner,+ 'enableExchangeRates' => $enableExchangeRates,+ 'useRunningBalance' => $useRunningBalance,+ 'enableExternalMap' => $enableExternalMap,+ 'enableExternalRates' => $enableExternalRates,+ 'allowWebhooks' => $allowWebhooks,+ 'enableBatchProcessing' => $enableBatchProcessing,+ 'validUrlProtocols' => $validUrlProtocols,]);}diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex 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 Controllerif ($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.phpindex d40d4432a3..215ebbd484 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -284,10 +284,7 @@ final class IndexController extends Controllerif (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.phpindex 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/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.phpindex df47d8cc89..d15b107fed 100644--- a/app/Http/Requests/ConfigurationRequest.php+++ b/app/Http/Requests/ConfigurationRequest.php@@ -43,15 +43,15 @@ class ConfigurationRequest extends FormRequestpublic function getConfigurationData(): array{return [- 'single_user_mode' => $this->boolean('single_user_mode'),- 'enable_exchange_rates' => $this->boolean('enable_exchange_rates'),- 'use_running_balance' => $this->boolean('use_running_balance'),- 'enable_external_map' => $this->boolean('enable_external_map'),- 'enable_external_rates' => $this->boolean('enable_external_rates'),- 'allow_webhooks' => $this->boolean('allow_webhooks'),- 'valid_url_protocols' => $this->string('valid_url_protocols'),- 'is_demo_site' => $this->boolean('is_demo_site'),- 'enable_batch_processing' => $this->boolean('enable_batch_processing'),+ 'single_user_mode' => $this->boolean('single_user_mode'),+ 'enable_exchange_rates' => $this->boolean('enable_exchange_rates'),+ 'use_running_balance' => $this->boolean('use_running_balance'),+ 'enable_external_map' => $this->boolean('enable_external_map'),+ 'enable_external_rates' => $this->boolean('enable_external_rates'),+ 'allow_webhooks' => $this->boolean('allow_webhooks'),+ 'valid_url_protocols' => $this->string('valid_url_protocols'),+ 'is_demo_site' => $this->boolean('is_demo_site'),+ 'enable_batch_processing' => $this->boolean('enable_batch_processing'),'enable_expression_engine' => $this->boolean('enable_expression_engine'),];}@@ -63,16 +63,16 @@ class ConfigurationRequest extends FormRequest{// fixedreturn [- 'single_user_mode' => ['min:0', 'max:1', 'numeric'],- 'enable_exchange_rates' => ['min:0', 'max:1', 'numeric'],- 'use_running_balance' => ['min:0', 'max:1', 'numeric'],- 'enable_external_map' => ['min:0', 'max:1', 'numeric'],- 'enable_external_rates' => ['min:0', 'max:1', 'numeric'],- 'allow_webhooks' => ['min:0', 'max:1', 'numeric'],- 'enable_batch_processing' => ['min:0', 'max:1', 'numeric'],- 'valid_url_protocols' => ['min:0', 'max:255'],- 'is_demo_site' => ['min:0', 'max:1', 'numeric'],- 'enable_expression_engine' => ['min:0', 'max:1', 'numeric']+ 'single_user_mode' => ['min:0', 'max:1', 'numeric'],+ 'enable_exchange_rates' => ['min:0', 'max:1', 'numeric'],+ 'use_running_balance' => ['min:0', 'max:1', 'numeric'],+ 'enable_external_map' => ['min:0', 'max:1', 'numeric'],+ 'enable_external_rates' => ['min:0', 'max:1', 'numeric'],+ 'allow_webhooks' => ['min:0', 'max:1', 'numeric'],+ 'enable_batch_processing' => ['min:0', 'max:1', 'numeric'],+ 'valid_url_protocols' => ['min:0', 'max:255'],+ 'is_demo_site' => ['min:0', 'max:1', 'numeric'],+ 'enable_expression_engine' => ['min:0', 'max:1', 'numeric'],];}diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex 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.phpindex 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.phpindex 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/config/firefly.php b/config/firefly.phpindex 0a68cf0bab..80839a9bc3 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-07',-'build_time' => 1788808180,+'build_time' => 1788808917,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex 1edff08ad5..3ee6e3d7ec 100644--- a/resources/lang/en_US/firefly.php+++ b/resources/lang/en_US/firefly.php@@ -2619,8 +2619,8 @@ return ['setting_valid_url_protocols_explain' => 'Firefly III only allows urls to have standard protocols like https and ftp etc. If you\'re a techie you may want to allow others as well.','setting_enable_batch_processing' => 'Enable batch processing','setting_enable_batch_processing_explain' => 'Batch processing is a relatively new feature of Firefly III that allows a set of new transactions (aka a batch) be processed when the final transaction is submitted, and not during the submission of each individual entry. This makes data import faster, but also skips rules until the end. It is an experimental feature so disabled by default.',- 'setting_enable_expression_engine' => 'Enable expression engine',- 'setting_enable_expression_engine_explain' => 'The expression engine lets you write rule actions that are dynamic, using the data of the transaction to join text together or copy values. However, it also allows crafty users to run commands on the underlying server or Docker container. This is potentially very dangerous, so the feature is disabled by default. Only enable this when you TRUST ALL your users.',+ 'setting_enable_expression_engine' => 'Enable expression engine',+ 'setting_enable_expression_engine_explain' => 'The expression engine lets you write rule actions that are dynamic, using the data of the transaction to join text together or copy values. However, it also allows crafty users to run commands on the underlying server or Docker container. This is potentially very dangerous, so the feature is disabled by default. Only enable this when you TRUST ALL your users.','setting_single_user_mode' => 'Single user mode','setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as well, assuming they can reach it (when it is connected to the internet).',diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.phpindex c7476b09df..dec69c6039 100644--- a/resources/lang/en_US/form.php+++ b/resources/lang/en_US/form.php@@ -48,7 +48,7 @@ return ['auto_budget_currency_id' => 'Currency','external_ip' => 'Your server\'s external IP','attachments' => 'Attachments',- 'enable_expression_engine' => 'Enable expression engine',+ 'enable_expression_engine' => 'Enable expression engine','BIC' => 'BIC','verify_password' => 'Verify password security','source_account' => 'Source account',