kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-22 14:34:58 -07:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into adminlte

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
James Cole
2026-07-02 05:29:16 +02:00
parent 1d230d055b a95b82b14c
commit b2b92aa4e6
3 changed files with 109 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/Correction/CorrectsAmounts.php
+100 -100
View File
@@ -64,7 +64,7 @@ class CorrectsAmounts extends Command
// transfers must not have foreign currency info if both accounts have the same currency.
$this->correctTransfers();
// deposits between assets and liabilities must not have foreign currency info if both accounts have the same currency.
$this->correctDeposits();
// $this->correctDeposits();
// auto budgets must be positive
$this->fixAutoBudgets();
// available budgets must be positive
@@ -85,105 +85,105 @@ class CorrectsAmounts extends Command
return 0;
}
private function correctDeposits(): void
{
Log::debug('Will now correct deposits.');
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$type = TransactionType::query()->where('type', TransactionTypeEnum::DEPOSIT->value)->first();
$journals = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->whereNotNull('transactions.foreign_amount')
->where('transaction_journals.transaction_type_id', $type->id)
->distinct()
->get(['transaction_journals.*'])
;
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {
$repository->setUser($journal->user);
$primary = Amount::getPrimaryCurrencyByUserGroup($journal->userGroup);
$valid = $this->validateJournal($journal);
if (false === $valid) {
// Log::debug(sprintf('Journal #%d does not need to be fixed or is invalid (see previous messages)', $journal->id));
continue;
}
Log::debug(sprintf('Journal #%d is ready to be corrected (if necessary).', $journal->id));
$source = $journal->transactions()->where('amount', '<', '0')->first();
$destination = $journal->transactions()->where('amount', '>', '0')->first();
$sourceAccount = $source->account;
$destAccount = $destination->account;
$sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $primary;
$destCurrency = $repository->getAccountCurrency($destAccount) ?? $primary;
Log::debug(sprintf('Currency of source account #%d "%s" is %s', $sourceAccount->id, $sourceAccount->name, $sourceCurrency->code));
Log::debug(sprintf('Currency of destination account #%d "%s" is %s', $destAccount->id, $destAccount->name, $destCurrency->code));
if ($sourceCurrency->id === $destCurrency->id) {
Log::debug('Both accounts have the same currency. Removing foreign currency info.');
$source->foreign_currency_id = null;
$source->foreign_amount = null;
$source->save();
$destination->foreign_currency_id = null;
$destination->foreign_amount = null;
// also make sure that both transactions use the same amounts and currencies, since the currency is the same anyway.
$destination->amount = bcmul($source->amount, '-1');
$destination->save();
continue;
}
// validate source transaction
if ($destCurrency->id !== $source->foreign_currency_id) {
Log::debug(sprintf(
'[a] Journal #%d: transaction #%d refers to foreign currency "%s" but should refer to "%s".',
$journal->id,
$source->id,
$source->foreignCurrency->code,
$destCurrency->code
));
$source->foreign_currency_id = $destCurrency->id;
$source->save();
}
if ($sourceCurrency->id !== $source->transaction_currency_id) {
Log::debug(sprintf(
'[b] Journal #%d: transaction #%d refers to currency "%s" but should refer to "%s".',
$journal->id,
$source->id,
$source->transactionCurrency->code,
$sourceCurrency->code
));
$source->transaction_currency_id = $sourceCurrency->id;
$source->save();
}
// validate destination:
if ($sourceCurrency->id !== $destination->foreign_currency_id) {
Log::debug(sprintf(
'[c] Journal #%d: transaction #%d refers to foreign currency "%s" but should refer to "%s".',
$journal->id,
$destination->id,
$destination->foreignCurrency->code,
$sourceCurrency->code
));
$destination->foreign_currency_id = $sourceCurrency->id;
$destination->save();
}
if ($destCurrency->id !== $destination->transaction_currency_id) {
Log::debug(sprintf(
'[d] Journal #%d: transaction #%d refers to currency "%s" but should refer to "%s".',
$journal->id,
$destination->id,
$destination->transactionCurrency->code,
$destCurrency->code
));
$destination->transaction_currency_id = $destCurrency->id;
$destination->save();
}
Log::debug(sprintf('Done with journal #%d.', $journal->id));
}
}
// private function correctDeposits(): void
// {
// Log::debug('Will now correct deposits.');
//
// /** @var AccountRepositoryInterface $repository */
// $repository = app(AccountRepositoryInterface::class);
// $type = TransactionType::query()->where('type', TransactionTypeEnum::DEPOSIT->value)->first();
// $journals = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
// ->whereNotNull('transactions.foreign_amount')
// ->where('transaction_journals.transaction_type_id', $type->id)
// ->distinct()
// ->get(['transaction_journals.*'])
// ;
//
// /** @var TransactionJournal $journal */
// foreach ($journals as $journal) {
// $repository->setUser($journal->user);
// $primary = Amount::getPrimaryCurrencyByUserGroup($journal->userGroup);
//
// $valid = $this->validateJournal($journal);
// if (false === $valid) {
// // Log::debug(sprintf('Journal #%d does not need to be fixed or is invalid (see previous messages)', $journal->id));
//
// continue;
// }
// Log::debug(sprintf('Journal #%d is ready to be corrected (if necessary).', $journal->id));
// $source = $journal->transactions()->where('amount', '<', '0')->first();
// $destination = $journal->transactions()->where('amount', '>', '0')->first();
// $sourceAccount = $source->account;
// $destAccount = $destination->account;
// $sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $primary;
// $destCurrency = $repository->getAccountCurrency($destAccount) ?? $primary;
// Log::debug(sprintf('Currency of source account #%d "%s" is %s', $sourceAccount->id, $sourceAccount->name, $sourceCurrency->code));
// Log::debug(sprintf('Currency of destination account #%d "%s" is %s', $destAccount->id, $destAccount->name, $destCurrency->code));
// if ($sourceCurrency->id === $destCurrency->id) {
// Log::debug('Both accounts have the same currency. Removing foreign currency info.');
// $source->foreign_currency_id = null;
// $source->foreign_amount = null;
// $source->save();
// $destination->foreign_currency_id = null;
// $destination->foreign_amount = null;
// // also make sure that both transactions use the same amounts and currencies, since the currency is the same anyway.
// $destination->amount = bcmul($source->amount, '-1');
// $destination->save();
//
// continue;
// }
//
// // validate source transaction
// if ($destCurrency->id !== $source->foreign_currency_id) {
// Log::debug(sprintf(
// '[a] Journal #%d: transaction #%d refers to foreign currency "%s" but should refer to "%s".',
// $journal->id,
// $source->id,
// $source->foreignCurrency->code,
// $destCurrency->code
// ));
// $source->foreign_currency_id = $destCurrency->id;
// $source->save();
// }
// if ($sourceCurrency->id !== $source->transaction_currency_id) {
// Log::debug(sprintf(
// '[b] Journal #%d: transaction #%d refers to currency "%s" but should refer to "%s".',
// $journal->id,
// $source->id,
// $source->transactionCurrency->code,
// $sourceCurrency->code
// ));
// $source->transaction_currency_id = $sourceCurrency->id;
// $source->save();
// }
//
// // validate destination:
// if ($sourceCurrency->id !== $destination->foreign_currency_id) {
// Log::debug(sprintf(
// '[c] Journal #%d: transaction #%d refers to foreign currency "%s" but should refer to "%s".',
// $journal->id,
// $destination->id,
// $destination->foreignCurrency->code,
// $sourceCurrency->code
// ));
// $destination->foreign_currency_id = $sourceCurrency->id;
// $destination->save();
// }
//
// if ($destCurrency->id !== $destination->transaction_currency_id) {
// Log::debug(sprintf(
// '[d] Journal #%d: transaction #%d refers to currency "%s" but should refer to "%s".',
// $journal->id,
// $destination->id,
// $destination->transactionCurrency->code,
// $destCurrency->code
// ));
// $destination->transaction_currency_id = $destCurrency->id;
// $destination->save();
// }
// Log::debug(sprintf('Done with journal #%d.', $journal->id));
// }
// }
private function correctTransfers(): void
{
changelog.md
+7
View File
@@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## v6.6.6 - 2026-07-01
<!-- summary: This release fixes a bug in v6.6.5 that will remove foreign currency information from deposits. -->
### Fixed
- [Issue 12426](https://github.com/firefly-iii/firefly-iii/issues/12426) (Important: The latest version removed all references to foreign currency in income) reported by @jgmm81
## v6.6.5 - 2026-06-30
<!-- summary: This release fixes some security issues and many other ones. -->
config/firefly.php
+2 -2
View File
@@ -78,8 +78,8 @@ return [
'running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-07-01',
'build_time' => 1782881975,
'version' => '6.6.6',
'build_time' => 1782932920,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.