Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-12-14
JC518bb0eecff20
diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.phpindex 00d0e8365d..5d1436ada2 100644--- a/app/Api/V1/Controllers/Chart/AccountController.php+++ b/app/Api/V1/Controllers/Chart/AccountController.php@@ -49,7 +49,7 @@ class AccountController extends Controlleruse CleansChartData;use CollectsAccountsFromFilter;- protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];+ protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];private array $chartData = [];private AccountRepositoryInterface $repository;@@ -101,17 +101,17 @@ class AccountController extends Controllerprivate function renderAccountData(array $params, Account $account): void{Log::debug(sprintf('Now in %s(array, #%d)', __METHOD__, $account->id));- $currency = $this->repository->getAccountCurrency($account);- $currentStart = clone $params['start'];- $range = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);- $period = $params['period'] ?? '1D';+ $currency = $this->repository->getAccountCurrency($account);+ $currentStart = clone $params['start'];+ $range = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);+ $period = $params['period'] ?? '1D';- $previous = array_values($range)[0]['balance'];- $pcPrevious = null;+ $previous = array_values($range)[0]['balance'];+ $pcPrevious = null;if (!$currency instanceof TransactionCurrency) {$currency = $this->primaryCurrency;}- $currentSet = [+ $currentSet = ['label' => $account->name,// the currency that belongs to the account.@@ -153,13 +153,13 @@ class AccountController extends Controller// do the same for the primary currency balance, if relevant:- $pcBalance = null;+ $pcBalance = null;if ($this->convertToPrimary) {$pcBalance = array_key_exists($format, $range) ? $range[$format]['pc_balance'] : $pcPrevious;$pcPrevious = $pcBalance;$currentSet['pc_entries'][$label] = $pcBalance;}- $currentStart = Navigation::addPeriod($currentStart, $period);+ $currentStart = Navigation::addPeriod($currentStart, $period);// $currentStart->addDay();}$this->chartData[] = $currentSet;diff --git a/composer.lock b/composer.lockindex 8d70cb94a3..107a80b8ba 100644--- a/composer.lock+++ b/composer.lock@@ -5824,20 +5824,20 @@},{"name": "ramsey/uuid",- "version": "4.9.1",+ "version": "4.9.2","source": {"type": "git","url": "https://github.com/ramsey/uuid.git",- "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"+ "reference": "8429c78ca35a09f27565311b98101e2826affde0"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",- "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/8429c78ca35a09f27565311b98101e2826affde0",+ "reference": "8429c78ca35a09f27565311b98101e2826affde0","shasum": ""},"require": {- "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",+ "brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14","php": "^8.0","ramsey/collection": "^1.2 || ^2.0"},@@ -5896,9 +5896,9 @@],"support": {"issues": "https://github.com/ramsey/uuid/issues",- "source": "https://github.com/ramsey/uuid/tree/4.9.1"+ "source": "https://github.com/ramsey/uuid/tree/4.9.2"},- "time": "2025-09-04T20:59:21+00:00"+ "time": "2025-12-14T04:43:48+00:00"},{"name": "rcrowe/twigbridge",diff --git a/config/firefly.php b/config/firefly.phpindex 34123e1e02..3ccdf90c5f 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => env('USE_RUNNING_BALANCE', false),// see cer.php for exchange rates feature flag.],- 'version' => 'develop/2025-12-13',- 'build_time' => 1765602694,+ 'version' => 'develop/2025-12-14',+ 'build_time' => 1765725141,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex 48e7661223..3e62e64b75 100644--- a/package-lock.json+++ b/package-lock.json@@ -3176,9 +3176,9 @@"license": "MIT"},"node_modules/@types/node": {- "version": "25.0.1",- "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.1.tgz",- "integrity": "sha512-czWPzKIAXucn9PtsttxmumiQ9N0ok9FrBwgRWrwmVLlp86BrMExzvXRLFYRJ+Ex3g6yqj+KuaxfX1JTgV2lpfg==",+ "version": "25.0.2",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.2.tgz",+ "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==","dev": true,"license": "MIT","dependencies": {@@ -4403,6 +4403,13 @@"dev": true,"license": "MIT"},+ "node_modules/buffer/node_modules/isarray": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",+ "dev": true,+ "license": "MIT"+ },"node_modules/builtin-status-codes": {"version": "3.0.0","resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",@@ -6630,6 +6637,16 @@"node": ">=8"}},+ "node_modules/globby/node_modules/slash": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },"node_modules/gopd": {"version": "1.2.0","resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",@@ -7475,10 +7492,9 @@}},"node_modules/isarray": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",- "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",- "dev": true,+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",+ "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==","license": "MIT"},"node_modules/isexe": {@@ -7588,12 +7604,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/json-stable-stringify/node_modules/isarray": {- "version": "2.0.5",- "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",- "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",- "license": "MIT"- },"node_modules/json5": {"version": "2.2.3","resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",@@ -8773,15 +8783,6 @@"npm": ">5"}},- "node_modules/patch-package/node_modules/slash": {- "version": "2.0.0",- "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",- "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",- "license": "MIT",- "engines": {- "node": ">=6"- }- },"node_modules/path-browserify": {"version": "0.0.1","resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",@@ -9768,6 +9769,13 @@"util-deprecate": "~1.0.1"}},+ "node_modules/readable-stream/node_modules/isarray": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",+ "dev": true,+ "license": "MIT"+ },"node_modules/readable-stream/node_modules/safe-buffer": {"version": "5.1.2","resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",@@ -10684,13 +10692,12 @@"license": "ISC"},"node_modules/slash": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",- "dev": true,+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",+ "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==","license": "MIT","engines": {- "node": ">=8"+ "node": ">=6"}},"node_modules/sockjs": {@@ -11244,13 +11251,6 @@"node": ">= 0.4"}},- "node_modules/to-buffer/node_modules/isarray": {- "version": "2.0.5",- "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",- "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",- "dev": true,- "license": "MIT"- },"node_modules/to-regex-range": {"version": "5.0.1","resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",