jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

merge default currency settings (#5739)

Browse Source
This commit is contained in:
Kevin Papst
2025-12-22 17:55:48 +01:00
committed by GitHub
parent f0e2337d67
commit 3fcaf55d02
15 changed files with 41 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controller/ActivityController.php
View File

@@ -111,7 +111,7 @@ final class ActivityController extends AbstractController
'page_setup' => $page,
'dataTable' => $table,
'metaColumns' => $metaColumns,
'defaultCurrency' => $configuration->getCustomerDefaultCurrency(),
'defaultCurrency' => $configuration->getDefaultCurrency(),
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}
@@ -452,7 +452,7 @@ final class ActivityController extends AbstractController
*/
private function createEditForm(Activity $activity, SystemConfiguration $configuration): FormInterface
{
$currency = $configuration->getCustomerDefaultCurrency();
$currency = $configuration->getDefaultCurrency();
$url = $this->generateUrl('admin_activity_create');
if ($activity->getProject()?->getId() !== null) {
$url = $this->generateUrl('admin_activity_create_with_project', ['project' => $activity->getProject()->getId()]);