kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
James Cole
2025-01-03 08:17:57 +01:00
parent f74be0402f ae80fd8578
commit 2ef3a33fbf
5 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -397,6 +397,9 @@ class BudgetController extends Controller
foreach ($journals as $journal) {
$key = sprintf('%d-%d', $journal['destination_account_id'], $journal['currency_id']);
$amount = $journal['amount'];
$symbol = $journal['currency_symbol'];
$code = $journal['currency_code'];
$name = $journal['currency_name'];
// if convert to native, use the native things, unless it's the foreign amount which is in the native currency.
if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] !== $this->defaultCurrency->id) {