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

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source 
# Conflicts:
#	app/Support/Http/Controllers/PeriodOverview.php
This commit is contained in:
James Cole
2025-09-27 05:32:41 +02:00
parent c54da62005 e5923202af
commit 8a06c0f7ec
5 changed files with 125 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/DebugController.php
View File

@@ -109,7 +109,7 @@ class DebugController extends Controller
Artisan::call('route:clear'); Artisan::call('route:clear');
Artisan::call('view:clear'); Artisan::call('view:clear');
PeriodStatistic::where('id','>',0)->delete(); PeriodStatistic::where('id', '>', 0)->delete();
// also do some recalculations. // also do some recalculations.
Artisan::call('correction:recalculates-liabilities'); Artisan::call('correction:recalculates-liabilities');

1
app/Models/PeriodStatistic.php
View File

@@ -9,7 +9,6 @@ use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\SoftDeletes;
class PeriodStatistic extends Model class PeriodStatistic extends Model
{ {

1
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -164,7 +164,6 @@ trait PeriodOverview
return $entries; return $entries;
// collect all expenses in this period: // collect all expenses in this period:
/** @var GroupCollectorInterface $collector */ /** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class); $collector = app(GroupCollectorInterface::class);

2
config/firefly.php
View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2025-09-26', 'version' => 'develop/2025-09-26',
'build_time' => 1758908498, 'build_time' => 1758914637,
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 27, 'db_version' => 27,