IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auto commit for release 'develop' on 2025-02-11

Browse Source
This commit is contained in:
github-actions 2025-02-11 10:47:28 +01:00
parent 7cb41fb333
commit ee260a3df7
15 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@ -172,6 +172,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
} }
$locale = app('steam')->getLocale(); $locale = app('steam')->getLocale();
Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String())); Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));
return [ return [
'journals' => $journals, 'journals' => $journals,
'currency' => $currency, 'currency' => $currency,

2
app/Helpers/Collector/Extensions/AccountCollection.php
View File

@ -260,7 +260,7 @@ trait AccountCollection
} }
// the balance must be found BEFORE the transaction date. // the balance must be found BEFORE the transaction date.
// so sub one second. This is not perfect, but works well enough. // so sub one second. This is not perfect, but works well enough.
$date = clone $transaction['date']; $date = clone $transaction['date'];
$date->subSecond(); $date->subSecond();
Log::debug(sprintf('accountBalanceIs: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); Log::debug(sprintf('accountBalanceIs: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
$balance = Steam::finalAccountBalance($account, $date); $balance = Steam::finalAccountBalance($account, $date);

2
app/Http/Controllers/Chart/ReportController.php
View File

@ -103,7 +103,7 @@ class ReportController extends Controller
$balanceCurrent = clone $current; $balanceCurrent = clone $current;
$balanceCurrent->subDay()->endOfDay(); // go to correct moment. $balanceCurrent->subDay()->endOfDay(); // go to correct moment.
Log::debug(sprintf('Call byAccounts("%s")', $balanceCurrent->format('Y-m-d H:i:s'))); Log::debug(sprintf('Call byAccounts("%s")', $balanceCurrent->format('Y-m-d H:i:s')));
$result = $helper->byAccounts($filtered, $balanceCurrent); $result = $helper->byAccounts($filtered, $balanceCurrent);
// loop result, add to array. // loop result, add to array.
/** @var array $netWorthItem */ /** @var array $netWorthItem */

7
app/Http/Controllers/Preferences/NotificationsController.php
View File

@ -1,4 +1,5 @@
<?php <?php
/* /*
* NotificationsController.php * NotificationsController.php
* Copyright (c) 2025 james@firefly-iii.org. * Copyright (c) 2025 james@firefly-iii.org.
@ -25,8 +26,4 @@ namespace FireflyIII\Http\Controllers\Preferences;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
class NotificationsController extends Controller class NotificationsController extends Controller {}
{
}

4
app/Http/Controllers/Transaction/ConvertController.php
View File

@ -224,7 +224,7 @@ class ConvertController extends Controller
// group accounts: // group accounts:
/** @var Account $account */ /** @var Account $account */
foreach ($accountList as $account) { foreach ($accountList as $account) {
$date = today()->endOfDay(); $date = today()->endOfDay();
Log::debug(sprintf('getLiabilities: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); Log::debug(sprintf('getLiabilities: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
$balance = Steam::finalAccountBalance($account, $date)['balance']; $balance = Steam::finalAccountBalance($account, $date)['balance'];
$currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency; $currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency;
@ -248,7 +248,7 @@ class ConvertController extends Controller
// group accounts: // group accounts:
/** @var Account $account */ /** @var Account $account */
foreach ($accountList as $account) { foreach ($accountList as $account) {
$date = today()->endOfDay(); $date = today()->endOfDay();
Log::debug(sprintf('getAssetAccounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); Log::debug(sprintf('getAssetAccounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
$balance = Steam::finalAccountBalance($account, $date)['balance']; $balance = Steam::finalAccountBalance($account, $date)['balance'];
$currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency; $currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency;

10
app/Services/Internal/Support/AccountServiceTrait.php
View File

@ -659,10 +659,10 @@ trait AccountServiceTrait
// submit to factory: // submit to factory:
$submission = [ $submission = [
'group_title' => null, 'group_title' => null,
'user' => $account->user, 'user' => $account->user,
'user_group' => $account->user->userGroup, 'user_group' => $account->user->userGroup,
'transactions' => [ 'transactions' => [
[ [
'type' => 'Opening balance', 'type' => 'Opening balance',
'date' => $openingBalanceDate, 'date' => $openingBalanceDate,
@ -671,7 +671,7 @@ trait AccountServiceTrait
'destination_id' => $destId, 'destination_id' => $destId,
'destination_name' => $destName, 'destination_name' => $destName,
'user' => $account->user, 'user' => $account->user,
'user_group' => $account->user->userGroup, 'user_group' => $account->user->userGroup,
'currency_id' => $currency->id, 'currency_id' => $currency->id,
'order' => 0, 'order' => 0,
'amount' => $amount, 'amount' => $amount,

2
app/Support/Chart/Budget/FrontpageChartGenerator.php
View File

@ -203,7 +203,7 @@ class FrontpageChartGenerator
$amount = $limit->native_amount; $amount = $limit->native_amount;
Log::debug(sprintf('Amount is now "%s".', $amount)); Log::debug(sprintf('Amount is now "%s".', $amount));
} }
$amount = null === $amount ? '0' : $amount; $amount = null === $amount ? '0' : $amount;
$sumSpent = bcmul($entry['sum'], '-1'); // spent $sumSpent = bcmul($entry['sum'], '-1'); // spent
$data[0]['entries'][$title] ??= '0'; $data[0]['entries'][$title] ??= '0';
$data[1]['entries'][$title] ??= '0'; $data[1]['entries'][$title] ??= '0';

2
app/Support/Steam.php
View File

@ -282,7 +282,7 @@ class Steam
$cache->addProperty($date); $cache->addProperty($date);
if ($cache->has()) { if ($cache->has()) {
// Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s'))); // Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
return $cache->get(); return $cache->get();
} }
Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s'))); Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));

10
composer.lock generated
View File

@ -11344,16 +11344,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "2.1.3", "version": "2.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "64ae44e48214f3deebdaeebf2694297a10a2bea9" "reference": "8f99e18eb775dbaf6460c95fa0b65312da9c746a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/64ae44e48214f3deebdaeebf2694297a10a2bea9", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f99e18eb775dbaf6460c95fa0b65312da9c746a",
"reference": "64ae44e48214f3deebdaeebf2694297a10a2bea9", "reference": "8f99e18eb775dbaf6460c95fa0b65312da9c746a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11398,7 +11398,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-02-07T15:05:24+00:00" "time": "2025-02-10T08:25:21+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",

2
config/firefly.php
View File

@ -81,7 +81,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2025-02-10', 'version' => 'develop/2025-02-11',
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 25, 'db_version' => 25,

18
package-lock.json generated
View File

@ -4757,9 +4757,9 @@
} }
}, },
"node_modules/compression": { "node_modules/compression": {
"version": "1.7.5", "version": "1.8.0",
"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz", "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
"integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==", "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -5685,9 +5685,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.5.96", "version": "1.5.97",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.96.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.97.tgz",
"integrity": "sha512-8AJUW6dh75Fm/ny8+kZKJzI1pgoE8bKLZlzDU2W1ENd+DXKJrx7I7l9hb8UWR4ojlnb5OlixMt00QWiYJoVw1w==", "integrity": "sha512-HKLtaH02augM7ZOdYRuO19rWDeY+QSJ1VxnXFa/XDFLf07HvM90pALIJFgrO+UVaajI3+aJMMpojoUTLZyQ7JQ==",
"dev": true, "dev": true,
"license": "ISC" "license": "ISC"
}, },
@ -8876,9 +8876,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.5.1", "version": "8.5.2",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
"integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==", "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {

4
resources/assets/v1/src/locales/hu.json
View File

@ -18,8 +18,8 @@
"is_reconciled": "Is reconciled", "is_reconciled": "Is reconciled",
"split": "Feloszt\u00e1s", "split": "Feloszt\u00e1s",
"single_split": "Feloszt\u00e1s", "single_split": "Feloszt\u00e1s",
"not_enough_currencies": "Not enough currencies", "not_enough_currencies": "Nincs el\u00e9g p\u00e9nznem",
"not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.", "not_enough_currencies_enabled": "Amennyiben csak egyetlen p\u00e9nznem enged\u00e9lyezett, akkor nincs sz\u00fcks\u00e9g \u00e1rfolyam be\u00e1ll\u00edt\u00e1sokra.",
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> mentve.", "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> mentve.",
"webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> elt\u00e1rolva.", "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> elt\u00e1rolva.",
"webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") friss\u00edtve.", "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") friss\u00edtve.",

2
resources/assets/v1/src/locales/ru.json
View File

@ -182,6 +182,6 @@
}, },
"config": { "config": {
"html_language": "ru", "html_language": "ru",
"date_time_fns": "D MMMM yyyy, @ HH:mm:ss" "date_time_fns": "d MMMM yyyy, @ HH:mm:ss"
} }
} }

4
resources/assets/v1/src/locales/sl.json
View File

@ -18,8 +18,8 @@
"is_reconciled": "Je usklajena", "is_reconciled": "Je usklajena",
"split": "Razdeli", "split": "Razdeli",
"single_split": "Razdeli", "single_split": "Razdeli",
"not_enough_currencies": "Not enough currencies", "not_enough_currencies": "Ni dovolj valut",
"not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.", "not_enough_currencies_enabled": "\u010ce imate omogo\u010deno samo eno valuto, menjalnih te\u010dajev ni treba dodajati.",
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcija \u0161t. #{ID} (\"{title}\")<\/a> je bila shranjena.", "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcija \u0161t. #{ID} (\"{title}\")<\/a> je bila shranjena.",
"webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> je bil shranjen.", "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> je bil shranjen.",
"webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") je bil posodobljen.", "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") je bil posodobljen.",

2
resources/assets/v1/src/locales/zh-tw.json
View File

@ -6,7 +6,7 @@
"administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.", "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
"administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"", "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
"table": "\u8868\u683c", "table": "\u8868\u683c",
"welcome_back": "What's playing?", "welcome_back": "\u6b61\u8fce\u56de\u4f86\u7e7c\u7e8c\u7406\u8ca1\uff01",
"flash_error": "\u932f\u8aa4\uff01", "flash_error": "\u932f\u8aa4\uff01",
"flash_warning": "\u8b66\u544a\uff01", "flash_warning": "\u8b66\u544a\uff01",
"flash_success": "\u6210\u529f\uff01", "flash_success": "\u6210\u529f\uff01",