9.2.2

limit fields for status
ref
2025-10-02 11:37:07 +03:00 · 2025-10-02 10:52:04 +03:00 · 2025-10-02 10:43:35 +03:00 · 2025-10-02 10:28:43 +03:00 · 2025-10-01 19:15:08 +03:00 · 2025-10-01 10:24:22 +03:00
5557 changed files with 154446 additions and 80605 deletions
@@ -1,17 +1,46 @@
 ## Issues

+#### Guidelines
+
 When reporting a possible bug, provide detail steps so that we will be able
-to reproduce the issue. Try not to use phrases like "very big bug",
+to reproduce the issue. Steps to reproduce should be clear and unambiguous. Try not to use phrases like "very big bug",
 "huge issue", "useless feature", etc. No need to use exclamation marks as well.

-Steps to reproduce should be clear and unambiguous.
+#### No support

 Note that we don't provide developer help or any kind of support on GitHub.
 For this, please use our [forum](https://forum.espocrm.com).

+#### Forum
+
+If you are very new to EspoCRM, it's probable that an issue you ran into is not a bug.
+Consider creating a topic on our [forum](https://forum.espocrm.com/forum/general) instead.
+
+#### Upgrade issues
+
+For upgrade-related issues, create a topic on the forum in the appropriate [section](https://forum.espocrm.com/forum/installation-and-upgrade-help). Upgrade-related issues posted on GitHub are removed.
+
+#### Project's best interest
+
+The issue tracker is for the benefit of the EspoCRM project. The project maintainers are going to handle issues in the project's best interest.
+The maintainers have right to close issues without explanation.
+
+#### Off-topic
+
+As we reference GitHub issues in release notes, we strive to keep them free of off-topic comments.
+
+#### Code-level issues
+
+If an issue is not reproducible by actions made via the UI but only by coding, the reporter is expected to have a clear
+understanding of its cause and to provide an explanation of it — unless the cause is obvious from the context.
+
+Otherwise, it's advisable to post on the forum in the Developer Help section.
+
 ## Pull Requests

-We are open for contributions that are bug fixes and small improvements. If you would like to contribute something that is not a small fix, please reach out to maintainers before submitting your PR (by creating a GitHub issue).
+We are open for contributions that are bug fixes and small improvements. If you would like to contribute something
+that is not a small fix, please reach out to maintainers before submitting your PR
+(by creating a GitHub issue or a forum post).

 Before we can merge your pull request, you need to accept our CLA [here](https://github.com/espocrm/cla).

@@ -0,0 +1,20 @@
+---
+name: Mistake or typo
+about: Report a typo or mistake in the code.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the mistake**
+A clear and concise description of the mistake or typo.
+
+**Location**
+Path of the file where the mistake is found. Paste the incorrect line or snippet if helpful.
+
+**Suggested correction**
+How it should be fixed.
+
+**Additional context**
+Add any other context about the problem here.
@@ -1,5 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: EspoCRM forum
+  - name: Upgrade issue
+    url: https://forum.espocrm.com/forum/installation-and-upgrade-help
+    about: "If something went wrong with an upgrade."
+  - name: Feature request
+    url: https://forum.espocrm.com/forum/feature-requests
+    about: "Use our forum for feature requests."
+  - name: Forum
    url: https://forum.espocrm.com/
-    about: "Use our forum for help requests and questions not related to product development. We don't provide support on GitHub."
+    about: "Use our forum for help requests and questions. We don't provide support on GitHub."
@@ -1,6 +1,6 @@
 ---
-name: Feature request
-about: Feature requests are not desired at the moment. Need to polish the system. For high-level features, consider creating feature requests on the forum. For low-level (framework) – here on GitHub.
+name: Feature request for framework
+about: For low-level features. For high-level features, create feature requests on our forum.
 title: ''
 labels: ''
 assignees: ''
@@ -7,7 +7,7 @@ on:
 jobs:
  test:
    name: Test on PHP ${{ matrix.php-versions }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
    env:
      TEST_DATABASE_HOST: '127.0.0.1'
      TEST_DATABASE_PLATFORM: 'Postgresql'
@@ -7,7 +7,7 @@ on:
 jobs:
  test:
    name: Test on PHP ${{ matrix.php-versions }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
    env:
      TEST_DATABASE_HOST: '127.0.0.1'
      TEST_DATABASE_PORT: '8888'
@@ -27,7 +27,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.1', '8.3']
+        php-versions: ['8.2', '8.4']
        branches: ['master']

    steps:
@@ -23,10 +23,10 @@ on:
 jobs:
  test:
    name: Test on PHP ${{ matrix.php-versions }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
    strategy:
      matrix:
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.2', '8.3', '8.4']

    steps:
    - uses: actions/checkout@v2
@@ -7,6 +7,7 @@
 /data/config-internal.php
 /data/config-override.php
 /data/config-internal-override.php
+/data/state.php
 /data/tmp/*
 /build
 /node_modules
@@ -17,8 +17,6 @@
    <codeStyleSettings language="PHP">
      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
-      <option name="CATCH_ON_NEW_LINE" value="true" />
-      <option name="FINALLY_ON_NEW_LINE" value="true" />
      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
      <option name="ALIGN_MULTILINE_FOR" value="false" />
      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
@@ -2,7 +2,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-${YEAR} Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-${YEAR} EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,6 +3,7 @@
    <option name="myName" value="Project Default" />
    <inspection_tool class="DuplicatedCode" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
    <inspection_tool class="ES6ConvertLetToConst" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" />
+    <inspection_tool class="HtmlUnknownAnchorTarget" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="JSIgnoredPromiseFromCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
    <inspection_tool class="PhpDocMissingThrowsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
    <inspection_tool class="PhpDocSignatureIsNotCompleteInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
@@ -341,6 +341,44 @@
            </SchemaInfo>
          </value>
        </entry>
+        <entry key="metadata/app/clientIcons">
+          <value>
+            <SchemaInfo>
+              <option name="generatedName" value="New Schema" />
+              <option name="name" value="metadata/app/clientIcons" />
+              <option name="relativePathToSchema" value="schema/metadata/app/clientIcons.json" />
+              <option name="schemaVersion" value="JSON Schema version 7" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="pattern" value="true" />
+                    <option name="path" value="*/Resources/metadata/app/clientIcons.json" />
+                    <option name="mappingKind" value="Pattern" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
+        <entry key="metadata/app/clientRecord">
+          <value>
+            <SchemaInfo>
+              <option name="generatedName" value="New Schema" />
+              <option name="name" value="metadata/app/clientRecord" />
+              <option name="relativePathToSchema" value="schema/metadata/app/clientRecord.json" />
+              <option name="schemaVersion" value="JSON Schema version 7" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="pattern" value="true" />
+                    <option name="path" value="*/Resources/metadata/app/clientRecord.json" />
+                    <option name="mappingKind" value="Pattern" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
        <entry key="metadata/app/clientRoutes">
          <value>
            <SchemaInfo>
@@ -1006,6 +1044,25 @@
            </SchemaInfo>
          </value>
        </entry>
+        <entry key="metadata/app/reactions">
+          <value>
+            <SchemaInfo>
+              <option name="generatedName" value="New Schema" />
+              <option name="name" value="metadata/app/reactions" />
+              <option name="relativePathToSchema" value="schema/metadata/app/reactions.json" />
+              <option name="schemaVersion" value="JSON Schema version 7" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="pattern" value="true" />
+                    <option name="path" value="*/Resources/metadata/app/reactions.json" />
+                    <option name="mappingKind" value="Pattern" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
        <entry key="metadata/app/rebuild">
          <value>
            <SchemaInfo>
@@ -1025,6 +1082,25 @@
            </SchemaInfo>
          </value>
        </entry>
+        <entry key="metadata/app/record">
+          <value>
+            <SchemaInfo>
+              <option name="generatedName" value="New Schema" />
+              <option name="name" value="metadata/app/record" />
+              <option name="relativePathToSchema" value="schema/metadata/app/record.json" />
+              <option name="schemaVersion" value="JSON Schema version 7" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="pattern" value="true" />
+                    <option name="path" value="*/Resources/metadata/app/record.json" />
+                    <option name="mappingKind" value="Pattern" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
        <entry key="metadata/app/recordId">
          <value>
            <SchemaInfo>
@@ -1329,6 +1405,25 @@
            </SchemaInfo>
          </value>
        </entry>
+        <entry key="metadata/logicDefs">
+          <value>
+            <SchemaInfo>
+              <option name="generatedName" value="New Schema" />
+              <option name="name" value="metadata/logicDefs" />
+              <option name="relativePathToSchema" value="schema/metadata/logicDefs.json" />
+              <option name="schemaVersion" value="JSON Schema version 7" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="pattern" value="true" />
+                    <option name="path" value="*/metadata/logicDefs/*.json" />
+                    <option name="mappingKind" value="Pattern" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
        <entry key="metadata/notificationDefs">
          <value>
            <SchemaInfo>
@@ -82,6 +82,12 @@
            ],
            "url": "./schema/metadata/integrations.json"
        },
+        {
+            "fileMatch": [
+                "*/metadata/logicDefs/*.json"
+            ],
+            "url": "./schema/metadata/logicDefs.json"
+        },
        {
            "fileMatch": [
                "*/metadata/notificationDefs/*.json"
@@ -184,6 +190,18 @@
            ],
            "url": "./schema/metadata/app/client.json"
        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/clientIcons.json"
+            ],
+            "url": "./schema/metadata/app/clientIcons.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/clientRecord.json"
+            ],
+            "url": "./schema/metadata/app/clientRecord.json"
+        },
        {
            "fileMatch": [
                "*/Resources/metadata/app/clientRoutes.json"
@@ -394,12 +412,24 @@
            ],
            "url": "./schema/metadata/app/portalContainerServices.json"
        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/reactions.json"
+            ],
+            "url": "./schema/metadata/app/reactions.json"
+        },
        {
            "fileMatch": [
                "*/Resources/metadata/app/rebuild.json"
            ],
            "url": "./schema/metadata/app/rebuild.json"
        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/record.json"
+            ],
+            "url": "./schema/metadata/app/record.json"
+        },
        {
            "fileMatch": [
                "*/Resources/metadata/app/recordId.json"
@@ -2,7 +2,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -107,6 +107,38 @@ module.exports = grunt => {
        };
    });

+    const cleanupBeforeFinal = [
+        'build/tmp/custom/Espo/Custom/*',
+        '!build/tmp/custom/Espo/Custom/.htaccess',
+        '!build/tmp/custom/Espo/Modules',
+        'build/tmp/custom/Espo/Modules/*',
+        '!build/tmp/custom/Espo/Modules/.htaccess',
+        'build/tmp/install/config.php',
+        'build/tmp/vendor/*/*/.git',
+        'build/tmp/client/custom/*',
+        '!build/tmp/client/custom/modules',
+        'build/tmp/client/custom/modules/*',
+        '!build/tmp/client/custom/modules/dummy.txt',
+        'build/tmp/client/modules/crm/src',
+        'build/tmp/client/lib/original/*',
+        'build/tmp/client/modules/crm/lib/original',
+        '!build/tmp/client/lib/original/espo.js',
+        '!build/tmp/client/lib/original/espo-*.js',
+        '!build/tmp/client/lib/original/espo-funnel-chart.js',
+        'build/tmp/client/lib/transpiled',
+    ];
+
+    const cleanupBeforeFinalTest = cleanupBeforeFinal.filter(it => {
+        return ![
+            '!build/tmp/custom/Espo/Modules',
+            'build/tmp/custom/Espo/Modules/*',
+            '!build/tmp/custom/Espo/Modules/.htaccess',
+            '!build/tmp/client/custom/modules',
+            'build/tmp/client/custom/modules/*',
+            '!build/tmp/client/custom/modules/dummy.txt',
+        ].includes(it)
+    })
+
    grunt.initConfig({
        pkg: pkg,

@@ -122,6 +154,9 @@ module.exports = grunt => {
        },

        clean: {
+            transpiled: [
+                'client/lib/transpiled/**',
+            ],
            start: [
                'build/EspoCRM-*',
                'client/lib/*',
@@ -130,23 +165,8 @@ module.exports = grunt => {
            ],
            final: ['build/tmp'],
            release: ['build/EspoCRM-' + pkg.version],
-            beforeFinal: {
-                src: [
-                    'build/tmp/custom/Espo/Custom/*',
-                    '!build/tmp/custom/Espo/Custom/.htaccess',
-                    'build/tmp/install/config.php',
-                    'build/tmp/vendor/*/*/.git',
-                    'build/tmp/custom/Espo/Custom/*',
-                    'build/tmp/client/custom/*',
-                    '!build/tmp/client/custom/modules',
-                    'build/tmp/client/custom/modules/*',
-                    '!build/tmp/client/custom/modules/dummy.txt',
-                    'build/tmp/client/lib/original/espo.js',
-                    'build/tmp/client/lib/original/espo-*.js',
-                    '!build/tmp/client/lib/original/espo-funnel-chart.js',
-                    'build/tmp/client/lib/transpiled',
-                ]
-            },
+            beforeFinal: {src: cleanupBeforeFinal},
+            beforeFinalTest: {src: cleanupBeforeFinalTest},
        },

        less: lessData,
@@ -164,8 +184,12 @@ module.exports = grunt => {
                    comments: /^!/,
                },
                beautify: false,
-                mangle: true,
-                compress: true
+                compress: {
+                    sequences: false,
+                    collapse_vars: false,
+                    keep_fargs: true,
+                    webkit: true,
+                },
            },
            bundle: {
                options: {
@@ -186,7 +210,6 @@ module.exports = grunt => {
                expand: true,
                cwd: 'client',
                src: [
-                    'src/**',
                    'res/**',
                    'fonts/**',
                    'modules/**',
@@ -420,7 +443,7 @@ module.exports = grunt => {
        });

        cp.execSync(
-            `find bin -type f -exec chmod 754 {} +`,
+            `find bin -type f -exec chmod 755 {} +`,
            {
                cwd: dirPath,
            }
@@ -500,6 +523,7 @@ module.exports = grunt => {
        'less',
        'cssmin',
        'prepare-lib-original',
+        'clean:transpiled',
        'transpile',
        'bundle',
        'bundle-templates',
@@ -509,7 +533,7 @@ module.exports = grunt => {
        'uglify:lib',
    ]);

-    grunt.registerTask('offline', [
+    const offline = [
        'clean:start',
        'mkdir:tmp',
        'internal',
@@ -521,7 +545,18 @@ module.exports = grunt => {
        'chmod-folders',
        'chmod-multiple',
        'clean:final',
-    ]);
+    ];
+
+    const offlineTest = offline.map(it => {
+        if (it === 'clean:beforeFinal') {
+            return 'clean:beforeFinalTest'
+        }
+
+        return it;
+    })
+
+    grunt.registerTask('offline', offline);
+    grunt.registerTask('offline-test', offlineTest);

    grunt.registerTask('build', [
        'composer-install',
@@ -566,6 +601,6 @@ module.exports = grunt => {
    grunt.registerTask('test', [
        'composer-install-dev',
        'npm-install',
-        'offline',
+        'offline-test',
    ]);
 };
@@ -2,37 +2,41 @@

 [![PHPStan level 8](https://img.shields.io/badge/PHPStan-level%208-brightgreen)](#espocrm)

-[EspoCRM is an Open Source CRM](https://www.espocrm.com) (Customer Relationship Management)
-software that allows you to see, enter and evaluate all your company relationships regardless
-of the type. People, companies or opportunities – all in an easy and intuitive interface.
-
-It's a web application with a frontend designed as a single page application and a REST API
-backend written in PHP.
-
-[Download](https://www.espocrm.com/download/) the latest release from our website. Release notes
-and release packages are available at [Releases](https://github.com/espocrm/espocrm/releases) on GitHub.
+[EspoCRM](https://www.espocrm.com) is a free, open-source CRM platform designed to help organizations build and maintain strong customer relationships.
+It provides a wide range of tools to store, organize, and manage leads, contacts, sales opportunities, marketing campaigns,
+support cases, and more – all business information in a simple and intuitive interface.

 ![Screenshot](https://user-images.githubusercontent.com/1006792/226094559-995dfd2a-a18f-4619-a21b-79a4e671990a.png)

+### Architecture
+
+EspoCRM is a web application with a frontend designed as a single-page application and a REST API
+backend written in PHP.
+
 ### Demo

-You can try the CRM on the online [demo](https://www.espocrm.com/demo/).
+You can try the CRM on an online [demo](https://www.espocrm.com/demo/).

 ### Requirements

-* PHP 8.1 - 8.3;
-* MySQL 5.7 (and later), or MariaDB 10.2 (and later);
-* PostgreSQL 15 (and later) (yet experimental, officially supported soon).
+* PHP 8.2 - 8.4;
+* MySQL 8.0 (and later), or MariaDB 10.3 (and later);
+* PostgreSQL 15 (and later).

-For more information about server configuration see [this article](https://docs.espocrm.com/administration/server-configuration/).
+For more information about server configuration, see [this article](https://docs.espocrm.com/administration/server-configuration/).

-### Documentation
+### Why EspoCRM?

-See the [documentation](https://docs.espocrm.com) for administrators, users and developers.
+* Open-source transparency. EspoCRM's source code is open and accessible, so anyone can inspect it and see how data is being managed within the CRM.
+* Customization freedom. You can develop features, create custom entities, fields, relationships, buttons to make the system fit your specific needs. EspoCRM is more than a CRM – it's a platform for building custom business applications.
+* Clean user interface. EspoCRM offers an uncluttered, minimalist, and fast user interface, which is easy to navigate and has a short learning curve.
+* Straightforward REST API. It can be easily integrated with other applications using a REST API.

-### Bug reporting
+### Who is EspoCRM for?

-Create a [GitHub issue](https://github.com/espocrm/espocrm/issues/new/choose) or post on our [forum](https://forum.espocrm.com/forum/bug-reports).
+* Startups, small & medium-sized businesses. It's an affordable solution that is flexible and fully customizable.
+* Developers & tech enthusiasts. You can extend functionalities, build extensions, and create custom integrations.
+* Anyone seeking a free CRM. If you're looking for a user-friendly and secure CRM platform, it can be a good option.

 ### Installing stable version

@@ -43,11 +47,29 @@ See installation instructions:
 * [Installation with Docker](https://docs.espocrm.com/administration/docker/installation/)
 * [Installation with Traefik](https://docs.espocrm.com/administration/docker/traefik/)

+### Download
+
+[Download](https://www.espocrm.com/download/) the latest release from our website. You can also download the latest and previous release packages from GitHub [releases](https://github.com/espocrm/espocrm/releases).
+
+### Release notes
+
+Release notes are available at GitHub [releases](https://github.com/espocrm/espocrm/releases).
+
+### Documentation
+
+See the [documentation](https://docs.espocrm.com) for administrators, users and developers.
+
+### Bug reporting
+
+Create a [GitHub issue](https://github.com/espocrm/espocrm/issues/new/choose) or post on our [forum](https://forum.espocrm.com/forum/bug-reports).
+
 ### Development

 See the [developer documentation](https://docs.espocrm.com/development/).

-We highly recommend using IDE for development. The backend codebase follows SOLID principles, utilizes interfaces, static typing and generics. We recommend to start learning EspoCRM from the Dependency Injection article in the documentation.
+We highly recommend using an IDE for development. The backend codebase follows SOLID principles, utilizes interfaces, static typing and generics. We recommend to start learning EspoCRM from the Dependency Injection article in the documentation.
+
+Metadata plays an integral role in the EspoCRM application. All possible parameters are described with a JSON Schema, meaning you will have autocompletion in the IDE. You can also find the full metadata reference in the documentation.

 ### Community & Support

@@ -55,11 +77,11 @@ If you have a question regarding some features, need help or customizations, wan

 ### License

-EspoCRM is published under the GNU AGPLv3 [license](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).
+EspoCRM is an open-source project licensed under [GNU AGPLv3](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).

 ### Contributing

-Before we can merge your pull request, you need to accept our CLA [here](https://github.com/espocrm/cla). See [contributing guidelines](https://github.com/espocrm/espocrm/blob/master/.github/CONTRIBUTING.md).
+Before we can merge your pull request, you need to accept our CLA [here](https://github.com/espocrm/cla). See the [contributing guidelines](https://github.com/espocrm/espocrm/blob/master/.github/CONTRIBUTING.md).

 Branches:

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -53,6 +53,11 @@ class Binding implements BindingProcessor

    private function bindServices(Binder $binder): void
    {
+        $binder->bindService(
+            'Espo\\Core\\Application\\ApplicationParams',
+            'applicationParams'
+        );
+
        $binder->bindService(
            'Espo\\Core\\InjectableFactory',
            'injectableFactory'
@@ -128,11 +133,6 @@ class Binding implements BindingProcessor
            'authTokenManager'
        );

-        $binder->bindService(
-            'Espo\\Core\\Select\\SelectBuilderFactory',
-            'selectBuilderFactory'
-        );
-
        $binder->bindService(
            'Espo\\Core\\ServiceFactory',
            'serviceFactory'
@@ -222,6 +222,26 @@ class Binding implements BindingProcessor
            'Espo\\Core\\ExternalAccount\\ClientManager',
            'externalAccountClientManager'
        );
+
+        $binder->bindService(
+            'Espo\\Core\\WebSocket\\Submission',
+            'webSocketSubmission'
+        );
+
+        $binder->bindService(
+            'Espo\\Tools\\Stream\\Service',
+            'streamService'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config\\SystemConfig',
+            'systemConfig'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config\\ApplicationConfig',
+            'applicationConfig'
+        );
    }

    private function bindCore(Binder $binder): void
@@ -235,6 +255,11 @@ class Binding implements BindingProcessor
            'Espo\\Core\\Utils\\Database\\ConfigDataProvider',
            'Espo\\Core\\Utils\\Database\\DefaultConfigDataProvider'
        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Job\\JobScheduler\\Creator',
+            'Espo\\Core\\Job\\JobScheduler\\Creators\\EntityCreator',
+        );
    }

    private function bindMisc(Binder $binder): void
@@ -292,6 +317,11 @@ class Binding implements BindingProcessor
            'Espo\\Core\\Mail\\Importer',
            'Espo\\Core\\Mail\\Importer\\DefaultImporter'
        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Mail\\Importer\\AutoReplyDetector',
+            'Espo\\Core\\Mail\\Importer\\DefaultAutoReplyDetector'
+        );
    }

    private function bindAcl(Binder $binder): void
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\Acl\Attachment;

+use Espo\Core\Name\Field;
 use Espo\Entities\Attachment;
 use Espo\Entities\Note;
 use Espo\Entities\Settings;
@@ -58,25 +59,22 @@ class AccessChecker implements AccessEntityCREDChecker

    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
    {
-        /** @var Attachment $entity */
-
-        if ($entity->get('parentType') === Settings::ENTITY_TYPE) {
+        if ($entity->getParentType() === Settings::ENTITY_TYPE) {
            // Allow the logo.
            return true;
        }

        $parent = null;

-        $parentType = $entity->get('parentType');
-        $parentId = $entity->get('parentId');
+        $parentType = $entity->getParentType();
+        $parentId = $entity->getParent()?->getId();

-        $relatedType = $entity->get('relatedType');
-        $relatedId = $entity->get('relatedId');
+        $relatedType = $entity->getRelatedType();
+        $relatedId = $entity->getRelated()?->getId();

        if ($parentId && $parentType) {
            $parent = $this->entityManager->getEntityById($parentType, $parentId);
-        }
-        else if ($relatedId && $relatedType) {
+        } else if ($relatedId && $relatedType) {
            $parent = $this->entityManager->getEntityById($relatedType, $relatedId);
        }

@@ -95,8 +93,7 @@ class AccessChecker implements AccessEntityCREDChecker
            if ($result !== null) {
                return $result;
            }
-        }
-        else if ($this->aclManager->checkEntity($user, $parent)) {
+        } else if ($this->aclManager->checkEntity($user, $parent)) {
            if (
                $entity->getTargetField() &&
                !$this->aclManager->checkField($user, $parent->getEntityType(), $entity->getTargetField())
@@ -118,8 +115,8 @@ class AccessChecker implements AccessEntityCREDChecker
    {
        if ($note->getTargetType() === Note::TARGET_TEAMS) {
            $intersect = array_intersect(
-                $note->getLinkMultipleIdList('teams'),
-                $user->getLinkMultipleIdList('teams')
+                $note->getLinkMultipleIdList(Field::TEAMS),
+                $user->getLinkMultipleIdList(Field::TEAMS)
            );

            if (count($intersect)) {
@@ -150,7 +147,7 @@ class AccessChecker implements AccessEntityCREDChecker
            return null;
        }

-        $parent = $this->entityManager->getEntity($note->getParentType(), $note->getParentId());
+        $parent = $this->entityManager->getEntityById($note->getParentType(), $note->getParentId());

        if ($parent && $this->aclManager->checkEntity($user, $parent)) {
            return true;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\Acl\Email;

+use Espo\Core\Name\Field;
 use Espo\Entities\User;
 use Espo\Entities\Email;
 use Espo\ORM\Entity;
@@ -100,12 +101,11 @@ class AccessChecker implements AccessEntityCREDSChecker
                return true;
            }

-            /** @var string[] $assignedUserIdList */
-            $assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
+            $assignedUserIdList = $entity->getLinkMultipleIdList(Field::ASSIGNED_USERS);

            if (
                count($assignedUserIdList) === 1 &&
-                $entity->hasLinkMultipleId('assignedUsers', $user->getId())
+                $entity->hasLinkMultipleId(Field::ASSIGNED_USERS, $user->getId())
            ) {
                return true;
            }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,19 +29,30 @@

 namespace Espo\Classes\Acl\Email;

+use Espo\Core\Acl\AssignmentChecker as AssignmentCheckerInterface;
+use Espo\Entities\Email;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
-use Espo\Core\Acl\DefaultAssignmentChecker;

-class AssignmentChecker extends DefaultAssignmentChecker
+/**
+ * @implements AssignmentCheckerInterface<Email>
+ */
+class AssignmentChecker implements AssignmentCheckerInterface
 {
-    protected function isPermittedAssignedUser(User $user, Entity $entity): bool
-    {
-        return true;
-    }
+    public function __construct(
+        private AssignmentCheckerInterface\Helper $helper,
+    ) {}

-    protected function isPermittedAssignedUsers(User $user, Entity $entity): bool
+    public function check(User $user, Entity $entity): bool
    {
+        if ($entity->getAssignedUser() && !$this->helper->checkAssignedUser($user, $entity)) {
+            return false;
+        }
+
+        if ($entity->getTeams()->getIdList() !== [] && !$this->helper->checkTeams($user, $entity)) {
+            return false;
+        }
+
        return true;
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,6 @@ use Espo\Core\AclManager;
 use Espo\Entities\Email;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
-use Espo\ORM\EntityManager;

 /**
 * @implements LinkChecker<Email, Entity>
@@ -43,7 +42,6 @@ use Espo\ORM\EntityManager;
 class ParentLinkChecker implements LinkChecker
 {
    public function __construct(
-        private EntityManager $entityManager,
        private AclManager $aclManager
    ) {}

@@ -53,24 +51,18 @@ class ParentLinkChecker implements LinkChecker
            return true;
        }

-        if (!$entity->getReplied()) {
-            return false;
-        }
-
-        $replied = $this->entityManager
-            ->getRepositoryByClass(Email::class)
-            ->getById($entity->getReplied()->getId());
+        $replied = $entity->getReplied();

        if (!$replied) {
            return false;
        }

-        $parentLink = $replied->getParent();
+        $parent = $replied->getParent();

        if (
-            !$parentLink ||
-            $parentLink->getId() !== $foreignEntity->getId() ||
-            $parentLink->getEntityType() !== $foreignEntity->getEntityType()
+            !$parent ||
+            $parent->getId() !== $foreignEntity->getId() ||
+            $parent->getEntityType() !== $foreignEntity->getEntityType()
        ) {
            return false;
        }
@@ -0,0 +1,67 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\Email\LinkCheckers;
+
+use Espo\Core\Acl\LinkChecker;
+use Espo\Core\AclManager;
+use Espo\Entities\Email;
+use Espo\Entities\Team;
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+/**
+ * @implements LinkChecker<Email, Team>
+ * @noinspection PhpUnused
+ */
+class TeamsLinkChecker implements LinkChecker
+{
+    public function __construct(
+        private AclManager $aclManager
+    ) {}
+
+    public function check(User $user, Entity $entity, Entity $foreignEntity): bool
+    {
+        if ($this->aclManager->checkEntityRead($user, $foreignEntity)) {
+            return true;
+        }
+
+        $replied = $entity->getReplied();
+
+        if (!$replied) {
+            return false;
+        }
+
+        if ($replied->getTeams()->hasId($foreignEntity->getId())) {
+            return true;
+        }
+
+        return false;
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -31,9 +31,7 @@ namespace Espo\Classes\Acl\Email;

 use Espo\Entities\User;
 use Espo\Entities\Email;
-
 use Espo\ORM\Entity;
-
 use Espo\Core\Acl\DefaultOwnershipChecker;
 use Espo\Core\Acl\OwnershipOwnChecker;
 use Espo\Core\Acl\OwnershipTeamChecker;
@@ -44,26 +42,20 @@ use Espo\Core\Acl\OwnershipTeamChecker;
 */
 class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {
-    private $defaultOwnershipChecker;
-
-    public function __construct(DefaultOwnershipChecker $defaultOwnershipChecker)
-    {
-        $this->defaultOwnershipChecker = $defaultOwnershipChecker;
-    }
+    public function __construct(private DefaultOwnershipChecker $defaultOwnershipChecker)
+    {}

    public function checkOwn(User $user, Entity $entity): bool
    {
-        /** @var Email $entity */
-
-        if ($user->getId() === $entity->get('assignedUserId')) {
+        if ($user->getId() === $entity->getAssignedUser()?->getId()) {
            return true;
        }

-        if ($user->getId() === $entity->get('createdById')) {
+        if ($user->getId() === $entity->getCreatedBy()?->getId()) {
            return true;
        }

-        if ($entity->hasLinkMultipleId('assignedUsers', $user->getId())) {
+        if ($entity->getAssignedUsers()->hasId($user->getId())) {
            return true;
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -0,0 +1,47 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\ImportEml;
+
+use Espo\Core\Acl\AccessCreateChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Entities\User;
+
+class AccessChecker implements AccessCreateChecker
+{
+    public function check(User $user, ScopeData $data): bool
+    {
+        return $data->isTrue();
+    }
+
+    public function checkCreate(User $user, ScopeData $data): bool
+    {
+        return $data->isTrue();
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,9 @@

 namespace Espo\Classes\Acl\Note;

+use Espo\Core\Acl\Permission;
 use Espo\Core\Acl\Table;
+use Espo\Core\Name\Field;
 use Espo\Entities\Note;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
@@ -83,7 +85,7 @@ class AccessChecker implements AccessEntityCREDChecker
            return true;
        }

-        $parent = $this->entityManager->getEntity($parentType, $parentId);
+        $parent = $this->entityManager->getEntityById($parentType, $parentId);

        if ($parent && $this->aclManager->checkEntityStream($user, $parent)) {
            return true;
@@ -127,7 +129,7 @@ class AccessChecker implements AccessEntityCREDChecker
        }

        if ($entity->getTargetType() === Note::TARGET_TEAMS) {
-            $targetTeamIdList = $entity->getLinkMultipleIdList('teams');
+            $targetTeamIdList = $entity->getLinkMultipleIdList(Field::TEAMS);

            foreach ($user->getTeamIdList() as $teamId) {
                if (in_array($teamId, $targetTeamIdList)) {
@@ -143,7 +145,7 @@ class AccessChecker implements AccessEntityCREDChecker
        }

        if ($entity->getTargetType() === Note::TARGET_PORTALS) {
-            return $this->aclManager->getPermissionLevel($user, 'portal') === Table::LEVEL_YES;
+            return $this->aclManager->getPermissionLevel($user, Permission::PORTAL) === Table::LEVEL_YES;
        }

        return false;
@@ -166,7 +168,7 @@ class AccessChecker implements AccessEntityCREDChecker
            return false;
        }

-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);

        if (!$createdAt) {
            return true;
@@ -183,8 +185,7 @@ class AccessChecker implements AccessEntityCREDChecker
            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                return false;
            }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
            return false;
        }

@@ -208,7 +209,7 @@ class AccessChecker implements AccessEntityCREDChecker
            return false;
        }

-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);

        if (!$createdAt) {
            return true;
@@ -225,8 +226,7 @@ class AccessChecker implements AccessEntityCREDChecker
            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                return false;
            }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
            return false;
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\Acl\Portal;

+use Espo\Core\Acl\Permission;
 use Espo\Entities\Portal;
 use Espo\Entities\User;
 use Espo\Core\Acl\AccessEntityCREDChecker;
@@ -45,18 +46,12 @@ class AccessChecker implements AccessEntityCREDChecker
 {
    use DefaultAccessCheckerDependency;

-    private DefaultAccessChecker $defaultAccessChecker;
-    private AclManager $aclManager;
-
-    public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
-    {
-        $this->defaultAccessChecker = $defaultAccessChecker;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(private DefaultAccessChecker $defaultAccessChecker, private AclManager $aclManager)
+    {}

    public function check(User $user, ScopeData $data): bool
    {
-        $level = $this->aclManager->getPermissionLevel($user, 'portal');
+        $level = $this->aclManager->getPermissionLevel($user, Permission::PORTAL);

        return $level === Table::LEVEL_YES;
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\Acl\Team;

+use Espo\Core\Name\Field;
 use Espo\Entities\Team;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
@@ -41,8 +42,7 @@ class OwnershipChecker implements OwnershipOwnChecker
 {
    public function checkOwn(User $user, Entity $entity): bool
    {
-        /** @var string[] $userTeamIdList */
-        $userTeamIdList = $user->getLinkMultipleIdList('teams');
+        $userTeamIdList = $user->getLinkMultipleIdList(Field::TEAMS);

        return in_array($entity->getId(), $userTeamIdList);
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\Acl\User;

+use Espo\Core\Acl\Permission;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
 use Espo\Core\Acl\AccessEntityCREDSChecker;
@@ -45,14 +46,10 @@ class AccessChecker implements AccessEntityCREDSChecker
 {
    use DefaultAccessCheckerDependency;

-    private DefaultAccessChecker $defaultAccessChecker;
-    private AclManager $aclManager;
-
-    public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
-    {
-        $this->defaultAccessChecker = $defaultAccessChecker;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(
+        private DefaultAccessChecker $defaultAccessChecker,
+        private AclManager $aclManager,
+    ) {}

    public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
    {
@@ -60,8 +57,6 @@ class AccessChecker implements AccessEntityCREDSChecker
            return false;
        }

-        /** @var User $entity */
-
        if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
            return false;
        }
@@ -71,13 +66,7 @@ class AccessChecker implements AccessEntityCREDSChecker

    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
    {
-        /** @var User $entity */
-
-        if ($entity->isPortal()) {
-            if ($this->aclManager->getPermissionLevel($user, 'portal') === Table::LEVEL_YES) {
-                return true;
-            }
-
+        if (!$user->isAdmin() && !$entity->isActive()) {
            return false;
        }

@@ -85,13 +74,19 @@ class AccessChecker implements AccessEntityCREDSChecker
            return false;
        }

+        if ($entity->isSystem()) {
+            return false;
+        }
+
+        if ($entity->isPortal()) {
+            return $this->aclManager->getPermissionLevel($user, Permission::PORTAL) === Table::LEVEL_YES;
+        }
+
        return $this->defaultAccessChecker->checkEntityRead($user, $entity, $data);
    }

    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
    {
-        /** @var User $entity */
-
        if ($entity->isSystem()) {
            return false;
        }
@@ -111,8 +106,6 @@ class AccessChecker implements AccessEntityCREDSChecker

    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
    {
-        /** @var User $entity */
-
        if (!$user->isAdmin()) {
            return false;
        }
@@ -130,8 +123,7 @@ class AccessChecker implements AccessEntityCREDSChecker

    public function checkEntityStream(User $user, Entity $entity, ScopeData $data): bool
    {
-        /** @var User $entity */
-
-        return $this->aclManager->checkUserPermission($user, $entity, 'user');
+        /** @noinspection PhpRedundantOptionalArgumentInspection */
+        return $this->aclManager->checkUserPermission($user, $entity, Permission::USER);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\Acl\User;

+use Espo\Core\Name\Field;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
 use Espo\Core\ORM\Entity as CoreEntity;
@@ -51,8 +52,8 @@ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
        assert($entity instanceof CoreEntity);

        $intersect = array_intersect(
-            $user->getLinkMultipleIdList('teams'),
-            $entity->getLinkMultipleIdList('teams')
+            $user->getLinkMultipleIdList(Field::TEAMS),
+            $entity->getLinkMultipleIdList(Field::TEAMS)
        );

        if (count($intersect)) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -36,6 +36,7 @@ use Espo\Entities\User;
 use Espo\Entities\WorkingTimeRange;
 use Espo\ORM\Entity;
 use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;

 /**
 * @implements AssignmentCheckerInterface<WorkingTimeRange>
@@ -73,7 +74,7 @@ class AssignmentChecker implements AssignmentCheckerInterface

        $users = $this->entityManager
            ->getRDBRepositoryByClass(User::class)
-            ->where(['id' => $entity->getUsers()->getIdList()])
+            ->where([Attribute::ID => $entity->getUsers()->getIdList()])
            ->find();

        foreach ($users as $targetUser) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -81,8 +81,7 @@ class AccessChecker implements AccessEntityCREDChecker

        if ($parentId && $parentType) {
            $parent = $this->entityManager->getEntityById($parentType, $parentId);
-        }
-        else if ($relatedId && $relatedType) {
+        } else if ($relatedId && $relatedType) {
            $parent = $this->entityManager->getEntityById($relatedType, $relatedId);
        }

@@ -101,8 +100,7 @@ class AccessChecker implements AccessEntityCREDChecker
            if ($result !== null) {
                return $result;
            }
-        }
-        else if ($this->aclManager->checkEntity($user, $parent)) {
+        } else if ($this->aclManager->checkEntity($user, $parent)) {
            if (
                $entity->getTargetField() &&
                !$this->aclManager->checkField($user, $parent->getEntityType(), $entity->getTargetField())
@@ -156,7 +154,7 @@ class AccessChecker implements AccessEntityCREDChecker
            return null;
        }

-        $parent = $this->entityManager->getEntity($note->getParentType(), $note->getParentId());
+        $parent = $this->entityManager->getEntityById($note->getParentType(), $note->getParentId());

        if ($parent && $this->aclManager->checkEntity($user, $parent)) {
            return true;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -68,9 +68,9 @@ class AccessChecker implements AccessEntityCREDSChecker

        assert($entity instanceof CoreEntity);

-        $userIdList = $entity->getLinkMultipleIdLIst('users');
+        $userIdList = $entity->getLinkMultipleIdList('users');

-        if (is_array($userIdList) && in_array($user->getId(), $userIdList)) {
+        if (in_array($user->getId(), $userIdList)) {
            return true;
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\AclPortal\Note;

+use Espo\Core\Name\Field;
 use Espo\Entities\Note;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
@@ -137,7 +138,7 @@ class AccessChecker implements AccessEntityCREDChecker
            return false;
        }

-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);

        if (!$createdAt) {
            return true;
@@ -154,8 +155,7 @@ class AccessChecker implements AccessEntityCREDChecker
            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                return false;
            }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
            return false;
        }

@@ -175,7 +175,7 @@ class AccessChecker implements AccessEntityCREDChecker
            return false;
        }

-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);

        if (!$createdAt) {
            return true;
@@ -192,8 +192,7 @@ class AccessChecker implements AccessEntityCREDChecker
            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                return false;
            }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
            return false;
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -27,19 +27,22 @@
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

-namespace Espo\Core\Di;
+namespace Espo\Classes\AppParams;

-use Espo\Core\Select\SelectBuilderFactory;
+use Espo\Core\Utils\Address\CountryDataProvider;
+use Espo\Tools\App\AppParam;

-trait SelectBuilderFactorySetter
+class AddressCountryData implements AppParam
 {
-    /**
-     * @var SelectBuilderFactory
-     */
-    protected $selectBuilderFactory;
+    public function __construct(
+        private CountryDataProvider $provider
+    ) {}

-    public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory): void
+    /**
+     * @return array{list: string[], preferredList: string[]}
+     */
+    public function get(): array
    {
-        $this->selectBuilderFactory = $selectBuilderFactory;
+        return $this->provider->get();
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -30,29 +30,27 @@
 namespace Espo\Classes\AppParams;

 use Espo\Core\Acl;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\ORM\EntityManager;
 use Espo\Core\Select\SelectBuilderFactory;
 use Espo\Entities\Template;
 use Espo\Tools\App\AppParam;
+use RuntimeException;

 /**
 * Returns a list of entity types for which a PDF template exists.
+ *
+ * @noinspection PhpUnused
 */
 class TemplateEntityTypeList implements AppParam
 {
-    private Acl $acl;
-    private SelectBuilderFactory $selectBuilderFactory;
-    private EntityManager $entityManager;

    public function __construct(
-        Acl $acl,
-        SelectBuilderFactory $selectBuilderFactory,
-        EntityManager $entityManager
-    ) {
-        $this->acl = $acl;
-        $this->selectBuilderFactory = $selectBuilderFactory;
-        $this->entityManager = $entityManager;
-    }
+        private Acl $acl,
+        private SelectBuilderFactory $selectBuilderFactory,
+        private EntityManager $entityManager,
+    ) {}

    /**
     * @return string[]
@@ -65,14 +63,19 @@ class TemplateEntityTypeList implements AppParam

        $list = [];

-        $query = $this->selectBuilderFactory
-            ->create()
-            ->from(Template::ENTITY_TYPE)
-            ->withAccessControlFilter()
-            ->buildQueryBuilder()
-            ->select(['entityType'])
-            ->group(['entityType'])
-            ->build();
+        try {
+            $query = $this->selectBuilderFactory
+                ->create()
+                ->from(Template::ENTITY_TYPE)
+                ->withAccessControlFilter()
+                ->buildQueryBuilder()
+                ->select(['entityType'])
+                ->where(['status' => Template::STATUS_ACTIVE])
+                ->group(['entityType'])
+                ->build();
+        } catch (BadRequest|Forbidden $e) {
+            throw new RuntimeException('', 0, $e);
+        }

        $templateCollection = $this->entityManager
            ->getRDBRepositoryByClass(Template::class)
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -30,11 +30,15 @@
 namespace Espo\Classes\AssignmentNotificators;

 use Espo\Core\Field\DateTime;
+use Espo\Core\Field\LinkParent;
+use Espo\Core\Name\Field;
+use Espo\Core\Notification\DefaultAssignmentNotificator;
 use Espo\Entities\EmailAddress;
 use Espo\Entities\EmailFolder;
 use Espo\Modules\Crm\Entities\Account;
 use Espo\Modules\Crm\Entities\Contact;
 use Espo\Modules\Crm\Entities\Lead;
+use Espo\ORM\Name\Attribute;
 use Espo\Tools\Stream\Service as StreamService;
 use Espo\Core\Notification\AssignmentNotificator;
 use Espo\Core\Notification\AssignmentNotificator\Params;
@@ -56,25 +60,14 @@ class Email implements AssignmentNotificator
 {
    private const DAYS_THRESHOLD = 2;

-    private User $user;
-    private EntityManager $entityManager;
-    private UserEnabledChecker $userChecker;
-    private AclManager $aclManager;
-    private StreamService $streamService;
-
    public function __construct(
-        User $user,
-        EntityManager $entityManager,
-        UserEnabledChecker $userChecker,
-        AclManager $aclManager,
-        StreamService $streamService
-    ) {
-        $this->user = $user;
-        $this->entityManager = $entityManager;
-        $this->userChecker = $userChecker;
-        $this->aclManager = $aclManager;
-        $this->streamService = $streamService;
-    }
+        private User $user,
+        private EntityManager $entityManager,
+        private UserEnabledChecker $userChecker,
+        private AclManager $aclManager,
+        private StreamService $streamService,
+        private DefaultAssignmentNotificator $defaultAssignmentNotificator,
+    ) {}

    /**
     * @param EmailEntity $entity
@@ -94,10 +87,19 @@ class Email implements AssignmentNotificator
            return;
        }

-        if ($params->getOption('isJustSent')) {
-            $previousUserIdList = [];
+        if (
+            $entity->getStatus() !== EmailEntity::STATUS_BEING_IMPORTED &&
+            !$this->streamService->checkIsEnabled(EmailEntity::ENTITY_TYPE)
+        ) {
+            $this->defaultAssignmentNotificator->process(
+                $entity,
+                $params->withOption(DefaultAssignmentNotificator::OPTION_FORCE_ASSIGNED_USER, true)
+            );
        }
-        else {
+
+        if ($params->getOption(EmailEntity::SAVE_OPTION_IS_JUST_SENT)) {
+            $previousUserIdList = [];
+        } else {
            $previousUserIdList = $entity->getFetched('usersIds');

            if (!is_array($previousUserIdList)) {
@@ -164,7 +166,7 @@ class Email implements AssignmentNotificator

            if ($person) {
                $data['personEntityType'] = $person->getEntityType();
-                $data['personEntityName'] = $person->get('name');
+                $data['personEntityName'] = $person->get(Field::NAME);
                $data['personEntityId'] = $person->getId();
            }
        }
@@ -176,44 +178,26 @@ class Email implements AssignmentNotificator
        }

        if (empty($data['personEntityId'])) {
-            $data['fromString'] = Util::parseFromName($entity->getFromString());
+            $data['fromString'] = Util::parseFromName($entity->getFromString() ?? '');

            if (empty($data['fromString']) && $from) {
                $data['fromString'] = $from;
            }
        }

-        $parent = null;
-
-        $parentId = $entity->getParentId();
-        $parentType = $entity->getParentType();
-
-        if ($parentType && $parentId) {
-            $parent = $this->entityManager->getEntityById($parentType, $parentId);
-        }
-
-        $account = null;
-
-        $accountLink = $entity->getAccount();
-
-        if ($accountLink) {
-            $account = $this->entityManager->getEntityById(Account::ENTITY_TYPE, $accountLink->getId());
-        }
+        $parent = $entity->getParent();
+        $account = $entity->getAccount();

        foreach ($userIdList as $userId) {
-            if (!$userId) {
-                continue;
-            }
-
            if ($userIdFrom === $userId) {
                continue;
            }

-            if ($entity->getLinkMultipleColumn('users', EmailEntity::USERS_COLUMN_IN_TRASH, $userId)) {
-                continue;
-            }
-
-            if ($entity->getLinkMultipleColumn('users', EmailEntity::USERS_COLUMN_IS_READ, $userId)) {
+            if (
+                $entity->getUserColumnInTrash($userId) ||
+                $entity->getUserColumnIsRead($userId) ||
+                $entity->getUserSkipNotification($userId)
+            ) {
                continue;
            }

@@ -222,10 +206,10 @@ class Email implements AssignmentNotificator
            }

            if (
-                $params->getOption('isBeingImported') ||
-                $params->getOption('isJustSent')
+                $params->getOption(EmailEntity::SAVE_OPTION_IS_BEING_IMPORTED) ||
+                $params->getOption(EmailEntity::SAVE_OPTION_IS_JUST_SENT)
            ) {
-                $folderId = $entity->getLinkMultipleColumn('users', EmailEntity::USERS_COLUMN_FOLDER_ID, $userId);
+                $folderId = $entity->getUserColumnFolderId($userId);

                if (
                    $folderId &&
@@ -241,8 +225,7 @@ class Email implements AssignmentNotificator
                }
            }

-            /** @var ?User $user */
-            $user = $this->entityManager->getEntityById(User::ENTITY_TYPE, $userId);
+            $user = $this->entityManager->getRDBRepositoryByClass(User::class)->getById($userId);

            if (!$user) {
                continue;
@@ -258,7 +241,7 @@ class Email implements AssignmentNotificator

            $isArchivedOrBeingImported =
                $entity->getStatus() === EmailEntity::STATUS_ARCHIVED ||
-                $params->getOption('isBeingImported');
+                $params->getOption(EmailEntity::SAVE_OPTION_IS_BEING_IMPORTED);

            if (
                $isArchivedOrBeingImported &&
@@ -284,20 +267,23 @@ class Email implements AssignmentNotificator
                    'relatedId' => $entity->getId(),
                    'relatedType' => EmailEntity::ENTITY_TYPE,
                ])
-                ->select(['id'])
+                ->select([Attribute::ID])
                ->findOne();

            if ($existing) {
                continue;
            }

-            $this->entityManager->createEntity(Notification::ENTITY_TYPE, [
-                'type' => Notification::TYPE_EMAIL_RECEIVED,
-                'userId' => $userId,
-                'data' => $data,
-                'relatedId' => $entity->getId(),
-                'relatedType' => EmailEntity::ENTITY_TYPE,
-            ]);
+            $notification = $this->entityManager->getRDBRepositoryByClass(Notification::class)->getNew();
+
+            $notification
+                ->setType(Notification::TYPE_EMAIL_RECEIVED)
+                ->setUserId($userId)
+                ->setData($data)
+                ->setRelated(LinkParent::createFromEntity($entity))
+                ->setActionId($params->getActionId());
+
+            $this->entityManager->saveEntity($notification);
        }
    }
 }
@@ -0,0 +1,69 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Field\DateTime;
+use Espo\Core\Utils\Config;
+use Espo\Entities\AppLogRecord;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\DeleteBuilder;
+
+class AppLog implements Cleanup
+{
+    private const PERIOD = '30 days';
+
+    public function __construct(
+        private EntityManager $entityManager,
+        private Config $config
+    ) {}
+
+    public function process(): void
+    {
+        if (!$this->config->get('cleanupAppLog')) {
+            return;
+        }
+
+        $query = DeleteBuilder::create()
+            ->from(AppLogRecord::ENTITY_TYPE)
+            ->where(['createdAt<' => $this->getBefore()->toString()])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
+    }
+
+    private function getBefore(): DateTime
+    {
+        /** @var string $period */
+        $period = $this->config->get('cleanupAppLogPeriod') ?? self::PERIOD;
+
+        return DateTime::createNow()->modify('-' . $period);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -71,7 +71,7 @@ class Audit implements Cleanup
            ->where([
                'parentType' => $entityType,
                'createdAt<' => $this->getBefore()->toString(),
-                'type' => [Note::TYPE_UPDATE, Note::TYPE_STATUS],
+                'type' => [Note::TYPE_UPDATE],
            ])
            ->build();

@@ -87,8 +87,9 @@ class Audit implements Cleanup
        $scopeList = array_keys($this->metadata->get(['scopes']) ?? []);

        $scopeList = array_filter($scopeList, function ($item) {
-            return $this->metadata->get(['scopes', $item, 'entity']) &&
-                !$this->metadata->get(['scopes', $item, 'stream']);
+            return $this->metadata->get("scopes.$item.entity") &&
+                !$this->metadata->get("scopes.$item.preserveAuditLog") &&
+                !$this->metadata->get("scopes.$item.stream");
        });

        return array_values($scopeList);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -0,0 +1,137 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Acl\UserAclManagerProvider;
+use Espo\Entities\StarSubscription;
+use Espo\Entities\User;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\DeleteBuilder;
+use Espo\Tools\Stars\StarService;
+
+/**
+ * @noinspection PhpUnused
+ */
+class Stars implements Cleanup
+{
+    public function __construct(
+        private EntityManager $entityManager,
+        private UserAclManagerProvider $userAclManagerProvider,
+        private StarService $service
+    ) {}
+
+    public function process(): void
+    {
+        foreach ($this->getEntityTypeList() as $entityType) {
+            $this->processEntityType($entityType);
+        }
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getEntityTypeList(): array
+    {
+        $groups = $this->entityManager->getRDBRepositoryByClass(StarSubscription::class)
+            ->group('entityType')
+            ->select('entityType')
+            ->find();
+
+        $list = [];
+
+        foreach ($groups as $group) {
+            $list[] = $group->get('entityType');
+        }
+
+        return $list;
+    }
+
+    private function processEntityType(string $entityType): void
+    {
+        if (
+            !$this->service->isEnabled($entityType) ||
+            !$this->entityManager->hasRepository($entityType)
+        ) {
+            $deleteQuery = DeleteBuilder::create()
+                ->from(StarSubscription::ENTITY_TYPE)
+                ->where(['entityType' => $entityType])
+                ->build();
+
+            $this->entityManager->getQueryExecutor()->execute($deleteQuery);
+
+            return;
+        }
+
+        $stars = $this->entityManager
+            ->getRDBRepositoryByClass(StarSubscription::class)
+            ->where(['entityType' => $entityType])
+            ->sth()
+            ->find();
+
+        foreach ($stars as $star) {
+            $entityId = $star->get('entityId');
+            $userId = $star->get('userId');
+
+            if ($userId === null || $entityId === null) {
+                continue;
+            }
+
+            $entity = $this->entityManager->getEntityById($entityType, $entityId);
+            $user = $this->entityManager->getRDBRepositoryByClass(User::class)->getById($userId);
+
+            if (!$entity || !$user) {
+                $this->unstar($userId, $entityType, $entityId);
+
+                continue;
+            }
+
+            $aclManager = $this->userAclManagerProvider->get($user);
+
+            if (!$aclManager->checkEntityRead($user, $entity)) {
+                $this->unstar($userId, $entityType, $entityId);
+            }
+        }
+    }
+
+    private function unstar(string $userId, string $entityType, string $entityId): void
+    {
+        $deleteQuery = DeleteBuilder::create()
+            ->from(StarSubscription::ENTITY_TYPE)
+            ->where([
+                'userId' => $userId,
+                'entityType' => $entityType,
+                'entityId' => $entityId,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($deleteQuery);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -31,9 +31,10 @@ namespace Espo\Classes\Cleanup;

 use Espo\Core\Cleanup\Cleanup;
 use Espo\Core\Field\DateTime;
+use Espo\Core\Name\Field;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\Metadata;
-use Espo\Entities\Subscription;
+use Espo\Entities\StreamSubscription;
 use Espo\ORM\EntityManager;
 use Espo\ORM\Query\Part\Condition as Cond;

@@ -41,19 +42,11 @@ class Subscribers implements Cleanup
 {
    private const PERIOD = '2 months';

-    private Metadata $metadata;
-    private EntityManager $entityManager;
-    private Config $config;
-
    public function __construct(
-        Metadata $metadata,
-        EntityManager $entityManager,
-        Config $config
-    ) {
-        $this->metadata = $metadata;
-        $this->entityManager = $entityManager;
-        $this->config = $config;
-    }
+        private Metadata $metadata,
+        private EntityManager $entityManager,
+        private Config $config
+    ) {}

    public function process(): void
    {
@@ -85,7 +78,7 @@ class Subscribers implements Cleanup
        }

        /** @var string $dateField */
-        $dateField = $data['dateField'] ?? 'createdAt';
+        $dateField = $data['dateField'] ?? Field::CREATED_AT;
        /** @var ?string[] $statusList */
        $statusList = $data['statusList'] ?? null;
        /** @var ?string $statusField */
@@ -105,7 +98,7 @@ class Subscribers implements Cleanup
        $query = $this->entityManager
            ->getQueryBuilder()
            ->delete()
-            ->from(Subscription::ENTITY_TYPE, 'subscription')
+            ->from(StreamSubscription::ENTITY_TYPE, 'subscription')
            ->join(
                $entityType,
                'entity',
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -31,42 +31,40 @@ namespace Espo\Classes\Cleanup;

 use Espo\Core\Cleanup\Cleanup;
 use Espo\Core\Utils\Config;
+use Espo\Core\Utils\DateTime as DateTimeUtil;
+use Espo\Entities\WebhookEventQueueItem;
+use Espo\Entities\WebhookQueueItem;
 use Espo\ORM\EntityManager;
-
 use DateTime;
+use Espo\ORM\Name\Attribute;

+/**
+ * @noinspection PhpUnused
+ */
 class WebhookQueue implements Cleanup
 {
    private string $cleanupWebhookQueuePeriod = '10 days';

-    private $config;
-
-    private $entityManager;
-
-    public function __construct(Config $config, EntityManager $entityManager)
-    {
-        $this->config = $config;
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private Config $config, private EntityManager $entityManager)
+    {}

    public function process(): void
    {
        $period = '-' . $this->config->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);

        $datetime = new DateTime();
-
        $datetime->modify($period);
-        $from = $datetime->format('Y-m-d H:i:s');
+        $from = $datetime->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT);

        $query1 = $this->entityManager
            ->getQueryBuilder()
            ->delete()
-            ->from('WebhookQueueItem')
+            ->from(WebhookQueueItem::ENTITY_TYPE)
            ->where([
                'DATE:(createdAt)<' => $from,
                'OR' => [
-                    'status!=' => 'Pending',
-                    'deleted' => true,
+                    'status!=' => WebhookQueueItem::STATUS_PENDING,
+                    Attribute::DELETED => true,
                ],
            ])
            ->build();
@@ -76,12 +74,12 @@ class WebhookQueue implements Cleanup
        $query2 = $this->entityManager
            ->getQueryBuilder()
            ->delete()
-            ->from('WebhookEventQueueItem')
+            ->from(WebhookEventQueueItem::ENTITY_TYPE)
            ->where([
                'DATE:(createdAt)<' => $from,
                'OR' => [
                    'isProcessed' => true,
-                    'deleted' => true,
+                    Attribute::DELETED => true,
                ],
            ])
            ->build();
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -32,6 +32,7 @@ namespace Espo\Classes\ConsoleCommands;
 use Espo\Core\Console\Command;
 use Espo\Core\Console\Command\Params;
 use Espo\Core\Console\IO;
+use Espo\Core\Name\Field;
 use Espo\Core\Utils\Config;
 use Espo\Entities\User;
 use Espo\ORM\EntityManager;
@@ -90,7 +91,7 @@ class CreateAdminUser implements Command

        $user->set('userName', $userName);
        $user->set('type', User::TYPE_ADMIN);
-        $user->set('name', $userName);
+        $user->set(Field::NAME, $userName);

        $repository->save($user);

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -75,8 +75,7 @@ class Import implements Command
                $countUpdated = $result->getCountUpdated();
                $countError = $result->getCountError();
                $countDuplicate = $result->getCountDuplicate();
-            }
-            catch (Throwable $e) {
+            } catch (Throwable $e) {
                $io->writeLine("Error occurred: " . $e->getMessage());

                return;
@@ -97,8 +96,7 @@ class Import implements Command

            try {
                $this->service->revert($id);
-            }
-            catch (Throwable $e) {
+            } catch (Throwable $e) {
                $io->writeLine("Error occurred: " . $e->getMessage());

                return;
@@ -114,8 +112,7 @@ class Import implements Command

            try {
                $result = $this->service->importById($id, true, $forceResume);
-            }
-            catch (Throwable $e) {
+            } catch (Throwable $e) {
                $io->writeLine("Error occurred: " . $e->getMessage());

                return;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -36,6 +36,7 @@ use Espo\Core\Console\Exceptions\InvalidArgument;
 use Espo\Core\Console\IO;
 use Espo\Core\Exceptions\Error;
 use Espo\Core\FieldProcessing\NextNumber\BeforeSaveProcessor;
+use Espo\Core\Name\Field;
 use Espo\Core\ORM\Entity as CoreEntity;
 use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\EntityManager;
@@ -62,7 +63,7 @@ class PopulateNumbers implements Command
        $entityType = $params->getArgument(0);
        $field = $params->getArgument(1);

-        $orderBy = $params->getOption('orderBy') ?? 'createdAt';
+        $orderBy = $params->getOption('orderBy') ?? Field::CREATED_AT;
        $order = strtoupper($params->getOption('order') ?? Order::ASC);

        if (!$entityType) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -57,8 +57,7 @@ class RebuildCategoryPaths implements Command

        try {
            $this->rebuildPaths->run($entityType);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
            $io->setExitStatus(1);
            $io->writeLine("Error: " . $e->getMessage());

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,39 +29,55 @@

 namespace Espo\Classes\DefaultLayouts;

+use Espo\Core\Name\Field;
+use Espo\Core\ORM\Type\FieldType;
 use Espo\Core\Utils\Metadata;
+use Espo\Entities\Team;
+use Espo\Entities\User;
+use Espo\ORM\Defs\Params\FieldParam;
+use Espo\ORM\Defs\Params\RelationParam;
+use stdClass;

 class DefaultSidePanelType
 {
-    private $metadata;
-
-    public function __construct(Metadata $metadata)
-    {
-        $this->metadata = $metadata;
-    }
+    public function __construct(private Metadata $metadata)
+    {}

    /**
-     * @return \stdClass[]
+     * @return stdClass[]
     */
    public function get(string $scope): array
    {
        $list = [];

        if (
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === 'link' &&
-            $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === 'User'
+            $this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USER, FieldParam::TYPE]) ===
+                FieldType::LINK &&
+            $this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USER, RelationParam::ENTITY]) ===
+                User::ENTITY_TYPE
            ||
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === 'linkMultiple' &&
-            $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUsers', 'entity']) === 'User'
+            $this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USERS, FieldParam::TYPE]) ===
+                FieldType::LINK_MULTIPLE &&
+            $this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USERS, RelationParam::ENTITY]) ===
+                User::ENTITY_TYPE
        ) {
            $list[] = (object) ['name' => ':assignedUser'];
        }

        if (
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === 'linkMultiple' &&
-            $this->metadata->get(['entityDefs', $scope, 'links', 'teams', 'entity']) === 'Team'
+            $this->metadata->get(['entityDefs', $scope, 'fields', Field::TEAMS, FieldParam::TYPE]) ===
+                FieldType::LINK_MULTIPLE &&
+            $this->metadata->get(['entityDefs', $scope, 'links', Field::TEAMS, RelationParam::ENTITY]) ===
+                Team::ENTITY_TYPE
        ) {
-            $list[] = (object) ['name' => 'teams'];
+            $list[] = (object) ['name' => Field::TEAMS];
+        }
+
+        if (
+            $this->metadata->get("entityDefs.$scope.fields.collaborators.type") === FieldType::LINK_MULTIPLE &&
+            $this->metadata->get("entityDefs.$scope.links.collaborators.entity") === User::ENTITY_TYPE
+        ) {
+            $list[] = (object) ['name' => Field::COLLABORATORS];
        }

        return $list;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -33,6 +33,7 @@ use Espo\Core\Duplicate\WhereBuilder;
 use Espo\Core\Field\EmailAddressGroup;
 use Espo\Core\Field\PhoneNumberGroup;
 use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Core\ORM\Type\FieldType;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\Metadata;
 use Espo\ORM\Defs;
@@ -92,15 +93,15 @@ class General implements WhereBuilder
            ->tryGetField($field)
            ?->getType();

-        if ($type === 'personName') {
+        if ($type === FieldType::PERSON_NAME) {
            return $this->applyFieldPersonName($field, $entity, $orBuilder);
        }

-        if ($type === 'email') {
+        if ($type === FieldType::EMAIL) {
            return $this->applyFieldEmail($field, $entity, $orBuilder);
        }

-        if ($type === 'phone') {
+        if ($type === FieldType::PHONE) {
            return $this->applyFieldPhone($field, $entity, $orBuilder);
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -31,6 +31,7 @@ namespace Espo\Classes\DuplicateWhereBuilders;

 use Espo\Core\Duplicate\WhereBuilder;

+use Espo\Core\Name\Field;
 use Espo\ORM\Entity;
 use Espo\ORM\Query\Part\Condition as Cond;
 use Espo\ORM\Query\Part\WhereItem;
@@ -42,10 +43,10 @@ class Name implements WhereBuilder
 {
    public function build(Entity $entity): ?WhereItem
    {
-        if ($entity->get('name')) {
+        if ($entity->get(Field::NAME)) {
            return Cond::equal(
-                Cond::column('name'),
-                $entity->get('name')
+                Cond::column(Field::NAME),
+                $entity->get(Field::NAME)
            );
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -33,6 +33,8 @@ use Espo\Core\Utils\Database\Orm\Defs\AttributeDefs;
 use Espo\Core\Utils\Database\Orm\Defs\EntityDefs;
 use Espo\Core\Utils\Database\Orm\FieldConverter;
 use Espo\ORM\Defs\FieldDefs;
+use Espo\ORM\Defs\Params\RelationParam;
+use Espo\ORM\Name\Attribute;
 use Espo\ORM\Type\AttributeType;
 use RuntimeException;

@@ -65,7 +67,7 @@ class RelationshipRole implements FieldConverter
        /** @var ?string $link */
        $link = $data['link'] ?? null;
        /** @var ?string $relationName */
-        $relationName = $data['relationName'] ?? null;
+        $relationName = $data[RelationParam::RELATION_NAME] ?? null;
        /** @var ?string $nearKey */
        $nearKey = $data['nearKey'] ?? null;

@@ -83,7 +85,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -95,7 +97,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -107,7 +109,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -119,7 +121,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -131,7 +133,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                "$column*" => '{value}',
                            ],
                        ],
@@ -143,7 +145,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                "$column*" => '{value}',
                            ],
                        ],
@@ -155,7 +157,7 @@ class RelationshipRole implements FieldConverter
                            'EXISTS' => [
                                'from' => $entityType,
                                'fromAlias' => 'sq',
-                                'select' => ['id'],
+                                'select' => [Attribute::ID],
                                'leftJoins' => [
                                    [
                                        $link,
@@ -177,7 +179,7 @@ class RelationshipRole implements FieldConverter
                        'EXISTS' => [
                            'from' => $entityType,
                            'fromAlias' => 'sq',
-                            'select' => ['id'],
+                            'select' => [Attribute::ID],
                            'leftJoins' => [
                                [
                                    $link,
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -76,7 +76,7 @@ class Wysiwyg implements FieldDuplicator

        foreach ($attachmentIdList as $id) {
            /** @var Attachment|null $attachment */
-            $attachment = $this->entityManager->getEntity(Attachment::ENTITY_TYPE, $id);
+            $attachment = $this->entityManager->getEntityById(Attachment::ENTITY_TYPE, $id);

            if (!$attachment) {
                continue;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -52,11 +52,6 @@ class AddressDataLoader implements Loader
        /** @var EmailRepository $repository */
        $repository = $this->entityManager->getRepository(Email::ENTITY_TYPE);

-        $repository->loadFromField($entity);
-        $repository->loadToField($entity);
-        $repository->loadCcField($entity);
-        $repository->loadBccField($entity);
-        $repository->loadReplyToField($entity);
        $repository->loadNameHash($entity);
    }
 }
@@ -0,0 +1,60 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldProcessing\Email;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
+use Espo\Entities\Email;
+use Espo\ORM\Entity;
+use Espo\Repositories\Email as EmailRepository;
+
+/**
+ * @implements Loader<Email>
+ */
+class AddressLoader implements Loader
+{
+    public function __construct(private EntityManager $entityManager)
+    {}
+    /**
+     * @inheritDoc
+     */
+    public function process(Entity $entity, Params $params): void
+    {
+        /** @var EmailRepository $repository */
+        $repository = $this->entityManager->getRepository(Email::ENTITY_TYPE);
+
+        $repository->loadFromField($entity);
+        $repository->loadToField($entity);
+        $repository->loadCcField($entity);
+        $repository->loadBccField($entity);
+        $repository->loadReplyToField($entity);
+    }
+}
@@ -0,0 +1,67 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldProcessing\Email;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Entities\Email;
+use Espo\Entities\EmailFolder;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;
+
+/**
+ * @implements Loader<Email>
+ */
+class FolderDataLoader implements Loader
+{
+    public function __construct(private EntityManager $entityManager) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $folderId = $entity->get(Email::USERS_COLUMN_FOLDER_ID);
+
+        if (!$folderId) {
+            return;
+        }
+
+        $folder = $this->entityManager
+            ->getRDBRepositoryByClass(EmailFolder::class)
+            ->select([Attribute::ID, 'name'])
+            ->where([Attribute::ID => $folderId])
+            ->findOne();
+
+        if (!$folder) {
+            return;
+        }
+
+        $entity->set('folderName', $folder->getName());
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,10 +29,15 @@

 namespace Espo\Classes\FieldProcessing\Email;

+use Espo\Core\Name\Field;
+use Espo\Entities\User;
 use Espo\Modules\Crm\Entities\Call;
+use Espo\Modules\Crm\Entities\Contact;
+use Espo\Modules\Crm\Entities\Lead;
 use Espo\Modules\Crm\Entities\Meeting;
 use Espo\ORM\Entity;
 use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;
 use Espo\Repositories\EmailAddress as EmailAddressRepository;
 use Espo\Entities\EmailAddress;
 use Espo\Entities\Email;
@@ -55,9 +60,9 @@ class IcsDataLoader implements Loader
 {
    /** @var array<string, string> */
    private $entityTypeLinkMap = [
-        'User' => 'users',
-        'Contact' => 'contacts',
-        'Lead' => 'leads',
+        User::ENTITY_TYPE => Meeting::LINK_USERS,
+        Contact::ENTITY_TYPE => Meeting::LINK_CONTACTS,
+        Lead::ENTITY_TYPE => Meeting::LINK_LEADS,
    ];

    public function __construct(private EntityManager $entityManager, private Log $log)
@@ -104,8 +109,7 @@ class IcsDataLoader implements Loader
                $valueMap->dateStartDate = $espoEvent->getDateStart();
                $valueMap->dateEndDate = $espoEvent->getDateEnd();
            }
-        }
-        catch (Throwable $e) {
+        } catch (Throwable $e) {
            $this->log->warning("Error while converting ICS event '" . $entity->getId() . "': " . $e->getMessage());

            return;
@@ -145,7 +149,7 @@ class IcsDataLoader implements Loader
            $nameMap = $valueMap->$namesAttribute ?? (object) [];

            $idList[] = $personEntity->getId();
-            $nameMap->{$personEntity->getId()} = $personEntity->get('name');
+            $nameMap->{$personEntity->getId()} = $personEntity->get(Field::NAME);

            $valueMap->$idsAttribute = $idList;
            $valueMap->$namesAttribute = $nameMap;
@@ -189,7 +193,7 @@ class IcsDataLoader implements Loader
        }

        $createdEvent = $this->entityManager
-            ->getEntity($emailSameEvent->get('createdEventType'), $emailSameEvent->get('createdEventId'));
+            ->getEntityById($emailSameEvent->get('createdEventType'), $emailSameEvent->get('createdEventId'));

        if (!$createdEvent) {
            return;
@@ -198,7 +202,7 @@ class IcsDataLoader implements Loader
        $eventData->createdEvent = (object) [
            'id' => $createdEvent->getId(),
            'entityType' => $emailSameEvent->getEntityType(),
-            'name' => $createdEvent->get('name'),
+            'name' => $createdEvent->get(Field::NAME),
        ];
    }

@@ -212,8 +216,8 @@ class IcsDataLoader implements Loader

        $found1 = $this->entityManager
            ->getRDBRepository(Meeting::ENTITY_TYPE)
-            ->select(['id'])
-            ->where(['id' => $id])
+            ->select([Attribute::ID])
+            ->where([Attribute::ID => $id])
            ->findOne();

        if ($found1) {
@@ -222,8 +226,8 @@ class IcsDataLoader implements Loader

        $found2 = $this->entityManager
            ->getRDBRepository(Call::ENTITY_TYPE)
-            ->select(['id'])
-            ->where(['id' => $id])
+            ->select([Attribute::ID])
+            ->where([Attribute::ID => $id])
            ->findOne();

        if ($found2) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,10 @@

 namespace Espo\Classes\FieldProcessing\Email;

+use Espo\Core\Name\Field;
+use Espo\Core\Name\Link;
 use Espo\ORM\Entity;
+use Espo\ORM\Name\Attribute;
 use Espo\Repositories\EmailAddress as EmailAddressRepository;
 use Espo\Core\FieldProcessing\Loader;
 use Espo\Core\FieldProcessing\Loader\Params;
@@ -42,17 +45,15 @@ use Espo\Entities\User;
 */
 class StringDataLoader implements Loader
 {
-    private EntityManager $entityManager;
-    private User $user;
+    private const LINK_EMAIL_ADDRESSES = Link::EMAIL_ADDRESSES;

    /** @var array<string, string> */
    private $fromEmailAddressNameCache = [];

-    public function __construct(EntityManager $entityManager, User $user)
-    {
-        $this->entityManager = $entityManager;
-        $this->user = $user;
-    }
+    public function __construct(
+        private EntityManager $entityManager,
+        private User $user
+    ) {}

    public function process(Entity $entity, Params $params): void
    {
@@ -61,9 +62,8 @@ class StringDataLoader implements Loader
        $userEmailAddressIdList = [];

        $emailAddressCollection = $this->entityManager
-            ->getRDBRepository(User::ENTITY_TYPE)
-            ->getRelation($this->user, 'emailAddresses')
-            ->select(['id'])
+            ->getRelation($this->user, self::LINK_EMAIL_ADDRESSES)
+            ->select([Attribute::ID])
            ->find();

        foreach ($emailAddressCollection as $emailAddress) {
@@ -89,7 +89,7 @@ class StringDataLoader implements Loader
            foreach ($idList as $emailAddressId) {
                $person = $this->getEmailAddressRepository()->getEntityByAddressId($emailAddressId, null, true);

-                $list[] = $person ? $person->get('name') : $names->$emailAddressId;
+                $list[] = $person ? $person->get(Field::NAME) : $names->$emailAddressId;
            }

            $entity->set('personStringData', 'To: ' . implode(', ', $list));
@@ -107,7 +107,7 @@ class StringDataLoader implements Loader
        if (!array_key_exists($fromEmailAddressId, $this->fromEmailAddressNameCache)) {
            $person = $this->getEmailAddressRepository()->getEntityByAddressId($fromEmailAddressId, null, true);

-            $fromName = $person?->get('name');
+            $fromName = $person?->get(Field::NAME);

            $this->fromEmailAddressNameCache[$fromEmailAddressId] = $fromName;
        }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -35,20 +35,17 @@ use Espo\Core\FieldProcessing\Loader;
 use Espo\Core\FieldProcessing\Loader\Params;
 use Espo\Core\ORM\EntityManager;
 use Espo\Entities\User;
+use Espo\ORM\Name\Attribute;

 /**
 * @implements Loader<Email>
 */
 class UserColumnsLoader implements Loader
 {
-    private EntityManager $entityManager;
-    private User $user;
-
-    public function __construct(EntityManager $entityManager, User $user)
-    {
-        $this->entityManager = $entityManager;
-        $this->user = $user;
-    }
+    public function __construct(
+        private EntityManager $entityManager,
+        private User $user
+    ) {}

    public function process(Entity $entity, Params $params): void
    {
@@ -58,9 +55,10 @@ class UserColumnsLoader implements Loader
                Email::USERS_COLUMN_IS_READ,
                Email::USERS_COLUMN_IS_IMPORTANT,
                Email::USERS_COLUMN_IN_TRASH,
+                Email::USERS_COLUMN_IN_ARCHIVE,
            ])
            ->where([
-                'deleted' => false,
+                Attribute::DELETED => false,
                'userId' => $this->user->getId(),
                'emailId' => $entity->getId(),
            ])
@@ -70,6 +68,7 @@ class UserColumnsLoader implements Loader
            $entity->set(Email::USERS_COLUMN_IS_READ, null);
            $entity->clear(Email::USERS_COLUMN_IS_IMPORTANT);
            $entity->clear(Email::USERS_COLUMN_IN_TRASH);
+            $entity->clear(Email::USERS_COLUMN_IN_ARCHIVE);

            return;
        }
@@ -78,6 +77,8 @@ class UserColumnsLoader implements Loader
            Email::USERS_COLUMN_IS_READ => $emailUser->get(Email::USERS_COLUMN_IS_READ),
            Email::USERS_COLUMN_IS_IMPORTANT => $emailUser->get(Email::USERS_COLUMN_IS_IMPORTANT),
            Email::USERS_COLUMN_IN_TRASH => $emailUser->get(Email::USERS_COLUMN_IN_TRASH),
+            Email::USERS_COLUMN_IN_ARCHIVE => $emailUser->get(Email::USERS_COLUMN_IN_ARCHIVE),
+            'isUsersSent' => $entity->getSentBy()?->getId() === $this->user->getId(),
        ]);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -0,0 +1,53 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldProcessing\InboundEmail;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\Mail\ConfigDataProvider;
+use Espo\Entities\InboundEmail;
+use Espo\ORM\Entity;
+
+/**
+ * @implements Loader<InboundEmail>
+ */
+class IsSystemLoader implements Loader
+{
+    public function __construct(
+        private ConfigDataProvider $configDataProvider,
+    ) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $isSystem = $entity->getEmailAddress() === $this->configDataProvider->getSystemOutboundAddress();
+
+        $entity->set('isSystem', $isSystem);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -32,12 +32,14 @@ namespace Espo\Classes\FieldProcessing\LeadCapture;
 use Espo\Core\FieldProcessing\Loader;
 use Espo\Core\FieldProcessing\Loader\Params;
 use Espo\Core\Utils\Config;
+use Espo\Core\Utils\Config\ApplicationConfig;
 use Espo\Core\Utils\FieldUtil;
 use Espo\Core\Utils\Util;
 use Espo\Entities\LeadCapture;
 use Espo\Modules\Crm\Entities\Lead;
 use Espo\ORM\Entity;
 use Espo\ORM\EntityManager;
+use Espo\ORM\Type\AttributeType;

 /**
 * @implements Loader<LeadCapture>
@@ -46,8 +48,9 @@ class ExampleLoader implements Loader
 {
    public function __construct(
        private FieldUtil $fieldUtil,
+        private ApplicationConfig $applicationConfig,
+        private EntityManager $entityManager,
        private Config $config,
-        private EntityManager $entityManager
    ) {}

    public function process(Entity $entity, Params $params): void
@@ -60,12 +63,13 @@ class ExampleLoader implements Loader

        $this->processRequestUrl($entity);
        $this->processRequestPayload($entity);
+        $this->processFormUrl($entity);
    }

    private function processRequestUrl(LeadCapture $entity): void
    {
        $apiKey = $entity->getApiKey();
-        $siteUrl = $this->config->get('siteUrl');
+        $siteUrl = $this->applicationConfig->getSiteUrl();

        if (!$apiKey) {
            return;
@@ -104,7 +108,16 @@ class ExampleLoader implements Loader
        foreach ($attributeList as $i => $attribute) {
            $value = strtoupper(Util::camelCaseToUnderscore($attribute));

-            if (in_array($seed->getAttributeType($attribute), [Entity::VARCHAR, Entity::TEXT])) {
+            if (
+                in_array(
+                    $seed->getAttributeType($attribute), [
+                        Entity::VARCHAR,
+                        Entity::TEXT,
+                        AttributeType::DATETIME,
+                        AttributeType::DATE,
+                    ]
+                )
+            ) {
                $value = '"' . $value . '"';
            }

@@ -121,4 +134,26 @@ class ExampleLoader implements Loader

        $entity->set('exampleRequestPayload', $requestPayload);
    }
+
+    private function processFormUrl(LeadCapture $entity): void
+    {
+        $formId = $entity->getFormId();
+        $siteUrl = $this->getSiteUrl();
+
+        if (!$entity->hasFormEnabled() || !$formId) {
+            /** @noinspection PhpRedundantOptionalArgumentInspection */
+            $entity->set('formUrl', null);
+
+            return;
+        }
+
+        $formUrl = "$siteUrl?entryPoint=leadCaptureForm&id=$formId";
+
+        $entity->set('formUrl', $formUrl);
+    }
+
+    private function getSiteUrl(): string
+    {
+        return $this->config->get('leadCaptureSiteUrl') ?? $this->applicationConfig->getSiteUrl();
+    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -33,14 +33,21 @@ use Espo\Core\FieldProcessing\Loader;
 use Espo\Core\FieldProcessing\Loader\Params;
 use Espo\Entities\Note;
 use Espo\ORM\Entity;
+use Espo\Tools\Stream\MassNotePreparator;

 /**
 * @implements Loader<Note>
 */
 class AdditionalFieldsLoader implements Loader
 {
+    public function __construct(
+        private MassNotePreparator $massNotePreparator,
+    ) {}
+
    public function process(Entity $entity, Params $params): void
    {
        $entity->loadAdditionalFields();
+
+        $this->massNotePreparator->prepare([$entity]);
    }
 }
@@ -0,0 +1,72 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldProcessing\OAuthAccount;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Entities\OAuthAccount;
+use Espo\ORM\Entity;
+use Espo\Tools\OAuth\ConfigDataProvider;
+
+/**
+ * @implements Loader<OAuthAccount>
+ */
+class DataLoader implements Loader
+{
+    public function __construct(
+        private ConfigDataProvider $configDataProvider,
+    ) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        if (!$entity->get('providerId')) {
+            return;
+        }
+
+        $provider = $entity->getProvider();
+
+        $scope = null;
+
+        if ($provider->getScopes()) {
+            $scope = implode($provider->getScopeSeparator() ?? ' ', $provider->getScopes());
+        }
+
+        $data = [
+            'endpoint' => $provider->getAuthorizationEndpoint(),
+            'clientId' => $provider->getClientId(),
+            'redirectUri' => $this->configDataProvider->getRedirectUri(),
+            'scope' => $scope,
+            'prompt' => $provider->getAuthorizationPrompt(),
+            'params' => $provider->getAuthorizationParams(),
+        ];
+
+        $entity->set('data', $data);
+    }
+}
@@ -0,0 +1,51 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldProcessing\OAuthProvider;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Entities\OAuthProvider;
+use Espo\ORM\Entity;
+use Espo\Tools\OAuth\ConfigDataProvider;
+
+/**
+ * @implements Loader<OAuthProvider>
+ */
+class AuthorizationRedirectUriLoader implements Loader
+{
+    public function __construct(
+        private ConfigDataProvider $configDataProvider,
+    ) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $entity->set('authorizationRedirectUri', $this->configDataProvider->getRedirectUri());
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 namespace Espo\Classes\FieldProcessing\User;

+use Espo\Core\Name\Field;
 use Espo\Entities\AuthLogRecord;
 use Espo\Entities\AuthToken;
 use Espo\Entities\User;
@@ -39,6 +40,7 @@ use Espo\Core\FieldProcessing\Loader\Params;
 use Espo\Core\ORM\EntityManager;

 use DateTime;
+use Espo\ORM\Name\Attribute;
 use Exception;

 /**
@@ -64,7 +66,7 @@ class LastAccessLoader implements Loader

        $authToken = $this->entityManager
            ->getRDBRepository(AuthToken::ENTITY_TYPE)
-            ->select(['id', 'lastAccess'])
+            ->select([Attribute::ID, 'lastAccess'])
            ->where([
                'userId' => $entity->getId(),
            ])
@@ -82,8 +84,7 @@ class LastAccessLoader implements Loader
        if ($lastAccess) {
            try {
                $dt = new DateTime($lastAccess);
-            }
-            catch (Exception) {}
+            } catch (Exception) {}
        }

        $where = [
@@ -97,13 +98,13 @@ class LastAccessLoader implements Loader

        $authLogRecord = $this->entityManager
            ->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
-            ->select(['id', 'createdAt'])
+            ->select([Attribute::ID, Field::CREATED_AT])
            ->where($where)
            ->order('requestTime', true)
            ->findOne();

        if ($authLogRecord) {
-            $lastAccess = $authLogRecord->get('createdAt');
+            $lastAccess = $authLogRecord->get(Field::CREATED_AT);
        }

        $entity->set('lastAccess', $lastAccess);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2025 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
--- a/Show More
+++ b/Show More