kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-16 09:51:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10298 from firefly-iii/release-1747132859

Browse Source 
🤖 Automatically merge the PR into the develop branch.
This commit is contained in:
github-actions[bot]
2025-05-13 12:41:07 +02:00
committed by GitHub
parent 0f3fe45b06 94961466f9
commit 8e7d750a5a
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Services/Internal/Update/JournalUpdateService.php
View File

@@ -725,7 +725,7 @@ class JournalUpdateService
// but rather the normal amount and currency. This is new behavior.
$isTransfer = TransactionTypeEnum::TRANSFER->value === $this->transactionJournal->transactionType->type;
// also check if it is not between an asset account and a liability, because then the same rule applies.
$isBetween = $this->isBetweenAssetAndLiability();
$isBetween = $this->isBetweenAssetAndLiability();
if ($isTransfer || $isBetween) {
Log::debug('Switch amounts, store in amount and not foreign_amount');
@@ -772,6 +772,7 @@ class JournalUpdateService
$this->sourceTransaction->refresh();
$this->destinationTransaction->refresh();
}
private function isBetweenAssetAndLiability(): bool
{
/** @var Transaction $sourceTransaction */

12
composer.lock generated
View File

@@ -11564,16 +11564,16 @@
},
{
"name": "rector/rector",
"version": "2.0.15",
"version": "2.0.16",
"source": {
"type": "git",
"url": "https://github.com/rectorphp/rector.git",
"reference": "abbbf32474a67e242d26bffc098a712a05b3d32a"
"reference": "f1366d1f8c7490541c8f7af6e5c7cef7cca1b5a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/abbbf32474a67e242d26bffc098a712a05b3d32a",
"reference": "abbbf32474a67e242d26bffc098a712a05b3d32a",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/f1366d1f8c7490541c8f7af6e5c7cef7cca1b5a2",
"reference": "f1366d1f8c7490541c8f7af6e5c7cef7cca1b5a2",
"shasum": ""
},
"require": {
@@ -11611,7 +11611,7 @@
],
"support": {
"issues": "https://github.com/rectorphp/rector/issues",
"source": "https://github.com/rectorphp/rector/tree/2.0.15"
"source": "https://github.com/rectorphp/rector/tree/2.0.16"
},
"funding": [
{
@@ -11619,7 +11619,7 @@
"type": "github"
}
],
"time": "2025-05-05T10:00:41+00:00"
"time": "2025-05-12T16:37:16+00:00"
},
{
"name": "sebastian/cli-parser",

2
config/firefly.php
View File

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

18
package-lock.json generated
View File

@@ -4417,9 +4417,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001717",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz",
"integrity": "sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==",
"version": "1.0.30001718",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
"integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
"dev": true,
"funding": [
{
@@ -5632,9 +5632,9 @@
"license": "MIT"
},
"node_modules/electron-to-chromium": {
"version": "1.5.151",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.151.tgz",
"integrity": "sha512-Rl6uugut2l9sLojjS4H4SAr3A4IgACMLgpuEMPYCVcKydzfyPrn5absNRju38IhQOf/NwjJY8OGWjlteqYeBCA==",
"version": "1.5.152",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.152.tgz",
"integrity": "sha512-xBOfg/EBaIlVsHipHl2VdTPJRSvErNUaqW8ejTq5OlOlIYx1wOllCHsAvAIrr55jD1IYEfdR86miUEt8H5IeJg==",
"dev": true,
"license": "ISC"
},
@@ -10155,9 +10155,9 @@
}
},
"node_modules/semver": {
"version": "7.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
"version": "7.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
"dev": true,
"license": "ISC",
"bin": {