mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-18 18:40:12 +00:00
🤖 Auto commit for release 'develop' on 2025-08-10
This commit is contained in:
@@ -82,7 +82,7 @@ class ShowController extends Controller
|
|||||||
* */
|
* */
|
||||||
public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
|
public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
|
||||||
{
|
{
|
||||||
if(0 === $account->id) {
|
if (0 === $account->id) {
|
||||||
throw new NotFoundHttpException();
|
throw new NotFoundHttpException();
|
||||||
}
|
}
|
||||||
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
|
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
|
||||||
|
@@ -188,7 +188,7 @@ class ReportController extends Controller
|
|||||||
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
||||||
$end->endOfDay();
|
$end->endOfDay();
|
||||||
|
|
||||||
app('view')->share('subTitle', trans('firefly.report_default', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat),]));
|
app('view')->share('subTitle', trans('firefly.report_default', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat)]));
|
||||||
|
|
||||||
$generator = ReportGeneratorFactory::reportGenerator('Standard', $start, $end);
|
$generator = ReportGeneratorFactory::reportGenerator('Standard', $start, $end);
|
||||||
$generator->setAccounts($accounts);
|
$generator->setAccounts($accounts);
|
||||||
@@ -213,7 +213,7 @@ class ReportController extends Controller
|
|||||||
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
||||||
$end->endOfDay();
|
$end->endOfDay();
|
||||||
|
|
||||||
app('view')->share('subTitle', trans('firefly.report_double', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat),]));
|
app('view')->share('subTitle', trans('firefly.report_double', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat)]));
|
||||||
|
|
||||||
$generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end);
|
$generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end);
|
||||||
$generator->setAccounts($accounts);
|
$generator->setAccounts($accounts);
|
||||||
|
@@ -78,8 +78,8 @@ return [
|
|||||||
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
|
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
|
||||||
// see cer.php for exchange rates feature flag.
|
// see cer.php for exchange rates feature flag.
|
||||||
],
|
],
|
||||||
'version' => 'develop/2025-08-09',
|
'version' => 'develop/2025-08-10',
|
||||||
'build_time' => 1754766074,
|
'build_time' => 1754800876,
|
||||||
'api_version' => '2.1.0', // field is no longer used.
|
'api_version' => '2.1.0', // field is no longer used.
|
||||||
'db_version' => 26,
|
'db_version' => 26,
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user