Fix: force HTTPS=on in Apache for Traefik proxy

Fix: configure Apache to trust X-Forwarded-Proto from Traefik
Simplify: remove custom entrypoint, use Coolify post-deploy instead
2026-03-15 14:35:00 +00:00 · 2026-03-15 14:33:07 +00:00 · 2026-03-15 14:22:47 +00:00 · 2026-03-15 14:19:44 +00:00 · 2026-03-15 14:18:07 +00:00 · 2026-03-15 14:17:15 +00:00
5678 changed files with 110162 additions and 34650 deletions
@@ -3,8 +3,9 @@
 #### Guidelines

 When reporting a possible bug, provide detail steps so that we will be able
-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.
+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.

 #### No support

@@ -16,6 +17,10 @@ For this, please use our [forum](https://forum.espocrm.com).
 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.
@@ -25,9 +30,18 @@ The maintainers have right to close issues without explanation.

 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: For high-level features, create feature requests on our 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'
@@ -33,7 +33,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.3']
+        php-versions: ['8.4']
        branches: ['master']

    steps:
@@ -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.2', '8.4']
+        php-versions: ['8.3', '8.5']
        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.2', '8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']

    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
@@ -7,6 +7,7 @@
      <option name="GROUP_USE_WRAP" value="2" />
      <option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
      <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+      <option name="SPACE_BEFORE_SHORT_CLOSURE_LEFT_PARENTHESIS" value="true" />
      <option name="FORCE_EMPTY_METHODS_IN_ONE_LINE" value="true" />
    </PHPCodeStyleSettings>
    <codeStyleSettings language="JSON">
@@ -19,6 +20,8 @@
      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="SPACE_AROUND_UNARY_OPERATOR" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="true" />
      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
    </codeStyleSettings>
@@ -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
@@ -341,6 +341,25 @@
            </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>
@@ -1386,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,12 @@
            ],
            "url": "./schema/metadata/app/client.json"
        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/clientIcons.json"
+            ],
+            "url": "./schema/metadata/app/clientIcons.json"
+        },
        {
            "fileMatch": [
                "*/Resources/metadata/app/clientRecord.json"
@@ -0,0 +1,18 @@
+###############################################################################
+# EspoCRM - Development Server for Extensions
+# Based on official image, overlays custom code on each deploy
+###############################################################################
+
+FROM espocrm/espocrm:latest
+
+# Fix redirect loop: tell Apache it's behind HTTPS proxy (Traefik)
+RUN echo 'SetEnv HTTPS on' > /etc/apache2/conf-available/force-https.conf && \
+    a2enconf force-https
+
+# Copy custom extensions and modifications
+COPY custom/ /var/www/html/custom/
+
+# Ensure correct permissions
+RUN chown -R www-data:www-data /var/www/html/custom
+
+EXPOSE 80
@@ -2,7 +2,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -184,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: {
@@ -19,24 +19,36 @@ You can try the CRM on an online [demo](https://www.espocrm.com/demo/).

 ### Requirements

-* PHP 8.2 - 8.4;
-* MySQL 5.7 (and later), or MariaDB 10.2 (and later);
+* PHP 8.3 - 8.5;
+* 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/).

+### Download
+
+[Download](https://www.espocrm.com/download/) the latest release from our website or 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.
+
 ### Why EspoCRM?

-* **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 CRM fit your specific needs.
-* **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.
+* 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.

 ### Who is EspoCRM for?

-* **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.
+* 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

@@ -47,18 +59,6 @@ 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).
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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'
@@ -232,6 +232,21 @@ class Binding implements BindingProcessor
            'Espo\\Tools\\Stream\\Service',
            'streamService'
        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config\\SystemConfig',
+            'systemConfig'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config\\ApplicationConfig',
+            'applicationConfig'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Session\\Session',
+            'session'
+        );
    }

    private function bindCore(Binder $binder): void
@@ -245,6 +260,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
@@ -302,6 +322,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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -0,0 +1,79 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 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\CurrencyRecordRate;
+
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Entities\CurrencyRecordRate;
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+/**
+ * @implements AccessEntityCREDChecker<CurrencyRecordRate>
+ */
+class AccessChecker implements AccessEntityCREDChecker
+{
+    use DefaultAccessCheckerDependency;
+
+    public function __construct(
+        private DefaultAccessChecker $defaultAccessChecker,
+    ) {}
+
+    public function checkCreate(User $user, ScopeData $data): bool
+    {
+        if ($data->getEdit() === Table::LEVEL_YES) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkDelete(User $user, ScopeData $data): bool
+    {
+        if ($data->getEdit() === Table::LEVEL_YES) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
+    {
+        return $this->checkCreate($user, $data);
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
+    {
+        return $this->checkDelete($user, $data);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -46,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
    {
@@ -70,11 +66,7 @@ class AccessChecker implements AccessEntityCREDSChecker

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

@@ -82,6 +74,14 @@ 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);
    }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -0,0 +1,59 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 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\AppParams;
+
+use Espo\Core\Currency\ConfigDataProvider;
+use Espo\Core\Utils\NumberUtil;
+use Espo\Tools\App\AppParam;
+use stdClass;
+
+/**
+ * @noinspection PhpUnused
+ */
+class CurrencyRates implements AppParam
+{
+    private const int PRECISION = 6;
+
+    public function __construct(
+        private ConfigDataProvider $configDataProvider,
+        private NumberUtil $numberUtil,
+    ) {}
+
+    public function get(): stdClass
+    {
+        $rates = $this->configDataProvider->getCurrencyRates()->toAssoc();
+
+        foreach ($rates as $code => $value) {
+            $rates[$code] = $this->numberUtil->format($value, self::PRECISION, '.', '');
+        }
+
+        return (object) $rates;
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 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;
@@ -273,13 +274,16 @@ class Email implements AssignmentNotificator
                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::fromEntity($entity))
+                ->setActionId($params->getActionId());
+
+            $this->entityManager->saveEntity($notification);
        }
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -47,6 +47,10 @@ class AppLog implements Cleanup

    public function process(): void
    {
+        if (!$this->config->get('cleanupAppLog')) {
+            return;
+        }
+
        $query = DeleteBuilder::create()
            ->from(AppLogRecord::ENTITY_TYPE)
            ->where(['createdAt<' => $this->getBefore()->toString()])
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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();

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@ use Espo\Core\Console\Exceptions\ArgumentNotSpecified;
 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\FieldProcessing\NextNumber\Processor;
 use Espo\Core\Name\Field;
 use Espo\Core\ORM\Entity as CoreEntity;
 use Espo\Core\ORM\Repository\Option\SaveOption;
@@ -44,11 +44,11 @@ use Espo\ORM\Query\Part\Order;

 class PopulateNumbers implements Command
 {
-    private BeforeSaveProcessor $beforeSaveProcessor;
+    private Processor $beforeSaveProcessor;
    private EntityManager $entityManager;

    public function __construct(
-        BeforeSaveProcessor $beforeSaveProcessor,
+        Processor $beforeSaveProcessor,
        EntityManager $entityManager
    ) {
        $this->beforeSaveProcessor = $beforeSaveProcessor;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -85,7 +85,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -97,7 +97,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -109,7 +109,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -121,7 +121,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                $column => '{value}',
                            ],
                        ],
@@ -133,7 +133,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                "$column*" => '{value}',
                            ],
                        ],
@@ -145,7 +145,7 @@ class RelationshipRole implements FieldConverter
                            'from' => $midTable,
                            'select' => [$nearKey],
                            'whereClause' => [
-                                'deleted' => false,
+                                Attribute::DELETED => false,
                                "$column*" => '{value}',
                            ],
                        ],
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -0,0 +1,63 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 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\CurrencyRecord;
+
+use Espo\Core\Currency\ConfigDataProvider;
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Entities\CurrencyRecord;
+use Espo\ORM\Entity;
+use ValueError;
+
+/**
+ * @implements Loader<CurrencyRecord>
+ */
+class IsBase implements Loader
+{
+    public function __construct(
+        private ConfigDataProvider $configDataProvider,
+    ) {}
+
+
+    public function process(Entity $entity, Params $params): void
+    {
+        try {
+            $code = $entity->getCode();
+        } catch (ValueError) {
+            $entity->setIsBase(false);
+
+            return;
+        }
+
+        $isBase = $code === $this->configDataProvider->getBaseCurrency();
+
+        $entity->setIsBase($isBase);
+    }
+}
@@ -0,0 +1,60 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 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\CurrencyRecord;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\Utils\Language;
+use Espo\Entities\CurrencyRecord;
+use Espo\ORM\Entity;
+use ValueError;
+
+/**
+ * @implements Loader<CurrencyRecord>
+ */
+class Label implements Loader
+{
+    public function __construct(
+        private Language $defaultLanguage
+    ) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        try {
+            $code = $entity->getCode();
+        } catch (ValueError) {
+            return;
+        }
+
+        $name = $this->defaultLanguage->translateLabel($code, 'names', 'Currency');
+
+        $entity->setLabel($name);
+    }
+}
@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 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\CurrencyRecord;
+
+use Espo\Core\Currency\ConfigDataProvider;
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Entities\CurrencyRecord;
+use Espo\ORM\Entity;
+use Espo\Tools\Currency\RateEntryProvider;
+
+/**
+ * @implements Loader<CurrencyRecord>
+ */
+class Rate implements Loader
+{
+    public function __construct(
+        private RateEntryProvider $rateEntryProvider,
+        private ConfigDataProvider $configDataProvider,
+    ) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $rate = $entity->getCode() !== $this->configDataProvider->getBaseCurrency() ?
+            $this->rateEntryProvider->getCurrentRateEntry($entity)?->getRate() :
+            '1';
+
+        $entity->setRate($rate);
+    }
+}
@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 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\CurrencyRecord;
+
+use Espo\Core\Currency\ConfigDataProvider;
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Entities\CurrencyRecord;
+use Espo\ORM\Entity;
+use Espo\Tools\Currency\RateEntryProvider;
+
+/**
+ * @implements Loader<CurrencyRecord>
+ */
+class RateDate implements Loader
+{
+    public function __construct(
+        private RateEntryProvider $rateEntryProvider,
+        private ConfigDataProvider $configDataProvider,
+    ) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $date = $entity->getCode() !== $this->configDataProvider->getBaseCurrency() ?
+            $this->rateEntryProvider->getCurrentRateEntry($entity)?->getDate() :
+            null;
+
+        $entity->setRateDate($date);
+    }
+}
@@ -0,0 +1,59 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 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\CurrencyRecord;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\Utils\Metadata;
+use Espo\Entities\CurrencyRecord;
+use Espo\ORM\Entity;
+use ValueError;
+
+/**
+ * @implements Loader<CurrencyRecord>
+ */
+class Symbol implements Loader
+{
+    public function __construct(
+        private Metadata $metadata,
+    ) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        try {
+            $code = $entity->getCode();
+        } catch (ValueError) {
+            return;
+        }
+        $symbol = $this->metadata->get("app.currency.symbolMap.$code");
+
+        $entity->setSymbol($symbol);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2026 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);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 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;
@@ -44,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
    {
@@ -63,8 +62,7 @@ class StringDataLoader implements Loader
        $userEmailAddressIdList = [];

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

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -35,6 +35,7 @@ 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>
@@ -57,7 +58,7 @@ class UserColumnsLoader implements Loader
                Email::USERS_COLUMN_IN_ARCHIVE,
            ])
            ->where([
-                'deleted' => false,
+                Attribute::DELETED => false,
                'userId' => $this->user->getId(),
                'emailId' => $entity->getId(),
            ])
@@ -72,12 +73,18 @@ class UserColumnsLoader implements Loader
            return;
        }

-        $entity->set([
+        $values = [
            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(),
-        ]);
+        ];
+
+        $entity->setMultiple($values);
+
+        foreach ($values as $key => $value) {
+            $entity->setFetched($key, $value);
+        }
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM – Open Source CRM application.
- * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
 * Website: https://www.espocrm.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@ namespace Espo\Classes\FieldProcessing\InboundEmail;

 use Espo\Core\FieldProcessing\Loader;
 use Espo\Core\FieldProcessing\Loader\Params;
-use Espo\Core\Utils\Config;
+use Espo\Core\Mail\ConfigDataProvider;
 use Espo\Entities\InboundEmail;
 use Espo\ORM\Entity;

@@ -41,12 +41,12 @@ use Espo\ORM\Entity;
 class IsSystemLoader implements Loader
 {
    public function __construct(
-        private Config $config,
+        private ConfigDataProvider $configDataProvider,
    ) {}

    public function process(Entity $entity, Params $params): void
    {
-        $isSystem = $entity->getEmailAddress() === $this->config->get('outboundEmailFromAddress');
+        $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-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2026 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\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;
@@ -48,7 +49,8 @@ class ExampleLoader implements Loader
    public function __construct(
        private FieldUtil $fieldUtil,
        private ApplicationConfig $applicationConfig,
-        private EntityManager $entityManager
+        private EntityManager $entityManager,
+        private Config $config,
    ) {}

    public function process(Entity $entity, Params $params): void
@@ -136,7 +138,7 @@ class ExampleLoader implements Loader
    private function processFormUrl(LeadCapture $entity): void
    {
        $formId = $entity->getFormId();
-        $siteUrl = $this->applicationConfig->getSiteUrl();
+        $siteUrl = $this->getSiteUrl();

        if (!$entity->hasFormEnabled() || !$formId) {
            /** @noinspection PhpRedundantOptionalArgumentInspection */
@@ -149,4 +151,9 @@ class ExampleLoader implements Loader

        $entity->set('formUrl', $formUrl);
    }
+
+    private function getSiteUrl(): string
+    {
+        return $this->config->get('leadCaptureSiteUrl') ?? $this->applicationConfig->getSiteUrl();
+    }
 }
--- a/Show More
+++ b/Show More