Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix #10510
James Cole49c68af07b0b
diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex 487446d6d1..60dda59c3b 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -106,7 +106,7 @@ trait AugumentData{/** @var AccountRepositoryInterface $repository */$repository = app(AccountRepositoryInterface::class);- $accounts = $repository->getAccountsByType([AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value]);+ $accounts = $repository->getAccountsByType([AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value]);$grouped = $accounts->groupBy('id')->toArray();$return = [];foreach ($accountIds as $combinedId) {diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex 44ef268444..5c75d64b44 100644--- a/resources/lang/en_US/firefly.php+++ b/resources/lang/en_US/firefly.php@@ -133,7 +133,7 @@ return ['expenses_by_budget' => 'Expenses by budget','income_by_category' => 'Income by category','expenses_by_asset_account' => 'Expenses by asset account',- 'expenses_by_expense_account' => 'Expenses by expense account',+ 'expenses_by_expense_account' => 'Expenses by destination account','cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.','sum_of_expenses' => 'Sum of expenses','sum_of_income' => 'Sum of income',