Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-10-25
JC591a56a7396cd
diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.phpindex 217a400006..059e005eb9 100644--- a/app/Http/Controllers/JavascriptController.php+++ b/app/Http/Controllers/JavascriptController.php@@ -115,7 +115,7 @@ class JavascriptController extends Controller'currencyCode' => $currency->code,'currencySymbol' => $currency->symbol,'accountingLocaleInfo' => $accounting,- 'anonymous' => var_export(Steam::anonymous(), true),+ 'anonymous' => var_export(Steam::anonymous(), true),'language' => $lang,'dateRangeTitle' => $dateRange['title'],'locale' => $locale,diff --git a/app/Support/Amount.php b/app/Support/Amount.phpindex 22e44a1316..f4bf1de35c 100644--- a/app/Support/Amount.php+++ b/app/Support/Amount.php@@ -163,7 +163,7 @@ class Amount*/public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string{- $amount = Steam::anonymous() ? '0' : $amount;+ $amount = Steam::anonymous() ? '0' : $amount;$locale = Steam::getLocale();$rounded = Steam::bcround($amount, $decimalPlaces);$coloured ??= true;diff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex 2dfc48ee3f..e290941e87 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -634,7 +634,7 @@ class Steamif (null !== $cached) {return $cached;}- $anonymous = app('preferences')->get('anonymous', config('firefly.default_preferences.anonymous', false))->data;+ $anonymous = app('preferences')->get('anonymous', config('firefly.default_preferences.anonymous', false))->data;$singleton->setPreference('anonymous', $anonymous);return $anonymous;diff --git a/config/firefly.php b/config/firefly.phpindex 4801282895..d773d6487a 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-25',- 'build_time' => 1761383422,+ 'build_time' => 1761394881,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.@@ -410,7 +410,7 @@ return [],- 'rule-actions' => [+ 'rule-actions' => ['set_category' => SetCategory::class,'clear_category' => ClearCategory::class,'set_budget' => SetBudget::class,@@ -444,7 +444,7 @@ return [// 'set_foreign_amount' => SetForeignAmount::class,// 'set_foreign_currency' => SetForeignCurrency::class,],- 'context-rule-actions' => [+ 'context-rule-actions' => ['set_category','set_budget','add_tag',@@ -463,13 +463,13 @@ return ['convert_transfer',],- 'test-triggers' => [+ 'test-triggers' => ['limit' => 10,'range' => 200,],// expected source types for each transaction type, in order of preference.- 'expected_source_types' => [+ 'expected_source_types' => ['source' => [TransactionTypeEnum::WITHDRAWAL->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],TransactionTypeEnum::DEPOSIT->value => [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::CASH->value],@@ -514,7 +514,7 @@ return [TransactionTypeEnum::LIABILITY_CREDIT->value => [AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],],],- 'allowed_opposing_types' => [+ 'allowed_opposing_types' => ['source' => [AccountTypeEnum::ASSET->value => [AccountTypeEnum::ASSET->value,@@ -604,7 +604,7 @@ return [],],// depending on the account type, return the allowed transaction types:- 'allowed_transaction_types' => [+ 'allowed_transaction_types' => ['source' => [AccountTypeEnum::ASSET->value => [TransactionTypeEnum::WITHDRAWAL->value,@@ -673,7 +673,7 @@ return [],// having the source + dest will tell you the transaction type.- 'account_to_transaction' => [+ 'account_to_transaction' => [AccountTypeEnum::ASSET->value => [AccountTypeEnum::ASSET->value => TransactionTypeEnum::TRANSFER->value,AccountTypeEnum::CASH->value => TransactionTypeEnum::WITHDRAWAL->value,@@ -738,7 +738,7 @@ return [],// allowed source -> destination accounts.- 'source_dests' => [+ 'source_dests' => [TransactionTypeEnum::WITHDRAWAL->value => [AccountTypeEnum::ASSET->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CASH->value],AccountTypeEnum::LOAN->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value],@@ -777,7 +777,7 @@ return [],],// if you add fields to this array, don't forget to update the export routine (ExportDataGenerator).- 'journal_meta_fields' => [+ 'journal_meta_fields' => [// sepa'sepa_cc','sepa_ct_op',@@ -811,47 +811,47 @@ return ['recurrence_count','recurrence_date',],- 'webhooks' => [+ 'webhooks' => ['max_attempts' => env('WEBHOOK_MAX_ATTEMPTS', 3),],- 'can_have_virtual_amounts' => [AccountTypeEnum::ASSET->value],- 'can_have_opening_balance' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],- 'dynamic_creation_allowed' => [+ 'can_have_virtual_amounts' => [AccountTypeEnum::ASSET->value],+ 'can_have_opening_balance' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],+ 'dynamic_creation_allowed' => [AccountTypeEnum::EXPENSE->value,AccountTypeEnum::REVENUE->value,AccountTypeEnum::INITIAL_BALANCE->value,AccountTypeEnum::RECONCILIATION->value,AccountTypeEnum::LIABILITY_CREDIT->value,],- 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],- 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],- 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],+ 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],+ 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],+ 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],// dynamic date ranges are as follows:- 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],+ 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],- 'allowed_sort_parameters' => [+ 'allowed_sort_parameters' => ['Account' => ['id', 'order', 'name', 'iban', 'active', 'account_type_id',- 'current_balance',- 'pc_current_balance',- 'opening_balance',- 'pc_opening_balance',- 'virtual_balance',- 'pc_virtual_balance',- 'debt_amount',- 'pc_debt_amount',- 'balance_difference',- 'pc_balance_difference',+ 'current_balance',+ 'pc_current_balance',+ 'opening_balance',+ 'pc_opening_balance',+ 'virtual_balance',+ 'pc_virtual_balance',+ 'debt_amount',+ 'pc_debt_amount',+ 'balance_difference',+ 'pc_balance_difference',],],- 'allowed_db_sort_parameters' => [+ 'allowed_db_sort_parameters' => ['Account' => ['id', 'order', 'name', 'iban', 'active', 'account_type_id'],],// preselected account lists possibilities:- 'preselected_accounts' => ['all', 'assets', 'liabilities'],+ 'preselected_accounts' => ['all', 'assets', 'liabilities'],// allowed to store a piggy bank in:- 'piggy_bank_account_types' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],+ 'piggy_bank_account_types' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],];