From 6e1207578e3716849d0bd6308a9bc427327229a6 Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Thu, 7 Sep 2023 22:24:08 +0200
Subject: [PATCH] Release 2.0.33 (#4273)

* added function to check if meta-field is defined by a plugin
* hide un-defined meta-fields in details view
* fix default charset = utf8mb4
* remove broken DATABASE_VERSION fallback
* split off upgrade infos for version 1.x
* fix page out of range #4279
---
 .env.dist                                    |  12 +-
 UPGRADING-1.md                               | 368 ++++++++++++++++++
 UPGRADING.md                                 | 381 +------------------
 config/packages/doctrine.yaml                |   5 -
 src/API/ActivityController.php               |   1 +
 src/API/CustomerController.php               |   1 +
 src/API/ProjectController.php                |   1 +
 src/API/TimesheetController.php              |   1 +
 src/API/UserController.php                   |   1 +
 src/Constants.php                            |   4 +-
 src/Entity/MetaTableTypeInterface.php        |   5 +
 src/Entity/MetaTableTypeTrait.php            |   8 +
 src/Repository/ActivityRepository.php        |   6 +-
 src/Repository/CustomerRepository.php        |   6 +-
 src/Repository/InvoiceRepository.php         |   6 +-
 src/Repository/InvoiceTemplateRepository.php |   6 +-
 src/Repository/ProjectRepository.php         |   6 +-
 src/Repository/Query/BaseQuery.php           |  11 +
 src/Repository/TeamRepository.php            |   6 +-
 src/Repository/TimesheetRepository.php       |   6 +-
 src/Repository/UserRepository.php            |   6 +-
 src/Utils/Pagination.php                     |  12 +-
 templates/activity/details.html.twig         |   2 +-
 templates/customer/details.html.twig         |   2 +-
 templates/project/details.html.twig          |   2 +-
 tests/Repository/TimesheetRepositoryTest.php |   4 +-
 tests/Utils/PaginationTest.php               |  50 +++
 27 files changed, 495 insertions(+), 424 deletions(-)
 create mode 100644 UPGRADING-1.md
 create mode 100644 tests/Utils/PaginationTest.php

diff --git a/.env.dist b/.env.dist
index 3d69195d9..2ccc39f47 100644
--- a/.env.dist
+++ b/.env.dist
@@ -7,19 +7,19 @@
 # Configure your database connection and set the correct server version.
 #
 # You have to replace the following values with your defaults:
-# - the version "5.7"
+# - the version "5.7" (the database server version, examples for MySQL and MariaDB below)
 # - the database username "user"
-# - the database password "password"
-# - the database schema name "database"
+# - the password "password" for "user"
+# - the database schema "database"
 # - you might have to adapt port "3306" and server IP "127.0.0.1" as well
 #
 # For MySQL that would be "serverVersion=5.7" as in:
-#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8&serverVersion=5.7
+#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7
 #
 # For MariaDB it would be "serverVersion=mariadb-10.5.8":
-#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8&serverVersion=mariadb-10.5.8
+#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=mariadb-10.5.8
 #
-DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8&serverVersion=5.7
+DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7
 
 #================================================================================
 # The full documentation can be found at https://www.kimai.org/documentation/emails.html
diff --git a/UPGRADING-1.md b/UPGRADING-1.md
new file mode 100644
index 000000000..9339f5340
--- /dev/null
+++ b/UPGRADING-1.md
@@ -0,0 +1,368 @@
+# Upgrading Kimai - Version 1.x
+
+_Make sure to create a backup before you start!_ 
+
+Read the [updates documentation](https://www.kimai.org/documentation/updates.html) to find out how 
+you can upgrade your Kimai installation to the latest stable release.
+
+Check below if there are more version specific steps required, which need to be executed after the normal update process.
+Perform EACH version specific task between your version and the new one, otherwise you risk data inconsistency or a broken installation.
+
+## [1.16](https://github.com/kimai/kimai/releases/tag/1.16)
+
+If you are using MariaDB, it must be at least version 10.1, older versions are not supported any longer.
+
+**DEVELOPER**
+
+- Removed `formDateTime` field from API model `I18nConfig`
+- Upgraded to Doctrine DBAL 3, see [docs](https://github.com/doctrine/dbal/blob/3.1.x/UPGRADE.md) - you might have to update your bundle
+
+## [1.15](https://github.com/kimai/kimai/releases/tag/1.15)
+
+**Many database changes: don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+Updating the database might take quite a while, depending on the amount of timesheet entries and speed of your database server (~1 minute per 100k records).
+
+**ATTENTION**
+
+- This release bumps the minimum required [PHP version to 7.3](https://www.kimai.org/blog/2021/php8-support-php72-dropped/)
+- Self-registration is disabled by default
+- Self-registration now always requires email confirmation
+- All plugins that use own databases need to be updated as well
+- Removed the YearChart widget and the related configs named `userRecapThisYear`, `userRecapLastYear`, `userRecapTwoYears`, `userRecapThreeYears`
+
+**LDAP & SAML**
+
+Please verify your config with the [LDAP](https://www.kimai.org/documentation/ldap.html) and [SAML](https://www.kimai.org/documentation/saml.html) documentation, especially:
+
+- SAML users: activate it by setting the `kimai.saml.activate: true` config key
+- LDAP users: activate it by setting the `kimai.ldap.activate: true` config key
+- LDAP and SAML users need to remove the complete `security` section from their `local.yaml`
+
+**DEVELOPER**  
+
+PHP 8 compatibility forced to upgrade MANY libraries, including but not limited to:
+
+- Removed FOSUserBundle and hslavich/oneloginsaml
+- Doctrine Migrations, whose new major version forces plugin updates 
+- Gedmo v3 (which include BC breaks in definitions)
+- Doctrine DBAL and others, which required PHP 7.3 as well
+
+**API BC break**: Due to team structure changes, it was impossible to keep the (writing) API structure. Please adjust your code accordingly!
+
+## [1.14](https://github.com/kimai/kimai/releases/tag/1.14)
+
+**CRITICAL BC break**: SQLite support was removed. If you are using SQLite, you have to [read this blog post](https://www.kimai.org/blog/2021/sqlite-and-ftp-support-removed/) and migrate to MySQL/MariaDB first!
+
+**New database tables and fields: don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+Permission changes:
+- `history_invoice` - removed permission entirely
+
+## [1.13](https://github.com/kimai/kimai/releases/tag/1.13)
+
+- Deprecated `now` variable in export templates: create it yourself with `{% set now = create_date('now', app.user) %}`
+- Changed invoice filename generation (check if you use cronjob for invoices)
+- **BC break**: duration entered as plain numbers will now be treated as decimal duration in hours instead of seconds
+
+## [1.12](https://github.com/kimai/kimai/releases/tag/1.12)
+
+- Export templates can now include items from plugins (eg. Expenses).
+
+## [1.10](https://github.com/kimai/kimai/releases/tag/1.10)
+
+**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+- Invoice renderer `CSV` was removed
+- Sessions are now stored in the database (all users have to re-login after upgrade)
+- New permissions: `lockdown_grace_timesheet`, `lockdown_override_timesheet`, `view_all_data`
+- Fixed team permissions on user queries: depending on your previous team & permission setup your users might see less data (SUPER_ADMINS see all data, but new: ADMINS only see all data if they own the `view_all_data` permission)
+- Markdown does not support headings anymore, text like `# foo` is not converted to `<h1 id="foo">foo</h1>` anymore
+
+### Developer
+
+- **BC break**: removed registration of `.env` with `putenv()` - do not rely on `getenv()` as it is not thread-safe
+- **BC break**: interface method signature `HtmlToPdfConverter::convertToPdf()` changed
+- **BC break**: the macros `badge` and `label` do not apply the `|trans` filter any more
+- **BC Break**: removed `getVisible()` (deprecated since 1.4) method on Customer, Project and Activity (use `isVisible()` instead, templates are still working)
+- **BC Break**: API changes
+    - some representation names changed (eg. from `ActivityMetaField` to `ActivityMeta`, `TimesheetSubCollection` vs `TimesheetCollectionExpanded`), you could use `class_alias()` if you use auto-generated code from Swagger-Gen or alike
+    - new result types were introduced
+    - result data changed in some areas to smooth out inconsistencies (eg. TeamEntity fields changed in nested results)
+
+## [1.9](https://github.com/kimai/kimai/releases/tag/1.9)
+
+**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+- The directory `var/data/invoices/` will be used to store archived invoice files (check file permissions)
+- The default invoice number format changed. If you want to use the old one: configure `{date}` as format - see [invoice documentation](https://www.kimai.org/documentation/invoices.html)
+- HTML invoice templates are now treated like other files and offered as download. If you are using relative URLs for including assets (CSS, images) you need to either inline them (see the default templates) or use absolute URLs
+- Invoice templates that use the templates variables `${activity.X}` or `${project.X}` should be checked and possibly adapted, as multi-select is now possible for filtering
+- Invoice templates have access to all meta-fields as variables, not only the ones marked as visible
+- Rates configuration/structure changed for customer, project and activity 
+  - **Invoice templates**: rates variables were removed
+
+Permission changes:
+- `history_invoice` - NEW: grants all features for the new invoice archive (by default for all admins)
+
+### Developer
+
+- **BC break**: `InvoiceItemInterface` has new methods `getType()` and `getCategory()`
+- **BC break**: API fields changed - see new `/rates` endpoints
+
+## [1.8](https://github.com/kimai/kimai/releases/tag/1.8)
+
+**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+- New PHP requirement: `ext-xsl` - which should be pre-installed in most environments when `ext-xml` is loaded
+- New mailer library: check if emails are still working (eg. by using the "password forgotten" function) or if you need to adjust your configuration, [see docs at symfony.com](https://symfony.com/doc/current/components/mailer.html#transport)
+- Support for line breaks in multiline invoice fields for spreadsheets (check your invoice templates after the update) 
+
+Permission changes:
+
+- `comments_create_customer` - NEW: permission that allows to add new comments for customers  
+- `comments_create_team_customer` - NEW: permission that allows to add new comments for team members of the current customer 
+- `comments_create_teamlead_customer` - NEW: permission that allows to add new comments for a teamlead of the current customer 
+- `comments_create_project` - NEW: permission that allows to add new comments for project  
+- `comments_create_team_project` - NEW: permission that allows to add new comments for team members of the current project 
+- `comments_create_teamlead_project` - NEW: permission that allows to add new comments for a teamlead of the current project 
+- `edit_teamlead_project` - removed default permission from ROLE_TEAMLEAD (if you use it: change it in the Role & Permission UI) 
+- `edit_teamlead_customer` - removed default permission from ROLE_TEAMLEAD (if you use it: change it in the Role & Permission UI) 
+- `upload_invoice_template` - NEW: permission that allows to upload invoice documents from the UI
+
+## [1.7](https://github.com/kimai/kimai/releases/tag/1.7)
+
+**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+New permissions:
+
+- `comments_customer` - show comment list on customer detail page (new feature) 
+- `details_customer` - show detail information for customers (customer number, vat, rates, meta-fields, assigned teams ...)
+- `comments_project` - show comment list on project detail page (new feature) 
+- `details_project` - show detail information for projects (rates, meta-fields, assigned teams ...)
+
+If you are using teams, please read on: The following list of permissions are now also available in the UI and they (can) replace the `X_project` and `X_customer` permissions. 
+They are more strict, as they allow only access to team specific items, the older permissions without `_teamlead_`/`_team_` work on a global level instead.
+  
+- `view_teamlead_customer`, `edit_teamlead_customer`, `budget_teamlead_customer`, `permissions_teamlead_customer`, `comments_teamlead_customer`, `details_teamlead_customer` - allows access to customer data when user is teamlead of a team assigned to the customer (replaces more global permission like `view_customer` for teamleads)
+- `view_team_customer`, `edit_team_customer`, `budget_team_customer`, `comments_team_customer`, `details_team_customer` - allows access to customer data when user is member of a team assigned to the customer (replaces more global permission like `view_customer` for users)
+- `view_teamlead_project`, `edit_teamlead_project`, `budget_teamlead_project`, `permissions_teamlead_project`, `comments_teamlead_project`, `details_teamlead_project` - allows access to customer data when user is teamlead of a team assigned to the project (replaces more global permission like `view_project` for teamleads)
+- `view_team_project`, `edit_team_project`, `budget_team_project`, `comments_team_project`, `details_team_project` - allows access to customer data when user is member of a team assigned to the project (replaces more global permission like `view_project` for users)
+
+### ExpenseBundle
+
+**ATTENTION** due to incompatibilities in the underlying frameworks users of the ExpenseBundle need to do one more step:
+You need to delete the bundle before updating: `rm -r var/plugins/ExpenseBundle`, otherwise you will run into errors during the update.
+After the Kimai update was successful, you have to re-install the latest bundle version, which is compatible with Kimai 1.7 only. 
+
+### Developer
+
+- Projects now have a start and end date and the API will only return those, which are either unconfigured or currently active, you might want to reload the list of projects once the user entered begin and end datetime OR use the new `ignoreDates` parameter.
+- Doctrine bundle was updated to v2, check your code for [the usage of RegistryInterface and ObjectManager](https://github.com/doctrine/DoctrineBundle/blob/master/UPGRADE-2.0.md)
+- Removed the webserver bundle and the command `server:run` - see [docs](https://www.kimai.org/documentation/developers.html)
+
+## [1.6](https://github.com/kimai/kimai/releases/tag/1.6), [1.6.1](https://github.com/kimai/kimai/releases/tag/1.6.1), [1.6.2](https://github.com/kimai/kimai/releases/tag/1.6.2)
+
+**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+- Invoice changes:
+  - Moved CSV, ODS and XSLX invoice templates to [another repository](https://github.com/Keleo/kimai2-invoice-templates). Using them? Install them manually (see [invoice documentation](https://www.kimai.org/documentation/invoices.html)).
+  - Added new invoice fields (VAT, contact, payment details) and customer field (VAT). Used the twig settings before? Move them to the respective invoice template settings.
+- Permissions can be managed via Admin UI. Please move your permission settings from [local.yaml to your database](https://www.kimai.org/documentation/permissions.html).
+- Important permission change: regular users with the `view_other_timesheet` permission could see all timesheets. This was a legacy from the time before team permissions were introduced. If you rely on this behavior, you need to create a team with all users and the teamlead being the user who needs access to all timesheets. 
+
+### Developer
+
+Please add default permissions to your [plugin](https://www.kimai.org/documentation/plugins.html).
+
+## [1.5](https://github.com/kimai/kimai/releases/tag/1.5)
+
+[Update as usual](https://www.kimai.org/documentation/updates.html)
+
+## [1.4](https://github.com/kimai/kimai/releases/tag/1.4)
+
+**There is a new directory, which needs to be writable by the webserver: `public/avatars/`.**
+
+New permission (used in new dashboard widget):
+- `view_team_member` - display team assignments (names, teamleads and members) for the current user
+
+Activated Javascript select component by default (check mobile devices).
+
+### Developer: BC breaks
+
+- Dashboard widgets and rows need to define their `type` by FQCN
+- Switched to Symfony 4.3 event types, this could fail in plugins, but only if they didn't use the official constants for event names
+
+## [1.3](https://github.com/kimai/kimai/releases/tag/1.3)
+
+Added `manage_tag` permission for new tag features
+
+### Developer: BC breaks
+
+- Refactored toolbars and search, plugins needs to be checked 
+- Invoices now supports multiple repositories, some method signatures had to be changed (eg. `calculateSumIdentifier()`)  
+
+## [1.2](https://github.com/kimai/kimai/releases/tag/1.2)
+
+**If you are still using 0.7 or below, you need to upgrade to 1.1 before upgrading to this version.**
+
+- Deleted timezone conversion command. 
+- Minimum password length raised from 5 to 8 character (applies only for password changes and new users)
+- Maximum customer name length lowered to 150 character
+- Maximum project name length lowered to 150 character
+- Maximum activity name length lowered to 150 character
+- Added new permission: `manage_invoice_template`
+  - Removed permissions: `view_invoice_template`, `create_invoice_template`, `edit_invoice_template`, `delete_invoice_template`
+- Removed permission: `view_export` (using `create_export` only)
+
+### Developer: BC breaks
+
+- Custom export renderer need to check for usage of `Timesheet::getEnd()` as running entries can now be exported as well
+
+## [1.1](https://github.com/kimai/kimai/releases/tag/1.1)
+
+[Update as usual](https://www.kimai.org/documentation/updates.html), nothing special for this release if you upgrade from 1.0 / 1.0.1.
+
+## [1.0](https://github.com/kimai/kimai/releases/tag/1.0)
+
+This release contains several changes, as I still have the goal to stabilize the code base to prevent 
+such "challenges" after 1.0 for a while.
+
+### Changes for your local.yaml
+ 
+New permissions are available. You have to add them to your `local.yaml` ONLY if you use a custom permission structure, 
+otherwise you can't use the new features: 
+- `view_tag` - view all tags
+- `delete_tag` - delete tags
+- `edit_exported_timesheet` - allows to edit records which were exported
+- `role_permissions` - view calculated permissions for user roles
+- `budget_activity` - view and edit budgets for activities
+- `budget_project` - view and edit budgets for projects
+- `budget_customer` - view and edit budgets for customers
+
+Removed permission:
+- `system_actions` - removed experimental feature to flush app cache from the about screen
+
+### BC BREAKS
+
+- API: Format for queries including a datetime object fixed to use HTML5 format (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00`)
+- **Permission config**: the `permissions` definition in your `local.yaml` needs to be verified/changed, as the internal structure was highly optimized to simplify the definition. 
+Thanks to the new structure, you should be able to remove almost everything from your `local.yaml` (tip: start over from scratch!). Please read [the updated permission docu](https://www.kimai.org/documentation/permissions.html). 
+- default widgets were removed from `kimai.yaml`, that shouldn't cause any issues ... but if something is odd: [look here for help](https://www.kimai.org/documentation/dashboard.html)
+
+## [0.9](https://github.com/kimai/kimai/releases/tag/0.9)
+
+Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
+
+### BC BREAKS
+
+This release contains some BC breaks which were necessary before 1.0 will be released (_now or never_), to prevent those BC breaks after 1.0. 
+
+- **Kimai requires PHP 7.2 now => [PHP 7.1 expired 4 month ago](https://www.php.net/supported-versions.php)**
+- The `.env` variable `DATABASE_PREFIX` was removed and the table prefix is now hardcoded to `kimai2_`. If you used another prefix, 
+you have to rename your tables manually before starting the update process. You can delete the row `DATABASE_PREFIX` from your `.env` file.
+- API: Format for DateTime objects changed, now including timezone identifier (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00+00:00`), see [#718](https://github.com/kimai/kimai/pull/718)
+- API: changed from snake_case to camelCase (affected fields: hourlyRate vs hourly_rate / fixedRate vs fixed_rate / orderNumber vs order_number / i18n config object)
+- Plugin mechanism changed: existing Plugins have to be deleted or updated
+
+### Apply necessary changes to your `local.yaml`: 
+
+New permissions are available: 
+- `system_configuration` - for accessing the new system configuration screen
+- `system_actions` - for the experimental feature to flush your cache from the about screen
+- `plugins` - for accessing the new plugins screen
+
+The setting `kimai.timesheet.mode` replaces the setting `kimai.timesheet.duration_only`. If you used the duration_only mode, you need to change your config:
+```yaml
+# Before
+kimai:
+    timesheet:
+        duration_only: true
+        
+# After
+kimai:
+    timesheet:
+        mode: duration_only
+```
+Or switch the mode directly in the new System configuration screen within Kimai.  
+
+## [0.8.1](https://github.com/kimai/kimai/releases/tag/0.8.1)
+
+A bug fixing release. Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
+
+## [0.8](https://github.com/kimai/kimai/releases/tag/0.8)
+
+After you followed the normal update and database migration process (see above), you need to execute a bash command to convert your timesheet data for timezone support:
+
+- Read this [pull request](https://github.com/kimai/kimai/pull/372) BEFORE you follow the instructions to convert the 
+timezones in your existing time records with `bin/console kimai:convert-timezone`. Without that, you will end up with wrong times in your database.
+
+### Apply necessary changes to your `local.yaml`: 
+
+- A new boolean setting `kimai.timesheet.rules.allow_future_times` was introduced
+- New permissions are available: 
+  - `view_export` - for the new export feature
+  - `create_export` - for the new export feature
+  - `edit_export_own_timesheet` - for the new export feature
+  - `edit_export_other_timesheet` - for the new export feature
+  - `system_information` - to see the new about screen
+
+## [0.7](https://github.com/kimai/kimai/releases/tag/0.7)
+
+The configuration `kimai.theme.active_warning` was deprecated and should be replaced in your local.yaml, 
+[read config docs for more information](https://www.kimai.org/documentation/timesheet.html#limit-active-entries).
+
+## [0.6.1](https://github.com/kimai/kimai/releases/tag/0.6.1)
+
+A bugfix release to address database compatibility issues with older MySQL/MariaDB versions.
+
+## [0.6](https://github.com/kimai/kimai/releases/tag/0.6)
+
+The API has some minor BC breaks: some fields were renamed and entities have a larger attribute set than collections. 
+Be aware that the API is still is development mode and shouldn't be considered stable for now.
+
+## [0.5](https://github.com/kimai/kimai/releases/tag/0.5)
+
+Some configuration nodes were removed, if you have one of them in your `local.yaml` you need to delete them before you start the update:
+- `kimai.invoice.calculator`
+- `kimai.invoice.renderer`
+- `kimai.invoice.number_generator`
+
+The new config `kimai.invoice.documents` was introduced, holding a list of directories ([read more](https://www.kimai.org/documentation/invoices.html)).
+
+**BC break:** InvoiceTemplate name was changed from 255 characters to 60. If you used longer invoice-template names, they will be truncated when upgrading the database.
+Please make sure that they are unique in the first 60 character before you upgrade your database with `doctrine:migrations:migrate`. 
+
+## [0.4](https://github.com/kimai/kimai/releases/tag/0.4)
+
+In the time between 0.3 and 0.4 there was a release of composer that introduced a BC break, 
+which leads to problems between Composer and Symfony Flex, resulting in an error like this when running it:
+
+```
+  [ErrorException]
+  Declaration of Symfony\Flex\ParallelDownloader::getRemoteContents($originUrl, $fileUrl, $context) should be compatible with Composer\Util\RemoteFilesystem::getRemoteContents($originUrl, $fileUrl, $context, ?array &$responseHeaders = NULL)
+```
+
+This can be fixed by updating Composer and Flex before executing the Kimai update:
+```
+sudo composer self-update
+sudo -u www-data composer update symfony/flex --no-plugins --no-scripts
+```
+
+## [0.3](https://github.com/kimai/kimai/releases/tag/0.3)
+
+You need to adjust your `.env` file and add your `from` address for [all emails](https://www.kimai.org/documentation/emails.html) generated by Kimai 2:
+```
+MAILER_FROM=kimai@example.com
+```
+
+Create a file and database backup before executing the following steps: 
+
+```bash
+git pull origin master
+sudo -u www-data composer install --no-dev --optimize-autoloader
+sudo -u www-data bin/console cache:clear --env=prod
+sudo -u www-data bin/console cache:warmup --env=prod
+bin/console doctrine:migrations:version --add 20180701120000
+bin/console doctrine:migrations:migrate
+```
diff --git a/UPGRADING.md b/UPGRADING.md
index c97be09d3..b79ba1398 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -1,4 +1,4 @@
-# Upgrading Kimai
+# Upgrading Kimai - Version2.x
 
 _Make sure to create a backup before you start!_ 
 
@@ -8,21 +8,31 @@ you can upgrade your Kimai installation to the latest stable release.
 Check below if there are more version specific steps required, which need to be executed after the normal update process.
 Perform EACH version specific task between your version and the new one, otherwise you risk data inconsistency or a broken installation.
 
+## [2.0.30](https://github.com/kimai/kimai/releases/tag/2.0.30)
+
+The `DATABASE_URL` in your environment settings ([.env](https://github.com/kimai/kimai/issues/4246) or in your [Docker](https://github.com/tobybatch/kimai2/issues/531) or webserver config)
+now requires the `charset` and `serverVersion` params, e.g.: `DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7` (examples in `.env`).
+
 ## [2.0](https://github.com/kimai/kimai/releases/tag/2.0)
 
 **!! This release requires minimum PHP version to 8.1 !!**
 
+### Breaking changes
+
+- All plugins need to be updated: delete all previous version from your installation (`rm -r var/plugins/*`) before updating!
+- The `local.yaml` is not compatible with old version, remove it before the update and then re-create it after everything works
+  - dashboard default config
+  - removed: theme.branding.translation
+  - removed: kimai.plugin_dir
+
+### Developer
+
 Developer read the full documentation at [https://www.kimai.org/documentation/migration-v2.html](https://www.kimai.org/documentation/migration-v2.html).
 
-- **All plugins need to be updated**: delete all previous version from your installation (`rm -r var/plugins/*`) before updating!
 - Invoice renderer and templates for XML, JSON and TEXT were moved to the [Extended invoicing plugin](https://www.kimai.org/store/invoice-bundle.html) (install if you use one of those)
 - Moved `company.docx` to [external repo](https://github.com/kimai/invoice-templates/tree/main/docx-company) (needs to be re-uploaded if you want to keep on using it!)
 - Role names are forced to be uppercase 
 - Removed unused `public/avatars/` directory 
-- `local.yaml` is not compatible with old version, remove it before the update and then re-create it after everything works 
-  - dashboard default config
-  - removed: theme.branding.translation
-  - removed: kimai.plugin_dir
 - Time-tracking mode `duration_only` was removed, existing installations will be switched to `duration_fixed_begin`
 - Removed Twig filters. You might have to replace them in your custom export/invoice templates:
   - `date_full` => `date_time`
@@ -38,362 +48,3 @@ Developer read the full documentation at [https://www.kimai.org/documentation/mi
   - `composer require symfony/mailgun-mailer`
   - `composer require symfony/postmark-mailer`
   - `composer require symfony/sendgrid-mailer`
-
-## [1.16](https://github.com/kimai/kimai/releases/tag/1.16)
-
-If you are using MariaDB, it must be at least version 10.1, older versions are not supported any longer.
-
-**DEVELOPER**
-
-- Removed `formDateTime` field from API model `I18nConfig`
-- Upgraded to Doctrine DBAL 3, see [docs](https://github.com/doctrine/dbal/blob/3.1.x/UPGRADE.md) - you might have to update your bundle
-
-## [1.15](https://github.com/kimai/kimai/releases/tag/1.15)
-
-**Many database changes: don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
-
-Updating the database might take quite a while, depending on the amount of timesheet entries and speed of your database server (~1 minute per 100k records).
-
-**ATTENTION**
-
-- This release bumps the minimum required [PHP version to 7.3](https://www.kimai.org/blog/2021/php8-support-php72-dropped/)
-- Self-registration is disabled by default
-- Self-registration now always requires email confirmation
-- All plugins that use own databases need to be updated as well
-- Removed the YearChart widget and the related configs named `userRecapThisYear`, `userRecapLastYear`, `userRecapTwoYears`, `userRecapThreeYears`
-
-**LDAP & SAML**
-
-Please verify your config with the [LDAP](https://www.kimai.org/documentation/ldap.html) and [SAML](https://www.kimai.org/documentation/saml.html) documentation, especially:
-
-- SAML users: activate it by setting the `kimai.saml.activate: true` config key
-- LDAP users: activate it by setting the `kimai.ldap.activate: true` config key
-- LDAP and SAML users need to remove the complete `security` section from their `local.yaml`
-
-**DEVELOPER**  
-
-PHP 8 compatibility forced to upgrade MANY libraries, including but not limited to:
-
-- Removed FOSUserBundle and hslavich/oneloginsaml
-- Doctrine Migrations, whose new major version forces plugin updates 
-- Gedmo v3 (which include BC breaks in definitions)
-- Doctrine DBAL and others, which required PHP 7.3 as well
-
-**API BC break**: Due to team structure changes, it was impossible to keep the (writing) API structure. Please adjust your code accordingly!
-
-## [1.14](https://github.com/kimai/kimai/releases/tag/1.14)
-
-**CRITICAL BC break**: SQLite support was removed. If you are using SQLite, you have to [read this blog post](https://www.kimai.org/blog/2021/sqlite-and-ftp-support-removed/) and migrate to MySQL/MariaDB first!
-
-**New database tables and fields: don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
-
-Permission changes:
-- `history_invoice` - removed permission entirely
-
-## [1.13](https://github.com/kimai/kimai/releases/tag/1.13)
-
-- Deprecated `now` variable in export templates: create it yourself with `{% set now = create_date('now', app.user) %}`
-- Changed invoice filename generation (check if you use cronjob for invoices)
-- **BC break**: duration entered as plain numbers will now be treated as decimal duration in hours instead of seconds
-
-## [1.12](https://github.com/kimai/kimai/releases/tag/1.12)
-
-- Export templates can now include items from plugins (eg. Expenses).
-
-## [1.10](https://github.com/kimai/kimai/releases/tag/1.10)
-
-**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
-
-- Invoice renderer `CSV` was removed
-- Sessions are now stored in the database (all users have to re-login after upgrade)
-- New permissions: `lockdown_grace_timesheet`, `lockdown_override_timesheet`, `view_all_data`
-- Fixed team permissions on user queries: depending on your previous team & permission setup your users might see less data (SUPER_ADMINS see all data, but new: ADMINS only see all data if they own the `view_all_data` permission)
-- Markdown does not support headings anymore, text like `# foo` is not converted to `<h1 id="foo">foo</h1>` anymore
-
-### Developer
-
-- **BC break**: removed registration of `.env` with `putenv()` - do not rely on `getenv()` as it is not thread-safe
-- **BC break**: interface method signature `HtmlToPdfConverter::convertToPdf()` changed
-- **BC break**: the macros `badge` and `label` do not apply the `|trans` filter any more
-- **BC Break**: removed `getVisible()` (deprecated since 1.4) method on Customer, Project and Activity (use `isVisible()` instead, templates are still working)
-- **BC Break**: API changes
-    - some representation names changed (eg. from `ActivityMetaField` to `ActivityMeta`, `TimesheetSubCollection` vs `TimesheetCollectionExpanded`), you could use `class_alias()` if you use auto-generated code from Swagger-Gen or alike
-    - new result types were introduced
-    - result data changed in some areas to smooth out inconsistencies (eg. TeamEntity fields changed in nested results)
-
-## [1.9](https://github.com/kimai/kimai/releases/tag/1.9)
-
-**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
-
-- The directory `var/data/invoices/` will be used to store archived invoice files (check file permissions)
-- The default invoice number format changed. If you want to use the old one: configure `{date}` as format - see [invoice documentation](https://www.kimai.org/documentation/invoices.html)
-- HTML invoice templates are now treated like other files and offered as download. If you are using relative URLs for including assets (CSS, images) you need to either inline them (see the default templates) or use absolute URLs
-- Invoice templates that use the templates variables `${activity.X}` or `${project.X}` should be checked and possibly adapted, as multi-select is now possible for filtering
-- Invoice templates have access to all meta-fields as variables, not only the ones marked as visible
-- Rates configuration/structure changed for customer, project and activity 
-  - **Invoice templates**: rates variables were removed
-
-Permission changes:
-- `history_invoice` - NEW: grants all features for the new invoice archive (by default for all admins)
-
-### Developer
-
-- **BC break**: `InvoiceItemInterface` has new methods `getType()` and `getCategory()`
-- **BC break**: API fields changed - see new `/rates` endpoints
-
-## [1.8](https://github.com/kimai/kimai/releases/tag/1.8)
-
-**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
-
-- New PHP requirement: `ext-xsl` - which should be pre-installed in most environments when `ext-xml` is loaded
-- New mailer library: check if emails are still working (eg. by using the "password forgotten" function) or if you need to adjust your configuration, [see docs at symfony.com](https://symfony.com/doc/current/components/mailer.html#transport)
-- Support for line breaks in multiline invoice fields for spreadsheets (check your invoice templates after the update) 
-
-Permission changes:
-
-- `comments_create_customer` - NEW: permission that allows to add new comments for customers  
-- `comments_create_team_customer` - NEW: permission that allows to add new comments for team members of the current customer 
-- `comments_create_teamlead_customer` - NEW: permission that allows to add new comments for a teamlead of the current customer 
-- `comments_create_project` - NEW: permission that allows to add new comments for project  
-- `comments_create_team_project` - NEW: permission that allows to add new comments for team members of the current project 
-- `comments_create_teamlead_project` - NEW: permission that allows to add new comments for a teamlead of the current project 
-- `edit_teamlead_project` - removed default permission from ROLE_TEAMLEAD (if you use it: change it in the Role & Permission UI) 
-- `edit_teamlead_customer` - removed default permission from ROLE_TEAMLEAD (if you use it: change it in the Role & Permission UI) 
-- `upload_invoice_template` - NEW: permission that allows to upload invoice documents from the UI
-
-## [1.7](https://github.com/kimai/kimai/releases/tag/1.7)
-
-**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
-
-New permissions:
-
-- `comments_customer` - show comment list on customer detail page (new feature) 
-- `details_customer` - show detail information for customers (customer number, vat, rates, meta-fields, assigned teams ...)
-- `comments_project` - show comment list on project detail page (new feature) 
-- `details_project` - show detail information for projects (rates, meta-fields, assigned teams ...)
-
-If you are using teams, please read on: The following list of permissions are now also available in the UI and they (can) replace the `X_project` and `X_customer` permissions. 
-They are more strict, as they allow only access to team specific items, the older permissions without `_teamlead_`/`_team_` work on a global level instead.
-  
-- `view_teamlead_customer`, `edit_teamlead_customer`, `budget_teamlead_customer`, `permissions_teamlead_customer`, `comments_teamlead_customer`, `details_teamlead_customer` - allows access to customer data when user is teamlead of a team assigned to the customer (replaces more global permission like `view_customer` for teamleads)
-- `view_team_customer`, `edit_team_customer`, `budget_team_customer`, `comments_team_customer`, `details_team_customer` - allows access to customer data when user is member of a team assigned to the customer (replaces more global permission like `view_customer` for users)
-- `view_teamlead_project`, `edit_teamlead_project`, `budget_teamlead_project`, `permissions_teamlead_project`, `comments_teamlead_project`, `details_teamlead_project` - allows access to customer data when user is teamlead of a team assigned to the project (replaces more global permission like `view_project` for teamleads)
-- `view_team_project`, `edit_team_project`, `budget_team_project`, `comments_team_project`, `details_team_project` - allows access to customer data when user is member of a team assigned to the project (replaces more global permission like `view_project` for users)
-
-### ExpenseBundle
-
-**ATTENTION** due to incompatibilities in the underlying frameworks users of the ExpenseBundle need to do one more step:
-You need to delete the bundle before updating: `rm -r var/plugins/ExpenseBundle`, otherwise you will run into errors during the update.
-After the Kimai update was successful, you have to re-install the latest bundle version, which is compatible with Kimai 1.7 only. 
-
-### Developer
-
-- Projects now have a start and end date and the API will only return those, which are either unconfigured or currently active, you might want to reload the list of projects once the user entered begin and end datetime OR use the new `ignoreDates` parameter.
-- Doctrine bundle was updated to v2, check your code for [the usage of RegistryInterface and ObjectManager](https://github.com/doctrine/DoctrineBundle/blob/master/UPGRADE-2.0.md)
-- Removed the webserver bundle and the command `server:run` - see [docs](https://www.kimai.org/documentation/developers.html)
-
-## [1.6](https://github.com/kimai/kimai/releases/tag/1.6), [1.6.1](https://github.com/kimai/kimai/releases/tag/1.6.1), [1.6.2](https://github.com/kimai/kimai/releases/tag/1.6.2)
-
-**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
-
-- Invoice changes:
-  - Moved CSV, ODS and XSLX invoice templates to [another repository](https://github.com/Keleo/kimai2-invoice-templates). Using them? Install them manually (see [invoice documentation](https://www.kimai.org/documentation/invoices.html)).
-  - Added new invoice fields (VAT, contact, payment details) and customer field (VAT). Used the twig settings before? Move them to the respective invoice template settings.
-- Permissions can be managed via Admin UI. Please move your permission settings from [local.yaml to your database](https://www.kimai.org/documentation/permissions.html).
-- Important permission change: regular users with the `view_other_timesheet` permission could see all timesheets. This was a legacy from the time before team permissions were introduced. If you rely on this behavior, you need to create a team with all users and the teamlead being the user who needs access to all timesheets. 
-
-### Developer
-
-Please add default permissions to your [plugin](https://www.kimai.org/documentation/plugins.html).
-
-## [1.5](https://github.com/kimai/kimai/releases/tag/1.5)
-
-[Update as usual](https://www.kimai.org/documentation/updates.html)
-
-## [1.4](https://github.com/kimai/kimai/releases/tag/1.4)
-
-**There is a new directory, which needs to be writable by the webserver: `public/avatars/`.**
-
-New permission (used in new dashboard widget):
-- `view_team_member` - display team assignments (names, teamleads and members) for the current user
-
-Activated Javascript select component by default (check mobile devices).
-
-### Developer: BC breaks
-
-- Dashboard widgets and rows need to define their `type` by FQCN
-- Switched to Symfony 4.3 event types, this could fail in plugins, but only if they didn't use the official constants for event names
-
-## [1.3](https://github.com/kimai/kimai/releases/tag/1.3)
-
-Added `manage_tag` permission for new tag features
-
-### Developer: BC breaks
-
-- Refactored toolbars and search, plugins needs to be checked 
-- Invoices now supports multiple repositories, some method signatures had to be changed (eg. `calculateSumIdentifier()`)  
-
-## [1.2](https://github.com/kimai/kimai/releases/tag/1.2)
-
-**If you are still using 0.7 or below, you need to upgrade to 1.1 before upgrading to this version.**
-
-- Deleted timezone conversion command. 
-- Minimum password length raised from 5 to 8 character (applies only for password changes and new users)
-- Maximum customer name length lowered to 150 character
-- Maximum project name length lowered to 150 character
-- Maximum activity name length lowered to 150 character
-- Added new permission: `manage_invoice_template`
-  - Removed permissions: `view_invoice_template`, `create_invoice_template`, `edit_invoice_template`, `delete_invoice_template`
-- Removed permission: `view_export` (using `create_export` only)
-
-### Developer: BC breaks
-
-- Custom export renderer need to check for usage of `Timesheet::getEnd()` as running entries can now be exported as well
-
-## [1.1](https://github.com/kimai/kimai/releases/tag/1.1)
-
-[Update as usual](https://www.kimai.org/documentation/updates.html), nothing special for this release if you upgrade from 1.0 / 1.0.1.
-
-## [1.0](https://github.com/kimai/kimai/releases/tag/1.0)
-
-This release contains several changes, as I still have the goal to stabilize the code base to prevent 
-such "challenges" after 1.0 for a while.
-
-### Changes for your local.yaml
- 
-New permissions are available. You have to add them to your `local.yaml` ONLY if you use a custom permission structure, 
-otherwise you can't use the new features: 
-- `view_tag` - view all tags
-- `delete_tag` - delete tags
-- `edit_exported_timesheet` - allows to edit records which were exported
-- `role_permissions` - view calculated permissions for user roles
-- `budget_activity` - view and edit budgets for activities
-- `budget_project` - view and edit budgets for projects
-- `budget_customer` - view and edit budgets for customers
-
-Removed permission:
-- `system_actions` - removed experimental feature to flush app cache from the about screen
-
-### BC BREAKS
-
-- API: Format for queries including a datetime object fixed to use HTML5 format (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00`)
-- **Permission config**: the `permissions` definition in your `local.yaml` needs to be verified/changed, as the internal structure was highly optimized to simplify the definition. 
-Thanks to the new structure, you should be able to remove almost everything from your `local.yaml` (tip: start over from scratch!). Please read [the updated permission docu](https://www.kimai.org/documentation/permissions.html). 
-- default widgets were removed from `kimai.yaml`, that shouldn't cause any issues ... but if something is odd: [look here for help](https://www.kimai.org/documentation/dashboard.html)
-
-## [0.9](https://github.com/kimai/kimai/releases/tag/0.9)
-
-Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
-
-### BC BREAKS
-
-This release contains some BC breaks which were necessary before 1.0 will be released (_now or never_), to prevent those BC breaks after 1.0. 
-
-- **Kimai requires PHP 7.2 now => [PHP 7.1 expired 4 month ago](https://www.php.net/supported-versions.php)**
-- The `.env` variable `DATABASE_PREFIX` was removed and the table prefix is now hardcoded to `kimai2_`. If you used another prefix, 
-you have to rename your tables manually before starting the update process. You can delete the row `DATABASE_PREFIX` from your `.env` file.
-- API: Format for DateTime objects changed, now including timezone identifier (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00+00:00`), see [#718](https://github.com/kimai/kimai/pull/718)
-- API: changed from snake_case to camelCase (affected fields: hourlyRate vs hourly_rate / fixedRate vs fixed_rate / orderNumber vs order_number / i18n config object)
-- Plugin mechanism changed: existing Plugins have to be deleted or updated
-
-### Apply necessary changes to your `local.yaml`: 
-
-New permissions are available: 
-- `system_configuration` - for accessing the new system configuration screen
-- `system_actions` - for the experimental feature to flush your cache from the about screen
-- `plugins` - for accessing the new plugins screen
-
-The setting `kimai.timesheet.mode` replaces the setting `kimai.timesheet.duration_only`. If you used the duration_only mode, you need to change your config:
-```yaml
-# Before
-kimai:
-    timesheet:
-        duration_only: true
-        
-# After
-kimai:
-    timesheet:
-        mode: duration_only
-```
-Or switch the mode directly in the new System configuration screen within Kimai.  
-
-## [0.8.1](https://github.com/kimai/kimai/releases/tag/0.8.1)
-
-A bug fixing release. Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
-
-## [0.8](https://github.com/kimai/kimai/releases/tag/0.8)
-
-After you followed the normal update and database migration process (see above), you need to execute a bash command to convert your timesheet data for timezone support:
-
-- Read this [pull request](https://github.com/kimai/kimai/pull/372) BEFORE you follow the instructions to convert the 
-timezones in your existing time records with `bin/console kimai:convert-timezone`. Without that, you will end up with wrong times in your database.
-
-### Apply necessary changes to your `local.yaml`: 
-
-- A new boolean setting `kimai.timesheet.rules.allow_future_times` was introduced
-- New permissions are available: 
-  - `view_export` - for the new export feature
-  - `create_export` - for the new export feature
-  - `edit_export_own_timesheet` - for the new export feature
-  - `edit_export_other_timesheet` - for the new export feature
-  - `system_information` - to see the new about screen
-
-## [0.7](https://github.com/kimai/kimai/releases/tag/0.7)
-
-The configuration `kimai.theme.active_warning` was deprecated and should be replaced in your local.yaml, 
-[read config docs for more information](https://www.kimai.org/documentation/timesheet.html#limit-active-entries).
-
-## [0.6.1](https://github.com/kimai/kimai/releases/tag/0.6.1)
-
-A bugfix release to address database compatibility issues with older MySQL/MariaDB versions.
-
-## [0.6](https://github.com/kimai/kimai/releases/tag/0.6)
-
-The API has some minor BC breaks: some fields were renamed and entities have a larger attribute set than collections. 
-Be aware that the API is still is development mode and shouldn't be considered stable for now.
-
-## [0.5](https://github.com/kimai/kimai/releases/tag/0.5)
-
-Some configuration nodes were removed, if you have one of them in your `local.yaml` you need to delete them before you start the update:
-- `kimai.invoice.calculator`
-- `kimai.invoice.renderer`
-- `kimai.invoice.number_generator`
-
-The new config `kimai.invoice.documents` was introduced, holding a list of directories ([read more](https://www.kimai.org/documentation/invoices.html)).
-
-**BC break:** InvoiceTemplate name was changed from 255 characters to 60. If you used longer invoice-template names, they will be truncated when upgrading the database.
-Please make sure that they are unique in the first 60 character before you upgrade your database with `doctrine:migrations:migrate`. 
-
-## [0.4](https://github.com/kimai/kimai/releases/tag/0.4)
-
-In the time between 0.3 and 0.4 there was a release of composer that introduced a BC break, 
-which leads to problems between Composer and Symfony Flex, resulting in an error like this when running it:
-
-```
-  [ErrorException]
-  Declaration of Symfony\Flex\ParallelDownloader::getRemoteContents($originUrl, $fileUrl, $context) should be compatible with Composer\Util\RemoteFilesystem::getRemoteContents($originUrl, $fileUrl, $context, ?array &$responseHeaders = NULL)
-```
-
-This can be fixed by updating Composer and Flex before executing the Kimai update:
-```
-sudo composer self-update
-sudo -u www-data composer update symfony/flex --no-plugins --no-scripts
-```
-
-## [0.3](https://github.com/kimai/kimai/releases/tag/0.3)
-
-You need to adjust your `.env` file and add your `from` address for [all emails](https://www.kimai.org/documentation/emails.html) generated by Kimai 2:
-```
-MAILER_FROM=kimai@example.com
-```
-
-Create a file and database backup before executing the following steps: 
-
-```bash
-git pull origin master
-sudo -u www-data composer install --no-dev --optimize-autoloader
-sudo -u www-data bin/console cache:clear --env=prod
-sudo -u www-data bin/console cache:warmup --env=prod
-bin/console doctrine:migrations:version --add 20180701120000
-bin/console doctrine:migrations:migrate
-```
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index 3c443a972..468d9874f 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -4,7 +4,6 @@ parameters:
     # environment variables are not available yet.
     # You should not need to change this value.
     env(DATABASE_URL): ''
-    env(DATABASE_VERSION): ~
 
 doctrine:
     dbal:
@@ -15,10 +14,6 @@ doctrine:
                 #schema_filter: ~^(?!(bundle_migration_|kimai2_sessions))~
                 url: '%env(DATABASE_URL)%'
                 driver: 'pdo_mysql'
-                # If this is wrong, automatic database detection might fail and find false-negatives when running
-                # doctrine:migrations:diff on null columns with MariaDB.
-                # This here is mainly a fallback for times, when users have not configured the database version in the URL
-                server_version: '%env(string:DATABASE_VERSION)%'
                 charset: utf8mb4
                 default_table_options:
                     charset: utf8mb4
diff --git a/src/API/ActivityController.php b/src/API/ActivityController.php
index 8e2254194..f3555339e 100644
--- a/src/API/ActivityController.php
+++ b/src/API/ActivityController.php
@@ -112,6 +112,7 @@ final class ActivityController extends BaseApiController
             $query->setSearchTerm(new SearchTerm($term));
         }
 
+        $query->setIsApiCall(true);
         $data = $this->repository->getActivitiesForQuery($query);
         $view = new View($data, 200);
         $view->getContext()->setGroups(self::GROUPS_COLLECTION);
diff --git a/src/API/CustomerController.php b/src/API/CustomerController.php
index 4341957c5..24d96428d 100644
--- a/src/API/CustomerController.php
+++ b/src/API/CustomerController.php
@@ -90,6 +90,7 @@ final class CustomerController extends BaseApiController
             $query->setSearchTerm(new SearchTerm($term));
         }
 
+        $query->setIsApiCall(true);
         $data = $this->repository->getCustomersForQuery($query);
         $view = new View($data, 200);
         $view->getContext()->setGroups(self::GROUPS_COLLECTION);
diff --git a/src/API/ProjectController.php b/src/API/ProjectController.php
index 2cd0bf794..3e0ae95bb 100644
--- a/src/API/ProjectController.php
+++ b/src/API/ProjectController.php
@@ -144,6 +144,7 @@ final class ProjectController extends BaseApiController
             $query->setSearchTerm(new SearchTerm($term));
         }
 
+        $query->setIsApiCall(true);
         $data = $this->repository->getProjectsForQuery($query);
         $view = new View($data, 200);
         $view->getContext()->setGroups(self::GROUPS_COLLECTION);
diff --git a/src/API/TimesheetController.php b/src/API/TimesheetController.php
index 504895b42..aa81ab1c9 100644
--- a/src/API/TimesheetController.php
+++ b/src/API/TimesheetController.php
@@ -250,6 +250,7 @@ final class TimesheetController extends BaseApiController
             $query->setModifiedAfter($factory->createDateTime($modifiedAfter));
         }
 
+        $query->setIsApiCall(true);
         $data = $this->repository->getPagerfantaForQuery($query);
         $results = (array) $data->getCurrentPageResults();
 
diff --git a/src/API/UserController.php b/src/API/UserController.php
index 786d410eb..99246e40d 100644
--- a/src/API/UserController.php
+++ b/src/API/UserController.php
@@ -85,6 +85,7 @@ final class UserController extends BaseApiController
             $query->setSearchTerm(new SearchTerm($term));
         }
 
+        $query->setIsApiCall(true);
         $data = $this->repository->getUsersForQuery($query);
         $view = new View($data, 200);
         $view->getContext()->setGroups(self::GROUPS_COLLECTION);
diff --git a/src/Constants.php b/src/Constants.php
index 1f050e252..ee8c74bcf 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -17,11 +17,11 @@ class Constants
     /**
      * The current release version
      */
-    public const VERSION = '2.0.32';
+    public const VERSION = '2.0.33';
     /**
      * The current release: major * 10000 + minor * 100 + patch
      */
-    public const VERSION_ID = 20032;
+    public const VERSION_ID = 20033;
     /**
      * The software name
      */
diff --git a/src/Entity/MetaTableTypeInterface.php b/src/Entity/MetaTableTypeInterface.php
index 8a293d935..03783a1d6 100644
--- a/src/Entity/MetaTableTypeInterface.php
+++ b/src/Entity/MetaTableTypeInterface.php
@@ -131,4 +131,9 @@ interface MetaTableTypeInterface
      * Returns the order (default: 0).
      */
     public function getOrder(): int;
+
+    /**
+     * Whether true if this field is defined by a plugin, or false if it is a value stored in the database.
+     */
+    public function isDefined(): bool;
 }
diff --git a/src/Entity/MetaTableTypeTrait.php b/src/Entity/MetaTableTypeTrait.php
index 42c59e7b3..8a60e38f9 100644
--- a/src/Entity/MetaTableTypeTrait.php
+++ b/src/Entity/MetaTableTypeTrait.php
@@ -255,4 +255,12 @@ trait MetaTableTypeTrait
             $this->id = null;
         }
     }
+
+    /**
+     * Whether this field is defined by a plugin or just a value stored in the database.
+     */
+    public function isDefined(): bool
+    {
+        return $this->type !== null;
+    }
 }
diff --git a/src/Repository/ActivityRepository.php b/src/Repository/ActivityRepository.php
index 7de174994..fb7f02535 100644
--- a/src/Repository/ActivityRepository.php
+++ b/src/Repository/ActivityRepository.php
@@ -371,11 +371,7 @@ class ActivityRepository extends EntityRepository
 
     public function getPagerfantaForQuery(ActivityQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 
     protected function getPaginatorForQuery(ActivityQuery $query): PaginatorInterface
diff --git a/src/Repository/CustomerRepository.php b/src/Repository/CustomerRepository.php
index cfee1469d..b31fa50c0 100644
--- a/src/Repository/CustomerRepository.php
+++ b/src/Repository/CustomerRepository.php
@@ -224,11 +224,7 @@ class CustomerRepository extends EntityRepository
 
     public function getPagerfantaForQuery(CustomerQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 
     public function countCustomersForQuery(CustomerQuery $query): int
diff --git a/src/Repository/InvoiceRepository.php b/src/Repository/InvoiceRepository.php
index 03037357d..de426192b 100644
--- a/src/Repository/InvoiceRepository.php
+++ b/src/Repository/InvoiceRepository.php
@@ -290,10 +290,6 @@ class InvoiceRepository extends EntityRepository
 
     public function getPagerfantaForQuery(InvoiceArchiveQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 }
diff --git a/src/Repository/InvoiceTemplateRepository.php b/src/Repository/InvoiceTemplateRepository.php
index 0d008ceca..ebbda3d27 100644
--- a/src/Repository/InvoiceTemplateRepository.php
+++ b/src/Repository/InvoiceTemplateRepository.php
@@ -59,11 +59,7 @@ class InvoiceTemplateRepository extends EntityRepository
 
     public function getPagerfantaForQuery(BaseQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 
     public function countTemplatesForQuery(BaseQuery $query): int
diff --git a/src/Repository/ProjectRepository.php b/src/Repository/ProjectRepository.php
index f46d48754..824ce5846 100644
--- a/src/Repository/ProjectRepository.php
+++ b/src/Repository/ProjectRepository.php
@@ -347,11 +347,7 @@ class ProjectRepository extends EntityRepository
 
     public function getPagerfantaForQuery(ProjectQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 
     private function getPaginatorForQuery(ProjectQuery $query): PaginatorInterface
diff --git a/src/Repository/Query/BaseQuery.php b/src/Repository/Query/BaseQuery.php
index e4356f009..4a019049c 100644
--- a/src/Repository/Query/BaseQuery.php
+++ b/src/Repository/Query/BaseQuery.php
@@ -35,6 +35,7 @@ class BaseQuery
         'order' => self::ORDER_ASC,
         'searchTerm' => null,
     ];
+    private bool $isApiCall = false;
     private int $page = 1;
     private int $pageSize = self::DEFAULT_PAGESIZE;
     private string $orderBy = 'id';
@@ -387,4 +388,14 @@ class BaseQuery
     {
         return $this->bookmarkSearch;
     }
+
+    public function setIsApiCall(bool $isApiCall): void
+    {
+        $this->isApiCall = $isApiCall;
+    }
+
+    public function isApiCall(): bool
+    {
+        return $this->isApiCall;
+    }
 }
diff --git a/src/Repository/TeamRepository.php b/src/Repository/TeamRepository.php
index afb6f54f2..671cfaf2e 100644
--- a/src/Repository/TeamRepository.php
+++ b/src/Repository/TeamRepository.php
@@ -115,11 +115,7 @@ class TeamRepository extends EntityRepository
 
     public function getPagerfantaForQuery(TeamQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 
     protected function getPaginatorForQuery(TeamQuery $query): PaginatorInterface
diff --git a/src/Repository/TimesheetRepository.php b/src/Repository/TimesheetRepository.php
index ad7003752..0be57ffe7 100644
--- a/src/Repository/TimesheetRepository.php
+++ b/src/Repository/TimesheetRepository.php
@@ -408,11 +408,7 @@ class TimesheetRepository extends EntityRepository
 
     public function getPagerfantaForQuery(TimesheetQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 
     protected function getPaginatorForQuery(TimesheetQuery $query): PaginatorInterface
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
index d7c48bba1..bf92b36ab 100644
--- a/src/Repository/UserRepository.php
+++ b/src/Repository/UserRepository.php
@@ -393,11 +393,7 @@ class UserRepository extends EntityRepository implements UserLoaderInterface, Us
 
     public function getPagerfantaForQuery(UserQuery $query): Pagination
     {
-        $paginator = new Pagination($this->getPaginatorForQuery($query));
-        $paginator->setMaxPerPage($query->getPageSize());
-        $paginator->setCurrentPage($query->getPage());
-
-        return $paginator;
+        return new Pagination($this->getPaginatorForQuery($query), $query);
     }
 
     public function countUsersForQuery(UserQuery $query): int
diff --git a/src/Utils/Pagination.php b/src/Utils/Pagination.php
index 0d5c4fcda..bca3e75e4 100644
--- a/src/Utils/Pagination.php
+++ b/src/Utils/Pagination.php
@@ -9,13 +9,23 @@
 
 namespace App\Utils;
 
+use App\Repository\Query\BaseQuery;
 use Pagerfanta\Adapter\AdapterInterface;
 use Pagerfanta\Pagerfanta;
 
 final class Pagination extends Pagerfanta
 {
-    public function __construct(AdapterInterface $adapter)
+    public function __construct(AdapterInterface $adapter, ?BaseQuery $query = null)
     {
         parent::__construct($adapter);
+
+        if ($query !== null) {
+            $this->setMaxPerPage($query->getPageSize());
+            $this->setCurrentPage($query->getPage());
+        }
+
+        if ($query === null || !$query->isApiCall()) {
+            $this->setNormalizeOutOfRangePages(true);
+        }
     }
 }
diff --git a/templates/activity/details.html.twig b/templates/activity/details.html.twig
index c3c6d3e73..1e2adf4f1 100644
--- a/templates/activity/details.html.twig
+++ b/templates/activity/details.html.twig
@@ -71,7 +71,7 @@
                         </td>
                     </tr>
                 {% endif %}
-                {% for metaField in activity.visibleMetaFields|sort((a, b) => a.order <=> b.order) %}
+                {% for metaField in activity.visibleMetaFields|filter(field => field.defined)|sort((a, b) => a.order <=> b.order) %}
                     <tr>
                         <th>{{ metaField.label|trans }}</th>
                         <td colspan="3">{{ widgets.form_type_value(metaField.type, metaField.value, activity) }}</td>
diff --git a/templates/customer/details.html.twig b/templates/customer/details.html.twig
index f34cd58e7..50006c255 100644
--- a/templates/customer/details.html.twig
+++ b/templates/customer/details.html.twig
@@ -112,7 +112,7 @@
                         </tr>
                     {% endif %}
                 {% endif %}
-                {% for metaField in customer.visibleMetaFields|sort((a, b) => a.order <=> b.order) %}
+                {% for metaField in customer.visibleMetaFields|filter(field => field.defined)|sort((a, b) => a.order <=> b.order) %}
                     <tr>
                         <th>{{ metaField.label|trans }}</th>
                         <td>{{ widgets.form_type_value(metaField.type, metaField.value, customer) }}</td>
diff --git a/templates/project/details.html.twig b/templates/project/details.html.twig
index 4b0f1f7d6..61df994e4 100644
--- a/templates/project/details.html.twig
+++ b/templates/project/details.html.twig
@@ -120,7 +120,7 @@
                         </td>
                     </tr>
                 {% endif %}
-                {% for metaField in project.visibleMetaFields|sort((a, b) => a.order <=> b.order) %}
+                {% for metaField in project.visibleMetaFields|filter(field => field.defined)|sort((a, b) => a.order <=> b.order) %}
                     <tr>
                         <th>{{ metaField.label|trans }}</th>
                         <td colspan="3">{{ widgets.form_type_value(metaField.type, metaField.value, project) }}</td>
diff --git a/tests/Repository/TimesheetRepositoryTest.php b/tests/Repository/TimesheetRepositoryTest.php
index 45704e8e9..f8124beb3 100644
--- a/tests/Repository/TimesheetRepositoryTest.php
+++ b/tests/Repository/TimesheetRepositoryTest.php
@@ -18,7 +18,7 @@ use App\Repository\ActivityRepository;
 use App\Repository\ProjectRepository;
 use App\Repository\Query\TimesheetQuery;
 use App\Repository\TimesheetRepository;
-use Pagerfanta\Pagerfanta;
+use App\Utils\Pagination;
 
 /**
  * @covers \App\Repository\TimesheetRepository
@@ -35,7 +35,7 @@ class TimesheetRepositoryTest extends AbstractRepositoryTest
         $query = new TimesheetQuery();
 
         $result = $repository->getPagerfantaForQuery($query);
-        $this->assertInstanceOf(Pagerfanta::class, $result);
+        $this->assertInstanceOf(Pagination::class, $result);
 
         $result = $repository->getTimesheetsForQuery($query);
         $this->assertIsArray($result);
diff --git a/tests/Utils/PaginationTest.php b/tests/Utils/PaginationTest.php
new file mode 100644
index 000000000..d4ab94865
--- /dev/null
+++ b/tests/Utils/PaginationTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Tests\Utils;
+
+use App\Repository\Query\TimesheetQuery;
+use App\Utils\Pagination;
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \App\Utils\Pagination
+ */
+class PaginationTest extends TestCase
+{
+    public function testDefaults(): void
+    {
+        $sut = new Pagination(new ArrayAdapter([]));
+        $this->assertEquals(1, $sut->getCurrentPage());
+        $this->assertEquals(10, $sut->getMaxPerPage());
+        $this->assertTrue($sut->getNormalizeOutOfRangePages());
+    }
+
+    public function testDefaultQuery(): void
+    {
+        $query = new TimesheetQuery();
+        $sut = new Pagination(new ArrayAdapter([]), $query);
+        $this->assertEquals(1, $sut->getCurrentPage());
+        $this->assertEquals(50, $sut->getMaxPerPage());
+        $this->assertTrue($sut->getNormalizeOutOfRangePages());
+    }
+
+    public function testWithParams(): void
+    {
+        $query = new TimesheetQuery();
+        $query->setPage(3);
+        $query->setPageSize(1);
+        $query->setIsApiCall(true);
+        $sut = new Pagination(new ArrayAdapter([1, 2, 3, 4, 5]), $query);
+        $this->assertFalse($sut->getNormalizeOutOfRangePages());
+        $this->assertEquals(1, $sut->getMaxPerPage());
+        $this->assertEquals(3, $sut->getCurrentPage());
+    }
+}