Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Improve report
Sander Dorigo452be7d9585f
diff --git a/.env.example b/.env.exampleindex 3d64bd5380..f6c682c56c 100644--- a/.env.example+++ b/.env.example@@ -126,7 +126,7 @@ PGSQL_SSL_CRL_FILE=nullPGSQL_SCHEMA=public# If you're looking for performance improvements, you could install memcached or redis-CACHE_DRIVER=file+CACHE_STORE=fileSESSION_DRIVER=file# If you set either of the options above to 'redis', you might want to update these settings toodiff --git a/app/Support/Report/Budget/BudgetReportGenerator.php b/app/Support/Report/Budget/BudgetReportGenerator.phpindex 24c81a4b93..58d1a28ea4 100644--- a/app/Support/Report/Budget/BudgetReportGenerator.php+++ b/app/Support/Report/Budget/BudgetReportGenerator.php@@ -292,7 +292,7 @@ class BudgetReportGenerator$limitId = $limit->id;$limitCurrency = $limit->transactionCurrency ?? $this->currency;$currencyId = $limitCurrency->id;- $expenses = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, $this->accounts, new Collection()->push($budget));+ $expenses = $this->opsRepository->sumExpenses($this->start, $this->end, $this->accounts, new Collection()->push($budget));$spent = $expenses[$currencyId]['sum'] ?? '0';$left = -1 === bccomp(bcadd($limit->amount, $spent), '0') ? '0' : bcadd($limit->amount, $spent);$overspent = 1 === bccomp(bcmul($spent, '-1'), $limit->amount) ? bcadd($spent, $limit->amount) : '0';diff --git a/config/cache.php b/config/cache.phpindex efe2c9f85c..8467a724e6 100644--- a/config/cache.php+++ b/config/cache.php@@ -36,7 +36,7 @@ return [|*/- 'default' => env_default_when_empty(env('CACHE_DRIVER'), 'file'),+ 'default' => env_default_when_empty(env('CACHE_STORE', env('CACHE_DRIVER', 'file'))),/*|--------------------------------------------------------------------------