waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed date filter financial start date issue

This commit is contained in:
Cihan Şentürk 2026-02-05 20:32:32 +03:00 committed by GitHub
parent 072e070d09
commit 2b098e5e51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Traits/DateTime.php
View File

@ -64,8 +64,7 @@ trait DateTime
$year = $year ?? $start_of_year->year; $year = $year ?? $start_of_year->year;
$financial_start = Date::create($year, $month, $day); $financial_start = Date::create($year, $month, $day);
if ((setting('localisation.financial_denote') == 'ends') && ($financial_start->dayOfYear != 1) ||
if ((setting('localisation.financial_denote') == 'ends') && ($financial_start->dayOfYear != 1) ||
$financial_start->greaterThan($date ?? Date::now()) $financial_start->greaterThan($date ?? Date::now())
) { ) {
$financial_start->subYear(); $financial_start->subYear();
@ -156,7 +155,7 @@ trait DateTime
$w = 52; $w = 52;
if (request()->filled('start_date') && request()->filled('end_date')) { if (request()->filled('start_date') && request()->filled('end_date')) {
$w = Date::parse(request('start_date'))->diffInWeeks(Date::parse(request('end_date'))) + 1; $w = Date::parse($start->copy())->diffInWeeks(Date::parse(request('end_date'))) + 1;
} }
for ($i = 0; $i < $w; $i++) { for ($i = 0; $i < $w; $i++) {
@ -175,7 +174,7 @@ trait DateTime
$m = 12; $m = 12;
if (request()->filled('start_date') && request()->filled('end_date')) { if (request()->filled('start_date') && request()->filled('end_date')) {
$m = Date::parse(request('start_date'))->diffInMonths(Date::parse(request('end_date'))) + 1; $m = Date::parse($start->copy())->diffInMonths(Date::parse(request('end_date'))) + 1;
} }
for ($i = 0; $i < $m; $i++) { for ($i = 0; $i < $m; $i++) {
@ -193,8 +192,13 @@ trait DateTime
$q = 4; $q = 4;
/*
Previously, diffInQuarters was calculated from start_date, which caused errors
when the financial start value differed from the default value.
Therefore, this change has been made. Ticket: #8106
*/
if (request()->filled('start_date') && request()->filled('end_date')) { if (request()->filled('start_date') && request()->filled('end_date')) {
$q = Date::parse(request('start_date'))->diffInQuarters(Date::parse(request('end_date'))) + 1; $q = Date::parse($start->copy())->diffInQuarters(Date::parse(request('end_date'))) + 1;
} }
for ($i = 0; $i < $q; $i++) { for ($i = 0; $i < $q; $i++) {
@ -366,4 +370,4 @@ trait DateTime
{ {
return $this->scopeDateFilter($query, $field); return $this->scopeDateFilter($query, $field);
} }
} }