Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-06-14
JC5df7d4f700cbb
diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.phpindex ed60536f1b..1b679cb867 100644--- a/app/Api/V1/Controllers/Chart/BudgetController.php+++ b/app/Api/V1/Controllers/Chart/BudgetController.php@@ -237,7 +237,7 @@ class BudgetController extends Controller/** @var array $entry */// only spent the entry where the entry's currency matches the budget limit's currency// so $filtered will only have 1 or 0 entries- $filtered = array_filter($spent, fn($entry) => $entry['currency_id'] === $limitCurrencyId);+ $filtered = array_filter($spent, fn ($entry) => $entry['currency_id'] === $limitCurrencyId);$result = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);if (1 === count($result)) {$compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.phpindex c542c2c35f..9f53540109 100644--- a/app/Services/Internal/Update/JournalUpdateService.php+++ b/app/Services/Internal/Update/JournalUpdateService.php@@ -825,11 +825,11 @@ class JournalUpdateServicepublic function isCompareHashChanged(): bool{Log::debug(sprintf('Now in %s', __METHOD__));- $compareHash = hash('sha256', sprintf('%s', Carbon::now()->getTimestamp()));- if(!$this->transactionGroup instanceof TransactionGroup) {+ $compareHash = hash('sha256', sprintf('%s', Carbon::now()->getTimestamp()));+ if (!$this->transactionGroup instanceof TransactionGroup) {$compareHash = $this->transactionGroupRepository->getCompareHash($this->transactionJournal->transactionGroup);}- if($this->transactionGroup instanceof TransactionGroup) {+ if ($this->transactionGroup instanceof TransactionGroup) {$this->transactionGroupRepository->getCompareHash($this->transactionGroup);}Log::debug(sprintf('Compare hash is "%s".', $compareHash));diff --git a/composer.lock b/composer.lockindex c5ec11d427..10303ec266 100644--- a/composer.lock+++ b/composer.lock@@ -11550,16 +11550,16 @@},{"name": "phpunit/phpunit",- "version": "12.2.1",+ "version": "12.2.2","source": {"type": "git","url": "https://github.com/sebastianbergmann/phpunit.git",- "reference": "5f09fda04e7caea93cff50b4e90319184f3e6ee3"+ "reference": "19e25c2da3f8071a683ee1e445b0e24bba25de61"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5f09fda04e7caea93cff50b4e90319184f3e6ee3",- "reference": "5f09fda04e7caea93cff50b4e90319184f3e6ee3",+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/19e25c2da3f8071a683ee1e445b0e24bba25de61",+ "reference": "19e25c2da3f8071a683ee1e445b0e24bba25de61","shasum": ""},"require": {@@ -11627,7 +11627,7 @@"support": {"issues": "https://github.com/sebastianbergmann/phpunit/issues","security": "https://github.com/sebastianbergmann/phpunit/security/policy",- "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.1"+ "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.2"},"funding": [{@@ -11651,7 +11651,7 @@"type": "tidelift"}],- "time": "2025-06-07T05:17:47+00:00"+ "time": "2025-06-13T05:49:28+00:00"},{"name": "rector/rector",diff --git a/config/firefly.php b/config/firefly.phpindex 95155172f1..57819c5db4 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,7 +78,7 @@ return ['running_balance_column' => env('USE_RUNNING_BALANCE', false),// see cer.php for exchange rates feature flag.],- 'version' => 'develop/2025-06-12',+ 'version' => 'develop/2025-06-14','api_version' => '2.1.0', // field is no longer used.'db_version' => 25,diff --git a/package-lock.json b/package-lock.jsonindex c99d616286..0fc1cb2844 100644--- a/package-lock.json+++ b/package-lock.json@@ -4417,9 +4417,9 @@}},"node_modules/caniuse-lite": {- "version": "1.0.30001722",- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001722.tgz",- "integrity": "sha512-DCQHBBZtiK6JVkAGw7drvAMK0Q0POD/xZvEmDp6baiMMP6QXXk9HpD6mNYBZWhOPG6LvIDb82ITqtWjhDckHCA==",+ "version": "1.0.30001723",+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz",+ "integrity": "sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==","dev": true,"funding": [{@@ -5632,9 +5632,9 @@"license": "MIT"},"node_modules/electron-to-chromium": {- "version": "1.5.166",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.166.tgz",- "integrity": "sha512-QPWqHL0BglzPYyJJ1zSSmwFFL6MFXhbACOCcsCdUMCkzPdS9/OIBVxg516X/Ado2qwAq8k0nJJ7phQPCqiaFAw==",+ "version": "1.5.167",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.167.tgz",+ "integrity": "sha512-LxcRvnYO5ez2bMOFpbuuVuAI5QNeY1ncVytE/KXaL6ZNfzX1yPlAO0nSOyIHx2fVAuUprMqPs/TdVhUFZy7SIQ==","dev": true,"license": "ISC"},diff --git a/resources/assets/v1/src/locales/tr.json b/resources/assets/v1/src/locales/tr.jsonindex a361cd96d3..57d3350265 100644--- a/resources/assets/v1/src/locales/tr.json+++ b/resources/assets/v1/src/locales/tr.json@@ -31,7 +31,7 @@"apply_rules_checkbox": "Apply rules","fire_webhooks_checkbox": "Fire webhooks","no_budget_pointer": "Hen\u00fcz b\u00fct\u00e7eniz yok gibi g\u00f6r\u00fcn\u00fcyor. <a href=\"budgets\">b\u00fct\u00e7eler<\/a> sayfas\u0131nda biraz olu\u015fturmal\u0131s\u0131n\u0131z. B\u00fct\u00e7eler, giderleri takip etmenize yard\u0131mc\u0131 olabilir.",- "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",+ "no_bill_pointer": "Hen\u00fcz aboneli\u011finiz yok gibi g\u00f6r\u00fcn\u00fcyor. <a href=\"subscriptions\">Abonelik<\/a> sayfas\u0131nda bir abonelik olu\u015fturmal\u0131s\u0131n\u0131z. Abonelikler, harcamalar\u0131n\u0131z\u0131 takip etmenize yard\u0131mc\u0131 olabilir.","source_account": "Kaynak hesap","hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.","destination_account": "Hedef hesap",