version

See https://social.technet.microsoft.com/Forums/lync/en-US/c16cc4aa-0a07-4742-929d-1b01d698066e/ics-file-description-with-colon-and-newline-is-displayed-without-newlines?forum=outlook

CONTRIBUTING.md

@@ -6,4 +6,4 @@ Before we can merge your pull request you need to accept our CLA [here](https://
 
 ## Issues
 
-We don't provide developer help or any kind of support on github. Please use our [forum](http://forum.espocrm.com/) for this.
+We don't provide developer help or any kind of support on github. Please use our [forum](https://forum.espocrm.com) for this.

Gruntfile.js

@@ -28,6 +28,7 @@ module.exports = function (grunt) {
         'client/lib/handlebars.js',
         'client/lib/base64.js',
         'client/lib/jquery-ui.min.js',
+        'client/lib/jquery.ui.touch-punch.min.js',
         'client/lib/moment.min.js',
         'client/lib/moment-timezone-with-data.min.js',
         'client/lib/jquery.timepicker.min.js',
@@ -35,10 +36,41 @@ module.exports = function (grunt) {
         'client/lib/bootstrap.min.js',
         'client/lib/bootstrap-datepicker.js',
         'client/lib/bull.js',
+        'client/lib/marked.min.js',
+
         'client/src/namespace.js',
         'client/src/exceptions.js',
         'client/src/loader.js',
-        'client/src/utils.js'
+        'client/src/utils.js',
+
+        'client/src/acl.js',
+        'client/src/model.js',
+        'client/src/model-offline.js',
+        'client/src/ajax.js',
+        'client/src/controller.js',
+
+        'client/src/ui.js',
+        'client/src/acl-manager.js',
+        'client/src/cache.js',
+        'client/src/storage.js',
+        'client/src/models/settings.js',
+        'client/src/language.js',
+        'client/src/metadata.js',
+        'client/src/field-manager.js',
+        'client/src/models/user.js',
+        'client/src/models/preferences.js',
+        'client/src/model-factory.js',
+        'client/src/collection-factory.js',
+        'client/src/pre-loader.js',
+        'client/src/controllers/base.js',
+        'client/src/router.js',
+        'client/src/date-time.js',
+        'client/src/layout-manager.js',
+        'client/src/theme-manager.js',
+        'client/src/session-storage.js',
+        'client/src/view-helper.js',
+
+        'client/src/app.js'
     ];
 
     function camelCaseToHyphen (string){
@@ -87,6 +119,9 @@ module.exports = function (grunt) {
         clean: {
             start: ['build/*'],
             final: ['build/tmp'],
+            beforeFinal: {
+                src: ['build/tmp/custom/Espo/Custom/*', '!build/tmp/custom/Espo/Custom/.htaccess']
+            }
         },
         less: lessData,
         uglify: {
@@ -259,9 +294,10 @@ module.exports = function (grunt) {
         'copy:frontendLib',
         'copy:backend',
         'replace',
+        'clean:beforeFinal',
         'copy:final',
         'chmod',
-        'clean:final',
+        'clean:final'
     ]);
 
 };

README.md

@@ -9,7 +9,7 @@ Download the latest release from our [website](http://www.espocrm.com).
 ### Requirements
 
 * PHP 5.6 or above (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
-* MySQL 5.1 or above.
+* MySQL 5.5.3 or above.
 
 For more information about server configuration see [this article](https://www.espocrm.com/documentation/administration/server-configuration/).
 
@@ -17,10 +17,14 @@ For more information about server configuration see [this article](https://www.e
 
 Documentation for administrators, users and developers is available [here](https://www.espocrm.com/documentation/).
 
-### How to report bug
+### How to report a bug
 
 Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/forum/bug-reports).
 
+### How to install a stable version
+
+[Download](https://www.espocrm.com/download/) the latest version. See the [instructions](https://www.espocrm.com/documentation/administration/installation/) about installation.
+
 ### How to get started (for developers)
 
 1. Clone repository to your local computer.
@@ -34,7 +38,7 @@ Now you can build. Build will create compiled css files.
 
 To compose a proper config.php and populate database you can run install by opening `http(s)://{YOUR_CRM_URL}/install` location in a browser. Then open `data/config.php` file and add `isDeveloperMode => true`.
 
-### How to build
+### How to build (for developers)
 
 You need to have nodejs and Grunt CLI installed.
 

application/Espo/Acl/Email.php

@@ -34,6 +34,7 @@ use \Espo\ORM\Entity;
 
 class Email extends \Espo\Core\Acl\Base
 {
+    protected $ownerUserIdAttribute = 'usersIds';
 
     public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
@@ -118,4 +119,3 @@ class Email extends \Espo\Core\Acl\Base
         return false;
     }
 }
-

application/Espo/Acl/EmailAddress.php

@@ -0,0 +1,63 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class EmailAddress extends \Espo\Core\Acl\Base
+{
+    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
+    {
+        $id = $entity->id;
+
+        $isFobidden = false;
+
+        $repository = $this->getEntityManager()->getRepository('EmailAddress');
+
+        if (!$user->isAdmin()) {
+            $entityWithSameAddressList = $repository->getEntityListByAddressId($id, $excludeEntity);
+            foreach ($entityWithSameAddressList as $e) {
+                if (!$this->getAclManager()->check($user, $e, 'edit')) {
+                    $isFobidden = true;
+                    if (
+                        $e->get('isPortalUser') && $excludeEntity->getEntityType() === 'Contact' &&
+                        $e->get('contactId') === $excludeEntity->id
+                    ) {
+                        $isFobidden = false;
+                    }
+                    if ($isFobidden) break;
+                }
+            }
+        }
+        return !$isFobidden;
+    }
+}
+

application/Espo/Acl/Import.php

@@ -0,0 +1,53 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Import extends \Espo\Core\Acl\Base
+{
+
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) return true;
+        if ($user->id === $entity->get('createdById')) return true;
+
+        return false;
+    }
+
+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) return true;
+        if ($user->id === $entity->get('createdById')) return true;
+
+        return false;
+    }
+}

application/Espo/Acl/Note.php

@@ -0,0 +1,104 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Note extends \Espo\Core\Acl\Base
+{
+    protected $deleteThresholdPeriod = '1 month';
+
+    protected $editThresholdPeriod = '7 days';
+
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        if ($entity->get('type') === 'Post' && $user->id === $entity->get('createdById')) {
+            return true;
+        }
+        return false;
+    }
+
+    public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'edit')) {
+            if ($this->checkIsOwner($user, $entity)) {
+                $createdAt = $entity->get('createdAt');
+                if ($createdAt) {
+                    $noteEditThresholdPeriod = '-' . $this->getConfig()->get('noteEditThresholdPeriod', $this->editThresholdPeriod);
+                    $dt = new \DateTime();
+                    $dt->modify($noteEditThresholdPeriod);
+                    try {
+                        if ($dt->format('U') > (new \DateTime($createdAt))->format('U')) {
+                            return false;
+                        }
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'delete')) {
+            if ($this->checkIsOwner($user, $entity)) {
+                $createdAt = $entity->get('createdAt');
+                if ($createdAt) {
+                    $deleteThresholdPeriod = '-' . $this->getConfig()->get('noteDeleteThresholdPeriod', $this->deleteThresholdPeriod);
+                    $dt = new \DateTime();
+                    $dt->modify($deleteThresholdPeriod);
+                    try {
+                        if ($dt->format('U') > (new \DateTime($createdAt))->format('U')) {
+                            return false;
+                        }
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
+}

application/Espo/Acl/PhoneNumber.php

@@ -0,0 +1,63 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class PhoneNumber extends \Espo\Core\Acl\Base
+{
+    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
+    {
+        $id = $entity->id;
+
+        $isFobidden = false;
+
+        $repository = $this->getEntityManager()->getRepository('PhoneNumber');
+
+        if (!$user->isAdmin()) {
+            $entityWithSameNumberList = $repository->getEntityListByPhoneNumberId($id, $excludeEntity);
+            foreach ($entityWithSameNumberList as $e) {
+                if (!$this->getAclManager()->check($user, $e, 'edit')) {
+                    $isFobidden = true;
+                    if (
+                        $e->get('isPortalUser') && $excludeEntity->getEntityType() === 'Contact' &&
+                        $e->get('contactId') === $excludeEntity->id
+                    ) {
+                        $isFobidden = false;
+                    }
+                    if ($isFobidden) break;
+                }
+            }
+        }
+
+        return !$isFobidden;
+    }
+}

application/Espo/Acl/User.php

@@ -30,6 +30,7 @@
 namespace Espo\Acl;
 
 use \Espo\ORM\Entity;
+use \Espo\Entities\User as EntityUser;
 
 class User extends \Espo\Core\Acl\Base
 {
@@ -37,5 +38,36 @@ class User extends \Espo\Core\Acl\Base
     {
         return $user->id === $entity->id;
     }
-}
 
+    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
+    {
+        if (!$user->isAdmin()) {
+            return false;
+        }
+        return $this->checkEntity($user, $entity, $data, 'create');
+    }
+
+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->id === 'system') {
+            return false;
+        }
+        if (!$user->isAdmin()) {
+            return false;
+        }
+        return parent::checkEntityDelete($user, $entity, $data);
+    }
+
+    public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->id === 'system') {
+            return false;
+        }
+        if (!$user->isAdmin()) {
+            if ($user->id !== $entity->id) {
+                return false;
+            }
+        }
+        return $this->checkEntity($user, $entity, $data, 'edit');
+    }
+}

application/Espo/AclPortal/Email.php

@@ -34,6 +34,7 @@ use \Espo\ORM\Entity;
 
 class Email extends \Espo\Core\AclPortal\Base
 {
+    protected $ownerUserIdAttribute = 'usersIds';
 
     public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {

application/Espo/AclPortal/EmailAddress.php

@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\AclPortal;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class EmailAddress extends \Espo\Core\AclPortal\Base
+{
+    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
+    {
+        $id = $entity->id;
+
+        $isFobidden = false;
+
+        $repository = $this->getEntityManager()->getRepository('EmailAddress');
+
+        if (!$user->isAdmin()) {
+            $entityWithSameAddressList = $repository->getEntityListByAddressId($id, $excludeEntity);
+            foreach ($entityWithSameAddressList as $e) {
+                if (!$this->getAclManager()->check($user, $e, 'edit')) {
+                    $isFobidden = true;
+                    break;
+                }
+            }
+        }
+        return !$isFobidden;
+    }
+}

application/Espo/AclPortal/Note.php

@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\AclPortal;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Note extends \Espo\Core\AclPortal\Base
+{
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        if ($entity->get('type') === 'Post' && $user->id === $entity->get('createdById')) {
+            return true;
+        }
+        return false;
+    }
+}
+

application/Espo/AclPortal/PhoneNumber.php

@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\AclPortal;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class PhoneNumber extends \Espo\Core\AclPortal\Base
+{
+    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
+    {
+        $id = $entity->id;
+
+        $isFobidden = false;
+
+        $repository = $this->getEntityManager()->getRepository('PhoneNumber');
+
+        if (!$user->isAdmin()) {
+            $entityWithSameNumberList = $repository->getEntityListByPhoneNumberId($id, $excludeEntity);
+            foreach ($entityWithSameNumberList as $e) {
+                if (!$this->getAclManager()->check($user, $e, 'edit')) {
+                    $isFobidden = true;
+                    break;
+                }
+            }
+        }
+
+        return !$isFobidden;
+    }
+}

application/Espo/Controllers/Attachment.php

@@ -34,5 +34,11 @@ use \Espo\Core\Exceptions\BadRequest;
 
 class Attachment extends \Espo\Core\Controllers\Record
 {
-
+    public function actionList($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+        return parent::actionList($params, $data, $request);
+    }
 }

application/Espo/Controllers/AuthLogRecord.php

@@ -0,0 +1,67 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+
+class AuthLogRecord extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function actionUpdate($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionMassUpdate($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionCreate($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionCreateLink($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionRemoveLink($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+}

application/Espo/Controllers/DataPrivacy.php

@@ -0,0 +1,55 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\BadRequest;
+
+class DataPrivacy extends \Espo\Core\Controllers\Base
+{
+    protected function checkControllerAccess()
+    {
+        if ($this->getAcl()->get('dataPrivacyPermission') === 'no') {
+            throw new Forbidden();
+        }
+    }
+
+    public function postActionErase($params, $data)
+    {
+        if (empty($data->entityType) || empty($data->id) || empty($data->fieldList) || !is_array($data->fieldList)) {
+            throw new BadRequest();
+        }
+
+        return $this->getServiceFactory()->create('DataPrivacy')->erase($data->entityType, $data->id, $data->fieldList);
+    }
+
+}

application/Espo/Controllers/EmailTemplateCategory.php

@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+class EmailTemplateCategory extends \Espo\Core\Templates\Controllers\CategoryTree
+{
+
+}

application/Espo/Controllers/EntityManager.php

@@ -83,6 +83,20 @@ class EntityManager extends \Espo\Core\Controllers\Base
         if (isset($data['textFilterFields']) && is_array($data['textFilterFields'])) {
             $params['textFilterFields'] = $data['textFilterFields'];
         }
+        if (!empty($data['color'])) {
+            $params['color'] = $data['color'];
+        }
+        if (!empty($data['iconClass'])) {
+            $params['iconClass'] = $data['iconClass'];
+        }
+        if (isset($data['fullTextSearch'])) {
+            $params['fullTestSearch'] = $data['fullTextSearch'];
+        }
+
+        $params['kanbanViewMode'] = !empty($data['kanbanViewMode']);
+        if (!empty($data['kanbanStatusIgnoreList'])) {
+            $params['kanbanStatusIgnoreList'] = $data['kanbanStatusIgnoreList'];
+        }
 
         $result = $this->getContainer()->get('entityManagerUtil')->create($name, $type, $params);
 
@@ -245,7 +259,9 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
         $params = array();
         foreach ($paramList as $item) {
-        	$params[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+            if (array_key_exists($item, $data)) {
+                $params[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+            }
         }
 
         foreach ($additionalParamList as $item) {
@@ -322,4 +338,16 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
         return true;
     }
+
+    public function postActionResetToDefault($params, $data, $request)
+    {
+        if (empty($data->scope)) {
+            throw new BadRequest();
+        }
+
+        $this->getContainer()->get('entityManagerUtil')->resetToDefaults($data->scope);
+        $this->getContainer()->get('dataManager')->clearCache();
+
+        return true;
+    }
 }

application/Espo/Controllers/FieldManager.php

@@ -77,6 +77,11 @@ class FieldManager extends \Espo\Core\Controllers\Base
         return $fieldManager->read($params['scope'], $data->name);
     }
 
+    public function patchActionUpdate($params, $data)
+    {
+        return $this->putActionUpdate($params, $data);
+    }
+
     public function putActionUpdate($params, $data)
     {
         if (empty($params['scope']) || empty($params['name'])) {

application/Espo/Controllers/Import.php

@@ -38,7 +38,7 @@ class Import extends \Espo\Core\Controllers\Record
 {
     protected function checkControllerAccess()
     {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->getAcl()->check('Import')) {
             throw new Forbidden();
         }
     }
@@ -90,10 +90,9 @@ class Import extends \Espo\Core\Controllers\Record
         $attachment->set('type', 'text/csv');
         $attachment->set('role', 'Import File');
         $attachment->set('name', 'import-file.csv');
+        $attachment->set('contents', $contents);
         $this->getEntityManager()->saveEntity($attachment);
 
-        $this->getFileStorageManager()->putContents($attachment, $contents);
-
         return array(
             'attachmentId' => $attachment->id
         );
@@ -127,7 +126,7 @@ class Import extends \Espo\Core\Controllers\Record
             throw new BadRequest();
         }
 
-        if (!isset($data->fieldDelimiter)) {
+        if (!isset($data->delimiter)) {
             throw new BadRequest();
         }
 
@@ -167,7 +166,7 @@ class Import extends \Espo\Core\Controllers\Record
             throw new BadRequest();
         }
 
-        if (!isset($data->fields)) {
+        if (!isset($data->attributeList)) {
             throw new BadRequest();
         }
 
@@ -178,7 +177,7 @@ class Import extends \Espo\Core\Controllers\Record
 
         $importParams = array(
             'headerRow' => !empty($data->headerRow),
-            'fieldDelimiter' => $data->fieldDelimiter,
+            'delimiter' => $data->delimiter,
             'textQualifier' => $data->textQualifier,
             'dateFormat' => $data->dateFormat,
             'timeFormat' => $data->timeFormat,
@@ -202,7 +201,7 @@ class Import extends \Espo\Core\Controllers\Record
             throw new Forbidden();
         }
 
-        return $this->getService('Import')->import($data->entityType, $data->fields, $attachmentId, $importParams);
+        return $this->getService('Import')->import($data->entityType, $data->attributeList, $attachmentId, $importParams);
     }
 
     public function postActionUnmarkAsDuplicate($params, $data)

application/Espo/Controllers/LeadCapture.php

@@ -0,0 +1,72 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Exceptions\NotFound;
+
+class LeadCapture extends \Espo\Core\Controllers\Record
+{
+    public function postActionLeadCapture($params, $data, $request, $response)
+    {
+        if (empty($params['apiKey'])) throw new BadRequest('No API key provided.');
+        if (empty($data)) throw new BadRequest('No payload provided.');
+
+        $allowOrigin = $this->getConfig()->get('leadCaptureAllowOrigin', '*');
+        $response->headers->set('Access-Control-Allow-Origin', $allowOrigin);
+
+        return $this->getRecordService()->leadCapture($params['apiKey'], $data);
+    }
+
+    public function optionsActionLeadCapture($params, $data, $request, $response)
+    {
+        if (empty($params['apiKey'])) throw new BadRequest('No API key provided.');
+
+        if (!$this->getRecordService()->isApiKeyValid($params['apiKey'])) {
+            throw new NotFound();
+        }
+
+        $allowOrigin = $this->getConfig()->get('leadCaptureAllowOrigin', '*');
+
+        $response->headers->set('Access-Control-Allow-Headers', 'Content-Type, Accept');
+        $response->headers->set('Access-Control-Allow-Origin', $allowOrigin);
+        $response->headers->set('Access-Control-Allow-Methods', 'POST');
+
+        return true;
+    }
+
+    public function postActionGenerateNewApiKey($params, $data, $request)
+    {
+        if (empty($data->id)) throw new BadRequest();
+
+        return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
+    }
+}

application/Espo/Controllers/LeadCaptureLogRecord.php

@@ -0,0 +1,38 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+
+class LeadCaptureLogRecord extends \Espo\Core\Controllers\Record
+{
+
+}

application/Espo/Controllers/Pdf.php

@@ -0,0 +1,60 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Exceptions\Error;
+
+class Pdf extends \Espo\Core\Controllers\Base
+{
+    public function postActionMassPrint($params, $data)
+    {
+        if (empty($data->idList) || !is_array($data->idList)) {
+            throw new BadRequest();
+        }
+        if (empty($data->entityType)) {
+            throw new BadRequest();
+        }
+        if (empty($data->templateId)) {
+            throw new BadRequest();
+        }
+        if (!$this->getAcl()->checkScope('Template')) {
+            throw new Forbidden();
+        }
+        if (!$this->getAcl()->checkScope($data->entityType)) {
+            throw new Forbidden();
+        }
+
+        return [
+            'id' => $this->getServiceFactory()->create('Pdf')->massGenerate($data->entityType, $data->idList, $data->templateId, true)
+        ];
+    }
+}

application/Espo/Controllers/Preferences.php

@@ -88,7 +88,7 @@ class Preferences extends \Espo\Core\Controllers\Base
             throw new BadRequest();
         }
 
-        if ($this->getAcl()->getLevel('Preferences', 'read') === 'no') {
+        if ($this->getAcl()->getLevel('Preferences', 'edit') === 'no') {
             throw new Forbidden();
         }
 
@@ -142,5 +142,45 @@ class Preferences extends \Espo\Core\Controllers\Base
 
         return $entity->getValueMap();
     }
-}
 
+    public function postActionResetDashboard($params, $data)
+    {
+        if (empty($data->id)) throw new BadRequest();
+
+        $userId = $data->id;
+
+        $this->handleUserAccess($userId);
+
+        $user = $this->getEntityManager()->getEntity('User', $userId);
+        $preferences = $this->getEntityManager()->getEntity('Preferences', $userId);
+        if (!$user)  throw new NotFound();
+        if (!$preferences)  throw new NotFound();
+
+        if ($user->isPortal()) throw new Forbidden();
+
+        if ($this->getAcl()->getLevel('Preferences', 'edit') === 'no') {
+            throw new Forbidden();
+        }
+
+        $forbiddenAttributeList = $this->getAcl()->getScopeForbiddenAttributeList('Preferences', 'edit');
+
+        if (in_array('dashboardLayout', $forbiddenAttributeList)) {
+            throw new Forbidden();
+        }
+
+        $dashboardLayout = $this->getConfig()->get('dashboardLayout');
+        $dashletsOptions = $this->getConfig()->get('dashletsOptions');
+
+        $preferences->set([
+            'dashboardLayout' => $dashboardLayout,
+            'dashletsOptions' => $dashletsOptions
+        ]);
+
+        $this->getEntityManager()->saveEntity($preferences);
+
+        return (object) [
+            'dashboardLayout' => $preferences->get('dashboardLayout'),
+            'dashletsOptions' => $preferences->get('dashletsOptions')
+        ];
+    }
+}

application/Espo/Controllers/Settings.php

@@ -90,11 +90,9 @@ class Settings extends \Espo\Core\Controllers\Base
             throw new Error('Cannot save settings');
         }
 
-        /** Rebuild for Currency Settings */
-        if (isset($data->baseCurrency) || isset($data->currencyRates)) {
+        if (isset($data->defaultCurrency) || isset($data->baseCurrency) || isset($data->currencyRates)) {
             $this->getContainer()->get('dataManager')->rebuildDatabase([]);
         }
-        /** END Rebuild for Currency Settings */
 
         return $this->getConfigData();
     }

application/Espo/Controllers/User.php

@@ -105,5 +105,19 @@ class User extends \Espo\Core\Controllers\Record
 
         return $this->getService('User')->passwordChangeRequest($userName, $emailAddress, $url);
     }
+
+    public function actionCreateLink($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return parent::actionCreateLink($params, $data, $request);
+    }
+
+    public function actionRemoveLink($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return parent::actionRemoveLink($params, $data, $request);
+    }
 }
 

application/Espo/Core/Acl/Base.php

@@ -46,6 +46,8 @@ class Base implements Injectable
 
     protected $injections = array();
 
+    protected $ownerUserIdAttribute = null;
+
     public function inject($name, $object)
     {
         $this->injections[$name] = $object;
@@ -217,7 +219,7 @@ class Base implements Injectable
             }
         }
 
-        if ($entity->hasAttribute('assignedUsersIds') && $entity->hasRelation('assignedUsers')) {
+        if ($entity->hasLinkMultipleField('assignedUsers')) {
             if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
                 return true;
             }
@@ -281,5 +283,23 @@ class Base implements Injectable
 
         return false;
     }
-}
 
+    public function getOwnerUserIdAttribute(Entity $entity)
+    {
+        if ($this->ownerUserIdAttribute) {
+            return $this->ownerUserIdAttribute;
+        }
+
+        if ($entity->hasLinkMultipleField('assignedUsers')) {
+            return 'assignedUsersIds';
+        }
+
+        if ($entity->hasAttribute('assignedUserId')) {
+            return 'assignedUserId';
+        }
+
+        if ($entity->hasAttribute('createdById')) {
+            return 'createdById';
+        }
+    }
+}

application/Espo/Core/Acl/Table.php

@@ -73,6 +73,8 @@ class Table
 
     protected $forbiddenFieldsCache = array();
 
+    protected $isStrictModeForced = false;
+
     protected $isStrictMode = false;
 
     public function __construct(User $user, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
@@ -83,7 +85,11 @@ class Table
             'fieldTableQuickAccess' => (object) [],
         ];
 
-        $this->isStrictMode = $config->get('aclStrictMode', false);
+        if ($this->isStrictModeForced) {
+            $this->isStrictMode = true;
+        } else {
+            $this->isStrictMode = $config->get('aclStrictMode', false);
+        }
 
         $this->user = $user;
 
@@ -163,7 +169,7 @@ class Table
         if (isset($this->data->$permission)) {
             return $this->data->$permission;
         }
-        return null;
+        return 'no';
     }
 
     public function getLevel($scope, $action)
@@ -204,6 +210,7 @@ class Table
             $this->applyDisabled($aclTable, $fieldTable);
             $this->applyMandatory($aclTable, $fieldTable);
             $this->applyAdditional($aclTable, $fieldTable, $valuePermissionLists);
+            $this->applyReadOnlyFields($fieldTable);
         } else {
             $aclTable = (object) [];
             foreach ($this->getScopeList() as $scope) {
@@ -405,7 +412,12 @@ class Table
             return;
         }
 
-        $data = $this->metadata->get('app.'.$this->type.'.default.scopeLevel', array());
+        $defaultsGroupName = 'default';
+        if ($this->isStrictMode) {
+            $defaultsGroupName = 'strictDefault';
+        }
+
+        $data = $this->metadata->get(['app', $this->type, $defaultsGroupName, 'scopeLevel'], []);
 
         foreach ($data as $scope => $item) {
             if (isset($table->$scope)) continue;
@@ -416,7 +428,7 @@ class Table
             $table->$scope = $value;
         }
 
-        $defaultFieldData = $this->metadata->get('app.'.$this->type.'.default.fieldLevel', array());
+        $defaultFieldData = $this->metadata->get(['app', $this->type, $defaultsGroupName, 'fieldLevel'], []);
 
         foreach ($this->getScopeList() as $scope) {
             if (isset($table->$scope) && $table->$scope === false) continue;
@@ -424,7 +436,7 @@ class Table
 
             $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));
 
-            $defaultScopeFieldData = $this->metadata->get('app.'.$this->type.'.default.scopeFieldLevel.' . $scope, array());
+            $defaultScopeFieldData = $this->metadata->get('app.'.$this->type.'.'.$defaultsGroupName.'.scopeFieldLevel.' . $scope, []);
 
             foreach (array_merge($defaultFieldData, $defaultScopeFieldData) as $field => $f) {
                 if (!in_array($field, $fieldList)) continue;
@@ -702,25 +714,29 @@ class Table
     private function buildCache()
     {
         $this->fileManager->putPhpContents($this->cacheFilePath, $this->data, true);
-        /*$contents = '<' . '?'. 'php return ' .  $this->varExport($this->data)  . ';';
-        $this->fileManager->putContents($this->cacheFilePath, $contents);*/
     }
 
-    /*private function varExport($variable)
+    protected function applyReadOnlyFields(&$fieldTable)
     {
-        if ($variable instanceof \StdClass) {
-            $result = '(object) ' . $this->varExport(get_object_vars($variable), true);
-        } else if (is_array($variable)) {
-            $array = array();
-            foreach ($variable as $key => $value) {
-                $array[] = var_export($key, true).' => ' . $this->varExport($value, true);
+        // TODO Enable in 5.4.0
+        return;
+        $scopeList = $this->getScopeWithAclList();
+        foreach ($scopeList as $scope) {
+            if (!property_exists($fieldTable, $scope)) continue;
+            $fieldList = array_keys($this->getMetadata()->get(['entityDefs', $scope, 'fields'], []));
+            foreach ($fieldList as $field) {
+                if ($this->getMetadata()->get(['entityDefs', $scope, 'fields', $field, 'readOnly'])) {
+                    if (property_exists($fieldTable->$scope, $field)) {
+                        $fieldTable->$scope->$field->edit = 'no';
+                    } else {
+                        $fieldTable->$scope->$field = (object) [];
+                        foreach ($this->fieldActionList as $action) {
+                            $fieldTable->$scope->$field->$action = 'yes';
+                        }
+                        $fieldTable->$scope->$field->edit = 'no';
+                    }
+                }
             }
-            $result = '['.implode(', ', $array).']';
-        } else {
-            $result = var_export($variable, true);
         }
-
-        return $result;
-    }*/
+    }
 }
-

application/Espo/Core/AclManager.php

@@ -47,6 +47,8 @@ class AclManager
 
     protected $tableClassName = '\\Espo\\Core\\Acl\\Table';
 
+    protected $userAclClassName = '\\Espo\\Core\\Acl';
+
     public function __construct(Container $container)
     {
         $this->container = $container;
@@ -180,9 +182,15 @@ class AclManager
 
         $impl = $this->getImplementation($scope);
 
-        $methodName = 'checkEntity' . ucfirst($action);
-        if (method_exists($impl, $methodName)) {
-            return $impl->$methodName($user, $entity, $data);
+        if (!$action) {
+            $action = 'read';
+        }
+
+        if ($action) {
+            $methodName = 'checkEntity' . ucfirst($action);
+            if (method_exists($impl, $methodName)) {
+                return $impl->$methodName($user, $entity, $data);
+            }
         }
 
         return $impl->checkEntity($user, $entity, $data, $action);
@@ -279,5 +287,11 @@ class AclManager
     {
         return $this->checkUserPermission($user, $target, 'assignmentPermission');
     }
-}
 
+    public function createUserAcl(User $user)
+    {
+        $className = $this->userAclClassName;
+        $acl = new $className($this, $user);
+        return $acl;
+    }
+}

application/Espo/Core/AclPortal/Table.php

@@ -50,6 +50,8 @@ class Table extends \Espo\Core\Acl\Table
 
     protected $levelList = ['yes', 'all', 'account', 'contact', 'own', 'no'];
 
+    protected $isStrictModeForced = true;
+
     public function __construct(User $user, Portal $portal, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
     {
         if (empty($portal)) {

application/Espo/Core/Application.php

@@ -81,6 +81,11 @@ class Application
         return $this->container;
     }
 
+    protected function getConfig()
+    {
+        return $this->getContainer()->get('config');
+    }
+
     public function run($name = 'default')
     {
         $this->routeHooks();
@@ -91,6 +96,7 @@ class Application
     public function runClient()
     {
         $this->getContainer()->get('clientManager')->display();
+        exit;
     }
 
     public function runEntryPoint($entryPoint, $data = array(), $final = false)
@@ -127,12 +133,17 @@ class Application
 
             $slim->run();
         } catch (\Exception $e) {
-            $container->get('output')->processError($e->getMessage(), $e->getCode(), true);
+            $container->get('output')->processError($e->getMessage(), $e->getCode(), true, $e);
         }
     }
 
     public function runCron()
     {
+        if ($this->getConfig()->get('cronDisabled')) {
+            $GLOBALS['log']->warning("Cron is not run because it's disabled with 'cronDisabled' param.");
+            return;
+        }
+
         $auth = $this->createAuth();
         $auth->useNoAuth();
 
@@ -154,7 +165,7 @@ class Application
 
     public function isInstalled()
     {
-        $config = $this->getContainer()->get('config');
+        $config = $this->getConfig();
 
         if (file_exists($config->getConfigPath()) && $config->get('isInstalled')) {
             return true;
@@ -176,7 +187,7 @@ class Application
         try {
             $auth = $this->createAuth();
         } catch (\Exception $e) {
-            $container->get('output')->processError($e->getMessage(), $e->getCode());
+            $container->get('output')->processError($e->getMessage(), $e->getCode(), false, $e);
         }
 
         $apiAuth = $this->createApiAuth($auth);
@@ -223,10 +234,10 @@ class Application
 
             try {
                 $controllerManager = $this->getContainer()->get('controllerManager');
-                $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request());
+                $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request(), $slim->response());
                 $container->get('output')->render($result);
             } catch (\Exception $e) {
-                $container->get('output')->processError($e->getMessage(), $e->getCode());
+                $container->get('output')->processError($e->getMessage(), $e->getCode(), false, $e);
             }
         });
 
@@ -243,7 +254,7 @@ class Application
 
     protected function getRouteList()
     {
-        $routes = new \Espo\Core\Utils\Route($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
+        $routes = new \Espo\Core\Utils\Route($this->getConfig(), $this->getMetadata(), $this->getContainer()->get('fileManager'));
 
 
         return $routes->getAll();
@@ -251,11 +262,11 @@ class Application
 
     protected function initRoutes()
     {
-        $crudList = array_keys($this->getContainer()->get('config')->get('crud'));
+        $crudList = array_keys($this->getConfig()->get('crud'));
 
         foreach ($this->getRouteList() as $route) {
             $method = strtolower($route['method']);
-            if (!in_array($method, $crudList)) {
+            if (!in_array($method, $crudList) && $method !== 'options') {
                 $GLOBALS['log']->error('Route: Method ['.$method.'] does not exist. Please check your route ['.$route['route'].']');
                 continue;
             }
@@ -272,7 +283,7 @@ class Application
 
     protected function initAutoloads()
     {
-        $autoload = new \Espo\Core\Utils\Autoload($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
+        $autoload = new \Espo\Core\Utils\Autoload($this->getConfig(), $this->getMetadata(), $this->getContainer()->get('fileManager'));
 
         try {
             $autoloadList = $autoload->getAll();

application/Espo/Core/Container.php

@@ -178,7 +178,7 @@ class Container
 
     protected function loadMailSender()
     {
-        $className = $this->getServiceClassName('mailSernder', '\\Espo\\Core\\Mail\\Sender');
+        $className = $this->getServiceClassName('mailSender', '\\Espo\\Core\\Mail\\Sender');
         return new $className(
             $this->get('config'),
             $this->get('entityManager')
@@ -217,7 +217,8 @@ class Container
             $this->get('acl'),
             $this->get('aclManager'),
             $this->get('metadata'),
-            $this->get('config')
+            $this->get('config'),
+            $this->get('injectableFactory')
         );
     }
 
@@ -246,6 +247,14 @@ class Container
         );
     }
 
+    protected function loadInternalAclManager()
+    {
+        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\AclManager');
+        return new $className(
+            $this->get('container')
+        );
+    }
+
     protected function loadAcl()
     {
         $className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
@@ -272,7 +281,7 @@ class Container
         return new \Espo\Core\Utils\Metadata\OrmMetadata(
             $this->get('metadata'),
             $this->get('fileManager'),
-            $this->get('config')->get('useCache')
+            $this->get('config')
         );
     }
 
@@ -295,6 +304,16 @@ class Container
         );
     }
 
+    protected function loadBaseLanguage()
+    {
+        return new \Espo\Core\Utils\Language(
+            'en_US',
+            $this->get('fileManager'),
+            $this->get('metadata'),
+            $this->get('useCache')
+        );
+    }
+
     protected function loadDefaultLanguage()
     {
         return new \Espo\Core\Utils\Language(
@@ -329,8 +348,6 @@ class Container
     protected function loadFieldManager()
     {
         return new \Espo\Core\Utils\FieldManager(
-            $this->get('metadata'),
-            $this->get('language'),
             $this
         );
     }

application/Espo/Core/ControllerManager.php

@@ -58,7 +58,7 @@ class ControllerManager
         return $this->metadata;
     }
 
-    public function process($controllerName, $actionName, $params, $data, $request)
+    public function process($controllerName, $actionName, $params, $data, $request, $response)
     {
         $customClassName = '\\Espo\\Custom\\Controllers\\' . Util::normilizeClassName($controllerName);
         if (class_exists($customClassName)) {
@@ -112,13 +112,13 @@ class ControllerManager
         }
 
         if (method_exists($controller, $beforeMethodName)) {
-            $controller->$beforeMethodName($params, $data, $request);
+            $controller->$beforeMethodName($params, $data, $request, $response);
         }
 
-        $result = $controller->$primaryActionMethodName($params, $data, $request);
+        $result = $controller->$primaryActionMethodName($params, $data, $request, $response);
 
         if (method_exists($controller, $afterMethodName)) {
-            $controller->$afterMethodName($params, $data, $request);
+            $controller->$afterMethodName($params, $data, $request, $response);
         }
 
         if (is_array($result) || is_bool($result) || $result instanceof \StdClass) {

application/Espo/Core/Controllers/Record.php

@@ -133,11 +133,12 @@ class Record extends Base
         $q = $request->get('q');
         $textFilter = $request->get('textFilter');
 
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
         if (empty($maxSize)) {
-            $maxSize = self::MAX_SIZE_LIMIT;
+            $maxSize = $maxSizeLimit;
         }
-        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-            throw new Forbidden("Max should should not exceed " . self::MAX_SIZE_LIMIT . ". Use pagination (offset, limit).");
+        if (!empty($maxSize) && $maxSize > $maxSizeLimit) {
+            throw new Forbidden("Max should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
         }
 
         $params = array(
@@ -160,6 +161,49 @@ class Record extends Base
         );
     }
 
+    public function getActionListKanban($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        $where = $request->get('where');
+        $offset = $request->get('offset');
+        $maxSize = $request->get('maxSize');
+        $asc = $request->get('asc', 'true') === 'true';
+        $sortBy = $request->get('sortBy');
+        $q = $request->get('q');
+        $textFilter = $request->get('textFilter');
+
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        if (empty($maxSize)) {
+            $maxSize = $maxSizeLimit;
+        }
+        if (!empty($maxSize) && $maxSize > $maxSizeLimit) {
+            throw new Forbidden("Max should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
+        }
+
+        $params = array(
+            'where' => $where,
+            'offset' => $offset,
+            'maxSize' => $maxSize,
+            'asc' => $asc,
+            'sortBy' => $sortBy,
+            'q' => $q,
+            'textFilter' => $textFilter
+        );
+
+        $this->fetchListParamsFromRequest($params, $request, $data);
+
+        $result = $this->getRecordService()->getListKanban($params);
+
+        return (object) [
+            'total' => $result->total,
+            'list' => $result->collection->getValueMapList(),
+            'additionalData' => $result->additionalData
+        ];
+    }
+
     protected function fetchListParamsFromRequest(&$params, $request, $data)
     {
         if ($request->get('primaryFilter')) {
@@ -171,6 +215,10 @@ class Record extends Base
         if ($request->get('filterList')) {
             $params['filterList'] = $request->get('filterList');
         }
+
+        if ($request->get('select')) {
+            $params['select'] = explode(',', $request->get('select'));
+        }
     }
 
     public function actionListLinked($params, $data, $request)
@@ -186,11 +234,12 @@ class Record extends Base
         $q = $request->get('q');
         $textFilter = $request->get('textFilter');
 
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
         if (empty($maxSize)) {
-            $maxSize = self::MAX_SIZE_LIMIT;
+            $maxSize = $maxSizeLimit;
         }
-        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-            throw new Forbidden();
+        if (!empty($maxSize) && $maxSize > $maxSizeLimit) {
+            throw new Forbidden("Max should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
         }
 
         $params = array(

application/Espo/Core/CronManager.php

@@ -116,9 +116,10 @@ class CronManager
     {
         $lastRunData = $this->getFileManager()->getPhpContents($this->lastRunTime);
 
-        $lastRunTime = time() - intval($this->getConfig()->get('cron.minExecutionTime')) - 1;
         if (is_array($lastRunData) && !empty($lastRunData['time'])) {
             $lastRunTime = $lastRunData['time'];
+        } else {
+            $lastRunTime = time() - intval($this->getConfig()->get('cronMinInterval', 0)) - 1;
         }
 
         return $lastRunTime;
@@ -136,9 +137,9 @@ class CronManager
     {
         $currentTime = time();
         $lastRunTime = $this->getLastRunTime();
-        $minTime = $this->getConfig()->get('cron.minExecutionTime');
+        $cronMinInterval = $this->getConfig()->get('cronMinInterval', 0);
 
-        if ($currentTime > ($lastRunTime + $minTime) ) {
+        if ($currentTime > ($lastRunTime + $cronMinInterval)) {
             return true;
         }
 
@@ -167,10 +168,30 @@ class CronManager
         $pendingJobList = $this->getCronJobUtil()->getPendingJobList();
 
         foreach ($pendingJobList as $job) {
+            $skip = false;
+            $this->getEntityManager()->getPdo()->query('LOCK TABLES `job` WRITE');
+            if ($this->getCronJobUtil()->isJobPending($job->id)) {
+                if ($job->get('scheduledJobId')) {
+                    if ($this->getCronJobUtil()->isScheduledJobRunning($job->get('scheduledJobId'), $job->get('targetId'), $job->get('targetType'))) {
+                        $skip = true;
+                    }
+                }
+            } else {
+                $skip = true;
+            }
+
+            if ($skip) {
+                $this->getEntityManager()->getPdo()->query('UNLOCK TABLES');
+                continue;
+            }
+
             $job->set('status', self::RUNNING);
+            $job->set('pid', $this->getCronJobUtil()->getPid());
             $this->getEntityManager()->saveEntity($job);
+            $this->getEntityManager()->getPdo()->query('UNLOCK TABLES');
 
             $isSuccess = true;
+            $skipLog = false;
 
             try {
                 if ($job->get('scheduledJobId')) {
@@ -180,7 +201,12 @@ class CronManager
                 }
             } catch (\Exception $e) {
                 $isSuccess = false;
-                $GLOBALS['log']->error('CronManager: Failed job running, job ['.$job->id.']. Error Details: '.$e->getMessage());
+                if ($e->getCode() === -1) {
+                    $job->set('attempts', 0);
+                    $skipLog = true;
+                } else {
+                    $GLOBALS['log']->error('CronManager: Failed job running, job ['.$job->id.']. Error Details: '.$e->getMessage());
+                }
             }
 
             $status = $isSuccess ? self::SUCCESS : self::FAILED;
@@ -188,7 +214,7 @@ class CronManager
             $job->set('status', $status);
             $this->getEntityManager()->saveEntity($job);
 
-            if ($job->get('scheduledJobId')) {
+            if ($job->get('scheduledJobId') && !$skipLog) {
                 $this->getCronScheduledJobUtil()->addLogRecord($job->get('scheduledJobId'), $status, null, $job->get('targetId'), $job->get('targetType'));
             }
         }

application/Espo/Core/DataManager.php

@@ -53,6 +53,8 @@ class DataManager
      */
     public function rebuild($entityList = null)
     {
+        $this->populateConfigParameters();
+
         $result = $this->clearCache();
 
         $result &= $this->rebuildMetadata();
@@ -143,13 +145,17 @@ class DataManager
                     if ($job) {
                         $entityManager->removeEntity($job);
                     }
+                    $name = $jobName;
+                    if (!empty($defs['name'])) {
+                        $name = $defs['name'];
+                    }
                     $job = $entityManager->getEntity('ScheduledJob');
                     $job->set(array(
                         'job' => $jobName,
                         'status' => 'Active',
                         'scheduling' => $defs['scheduling'],
                         'isInternal' => true,
-                        'name' => $jobName
+                        'name' => $name
                     ));
                     $entityManager->saveEntity($job);
                 }
@@ -168,5 +174,25 @@ class DataManager
         $this->getContainer()->get('config')->save();
         return true;
     }
-}
 
+    protected function populateConfigParameters()
+    {
+        $config = $this->getContainer()->get('config');
+
+        $pdo = $this->getContainer()->get('entityManager')->getPDO();
+        $query = "SHOW VARIABLES LIKE 'ft_min_word_len'";
+        $sth = $pdo->prepare($query);
+        $sth->execute();
+
+        $fullTextSearchMinLength = null;
+        if ($row = $sth->fetch(\PDO::FETCH_ASSOC)) {
+            if (isset($row['Value'])) {
+                $fullTextSearchMinLength = intval($row['Value']);
+            }
+        }
+
+        $config->set('fullTextSearchMinLength', $fullTextSearchMinLength);
+
+        $config->save();
+    }
+}

application/Espo/Core/Exceptions/ServiceUnavailable.php

@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Exceptions;
+
+class ServiceUnavailable extends \Exception
+{
+    protected $code = 503;
+
+}

application/Espo/Core/Export/Csv.php

@@ -31,19 +31,35 @@ namespace Espo\Core\Export;
 
 use \Espo\Core\Exceptions\Error;
 
+use \Espo\Core\ORM\Entity;
+
 class Csv extends \Espo\Core\Injectable
 {
     protected $dependencyList = [
         'config',
-        'preferences'
+        'preferences',
+        'metadata'
     ];
 
+    public function loadAdditionalFields(Entity $entity, $fieldList)
+    {
+        foreach ($fieldList as $field) {
+            if ($this->getInjection('metadata')->get(['entityDefs', $entity->getEntityType(), 'fields', $field, 'type']) === 'linkMultiple') {
+                if (!$entity->has($field . 'Ids')) {
+                    $entity->loadLinkMultipleField($field);
+                }
+            }
+        }
+    }
+
     public function process($entityType, $params, $dataList)
     {
         if (!is_array($params['attributeList'])) {
             throw new Error();
         }
 
+        $dataList = $this->prepareDataList($dataList);
+
         $attributeList = $params['attributeList'];
 
         $delimiter = $this->getInjection('preferences')->get('exportDelimiter');
@@ -62,4 +78,21 @@ class Csv extends \Espo\Core\Injectable
 
         return $csv;
     }
+
+    protected function prepareDataList($dataList)
+    {
+        $prepareDataList = [];
+        foreach ($dataList as $row) {
+            $preparedRow = [];
+            foreach ($row as $item) {
+                if (is_array($item) || is_object($item)) {
+                    $item = \Espo\Core\Utils\Json::encode($item);
+                }
+                $preparedRow[] = $item;
+            }
+            $prepareDataList[] = $preparedRow;
+        }
+
+        return $prepareDataList;
+    }
 }

application/Espo/Core/Export/Xlsx.php

@@ -62,22 +62,51 @@ class Xlsx extends \Espo\Core\Injectable
     public function loadAdditionalFields(Entity $entity, $fieldList)
     {
         foreach ($entity->getRelationList() as $link) {
-            if ($entity->getRelationType($link) === 'belongsToParent') {
-                if (in_array($link, $fieldList)) {
-                    $parent = $entity->get($link);
-                    if ($parent instanceof Entity) {
-                        $entity->set($link . 'Name', $parent->get('name'));
+            if (in_array($link, $fieldList)) {
+                if ($entity->getRelationType($link) === 'belongsToParent') {
+                    if (!$entity->get($link . 'Name')) {
+                        $entity->loadParentNameField($link);
                     }
-                }
-            } else if ($entity->getRelationType($link) === 'belongsTo' && $entity->getRelationParam($link, 'noJoin') && $entity->hasField($link . 'Name')) {
-                if (in_array($link, $fieldList)) {
-                    $related = $entity->get($link);
-                    if ($related instanceof Entity) {
-                        $entity->set($link . 'Name', $related->get('name'));
+                } else if (
+                    (
+                        (
+                            $entity->getRelationType($link) === 'belongsTo'
+                            &&
+                            $entity->getRelationParam($link, 'noJoin')
+                        )
+                        ||
+                        $entity->getRelationType($link) === 'hasOne'
+                    )
+                    &&
+                    $entity->hasAttribute($link . 'Name')
+                ) {
+                    if (!$entity->get($link . 'Name') || !$entity->get($link . 'Id')) {
+                        $entity->loadLinkField($link);
                     }
                 }
             }
         }
+        foreach ($fieldList as $field) {
+            if ($this->getMetadata()->get(['entityDefs', $entity->getEntityType(), 'fields', $field, 'type']) === 'linkMultiple') {
+                if (!$entity->has($field . 'Ids')) {
+                    $entity->loadLinkMultipleField($field);
+                }
+            }
+        }
+    }
+
+    public function filterFieldList($entityType, $fieldList, $exportAllFields)
+    {
+        if ($exportAllFields) {
+            foreach ($fieldList as $i => $field) {
+                $type = $this->getMetadata()->get(['entityDefs', $entityType, 'fields', $field, 'type']);
+                if (in_array($type, ['linkMultiple', 'attachmentMultiple'])) {
+                    unset($fieldList[$i]);
+                }
+            }
+        }
+
+        return array_values($fieldList);
     }
 
     public function addAdditionalAttributes($entityType, &$attributeList, $fieldList)
@@ -123,7 +152,7 @@ class Xlsx extends \Espo\Core\Injectable
             throw new Error();
         }
 
-        $phpExcel = new \PHPExcel();
+        $phpExcel = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
         $sheet = $phpExcel->setActiveSheetIndex(0);
 
         if (isset($params['exportName'])) {
@@ -155,10 +184,11 @@ class Xlsx extends \Espo\Core\Injectable
             )
         );
 
+        $now = new \DateTime();
+        $now->setTimezone(new \DateTimeZone($this->getInjection('config')->get('timeZone', 'UTC')));
+
         $sheet->setCellValue('A1', $exportName);
-
-        $sheet->setCellValue('B1', \PHPExcel_Shared_Date::PHPToExcel(strtotime(date('Y-m-d H:i:s'))));
-
+        $sheet->setCellValue('B1', \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel(strtotime($now->format('Y-m-d H:i:s'))));
 
         $sheet->getStyle('A1')->applyFromArray($titleStyle);
         $sheet->getStyle('B1')->applyFromArray($dateStyle);
@@ -270,6 +300,8 @@ class Xlsx extends \Espo\Core\Injectable
                     }
                 } else if ($type == 'int') {
                     $sheet->setCellValue("$col$rowNumber", $row[$name] ?: 0);
+                } else if ($type == 'float') {
+                    $sheet->setCellValue("$col$rowNumber", $row[$name] ?: 0);
                 } else if ($type == 'currency') {
                     if (array_key_exists($name.'Currency', $row) && array_key_exists($name, $row)) {
                         $sheet->setCellValue("$col$rowNumber", $row[$name] ? $row[$name] : '');
@@ -282,7 +314,7 @@ class Xlsx extends \Espo\Core\Injectable
                     }
                 } else if ($type == 'currencyConverted') {
                     if (array_key_exists($name, $row)) {
-                        $currency = $this->getConfig()->get('baseCurrency');
+                        $currency = $this->getConfig()->get('defaultCurrency');
                         $currencySymbol = $this->getMetadata()->get(['app', 'currency', 'symbolMap', $currency], '');
 
                         $sheet->getStyle("$col$rowNumber")
@@ -309,7 +341,7 @@ class Xlsx extends \Espo\Core\Injectable
                     }
                 } else if ($type == 'date') {
                     if (isset($row[$name])) {
-                        $sheet->setCellValue("$col$rowNumber", \PHPExcel_Shared_Date::PHPToExcel(strtotime($row[$name])));
+                        $sheet->setCellValue("$col$rowNumber", \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel(strtotime($row[$name])));
                     }
                 } else if ($type == 'datetime' || $type == 'datetimeOptional') {
                     $value = null;
@@ -334,14 +366,14 @@ class Xlsx extends \Espo\Core\Injectable
                         }
                     }
                     if ($value) {
-                        $sheet->setCellValue("$col$rowNumber", \PHPExcel_Shared_Date::PHPToExcel(strtotime($value)));
+                        $sheet->setCellValue("$col$rowNumber", \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel(strtotime($value)));
                     }
                 } else if ($type == 'image') {
                     if (isset($row[$name . 'Id']) && $row[$name . 'Id']) {
                         $attachment = $this->getEntityManager()->getEntity('Attachment', $row[$name . 'Id']);
 
                         if ($attachment) {
-                            $objDrawing = new \PHPExcel_Worksheet_Drawing();
+                            $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
                             $filePath = $this->getInjection('fileStorageManager')->getLocalFilePath($attachment);
 
                             if ($filePath && file_exists($filePath)) {
@@ -367,14 +399,97 @@ class Xlsx extends \Espo\Core\Injectable
                         }
                         $sheet->setCellValue("$col$rowNumber", $value);
                     }
+                } else if ($type == 'linkMultiple') {
+                    if (array_key_exists($name . 'Ids', $row) && array_key_exists($name . 'Names', $row)) {
+                        $nameList = [];
+                        foreach ($row[$name . 'Ids'] as $relatedId) {
+                            $relatedName = $relatedId;
+                            if (property_exists($row[$name . 'Names'], $relatedId)) {
+                                $relatedName = $row[$name . 'Names']->$relatedId;
+                            }
+                            $nameList[] = $relatedName;
+                        }
+                        $sheet->setCellValue("$col$rowNumber", implode(', ', $nameList));
+                    }
+                } else if ($type == 'address') {
+                    $value = '';
+                    if (!empty($row[$name . 'Street'])) {
+                        $value = $value .= $row[$name.'Street'];
+                    }
+                    if (!empty($row[$name.'City']) || !empty($row[$name.'State']) || !empty($row[$name.'PostalCode'])) {
+                        if ($value) {
+                            $value .= "\n";
+                        }
+                        if (!empty($row[$name.'City'])) {
+                            $value .= $row[$name.'City'];
+                            if (
+                                !empty($row[$name.'State']) || !empty($row[$name.'PostalCode'])
+                            ) {
+                                $value .= ', ';
+                            }
+                        }
+                        if (!empty($row[$name.'State'])) {
+                            $value .= $row[$name.'State'];
+                            if (!empty($row[$name.'PostalCode'])) {
+                                $value .= ' ';
+                            }
+                        }
+                        if (!empty($row[$name.'PostalCode'])) {
+                            $value .= $row[$name.'PostalCode'];
+                        }
+                    }
+                    if (!empty($row[$name.'Country'])) {
+                        if ($value) {
+                            $value .= "\n";
+                        }
+                        $value .= $row[$name.'Country'];
+                    }
+                    $sheet->setCellValue("$col$rowNumber", $value);
+                } else if ($type == 'duration') {
+                    if (!empty($row[$name])) {
+                        $seconds = intval($row[$name]);
+
+                        $days = intval(floor($seconds / 86400));
+                        $seconds = $seconds - $days * 86400;
+                        $hours = intval(floor($seconds / 3600));
+                        $seconds = $seconds - $hours * 3600;
+                        $minutes = intval(floor($seconds / 60));
+
+                        $value = '';
+                        if ($days) {
+                            $value .= (string) $days . $this->getInjection('language')->translate('d', 'durationUnits');
+                            if ($minutes || $hours) {
+                                $value .= ' ';
+                            }
+                        }
+                        if ($hours) {
+                            $value .= (string) $hours . $this->getInjection('language')->translate('h', 'durationUnits');
+                            if ($minutes) {
+                                $value .= ' ';
+                            }
+                        }
+                        if ($minutes) {
+                            $value .= (string) $minutes . $this->getInjection('language')->translate('m', 'durationUnits');
+                        }
+
+                        $sheet->setCellValue("$col$rowNumber", $value);
+                    }
+
                 } else {
                     if (array_key_exists($name, $row)) {
-                        $sheet->setCellValue("$col$rowNumber", $row[$name]);
+                        $sheet->setCellValueExplicit("$col$rowNumber", $row[$name], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
                     }
                 }
 
                 $link = false;
 
+                $foreignLink = null;
+                $isForeign = false;
+                if (strpos($name, '_')) {
+                    $isForeign = true;
+                    list($foreignLink, $foreignField) = explode('_', $name);
+                }
+
                 if ($name == 'name') {
                     if (array_key_exists('id', $row)) {
                         $link = $this->getConfig()->getSiteUrl() . "/#".$entityType . "/view/" . $row['id'];
@@ -385,7 +500,13 @@ class Xlsx extends \Espo\Core\Injectable
                     }
                 } else if ($type == 'link') {
                     if (array_key_exists($name.'Id', $row)) {
-                        $foreignEntity = $this->getMetadata()->get(['entityDefs', $entityType, 'links', $name, 'entity']);
+                        $foreignEntity = null;
+                        if (!$isForeign) {
+                            $foreignEntity = $this->getMetadata()->get(['entityDefs', $entityType, 'links', $name, 'entity']);
+                        } else {
+                            $foreignEntity1 = $this->getMetadata()->get(['entityDefs', $entityType, 'links', $foreignLink, 'entity']);
+                            $foreignEntity = $this->getMetadata()->get(['entityDefs', $foreignEntity1, 'links', $foreignField, 'entity']);
+                        }
                         if ($foreignEntity) {
                             $link = $this->getConfig()->getSiteUrl() . "/#" . $foreignEntity. "/view/". $row[$name.'Id'];
                         }
@@ -417,12 +538,15 @@ class Xlsx extends \Espo\Core\Injectable
 
         $sheet->getStyle("A2:A$rowNumber")
             ->getNumberFormat()
-            ->setFormatCode(\PHPExcel_Style_NumberFormat::FORMAT_TEXT);
+            ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_TEXT);
 
         $startingRowNumber = 4;
 
         foreach ($fieldList as $i => $name) {
             $col = $azRange[$i];
+            if (!array_key_exists($name, $typesCache)) {
+                break;
+            }
             $type = $typesCache[$name];
 
             switch ($type) {
@@ -435,6 +559,11 @@ class Xlsx extends \Espo\Core\Injectable
                         ->getNumberFormat()
                         ->setFormatCode('0');
                 } break;
+                case 'float': {
+                    $sheet->getStyle($col.$startingRowNumber.':'.$col.$rowNumber)
+                        ->getNumberFormat()
+                        ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
+                } break;
                 case 'date': {
                     $sheet->getStyle($col.$startingRowNumber.':'.$col.$rowNumber)
                         ->getNumberFormat()
@@ -468,7 +597,7 @@ class Xlsx extends \Espo\Core\Injectable
             $sheet->getStyle($linkColumn.$startingRowNumber.':'.$linkColumn.$rowNumber)->applyFromArray($linkStyle);
         }
 
-        $objWriter = \PHPExcel_IOFactory::createWriter($phpExcel, 'Excel2007');
+        $objWriter = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($phpExcel, 'Xlsx');
 
         if (!$this->getInjection('fileManager')->isDir('data/cache/')) {
             $this->getInjection('fileManager')->mkdir('data/cache/');

application/Espo/Core/Formula/Functions/ArrayGroup/IncludesType.php

@@ -36,10 +36,10 @@ class IncludesType extends \Espo\Core\Formula\Functions\Base
     public function process(\StdClass $item)
     {
         if (!property_exists($item, 'value') || !is_array($item->value)) {
-            throw new Error('Value for \'Array\\Includses\' item is not array.');
+            throw new Error('Value for \'Array\\Includes\' item is not array.');
         }
         if (count($item->value) < 2) {
-            throw new Error('Bad arguments passed to \'Array\\Includses\'.');
+            throw new Error('Bad arguments passed to \'Array\\Includes\'.');
         }
         $list = $this->evaluate($item->value[0]);
         $needle = $this->evaluate($item->value[1]);

application/Espo/Core/Formula/Functions/EntityGroup/CountRelatedType.php

@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Formula\Functions\EntityGroup;
+
+use \Espo\ORM\Entity;
+use \Espo\Core\Exceptions\Error;
+
+class CountRelatedType extends \Espo\Core\Formula\Functions\Base
+{
+    protected function init()
+    {
+        $this->addDependency('entityManager');
+        $this->addDependency('selectManagerFactory');
+    }
+
+    public function process(\StdClass $item)
+    {
+        if (!property_exists($item, 'value')) {
+            throw new Error();
+        }
+
+        if (!is_array($item->value)) {
+            throw new Error();
+        }
+
+        if (count($item->value) < 1) {
+            throw new Error();
+        }
+
+        $link = $this->evaluate($item->value[0]);
+
+        if (empty($link)) {
+            throw new Error("No link passed to countRelated function.");
+        }
+
+        $filter = null;
+        if (count($item->value) > 1) {
+            $filter = $this->evaluate($item->value[1]);
+        }
+
+        $entity = $this->getEntity();
+
+        $entityManager = $this->getInjection('entityManager');
+
+        $foreignEntityType = $entity->getRelationParam($link, 'entity');
+
+        if (empty($foreignEntityType)) {
+            throw new Error();
+        }
+
+        $foreignSelectManager = $this->getInjection('selectManagerFactory')->create($foreignEntityType);
+
+        $selectParams = $foreignSelectManager->getEmptySelectParams();
+
+        if ($filter) {
+            $foreignSelectManager->applyFilter($filter, $selectParams);
+        }
+
+        return $entityManager->getRepository($entity->getEntityType())->countRelated($entity, $link, $selectParams);
+    }
+
+}

application/Espo/Core/Formula/Functions/EntityGroup/SumRelatedType.php

@@ -0,0 +1,119 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Formula\Functions\EntityGroup;
+
+use \Espo\ORM\Entity;
+use \Espo\Core\Exceptions\Error;
+
+class SumRelatedType extends \Espo\Core\Formula\Functions\Base
+{
+    protected function init()
+    {
+        $this->addDependency('entityManager');
+        $this->addDependency('selectManagerFactory');
+    }
+
+    public function process(\StdClass $item)
+    {
+        if (!property_exists($item, 'value')) {
+            throw new Error();
+        }
+
+        if (!is_array($item->value)) {
+            throw new Error();
+        }
+
+        if (count($item->value) < 2) {
+            throw new Error();
+        }
+
+        $link = $this->evaluate($item->value[0]);
+
+        if (empty($link)) {
+            throw new Error("No link passed to sumRelated function.");
+        }
+
+        $field = $this->evaluate($item->value[1]);
+
+        if (empty($field)) {
+            throw new Error("No field passed to sumRelated function.");
+        }
+
+        $filter = null;
+        if (count($item->value) > 2) {
+            $filter = $this->evaluate($item->value[2]);
+        }
+
+        $entity = $this->getEntity();
+
+        $entityManager = $this->getInjection('entityManager');
+
+        $foreignEntityType = $entity->getRelationParam($link, 'entity');
+
+        if (empty($foreignEntityType)) {
+            throw new Error();
+        }
+
+        $foreignSelectManager = $this->getInjection('selectManagerFactory')->create($foreignEntityType);
+
+        $foreignLink = $entity->getRelationParam($link, 'foreign');
+
+        if (empty($foreignLink)) {
+            throw new Error("No foreign link for link {$link}.");
+        }
+
+        $selectParams = $foreignSelectManager->getEmptySelectParams();
+
+        if ($filter) {
+            $foreignSelectManager->applyFilter($filter, $selectParams);
+        }
+
+        $selectParams['select'] = [[$foreignLink . '.id', 'foreignId'], 'SUM:' . $field];
+
+        $foreignSelectManager->addJoin($foreignLink, $selectParams);
+
+        $selectParams['groupBy'] = [$foreignLink . '.id'];
+
+        $entityManager->getRepository($foreignEntityType)->handleSelectParams($selectParams);
+
+        $sql = $entityManager->getQuery()->createSelectQuery($foreignEntityType, $selectParams);
+
+        $pdo = $entityManager->getPDO();
+        $sth = $pdo->prepare($sql);
+        $sth->execute();
+        $rowList = $sth->fetchAll(\PDO::FETCH_ASSOC);
+
+        if (empty($rowList)) {
+            return 0;
+        }
+
+        return $rowList[0]['SUM:' . $field];
+    }
+}

application/Espo/Core/Formula/Functions/StringGroup/ContainsType.php

@@ -0,0 +1,53 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Formula\Functions\StringGroup;
+
+use \Espo\Core\Exceptions\Error;
+
+class ContainsType extends \Espo\Core\Formula\Functions\Base
+{
+    public function process(\StdClass $item)
+    {
+        if (!property_exists($item, 'value') || !is_array($item->value)) {
+            throw new Error('Value for \'String\\Contains\' item is not an array.');
+        }
+        if (count($item->value) < 2) {
+            throw new Error('Bad arguments passed to \'String\\Contains\'.');
+        }
+        $string = $this->evaluate($item->value[0]);
+        $needle = $this->evaluate($item->value[1]);
+
+        if (!is_string($string)) {
+            return false;
+        }
+
+        return mb_strpos($string, $needle) !== false;
+    }
+}

application/Espo/Core/Formula/Functions/StringGroup/LengthType.php

@@ -1,3 +1,4 @@
+<?php
 /************************************************************************
  * This file is part of EspoCRM.
  *
@@ -25,44 +26,33 @@
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
-(function ($) {
 
-	var root = this;
+namespace Espo\Core\Formula\Functions\StringGroup;
 
-	root.Espo = {};
+use \Espo\Core\Exceptions\Error;
 
-	this.EspoTest = {
+class LengthType extends \Espo\Core\Formula\Functions\Base
+{
+    public function process(\StdClass $item)
+    {
+        if (!property_exists($item, 'value')) {
+            return '';
+        }
 
-		include: function (path, options) {
-			var thisObject = root;
-			if (options != undefined && 'self' in options) {
-				thisObject = options.self;
-			}
+        if (!is_array($item->value)) {
+            throw new Error();
+        }
 
-			var self = this;
+        if (count($item->value) < 1) {
+            throw new Error();
+        }
 
-			var ajaxOptions = {
-				url: path,
-				async: false,
-				cache: false,
-				type: 'GET',
-				dataType: 'text',
-				success: function (script) {
-					eval.call(thisObject, script);
-				},
-				error: function () {
-					console.error("Error occured while loading " + path);
-				}
-			};
+        $value = $this->evaluate($item->value[0]);
 
-			if (typeof options != 'undefined') {
-				_.each(options, function (value, key) {
-					ajaxOptions[key] = options[key];
-				});
-			}
+        if (!is_string($value)) {
+            $value = strval($value);
+        }
 
-			$.ajax(ajaxOptions);
-		},
-
-	};
-}).call(this, $);
+        return mb_strlen($value);
+    }
+}

application/Espo/Core/Formula/Functions/StringGroup/LowerCaseType.php

@@ -53,6 +53,6 @@ class LowerCaseType extends \Espo\Core\Formula\Functions\Base
             $value = strval($value);
         }
 
-        return strtolower($value);
+        return mb_strtolower($value);
     }
 }

application/Espo/Core/Formula/Functions/StringGroup/SubstringType.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 /************************************************************************
  * This file is part of EspoCRM.
  *
@@ -52,9 +52,9 @@ class SubstringType extends \Espo\Core\Formula\Functions\Base
 
         if (count($item->value) > 2) {
             $length = $this->evaluate($item->value[2]);
-            return substr($string, $start, $length);
+            return mb_substr($string, $start, $length);
         } else {
-            return substr($string, $start);
+            return mb_substr($string, $start);
         }
     }
 }

application/Espo/Core/Formula/Functions/StringGroup/UpperCaseType.php

@@ -53,6 +53,6 @@ class UpperCaseType extends \Espo\Core\Formula\Functions\Base
             $value = strval($value);
         }
 
-        return strtoupper($value);
+        return mb_strtoupper($value);
     }
 }

application/Espo/Core/Formula/Parser.php

@@ -176,6 +176,8 @@ class Parser
 
         $this->processStrings($expression, $modifiedExpression, $splitterIndexList, true);
 
+        $expressionOutOfBraceList = [];
+
         for ($i = 0; $i < strlen($modifiedExpression); $i++) {
             if ($modifiedExpression[$i] === '(') {
                 $braceCounter++;
@@ -186,6 +188,11 @@ class Parser
             if ($braceCounter === 0 && $i < strlen($modifiedExpression) - 1) {
                 $hasExcessBraces = false;
             }
+            if ($braceCounter === 0) {
+                $expressionOutOfBraceList[] = true;
+            } else {
+                $expressionOutOfBraceList[] = false;
+            }
         }
         if ($braceCounter !== 0) {
             throw new Error('Incorrect round brackets in expression ' . $expression . '.');
@@ -226,7 +233,13 @@ class Parser
 
         foreach ($this->priorityList as $operationList) {
             foreach ($operationList as $operator) {
-                $index = strpos($expression, $operator, 1);
+                $startFrom = 1;
+                while (true) {
+                    $index = strpos($expression, $operator, $startFrom);
+                    if ($index === false) break;
+                    if ($expressionOutOfBraceList[$index]) break;
+                    $startFrom = $index + 1;
+                }
                 if ($index !== false) {
                     $possibleRightOperator = null;
                     if (strlen($operator) === 1) {

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -50,13 +50,19 @@ class Htmlizer
 
     protected $entityManager;
 
-    public function __construct(FileManager $fileManager, DateTime $dateTime, NumberUtil $number, $acl = null, $entityManager = null)
+    protected $metadata;
+
+    protected $language;
+
+    public function __construct(FileManager $fileManager, DateTime $dateTime, NumberUtil $number, $acl = null, $entityManager = null, $metadata = null, $language = null)
     {
         $this->fileManager = $fileManager;
         $this->dateTime = $dateTime;
         $this->number = $number;
         $this->acl = $acl;
         $this->entityManager = $entityManager;
+        $this->metadata = $metadata;
+        $this->language = $language;
     }
 
     protected function getAcl()
@@ -94,10 +100,10 @@ class Htmlizer
             $forbidenAttributeList = $this->getAcl()->getScopeForbiddenAttributeList($entity->getEntityType(), 'read');
         }
 
+
         foreach ($fieldList as $field) {
             if (in_array($field, $forbidenAttributeList)) continue;
 
-
             $type = $entity->getAttributeType($field);
 
             if ($type == Entity::DATETIME) {
@@ -115,16 +121,16 @@ class Htmlizer
                     foreach ($list as $item) {
                         $v = $item;
                         if ($item instanceof \StdClass) {
-                            $v = json_decode(json_encode($v), true);
+                            $v = json_decode(json_encode($v, \JSON_PRESERVE_ZERO_FRACTION), true);
                         }
-                        if (!is_array($v)) {
-                            $v = [];
-                        }
-                        foreach ($v as $k => $w) {
-                            $keyRaw = $k . '_RAW';
-                            $v[$keyRaw] = $v[$k];
-                            $v[$k] = $this->format($v[$k]);
+                        if (is_array($v)) {
+                            foreach ($v as $k => $w) {
+                                $keyRaw = $k . '_RAW';
+                                $v[$keyRaw] = $v[$k];
+                                $v[$k] = $this->format($v[$k]);
+                            }
                         }
+
                         $newList[] = $v;
                     }
                     $data[$field] = $newList;
@@ -133,7 +139,7 @@ class Htmlizer
                 if (!empty($data[$field])) {
                     $value = $data[$field];
                     if ($value instanceof \StdClass) {
-                        $data[$field] = json_decode(json_encode($value), true);
+                        $data[$field] = json_decode(json_encode($value, \JSON_PRESERVE_ZERO_FRACTION), true);
                     }
                     foreach ($data[$field] as $k => $w) {
                         $keyRaw = $k . '_RAW';
@@ -148,6 +154,14 @@ class Htmlizer
             if (array_key_exists($field, $data)) {
                 $keyRaw = $field . '_RAW';
                 $data[$keyRaw] = $data[$field];
+
+                $fieldType = $this->getFieldType($entity->getEntityType(), $field);
+                if ($fieldType === 'enum') {
+                    if ($this->language) {
+                        $data[$field] = $this->language->translateOption($data[$field], $field, $entity->getEntityType());
+                    }
+                }
+
                 $data[$field] = $this->format($data[$field]);
             }
         }
@@ -205,6 +219,14 @@ class Htmlizer
                         return number_format($number, $decimals, $decimalPoint, $thousandsSeparator);
                     }
                     return '';
+                },
+                'var' => function ($context, $options) {
+                    if ($context && isset($context[0]) && isset($context[1])) {
+                        if (isset($context[1][$context[0]])) {
+                            return $context[1][$context[0]];
+                        }
+                    }
+                    return;
                 }
             ],
             'hbhelpers' => [
@@ -246,13 +268,20 @@ class Htmlizer
 
         $data = $this->getDataFromEntity($entity, $skipLinks);
 
+        if (!array_key_exists('today', $data)) {
+            $data['today'] = $this->dateTime->getTodayString();
+        }
+
+        if (!array_key_exists('now', $data)) {
+            $data['now'] = $this->dateTime->getNowString();
+        }
+
         foreach ($additionalData as $k => $value) {
             $data[$k] = $value;
         }
 
         $html = $renderer($data);
 
-
         $html = str_replace('?entryPoint=attachment&', '?entryPoint=attachment&', $html);
 
         if ($this->getEntityManager()) {
@@ -269,4 +298,9 @@ class Htmlizer
 
         return $html;
     }
+
+    protected function getFieldType($entityType, $field) {
+        if (!$this->metadata) return;
+        return $this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'type']);
+    }
 }

application/Espo/Core/Mail/Importer.php

@@ -154,31 +154,8 @@ class Importer
         }
 
         if ($duplicate = $this->findDuplicate($email)) {
-            if ($assignedUserId) {
-                $duplicate->addLinkMultipleId('users', $assignedUserId);
-                $duplicate->addLinkMultipleId('assignedUsers', $assignedUserId);
-            }
-            if (!empty($userIdList)) {
-                foreach ($userIdList as $uId) {
-                    $duplicate->addLinkMultipleId('users', $uId);
-                }
-            }
-
-            if ($folderData) {
-                foreach ($folderData as $uId => $folderId) {
-                    $email->setLinkMultipleColumn('users', 'folderId', $uId, $folderId);
-                }
-            }
-
-            $duplicate->set('isBeingImported', true);
-
-            $this->getEntityManager()->saveEntity($duplicate);
-
-            if (!empty($teamsIdList)) {
-                foreach ($teamsIdList as $teamId) {
-                    $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);
-                }
-            }
+            $duplicate = $this->getEntityManager()->getEntity('Email', $duplicate->id);
+            $this->processDuplicate($duplicate, $assignedUserId, $userIdList, $folderData, $teamsIdList);
             return $duplicate;
         }
 
@@ -228,6 +205,10 @@ class Importer
             ))->findOne();
             if ($replied) {
                 $email->set('repliedId', $replied->id);
+                $repliedTeamIdList = $replied->getLinkMultipleIdList('teams');
+                foreach ($repliedTeamIdList as $repliedTeamId) {
+                    $email->addLinkMultipleId('teams', $repliedTeamId);
+                }
             }
         }
 
@@ -299,6 +280,43 @@ class Importer
             }
         }
 
+        $this->getEntityManager()->getPdo()->query('LOCK TABLES `email` WRITE');
+
+        if ($duplicate = $this->findDuplicate($email)) {
+            $this->getEntityManager()->getPdo()->query('UNLOCK TABLES');
+            $duplicate = $this->getEntityManager()->getEntity('Email', $duplicate->id);
+            $this->processDuplicate($duplicate, $assignedUserId, $userIdList, $folderData, $teamsIdList);
+            return $duplicate;
+        }
+
+        if (!$email->get('messageId')) {
+            $email->setDummyMessageId();
+        }
+
+        $this->getEntityManager()->saveEntity($email, [
+            'skipAll' => true,
+            'keepNew' => true
+        ]);
+
+        $this->getEntityManager()->getPdo()->query('UNLOCK TABLES');
+
+        if ($parentFound) {
+            $parentType = $email->get('parentType');
+            $parentId = $email->get('parentId');
+            $emailKeepParentTeamsEntityList = $this->getConfig()->get('emailKeepParentTeamsEntityList', []);
+            if ($parentId && in_array($parentType, $emailKeepParentTeamsEntityList)) {
+                if ($this->getEntityManager()->hasRepository($parentType)) {
+                    $parent = $this->getEntityManager()->getEntity($parentType, $parentId);
+                    if ($parent) {
+                        $parentTeamIdList = $parent->getLinkMultipleIdList('teams');
+                        foreach ($parentTeamIdList as $parentTeamId) {
+                            $email->addLinkMultipleId('teams', $parentTeamId);
+                        }
+                    }
+                }
+            }
+        }
+
         $this->getEntityManager()->saveEntity($email);
 
         foreach ($inlineAttachmentList as $attachment) {
@@ -352,12 +370,41 @@ class Importer
     protected function findDuplicate(Entity $email)
     {
         if ($email->get('messageId')) {
-            $duplicate = $this->getEntityManager()->getRepository('Email')->where(array(
+            $duplicate = $this->getEntityManager()->getRepository('Email')->select(['id'])->where(array(
                 'messageId' => $email->get('messageId')
-            ))->findOne();
+            ))->findOne(['skipAdditionalSelectParams' => true]);
             if ($duplicate) {
                 return $duplicate;
             }
         }
     }
+
+    protected function processDuplicate(Entity $duplicate, $assignedUserId, $userIdList, $folderData, $teamsIdList)
+    {
+        if ($assignedUserId) {
+            $duplicate->addLinkMultipleId('users', $assignedUserId);
+            $duplicate->addLinkMultipleId('assignedUsers', $assignedUserId);
+        }
+        if (!empty($userIdList)) {
+            foreach ($userIdList as $uId) {
+                $duplicate->addLinkMultipleId('users', $uId);
+            }
+        }
+
+        if ($folderData) {
+            foreach ($folderData as $uId => $folderId) {
+                $duplicate->setLinkMultipleColumn('users', 'folderId', $uId, $folderId);
+            }
+        }
+
+        $duplicate->set('isBeingImported', true);
+
+        $this->getEntityManager()->saveEntity($duplicate);
+
+        if (!empty($teamsIdList)) {
+            foreach ($teamsIdList as $teamId) {
+                $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);
+            }
+        }
+    }
 }

application/Espo/Core/Mail/Parsers/MailMimeParser.php

@@ -179,9 +179,10 @@ class MailMimeParser
         } else {
             $email->set('isHtml', false);
             $email->set('body', $bodyPlain);
+            $email->set('bodyPlain', $bodyPlain);
         }
 
-        if (!$email->get('body') && $email->get('bodyPlain')) {
+        if (!$email->get('body') && $email->hasBodyPlain()) {
             $email->set('body', $email->get('bodyPlain'));
         }
 

application/Espo/Core/Mail/Parsers/PhpMimeMailParser.php

@@ -165,9 +165,10 @@ class PhpMimeMailParser
         } else {
             $email->set('isHtml', false);
             $email->set('body', $bodyPlain);
+            $email->set('bodyPlain', $bodyPlain);
         }
 
-        if (!$email->get('body') && $email->get('bodyPlain')) {
+        if (!$email->get('body') && $email->hasBodyPlain()) {
             $email->set('body', $email->get('bodyPlain'));
         }
 

application/Espo/Core/Mail/Parsers/PhpMimeMailParser/Parser.php

@@ -33,7 +33,7 @@ use \PhpMimeMailParser\Attachment;
 
 class Parser extends \PhpMimeMailParser\Parser
 {
-    public function getAttachments()
+    public function getAttachments($include_inline = true)
     {
         $attachments = [];
         $dispositions = ['attachment', 'inline'];

application/Espo/Core/Mail/Parsers/ZendMail.php

@@ -139,7 +139,7 @@ class ZendMail
             $this->importPartDataToEmail($email, $zendMessage, $inlineIds, 'text/plain', $inlineAttachmentList);
         }
 
-        if (!$email->get('body') && $email->get('bodyPlain')) {
+        if (!$email->get('body') && $email->hasBodyPlain()) {
             $email->set('body', $email->get('bodyPlain'));
         }
 
@@ -192,7 +192,7 @@ class ZendMail
                     $content = $this->getContentFromPart($part);
                     if ($type == 'text/plain') {
                         $bodyPlain = '';
-                        if ($email->get('bodyPlain')) {
+                        if ($email->hasBodyPlain()) {
                             $bodyPlain .= $email->get('bodyPlain') . "\n";
                         }
                         $bodyPlain .= $content;

application/Espo/Core/Mail/Sender.php

@@ -89,8 +89,12 @@ class Sender
 
         $this->transport = new SmtpTransport();
 
+        $config = $this->config;
+
+        $localHostName = $config->get('smtpLocalHostName', gethostname());
+
         $opts = array(
-            'name' => 'admin',
+            'name' => $localHostName,
             'host' => $params['server'],
             'port' => $params['port'],
             'connection_config' => array()
@@ -132,8 +136,10 @@ class Sender
 
         $config = $this->config;
 
+        $localHostName = $config->get('smtpLocalHostName', gethostname());
+
         $opts = array(
-            'name' => 'admin',
+            'name' => $localHostName,
             'host' => $config->get('smtpServer'),
             'port' => $config->get('smtpPort'),
             'connection_config' => array()
@@ -260,7 +266,7 @@ class Sender
                 $attachment = new MimePart(file_get_contents($fileName));
                 $attachment->disposition = Mime::DISPOSITION_ATTACHMENT;
                 $attachment->encoding = Mime::ENCODING_BASE64;
-                $attachment->filename = $a->get('name');
+                $attachment->filename ='=?utf-8?B?' . base64_encode($a->get('name')) . '?=';
                 if ($a->get('type')) {
                     $attachment->type = $a->get('type');
                 }
@@ -349,7 +355,7 @@ class Sender
 
         try {
             $messageId = $email->get('messageId');
-            if (empty($messageId) || !is_string($messageId) || strlen($messageId) < 4) {
+            if (empty($messageId) || !is_string($messageId) || strlen($messageId) < 4 || strpos($messageId, 'dummy:') === 0) {
                 $messageId = $this->generateMessageId($email);
                 $email->set('messageId', '<' . $messageId . '>');
             } else {

application/Espo/Core/Notificators/Base.php

@@ -92,11 +92,27 @@ class Base implements Injectable
 
     public function process(Entity $entity)
     {
-        if (!$entity->get('assignedUserId')) return;
-        if (!$entity->isFieldChanged('assignedUserId')) return;
+        if ($entity->hasLinkMultipleField('assignedUsers')) {
+            $userIdList = $entity->getLinkMultipleIdList('assignedUsers');
+            $fetchedAssignedUserIdList = $entity->getFetched('assignedUsersIds');
+            if (!is_array($fetchedAssignedUserIdList)) {
+                $fetchedAssignedUserIdList = [];
+            }
 
-        $assignedUserId = $entity->get('assignedUserId');
+            foreach ($userIdList as $userId) {
+                if (in_array($userId, $fetchedAssignedUserIdList)) continue;
+                $this->processForUser($entity, $userId);
+            }
+        } else {
+            if (!$entity->get('assignedUserId')) return;
+            if (!$entity->isAttributeChanged('assignedUserId')) return;
+            $assignedUserId = $entity->get('assignedUserId');
+            $this->processForUser($entity, $assignedUserId);
+        }
+    }
 
+    protected function processForUser(Entity $entity, $assignedUserId)
+    {
         if ($entity->hasAttribute('createdById') && $entity->hasAttribute('modifiedById')) {
             if ($entity->isNew()) {
                 $isNotSelfAssignment = $assignedUserId !== $entity->get('createdById');

application/Espo/Core/ORM/Entity.php

@@ -41,6 +41,29 @@ class Entity extends \Espo\ORM\Entity
         return $this->hasAttribute($field . 'Id');
     }
 
+    public function loadParentNameField($field)
+    {
+        if (!$this->hasAttribute($field. 'Id') || !$this->hasAttribute($field . 'Type')) return;
+
+        $parentId = $this->get($field . 'Id');
+        $parentType = $this->get($field . 'Type');
+
+        if ($parentId && $parentType) {
+            if (!$this->entityManager->hasRepository($parentType)) return;
+            $repository = $this->entityManager->getRepository($parentType);
+
+            $select = ['id', 'name'];
+            $foreignEntity = $repository->select($select)->where(['id' => $parentId])->findOne();
+            if ($foreignEntity) {
+                $this->set($field . 'Name', $foreignEntity->get('name'));
+            } else {
+                $this->set($field . 'Name', null);
+            }
+        } else {
+            $this->set($field . 'Name', null);
+        }
+    }
+
     public function loadLinkMultipleField($field, $columns = null)
     {
         if (!$this->hasRelation($field) || !$this->hasAttribute($field . 'Ids')) return;
@@ -50,31 +73,50 @@ class Entity extends \Espo\ORM\Entity
             $defs['additionalColumns'] = $columns;
         }
 
+        $idsAttribute = $field . 'Ids';
+
         $foreignEntityType = $this->getRelationParam($field, 'entity');
-        if ($foreignEntityType && $this->entityManager) {
-            $foreignEntityDefs = $this->entityManager->getMetadata()->get($foreignEntityType);
-            if ($foreignEntityDefs && !empty($foreignEntityDefs['collection'])) {
-                $collectionDefs = $foreignEntityDefs['collection'];
-                if (!empty($foreignEntityDefs['collection']['orderBy'])) {
-                    $orderBy = $foreignEntityDefs['collection']['orderBy'];
-                    $order = 'ASC';
-                    if (array_key_exists('order', $foreignEntityDefs['collection'])) {
-                        $order = $foreignEntityDefs['collection']['order'];
-                    }
-                    if (array_key_exists($orderBy, $foreignEntityDefs['fields'])) {
-                        $defs['orderBy'] = $orderBy;
-                        $defs['order'] = $order;
+
+        if ($this->getAttributeParam($idsAttribute, 'orderBy')) {
+            $defs['orderBy'] = $this->getAttributeParam($idsAttribute, 'orderBy');
+            $defs['order'] = 'ASC';
+            if ($this->getAttributeParam($idsAttribute, 'orderDirection')) {
+                $defs['order'] = $this->getAttributeParam($idsAttribute, 'orderDirection');
+            }
+        } else {
+            if ($foreignEntityType && $this->entityManager) {
+                $foreignEntityDefs = $this->entityManager->getMetadata()->get($foreignEntityType);
+                if ($foreignEntityDefs && !empty($foreignEntityDefs['collection'])) {
+                    $collectionDefs = $foreignEntityDefs['collection'];
+                    if (!empty($foreignEntityDefs['collection']['orderBy'])) {
+                        $orderBy = $foreignEntityDefs['collection']['orderBy'];
+                        $order = 'ASC';
+                        if (array_key_exists('order', $foreignEntityDefs['collection'])) {
+                            $order = $foreignEntityDefs['collection']['order'];
+                        }
+                        if (array_key_exists($orderBy, $foreignEntityDefs['fields'])) {
+                            $defs['orderBy'] = $orderBy;
+                            $defs['order'] = $order;
+                        }
                     }
                 }
             }
         }
 
+        $defs['select'] = ['id', 'name'];
+
+        $hasType = false;
+        if ($this->hasField($field . 'Types')) {
+            $hasType = true;
+            $defs['select'][] = 'type';
+        }
+
         $collection = $this->get($field, $defs);
-        $ids = array();
-        $names = new \stdClass();
-        $types = new \stdClass();
+        $ids = [];
+        $names = (object) [];
+        $types = (object) [];
         if (!empty($columns)) {
-            $columnsData = new \stdClass();
+            $columnsData = (object) [];
         }
 
         if ($collection) {
@@ -82,7 +124,9 @@ class Entity extends \Espo\ORM\Entity
                 $id = $e->id;
                 $ids[] = $id;
                 $names->$id = $e->get('name');
-                $types->$id = $e->get('type');
+                if ($hasType) {
+                    $types->$id = $e->get('type');
+                }
                 if (!empty($columns)) {
                     $columnsData->$id = new \stdClass();
                     foreach ($columns as $column => $f) {
@@ -92,9 +136,15 @@ class Entity extends \Espo\ORM\Entity
             }
         }
 
-        $this->set($field . 'Ids', $ids);
+        $this->set($idsAttribute, $ids);
+        if (!$this->isNew() && !$this->hasFetched($idsAttribute)) {
+            $this->setFetched($idsAttribute, $ids);
+        }
+
         $this->set($field . 'Names', $names);
-        $this->set($field . 'Types', $types);
+        if ($hasType) {
+            $this->set($field . 'Types', $types);
+        }
         if (!empty($columns)) {
             $this->set($field . 'Columns', $columnsData);
         }
@@ -105,7 +155,13 @@ class Entity extends \Espo\ORM\Entity
         if (!$this->hasRelation($field) || !$this->hasAttribute($field . 'Id')) return;
         if ($this->getRelationType($field) !== 'hasOne' && $this->getRelationType($field) !== 'belongsTo') return;
 
-        $entity = $this->get($field);
+        $relatedEntityType = $this->getRelationParam($field, 'entity');
+
+        $select = ['id', 'name'];
+
+        $entity = $this->get($field, [
+            'select' => $select
+        ]);
 
         $entityId = null;
         $entityName = null;
@@ -114,7 +170,13 @@ class Entity extends \Espo\ORM\Entity
             $entityName = $entity->get('name');
         }
 
-        $this->set($field . 'Id', $entityId);
+        $idAttribute = $field . 'Id';
+
+        if (!$this->isNew() && !$this->hasFetched($idAttribute)) {
+            $this->setFetched($idAttribute, $entityId);
+        }
+
+        $this->set($idAttribute, $entityId);
         $this->set($field . 'Name', $entityName);
     }
 

application/Espo/Core/ORM/Repositories/RDB.php

@@ -40,7 +40,9 @@ use \Espo\Core\Interfaces\Injectable;
 class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 {
     protected $dependencies = array(
-        'metadata'
+        'metadata',
+        'config',
+        'fieldManagerUtil'
     );
 
     protected $injections = array();
@@ -51,6 +53,10 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
     protected $processFieldsAfterSaveDisabled = false;
 
+    protected $processFieldsBeforeSaveDisabled = false;
+
+    protected $processFieldsAfterRemoveDisabled = false;
+
     protected function addDependency($name)
     {
         $this->dependencies[] = $name;
@@ -83,6 +89,16 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         return $this->getInjection('metadata');
     }
 
+    protected function getConfig()
+    {
+        return $this->getInjection('config');
+    }
+
+    protected function getFieldManagerUtil()
+    {
+        return $this->getInjection('fieldManagerUtil');
+    }
+
     public function __construct($entityType, EntityManager $entityManager, EntityFactory $entityFactory)
     {
         parent::__construct($entityType, $entityManager, $entityFactory);
@@ -110,20 +126,17 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
             return;
         }
 
-        $defs = $metadata->get('entityDefs.' . $entityType);
+        $defs = $metadata->get(['entityDefs', $entityType]);
 
         foreach ($defs['fields'] as $field => $d) {
             if (isset($d['type']) && $d['type'] == 'currency') {
-                if (!empty($d['notStorable'])) {
-                    continue;
-                }
-                if (empty($params['customJoin'])) {
-                    $params['customJoin'] = '';
-                }
-                $alias = Util::toUnderScore($field) . "_currency_alias";
-                $params['customJoin'] .= "
-                    LEFT JOIN currency AS `{$alias}` ON {$alias}.id = ".Util::toUnderScore($entityType).".".Util::toUnderScore($field)."_currency
-                ";
+                if (!empty($d['notStorable'])) continue;
+                if (empty($params['leftJoins'])) $params['leftJoins'] = [];
+                $alias = $field . 'CurrencyRate';
+
+                $params['leftJoins'][] = ['Currency', $alias, [
+                    $alias . '.id:' => $field . 'Currency'
+                ]];
             }
         }
 
@@ -131,52 +144,30 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
     protected function handleEmailAddressParams(&$params)
     {
-        $entityType = $this->entityType;
-
-        $defs = $this->getEntityManager()->getMetadata()->get($entityType);
+        $defs = $this->getEntityManager()->getMetadata()->get($this->entityType);
         if (!empty($defs['relations']) && array_key_exists('emailAddresses', $defs['relations'])) {
-            if (empty($params['leftJoins'])) {
-                $params['leftJoins'] = array();
-            }
-            if (empty($params['whereClause'])) {
-                $params['whereClause'] = array();
-            }
-            if (empty($params['joinConditions'])) {
-                $params['joinConditions'] = array();
-            }
-            $params['leftJoins'][] = 'emailAddresses';
-            $params['joinConditions']['emailAddresses'] = array(
+            if (empty($params['leftJoins'])) $params['leftJoins'] = [];
+            $params['leftJoins'][] = ['emailAddresses', null, [
                 'primary' => 1
-            );
+            ]];
         }
     }
 
     protected function handlePhoneNumberParams(&$params)
     {
-        $entityType = $this->entityType;
-
-        $defs = $this->getEntityManager()->getMetadata()->get($entityType);
+        $defs = $this->getEntityManager()->getMetadata()->get($this->entityType);
         if (!empty($defs['relations']) && array_key_exists('phoneNumbers', $defs['relations'])) {
-            if (empty($params['leftJoins'])) {
-                $params['leftJoins'] = array();
-            }
-            if (empty($params['whereClause'])) {
-                $params['whereClause'] = array();
-            }
-            if (empty($params['joinConditions'])) {
-                $params['joinConditions'] = array();
-            }
-            $params['leftJoins'][] = 'phoneNumbers';
-            $params['joinConditions']['phoneNumbers'] = array(
+            if (empty($params['leftJoins'])) $params['leftJoins'] = [];
+            $params['leftJoins'][] = ['phoneNumbers', null, [
                 'primary' => 1
-            );
+            ]];
         }
     }
 
     protected function beforeRemove(Entity $entity, array $options = array())
     {
         parent::beforeRemove($entity, $options);
-        if (!$this->hooksDisabled) {
+        if (!$this->hooksDisabled && empty($options['skipHooks'])) {
             $this->getEntityManager()->getHookManager()->process($this->entityType, 'beforeRemove', $entity, $options);
         }
 
@@ -192,14 +183,19 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
     protected function afterRemove(Entity $entity, array $options = array())
     {
         parent::afterRemove($entity, $options);
-        if (!$this->hooksDisabled) {
+
+        if (!$this->processFieldsAfterRemoveDisabled) {
+            $this->processArrayFieldsRemove($entity);
+        }
+
+        if (!$this->hooksDisabled && empty($options['skipHooks'])) {
             $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRemove', $entity, $options);
         }
     }
 
     protected function afterMassRelate(Entity $entity, $relationName, array $params = array(), array $options = array())
     {
-        if (!$this->hooksDisabled) {
+        if (!$this->hooksDisabled && empty($options['skipHooks'])) {
             $hookData = array(
                 'relationName' => $relationName,
                 'relationParams' => $params
@@ -220,7 +216,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
         if ($foreign instanceof Entity) {
             $foreignEntity = $foreign;
-            if (!$this->hooksDisabled) {
+            if (!$this->hooksDisabled && empty($options['skipHooks'])) {
                 $hookData = array(
                     'relationName' => $relationName,
                     'relationData' => $data,
@@ -237,7 +233,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
         if ($foreign instanceof Entity) {
             $foreignEntity = $foreign;
-            if (!$this->hooksDisabled) {
+            if (!$this->hooksDisabled && empty($options['skipHooks'])) {
                 $hookData = array(
                     'relationName' => $relationName,
                     'foreignEntity' => $foreignEntity
@@ -251,9 +247,13 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
     {
         parent::beforeSave($entity, $options);
 
-        if (!$this->hooksDisabled) {
+        if (!$this->hooksDisabled && empty($options['skipHooks'])) {
             $this->getEntityManager()->getHookManager()->process($this->entityType, 'beforeSave', $entity, $options);
         }
+
+        if (!$this->processFieldsBeforeSaveDisabled) {
+            $this->processCurrencyFieldsBeforeSave($entity);
+        }
     }
 
     protected function afterSave(Entity $entity, array $options = array())
@@ -269,9 +269,11 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
             $this->processPhoneNumberSave($entity);
             $this->processSpecifiedRelationsSave($entity);
             $this->processFileFieldsSave($entity);
+            $this->processArrayFieldsSave($entity);
+            $this->processWysiwygFieldsSave($entity);
         }
 
-        if (!$this->hooksDisabled) {
+        if (!$this->hooksDisabled && empty($options['skipHooks'])) {
             $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterSave', $entity, $options);
         }
     }
@@ -285,35 +287,40 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
             if (!$entity->has('id')) {
                 $entity->set('id', Util::generateId());
             }
+        }
 
-            if ($entity->hasAttribute('createdAt')) {
-                if (empty($options['import']) || !$entity->has('createdAt')) {
-                    $entity->set('createdAt', $nowString);
-                }
-            }
-            if ($entity->hasAttribute('modifiedAt')) {
-                $entity->set('modifiedAt', $nowString);
-            }
-            if ($entity->hasAttribute('createdById')) {
-                if (empty($options['skipCreatedBy']) && (empty($options['import']) || !$entity->has('createdById'))) {
-                    if ($this->getEntityManager()->getUser()) {
-                        $entity->set('createdById', $this->getEntityManager()->getUser()->id);
+        if (empty($options['skipAll'])) {
+            if ($entity->isNew()) {
+                if ($entity->hasAttribute('createdAt')) {
+                    if (empty($options['import']) || !$entity->has('createdAt')) {
+                        $entity->set('createdAt', $nowString);
                     }
                 }
-            }
-        } else {
-            if (empty($options['silent']) && empty($options['skipModifiedBy'])) {
                 if ($entity->hasAttribute('modifiedAt')) {
                     $entity->set('modifiedAt', $nowString);
                 }
-                if ($entity->hasAttribute('modifiedById')) {
-                    if ($this->getEntityManager()->getUser()) {
-                        $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
-                        $entity->set('modifiedByName', $this->getEntityManager()->getUser()->get('name'));
+                if ($entity->hasAttribute('createdById')) {
+                    if (empty($options['skipCreatedBy']) && (empty($options['import']) || !$entity->has('createdById'))) {
+                        if ($this->getEntityManager()->getUser()) {
+                            $entity->set('createdById', $this->getEntityManager()->getUser()->id);
+                        }
+                    }
+                }
+            } else {
+                if (empty($options['silent']) && empty($options['skipModifiedBy'])) {
+                    if ($entity->hasAttribute('modifiedAt')) {
+                        $entity->set('modifiedAt', $nowString);
+                    }
+                    if ($entity->hasAttribute('modifiedById')) {
+                        if ($this->getEntityManager()->getUser()) {
+                            $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
+                            $entity->set('modifiedByName', $this->getEntityManager()->getUser()->get('name'));
+                        }
                     }
                 }
             }
         }
+
         $this->restoreData = $restoreData;
 
         $result = parent::save($entity, $options);
@@ -321,6 +328,28 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         return $result;
     }
 
+    protected function getFieldByTypeList($type)
+    {
+        return $this->getFieldManagerUtil()->getFieldByTypeList($this->entityType, $type);
+    }
+
+    protected function processCurrencyFieldsBeforeSave(Entity $entity)
+    {
+        foreach ($this->getFieldByTypeList('currency') as $field) {
+            $currencyAttribute = $field . 'Currency';
+            $defaultCurrency = $this->getConfig()->get('defaultCurrency');
+            if ($entity->isNew()) {
+                if ($entity->get($field) && !$entity->get($currencyAttribute)) {
+                    $entity->set($currencyAttribute, $defaultCurrency);
+                }
+            } else {
+                if ($entity->isAttributeChanged($field) && $entity->has($currencyAttribute) && !$entity->get($currencyAttribute)) {
+                    $entity->set($currencyAttribute, $defaultCurrency);
+                }
+            }
+        }
+    }
+
     protected function processFileFieldsSave(Entity $entity)
     {
         foreach ($entity->getRelations() as $name => $defs) {
@@ -360,17 +389,68 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         }
     }
 
+    protected function processArrayFieldsSave(Entity $entity)
+    {
+        foreach ($entity->getAttributes() as $attribute => $defs) {
+            if (!isset($defs['type']) || $defs['type'] !== Entity::JSON_ARRAY) continue;
+            if (!$entity->has($attribute)) continue;
+            if (!$entity->isAttributeChanged($attribute)) continue;
+            if (!$entity->getAttributeParam($attribute, 'storeArrayValues')) continue;
+            if ($entity->getAttributeParam($attribute, 'notStorable')) continue;
+            $this->getEntityManager()->getRepository('ArrayValue')->storeEntityAttribute($entity, $attribute);
+        }
+    }
+
+    protected function processWysiwygFieldsSave(Entity $entity)
+    {
+        if (!$entity->isNew()) return;
+
+        $fieldsDefs = $this->getMetadata()->get(['entityDefs', $entity->getEntityType(), 'fields'], []);
+        foreach ($fieldsDefs as $field => $defs) {
+            if (!empty($defs['type']) && $defs['type'] === 'wysiwyg') {
+                $content = $entity->get($field);
+                if (!$content) continue;
+                if (preg_match_all("/\?entryPoint=attachment&id=([^&=\"']+)/", $content, $matches)) {
+                    if (!empty($matches[1]) && is_array($matches[1])) {
+                        foreach ($matches[1] as $id) {
+                            $attachment = $this->getEntityManager()->getEntity('Attachment', $id);
+                            if ($attachment) {
+                                if (!$attachment->get('relatedId') && !$attachment->get('sourceId')) {
+                                    $attachment->set([
+                                        'relatedId' => $entity->id,
+                                        'relatedType' => $entity->getEntityType()
+                                    ]);
+                                    $this->getEntityManager()->saveEntity($attachment);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    protected function processArrayFieldsRemove(Entity $entity)
+    {
+        foreach ($entity->getAttributes() as $attribute => $defs) {
+            if (!isset($defs['type']) || $defs['type'] !== Entity::JSON_ARRAY) continue;
+            if (!$entity->getAttributeParam($attribute, 'storeArrayValues')) continue;
+            if ($entity->getAttributeParam($attribute, 'notStorable')) continue;
+            $this->getEntityManager()->getRepository('ArrayValue')->deleteEntityAttribute($entity, $attribute);
+        }
+    }
+
     protected function processEmailAddressSave(Entity $entity)
     {
         if ($entity->hasRelation('emailAddresses') && $entity->hasAttribute('emailAddress')) {
-            $emailAddressRepository = $this->getEntityManager()->getRepository('EmailAddress')->storeEntityEmailAddress($entity);
+            $this->getEntityManager()->getRepository('EmailAddress')->storeEntityEmailAddress($entity);
         }
     }
 
     protected function processPhoneNumberSave(Entity $entity)
     {
         if ($entity->hasRelation('phoneNumbers') && $entity->hasAttribute('phoneNumber')) {
-            $emailAddressRepository = $this->getEntityManager()->getRepository('PhoneNumber')->storeEntityPhoneNumber($entity);
+            $this->getEntityManager()->getRepository('PhoneNumber')->storeEntityPhoneNumber($entity);
         }
     }
 
@@ -420,17 +500,21 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                                         $data->$columnName = $foreignEntity->get($columnField);
                                     }
                                     $existingColumnsData->$foreignId = $data;
-                                    $entity->setFetched($columnsFieldsName, $existingColumnsData);
+                                    if (!$entity->isNew()) {
+                                        $entity->setFetched($columnsFieldsName, $existingColumnsData);
+                                    }
                                 }
 
                             }
                         }
 
-                        if ($entity->has($fieldName)) {
-                            $entity->setFetched($fieldName, $existingIds);
-                        }
-                        if ($entity->has($columnsFieldsName) && !empty($columns)) {
-                            $entity->setFetched($columnsFieldsName, $existingColumnsData);
+                        if (!$entity->isNew()) {
+                            if ($entity->has($fieldName)) {
+                                $entity->setFetched($fieldName, $existingIds);
+                            }
+                            if ($entity->has($columnsFieldsName) && !empty($columns)) {
+                                $entity->setFetched($columnsFieldsName, $existingColumnsData);
+                            }
                         }
 
                         foreach ($existingIds as $id) {
@@ -495,13 +579,17 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                 $where[$foreignKey] = $entity->id;
                 $previousForeignEntity = $this->getEntityManager()->getRepository($foreignEntityType)->where($where)->findOne();
                 if ($previousForeignEntity) {
-                    $entity->setFetched($idFieldName, $previousForeignEntity->id);
+                    if (!$entity->isNew()) {
+                        $entity->setFetched($idFieldName, $previousForeignEntity->id);
+                    }
                     if ($previousForeignEntity->id !== $entity->get($idFieldName)) {
                         $previousForeignEntity->set($foreignKey, null);
                         $this->getEntityManager()->saveEntity($previousForeignEntity);
                     }
                 } else {
-                    $entity->setFetched($idFieldName, null);
+                    if (!$entity->isNew()) {
+                        $entity->setFetched($idFieldName, null);
+                    }
                 }
 
                 if ($entity->get($idFieldName)) {

application/Espo/Core/Pdf/Tcpdf.php

@@ -40,6 +40,13 @@ class Tcpdf extends \TCPDF
 
     protected $footerPosition = 15;
 
+    protected $useGroupNumbers = false;
+
+    public function setUseGroupNumbers($value)
+    {
+        $this->useGroupNumbers = $value;
+    }
+
     public function setFooterHtml($html)
     {
         $this->footerHtml = $html;
@@ -51,10 +58,26 @@ class Tcpdf extends \TCPDF
     }
 
     public function Footer() {
+        $breakMargin = $this->getBreakMargin();
+        $autoPageBreak = $this->AutoPageBreak;
+
+        $this->SetAutoPageBreak(false, 0);
+
         $this->SetY((-1) * $this->footerPosition);
 
-        $html = str_replace('{pageNumber}', '{:pnp:}', $this->footerHtml);
+        $html = $this->footerHtml;
+
+        if ($this->useGroupNumbers) {
+            $html = str_replace('{pageNumber}', '{:png:}', $html);
+            $html = str_replace('{pageAbsoluteNumber}', '{:pnp:}', $html);
+        } else {
+            $html = str_replace('{pageNumber}', '{:pnp:}', $html);
+            $html = str_replace('{pageAbsoluteNumber}', '{:pnp:}', $html);
+        }
+
         $this->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, '', 0, false, 'T');
+
+        $this->SetAutoPageBreak($autoPageBreak, $breakMargin);
     }
 
     protected function _putpages() {
@@ -91,6 +114,9 @@ class Tcpdf extends \TCPDF
                 ++$pagegroupnum;
                 $pnga = TCPDF_STATIC::formatPageNumber($pagegroupnum);
                 $pngu = TCPDF_FONTS::UTF8ToUTF16BE($pnga, false, $this->isunicode, $this->CurrentFont);
+
+                $pnga = $pngu;
+
                 $png_num_chars = $this->GetNumChars($pnga);
                 // replace page numbers
                 $replace = array();

application/Espo/Core/Portal/AclManager.php

@@ -41,6 +41,8 @@ class AclManager extends \Espo\Core\AclManager
 
     private $portal = null;
 
+    protected $userAclClassName = '\\Espo\\Core\\Portal\\Acl';
+
     public function getImplementation($scope)
     {
         if (empty($this->implementationHashMap[$scope])) {

application/Espo/Core/Portal/Application.php

@@ -99,6 +99,6 @@ class Application extends \Espo\Core\Application
         $this->getContainer()->get('clientManager')->display(null, 'html/portal.html', array(
             'portalId' => $this->getPortal()->id
         ));
+        exit;
     }
 }
-

application/Espo/Core/Repositories/CategoryTree.php

@@ -41,7 +41,7 @@ class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
 		$query = $this->getEntityManager()->getQuery();
 
 		$parentId = $entity->get('parentId');
-		$pathsTableName = $query->toDb($entity->getEntityType() . 'Path');
+		$pathsTableName = $query->toDb($query->sanitize($entity->getEntityType()) . 'Path');
 
 		if ($entity->isNew()) {
 			if ($parentId) {
@@ -62,7 +62,7 @@ class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
 			}
 			$pdo->query($sql);
 		} else {
-			if ($entity->isFieldChanged('parentId')) {
+			if ($entity->isAttributeChanged('parentId')) {
 				$sql = "
 					DELETE a FROM `".$pathsTableName."` AS a
 					JOIN `".$pathsTableName."` AS d ON a.descendor_id = d.descendor_id
@@ -93,7 +93,7 @@ class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
 		$pdo = $this->getEntityManager()->getPDO();
 		$query = $this->getEntityManager()->getQuery();
 
-		$pathsTableName = $query->toDb($entity->getEntityType() . 'Path');
+		$pathsTableName = $query->toDb($query->sanitize($entity->getEntityType()) . 'Path');
 
 		$sql = "DELETE FROM `".$pathsTableName."` WHERE descendor_id = ".$pdo->quote($entity->id)."";
 		$pdo->query($sql);

application/Espo/Core/Repositories/Event.php

@@ -61,10 +61,15 @@ class Event extends \Espo\Core\ORM\Repositories\RDB
         $pdo->query($sql);
     }
 
-    protected function afterSave(Entity $entity, array $options = array())
+    protected function afterSave(Entity $entity, array $options = [])
     {
-        parent::afterSave($entity, $options);
+        $this->processReminderAfterSave($entity, $options);
 
+        parent::afterSave($entity, $options);
+    }
+
+    protected function processReminderAfterSave(Entity $entity, array $options = [])
+    {
         if (
             $entity->isNew() ||
             $entity->isAttributeChanged('assignedUserId') ||

application/Espo/Core/SelectManagerFactory.php

@@ -32,6 +32,7 @@ namespace Espo\Core;
 use \Espo\Core\Exceptions\Error;
 
 use \Espo\Core\Utils\Util;
+use \Espo\Core\InjectableFactory;
 
 class SelectManagerFactory
 {
@@ -43,7 +44,9 @@ class SelectManagerFactory
 
     private $metadata;
 
-    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, AclManager $aclManager, Utils\Metadata $metadata, Utils\Config $config)
+    private $injectableFactory;
+
+    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, AclManager $aclManager, Utils\Metadata $metadata, Utils\Config $config, InjectableFactory $injectableFactory)
     {
         $this->entityManager = $entityManager;
         $this->user = $user;
@@ -51,9 +54,10 @@ class SelectManagerFactory
         $this->aclManager = $aclManager;
         $this->metadata = $metadata;
         $this->config = $config;
+        $this->injectableFactory = $injectableFactory;
     }
 
-    public function create($entityType)
+    public function create($entityType, $user = null)
     {
         $normalizedName = Util::normilizeClassName($entityType);
 
@@ -70,7 +74,14 @@ class SelectManagerFactory
             }
         }
 
-        $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->aclManager, $this->metadata, $this->config);
+        if ($user) {
+            $acl = $this->aclManager->createUserAcl($user);
+        } else {
+            $acl = $this->acl;
+            $user = $this->user;
+        }
+
+        $selectManager = new $className($this->entityManager, $user, $acl, $this->aclManager, $this->metadata, $this->config, $this->injectableFactory);
         $selectManager->setEntityType($entityType);
 
         return $selectManager;

application/Espo/Core/SelectManagers/Base.php

@@ -36,6 +36,7 @@ use \Espo\Core\Acl;
 use \Espo\Core\AclManager;
 use \Espo\Core\Utils\Metadata;
 use \Espo\Core\Utils\Config;
+use \Espo\Core\InjectableFactory;
 
 class Base
 {
@@ -63,15 +64,19 @@ class Base
 
     const MIN_LENGTH_FOR_CONTENT_SEARCH = 4;
 
-    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, AclManager $aclManager, Metadata $metadata, Config $config)
+    const MIN_LENGTH_FOR_FULL_TEXT_SEARCH = 4;
+
+    protected $fullTextSearchDataCacheHash = [];
+
+    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, AclManager $aclManager, Metadata $metadata, Config $config, InjectableFactory $injectableFactory)
     {
         $this->entityManager = $entityManager;
         $this->user = $user;
         $this->acl = $acl;
         $this->aclManager = $aclManager;
-
         $this->metadata = $metadata;
         $this->config = $config;
+        $this->injectableFactory = $injectableFactory;
     }
 
     protected function getEntityManager()
@@ -104,6 +109,11 @@ class Base
         return $this->aclManager;
     }
 
+    protected function getInjectableFactory()
+    {
+        return $this->injectableFactory;
+    }
+
     public function setEntityType($entityType)
     {
         $this->entityType = $entityType;
@@ -151,6 +161,9 @@ class Base
                     if ($desc) {
                         $list = array_reverse($list);
                     }
+                    foreach ($list as $i => $listItem) {
+                        $list[$i] = str_replace(',', '_COMMA_', $listItem);
+                    }
                     $result['orderBy'] = 'LIST:' . $sortBy . ':' . implode(',', $list);
                     return;
                 }
@@ -186,7 +199,6 @@ class Base
     {
         $this->prepareResult($result);
 
-        $whereClause = array();
         foreach ($where as $item) {
             if (!isset($item['type'])) continue;
 
@@ -198,8 +210,8 @@ class Base
                     }
                     $this->applyBoolFilter($filter, $result);
                 }
-            } else if ($item['type'] == 'textFilter' && !empty($item['value'])) {
-                if (!empty($item['value'])) {
+            } else if ($item['type'] == 'textFilter') {
+                if (isset($item['value']) || $item['value'] !== '') {
                     $this->textFilter($item['value'], $result);
                 }
             } else if ($item['type'] == 'primary' && !empty($item['value'])) {
@@ -207,10 +219,17 @@ class Base
             }
         }
 
+        $whereClause = $this->convertWhere($where, false, $result);
+
+        $result['whereClause'] = array_merge($result['whereClause'], $whereClause);
+    }
+
+    public function convertWhere(array $where, $ignoreAdditionaFilterTypes = false, &$result = null)
+    {
+        $whereClause = [];
 
         $ignoreTypeList = array_merge(['bool', 'primary'], $this->additionalFilterTypeList);
 
-        $additionalFilters = array();
         foreach ($where as $item) {
             if (!isset($item['type'])) continue;
 
@@ -221,7 +240,7 @@ class Base
                     $whereClause[] = $part;
                 }
             } else {
-                if (in_array($type, $this->additionalFilterTypeList)) {
+                if (!$ignoreAdditionaFilterTypes && in_array($type, $this->additionalFilterTypeList)) {
                     if (!empty($item['value'])) {
                         $methodName = 'apply' . ucfirst($type);
 
@@ -242,7 +261,7 @@ class Base
             }
         }
 
-        $result['whereClause'] = array_merge($result['whereClause'], $whereClause);
+        return $whereClause;
     }
 
     protected function applyLinkedWith($link, $idsValue, &$result)
@@ -375,8 +394,9 @@ class Base
 
     protected function q($params, &$result)
     {
-        if (!empty($params['q'])) {
-            $this->textFilter($params['q'], $result);
+        if (isset($params['q']) && $params['q'] !== '') {
+            $textFilter = $params['q'];
+            $this->textFilter($textFilter, $result);
         }
     }
 
@@ -389,7 +409,7 @@ class Base
     public function manageTextFilter($textFilter, &$result)
     {
         $this->prepareResult($result);
-        $this->q(array('q' => $textFilter), $result);
+        $this->q(['q' => $textFilter], $result);
     }
 
     public function getEmptySelectParams()
@@ -472,9 +492,9 @@ class Base
     {
         if ($this->hasAssignedUsersField()) {
             $this->setDistinct(true, $result);
-            $this->addLeftJoin('assignedUsers', $result);
+            $this->addLeftJoin(['assignedUsers', 'assignedUsersAccess'], $result);
             $result['whereClause'][] = array(
-                'assignedUsers.id' => $this->getUser()->id
+                'assignedUsersAccess.id' => $this->getUser()->id
             );
             return;
         }
@@ -720,7 +740,7 @@ class Base
             $this->where($params['where'], $result);
         }
 
-        if (!empty($params['textFilter'])) {
+        if (isset($params['textFilter']) && $params['textFilter'] !== '') {
             $this->textFilter($params['textFilter'], $result);
         }
 
@@ -952,7 +972,7 @@ class Base
 
     protected function getWherePart($item, &$result = null)
     {
-        $part = array();
+        $part = [];
 
         $attribute = null;
         if (!empty($item['field'])) { // for backward compatibility
@@ -984,165 +1004,199 @@ class Base
         if (!array_key_exists('value', $item)) {
             $item['value'] = null;
         }
+        $value = $item['value'];
 
         if (!empty($item['type'])) {
-            switch ($item['type']) {
+            $type = $item['type'];
+
+            switch ($type) {
                 case 'or':
                 case 'and':
                 case 'not':
-                    if (is_array($item['value'])) {
-                        $arr = array();
-                        foreach ($item['value'] as $i) {
+                    if (is_array($value)) {
+                        $arr = [];
+                        foreach ($value as $i) {
                             $a = $this->getWherePart($i, $result);
                             foreach ($a as $left => $right) {
-                                if (!empty($right) || is_null($right) || $right === '') {
-                                    $arr[] = array($left => $right);
+                                if (!empty($right) || is_null($right) || $right === '' || $right === 0 || $right === false) {
+                                    $arr[] = [$left => $right];
                                 }
                             }
                         }
-                        $part[strtoupper($item['type'])] = $arr;
+                        $part[strtoupper($type)] = $arr;
                     }
                     break;
+
                 case 'like':
-                    $part[$attribute . '*'] = $item['value'];
+                    $part[$attribute . '*'] = $value;
                     break;
+
                 case 'notLike':
-                    $part[$attribute . '!*'] = $item['value'];
+                    $part[$attribute . '!*'] = $value;
                     break;
+
                 case 'equals':
                 case 'on':
-                    $part[$attribute . '='] = $item['value'];
+                    $part[$attribute . '='] = $value;
                     break;
+
                 case 'startsWith':
-                    $part[$attribute . '*'] = $item['value'] . '%';
+                    $part[$attribute . '*'] = $value . '%';
                     break;
+
                 case 'endsWith':
-                    $part[$attribute . '*'] = '%' . $item['value'];
+                    $part[$attribute . '*'] = '%' . $value;
                     break;
+
                 case 'contains':
-                    $part[$attribute . '*'] = '%' . $item['value'] . '%';
+                    $part[$attribute . '*'] = '%' . $value . '%';
                     break;
+
                 case 'notContains':
-                    $part[$attribute . '!*'] = '%' . $item['value'] . '%';
+                    $part[$attribute . '!*'] = '%' . $value . '%';
                     break;
+
                 case 'notEquals':
                 case 'notOn':
-                    $part[$attribute . '!='] = $item['value'];
+                    $part[$attribute . '!='] = $value;
                     break;
+
                 case 'greaterThan':
                 case 'after':
-                    $part[$attribute . '>'] = $item['value'];
+                    $part[$attribute . '>'] = $value;
                     break;
+
                 case 'lessThan':
                 case 'before':
-                    $part[$attribute . '<'] = $item['value'];
+                    $part[$attribute . '<'] = $value;
                     break;
+
                 case 'greaterThanOrEquals':
-                    $part[$attribute . '>='] = $item['value'];
+                    $part[$attribute . '>='] = $value;
                     break;
+
                 case 'lessThanOrEquals':
-                    $part[$attribute . '<='] = $item['value'];
+                    $part[$attribute . '<='] = $value;
                     break;
+
                 case 'in':
-                    $part[$attribute . '='] = $item['value'];
+                    $part[$attribute . '='] = $value;
                     break;
+
                 case 'notIn':
-                    $part[$attribute . '!='] = $item['value'];
+                    $part[$attribute . '!='] = $value;
                     break;
+
                 case 'isNull':
                     $part[$attribute . '='] = null;
                     break;
+
                 case 'isNotNull':
                 case 'ever':
                     $part[$attribute . '!='] = null;
                     break;
+
                 case 'isTrue':
                     $part[$attribute . '='] = true;
                     break;
+
                 case 'isFalse':
                     $part[$attribute . '='] = false;
                     break;
+
                 case 'today':
                     $part[$attribute . '='] = date('Y-m-d');
                     break;
+
                 case 'past':
                     $part[$attribute . '<'] = date('Y-m-d');
                     break;
+
                 case 'future':
                     $part[$attribute . '>='] = date('Y-m-d');
                     break;
+
                 case 'lastSevenDays':
                     $dt1 = new \DateTime();
                     $dt2 = clone $dt1;
                     $dt2->modify('-7 days');
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt2->format('Y-m-d'),
                         $attribute . '<=' => $dt1->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'lastXDays':
                     $dt1 = new \DateTime();
                     $dt2 = clone $dt1;
-                    $number = strval(intval($item['value']));
+                    $number = strval(intval($value));
 
                     $dt2->modify('-'.$number.' days');
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt2->format('Y-m-d'),
                         $attribute . '<=' => $dt1->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'nextXDays':
                     $dt1 = new \DateTime();
                     $dt2 = clone $dt1;
-                    $number = strval(intval($item['value']));
+                    $number = strval(intval($value));
                     $dt2->modify('+'.$number.' days');
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt1->format('Y-m-d'),
                         $attribute . '<=' => $dt2->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'olderThanXDays':
                     $dt1 = new \DateTime();
-                    $number = strval(intval($item['value']));
+                    $number = strval(intval($value));
                     $dt1->modify('-'.$number.' days');
                     $part[$attribute . '<'] = $dt1->format('Y-m-d');
                     break;
+
                 case 'afterXDays':
                     $dt1 = new \DateTime();
-                    $number = strval(intval($item['value']));
+                    $number = strval(intval($value));
                     $dt1->modify('+'.$number.' days');
                     $part[$attribute . '>'] = $dt1->format('Y-m-d');
                     break;
+
                 case 'currentMonth':
                     $dt = new \DateTime();
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt->modify('first day of this month')->format('Y-m-d'),
                         $attribute . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'lastMonth':
                     $dt = new \DateTime();
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt->modify('first day of last month')->format('Y-m-d'),
                         $attribute . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'nextMonth':
                     $dt = new \DateTime();
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt->modify('first day of next month')->format('Y-m-d'),
                         $attribute . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'currentQuarter':
                     $dt = new \DateTime();
                     $quarter = ceil($dt->format('m') / 3);
                     $dt->modify('first day of January this year');
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
                         $attribute . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'lastQuarter':
                     $dt = new \DateTime();
                     $quarter = ceil($dt->format('m') / 3);
@@ -1152,33 +1206,37 @@ class Base
                         $quarter = 4;
                         $dt->modify('-1 year');
                     }
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
                         $attribute . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'currentYear':
                     $dt = new \DateTime();
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt->modify('first day of January this year')->format('Y-m-d'),
                         $attribute . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'lastYear':
                     $dt = new \DateTime();
-                    $part['AND'] = array(
+                    $part['AND'] = [
                         $attribute . '>=' => $dt->modify('first day of January last year')->format('Y-m-d'),
                         $attribute . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
-                    );
+                    ];
                     break;
+
                 case 'between':
-                    if (is_array($item['value'])) {
-                        $part['AND'] = array(
-                            $attribute . '>=' => $item['value'][0],
-                            $attribute . '<=' => $item['value'][1],
-                        );
+                    if (is_array($value)) {
+                        $part['AND'] = [
+                            $attribute . '>=' => $value[0],
+                            $attribute . '<=' => $value[1],
+                        ];
                     }
                     break;
+
                 case 'columnLike':
                 case 'columnIn':
                 case 'columnIsNull':
@@ -1188,30 +1246,30 @@ class Base
                     $alias =  $link . 'Filter' . strval(rand(10000, 99999));
                     $this->setDistinct(true, $result);
                     $this->addLeftJoin([$link, $alias], $result);
-                    $value = $item['value'];
                     $columnKey = $alias . 'Middle.' . $column;
-                    if ($item['type'] === 'columnIn') {
+                    if ($type === 'columnIn') {
                         $part[$columnKey] = $value;
-                    } else if ($item['type'] === 'columnNotIn') {
+                    } else if ($type === 'columnNotIn') {
                         $part[$columnKey . '!='] = $value;
-                    } else if ($item['type'] === 'columnIsNull') {
+                    } else if ($type === 'columnIsNull') {
                         $part[$columnKey] = null;
-                    } else if ($item['type'] === 'columnIsNotNull') {
+                    } else if ($type === 'columnIsNotNull') {
                         $part[$columnKey . '!='] = null;
-                    } else if ($item['type'] === 'columnLike') {
+                    } else if ($type === 'columnLike') {
                         $part[$columnKey . '*'] = $value;
-                    } else if ($item['type'] === 'columnStartsWith') {
+                    } else if ($type === 'columnStartsWith') {
                         $part[$columnKey . '*'] = $value . '%';
-                    } else if ($item['type'] === 'columnEndsWith') {
+                    } else if ($type === 'columnEndsWith') {
                         $part[$columnKey . '*'] = '%' . $value;
-                    } else if ($item['type'] === 'columnContains') {
+                    } else if ($type === 'columnContains') {
                         $part[$columnKey . '*'] = '%' . $value . '%';
-                    } else if ($item['type'] === 'columnEquals') {
+                    } else if ($type === 'columnEquals') {
                         $part[$columnKey . '='] = $value;
-                    } else if ($item['type'] === 'columnNotEquals') {
+                    } else if ($type === 'columnNotEquals') {
                         $part[$columnKey . '!='] = $value;
                     }
                     break;
+
                 case 'isNotLinked':
                     if (!$result) break;
                     $alias = $attribute . 'IsNotLinkedFilter' . strval(rand(10000, 99999));
@@ -1219,6 +1277,7 @@ class Base
                     $this->setDistinct(true, $result);
                     $this->addLeftJoin([$attribute, $alias], $result);
                     break;
+
                 case 'isLinked':
                     if (!$result) break;
                     $alias = $attribute . 'IsLinkedFilter' . strval(rand(10000, 99999));
@@ -1226,6 +1285,7 @@ class Base
                     $this->setDistinct(true, $result);
                     $this->addLeftJoin([$attribute, $alias], $result);
                     break;
+
                 case 'linkedWith':
                     $seed = $this->getSeed();
                     $link = $attribute;
@@ -1233,9 +1293,7 @@ class Base
 
                     $alias =  $link . 'Filter' . strval(rand(10000, 99999));
 
-                    $value = $item['value'];
-
-                    if (is_null($value)) break;
+                    if (is_null($value) || !$value && !is_array($value)) break;
 
                     $relationType = $seed->getRelationType($link);
 
@@ -1264,13 +1322,12 @@ class Base
                     }
                     $this->setDistinct(true, $result);
                     break;
+
                 case 'notLinkedWith':
                     $seed = $this->getSeed();
                     $link = $attribute;
                     if (!$seed->hasRelation($link)) break;
 
-                    $value = $item['value'];
-
                     if (is_null($value)) break;
 
                     $relationType = $seed->getRelationType($link);
@@ -1296,12 +1353,64 @@ class Base
                             $part[$key . '!='] = $value;
                         }
                     } else if ($relationType == 'hasOne') {
-                        $this->addLeftJoin([$link, alias], $result);
+                        $this->addLeftJoin([$link, $alias], $result);
                         $part[$alias . '.id!='] = $value;
                     } else {
                         break;
                     }
                     $this->setDistinct(true, $result);
+                    break;
+
+                case 'arrayAnyOf':
+                case 'arrayNoneOf':
+                case 'arrayIsEmpty':
+                case 'arrayIsNotEmpty':
+                    $arrayValueAlias = 'arrayFilter' . strval(rand(10000, 99999));
+                    $arrayAttribute = $attribute;
+                    $arrayEntityType = $this->getEntityType();
+                    $idPart = 'id';
+
+                    if (strpos($attribute, '.') > 0) {
+                        list($arrayAttributeLink, $arrayAttribute) = explode('.', $attribute);
+                        $seed = $this->getSeed();
+                        $arrayEntityType = $seed->getRelationParam($arrayAttributeLink, 'entity');
+                        $idPart = $arrayAttributeLink . '.id';
+                    }
+
+                    if ($type === 'arrayAnyOf') {
+                        if (is_null($value) || !$value && !is_array($value)) break;
+                        $this->addLeftJoin(['ArrayValue', $arrayValueAlias, [
+                            $arrayValueAlias . '.entityId:' => $idPart,
+                            $arrayValueAlias . '.entityType' => $arrayEntityType,
+                            $arrayValueAlias . '.attribute' => $arrayAttribute
+                        ]], $result);
+                        $part[$arrayValueAlias . '.value'] = $value;
+                    } else if ($type === 'arrayNoneOf') {
+                        if (is_null($value) || !$value && !is_array($value)) break;
+                        $this->addLeftJoin(['ArrayValue', $arrayValueAlias, [
+                            $arrayValueAlias . '.entityId:' => $idPart,
+                            $arrayValueAlias . '.entityType' => $arrayEntityType,
+                            $arrayValueAlias . '.attribute' => $arrayAttribute,
+                            $arrayValueAlias . '.value=' => $value
+                        ]], $result);
+                        $part[$arrayValueAlias . '.id'] = null;
+                    } else if ($type === 'arrayIsEmpty') {
+                        $this->addLeftJoin(['ArrayValue', $arrayValueAlias, [
+                            $arrayValueAlias . '.entityId:' => $idPart,
+                            $arrayValueAlias . '.entityType' => $arrayEntityType,
+                            $arrayValueAlias . '.attribute' => $arrayAttribute
+                        ]], $result);
+                        $part[$arrayValueAlias . '.id'] = null;
+                    } else if ($type === 'arrayIsNotEmpty') {
+                        $this->addLeftJoin(['ArrayValue', $arrayValueAlias, [
+                            $arrayValueAlias . '.entityId:' => $idPart,
+                            $arrayValueAlias . '.entityType' => $arrayEntityType,
+                            $arrayValueAlias . '.attribute' => $arrayAttribute
+                        ]], $result);
+                        $part[$arrayValueAlias . '.id!='] = null;
+                    }
+
+                    $this->setDistinct(true, $result);
             }
         }
 
@@ -1327,6 +1436,20 @@ class Base
         $method = 'filter' . ucfirst($filterName);
         if (method_exists($this, $method)) {
             $this->$method($result);
+        } else {
+            $className = $this->getMetadata()->get(['entityDefs', $this->entityType, 'collection', 'filters', $filterName, 'className']);
+            if ($className) {
+                if (!class_exists($className)) {
+                    $GLOBALS['log']->error("Could find class for filter {$filterName}.");
+                    return;
+                }
+                $impl = $this->getInjectableFactory()->createByClassName($className);
+                if (!$impl) {
+                    $GLOBALS['log']->error("Could not create filter {$filterName} implementation.");
+                    return;
+                }
+                $impl->applyFilter($this->entityType, $filterName, $result, $this);
+            }
         }
     }
 
@@ -1474,35 +1597,252 @@ class Base
         );
     }
 
+    public function getFullTextSearchDataForTextFilter($textFilter, $isAuxiliaryUse = false)
+    {
+        if (array_key_exists($textFilter, $this->fullTextSearchDataCacheHash)) {
+            return $this->fullTextSearchDataCacheHash[$textFilter];
+        }
+
+        if ($this->getConfig()->get('fullTextSearchDisabled')) {
+            return null;
+        }
+
+        $result = null;
+
+        $fieldList = $this->getTextFilterFieldList();
+
+        if ($isAuxiliaryUse) {
+            $textFilter = str_replace('%', '', $textFilter);
+        }
+
+        $fullTextSearchColumnList = $this->getEntityManager()->getOrmMetadata()->get($this->getEntityType(), ['fullTextSearchColumnList']);
+
+        $useFullTextSearch = false;
+
+        if (
+            $this->getMetadata()->get(['entityDefs', $this->getEntityType(), 'collection', 'fullTextSearch'])
+            &&
+            !empty($fullTextSearchColumnList)
+        ) {
+            $fullTextSearchMinLength = $this->getConfig()->get('fullTextSearchMinLength', self::MIN_LENGTH_FOR_FULL_TEXT_SEARCH);
+            if (!$fullTextSearchMinLength) {
+                $fullTextSearchMinLength = 0;
+            }
+            $textFilterWoWildcards = str_replace('*', '', $textFilter);
+            if (mb_strlen($textFilterWoWildcards) >= $fullTextSearchMinLength) {
+                $useFullTextSearch = true;
+            }
+        }
+
+        $fullTextSearchFieldList = [];
+
+        if ($useFullTextSearch) {
+            foreach ($fieldList as $field) {
+                $defs = $this->getMetadata()->get(['entityDefs', $this->getEntityType(), 'fields', $field], []);
+                if (empty($defs['type'])) continue;
+                $fieldType = $defs['type'];
+                if (!empty($defs['notStorable'])) continue;
+                if (!$this->getMetadata()->get(['fields', $fieldType, 'fullTextSearch'])) continue;
+                $fullTextSearchFieldList[] = $field;
+            }
+            if (!count($fullTextSearchFieldList)) {
+                $useFullTextSearch = false;
+            }
+        }
+
+        if (empty($fullTextSearchColumnList)) {
+            $useFullTextSearch = false;
+        }
+
+        if ($isAuxiliaryUse) {
+            if (mb_strpos($textFilter, '@') !== false) {
+                $useFullTextSearch = false;
+            }
+        }
+
+        if ($useFullTextSearch) {
+            $textFilter = str_replace(['(', ')'], '', $textFilter);
+
+            if (
+                $isAuxiliaryUse && mb_strpos($textFilter, '*') === false
+                ||
+                mb_strpos($textFilter, ' ') === false
+                &&
+                mb_strpos($textFilter, '+') === false
+                &&
+                mb_strpos($textFilter, '-') === false
+                &&
+                mb_strpos($textFilter, '*') === false
+            ) {
+                $function = 'MATCH_NATURAL_LANGUAGE';
+            } else {
+                $function = 'MATCH_BOOLEAN';
+            }
+
+            $textFilter = str_replace('"*', '"', $textFilter);
+            $textFilter = str_replace('*"', '"', $textFilter);
+
+            while (strpos($textFilter, '**')) {
+                $textFilter = str_replace('**', '*', $textFilter);
+                $textFilter = trim($textFilter);
+            }
+
+            while (mb_substr($textFilter, -2)  === ' *') {
+                $textFilter = mb_substr($textFilter, 0, mb_strlen($textFilter) - 2);
+                $textFilter = trim($textFilter);
+            }
+
+            $fullTextSearchColumnSanitizedList = [];
+            $query = $this->getEntityManager()->getQuery();
+            foreach ($fullTextSearchColumnList as $i => $field) {
+                $fullTextSearchColumnSanitizedList[$i] = $query->sanitize($query->toDb($field));
+            }
+
+            $where = $function . ':' . implode(',', $fullTextSearchColumnSanitizedList) . ':' . $textFilter;
+
+            $result = [
+                'where' => $where,
+                'fieldList' => $fullTextSearchFieldList,
+                'columnList' => $fullTextSearchColumnList
+            ];
+        }
+
+        $this->fullTextSearchDataCacheHash[$textFilter] = $result;
+
+        return $result;
+    }
+
     protected function textFilter($textFilter, &$result)
     {
         $fieldDefs = $this->getSeed()->getAttributes();
         $fieldList = $this->getTextFilterFieldList();
-        $d = array();
+        $group = [];
+
+        $textFilterContainsMinLength = $this->getConfig()->get('textFilterContainsMinLength', self::MIN_LENGTH_FOR_CONTENT_SEARCH);
+
+        $fullTextSearchData = null;
+
+        $forceFullTextSearch = false;
+
+        $useFullTextSearch = !empty($result['useFullTextSearch']);
+
+        if (mb_strpos($textFilter, 'ft:') === 0) {
+            $textFilter = mb_substr($textFilter, 3);
+            $useFullTextSearch = true;
+            $forceFullTextSearch = true;
+        }
+
+        $textFilterForFullTextSearch = $textFilter;
+
+        $skipWidlcards = false;
+
+        if (mb_strpos($textFilter, '*') !== false) {
+            $skipWidlcards = true;
+            $textFilter = str_replace('*', '%', $textFilter);
+        } else {
+            if (!$useFullTextSearch) {
+                $textFilterForFullTextSearch .= '*';
+            }
+        }
+
+        $textFilterForFullTextSearch = str_replace('%', '*', $textFilterForFullTextSearch);
+
+        $skipFullTextSearch = false;
+        if (!$forceFullTextSearch) {
+            if (mb_strpos($textFilterForFullTextSearch, '*') === 0) {
+                $skipFullTextSearch = true;
+            } else if (mb_strpos($textFilterForFullTextSearch, ' *') !== false) {
+                $skipFullTextSearch = true;
+            }
+        }
+
+        $fullTextSearchData = null;
+        if (!$skipFullTextSearch) {
+            $fullTextSearchData = $this->getFullTextSearchDataForTextFilter($textFilterForFullTextSearch, !$useFullTextSearch);
+        }
+
+        $fullTextGroup = [];
+
+        $fullTextSearchFieldList = [];
+        if ($fullTextSearchData) {
+            $fullTextGroup[] = $fullTextSearchData['where'];
+            $fullTextSearchFieldList = $fullTextSearchData['fieldList'];
+        }
 
         foreach ($fieldList as $field) {
-            $expression = $textFilter . '%';
-            if (
-                strlen($textFilter) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH
-                &&
-                (
-                    !empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
-                    ||
-                    !empty($this->textFilterUseContainsAttributeList[$field])
-                    ||
-                    !empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'varchar' &&
-                    $this->getConfig()->get('textFilterUseContainsForVarchar')
-                )
-            ) {
-                $expression = '%' . $textFilter . '%';
-            } else {
-                $expression = $textFilter . '%';
+            if ($useFullTextSearch) {
+                if (in_array($field, $fullTextSearchFieldList)) continue;
             }
-            $d[$field . '*'] = $expression;
+            if ($forceFullTextSearch) continue;
+
+            $attributeType = null;
+            if (!empty($fieldDefs[$field]['type'])) {
+                $attributeType = $fieldDefs[$field]['type'];
+            }
+
+            if ($attributeType === 'int') {
+                if (is_numeric($textFilter)) {
+                    $group[$field] = intval($textFilter);
+                }
+                continue;
+            }
+
+            if (!$skipWidlcards) {
+                if (
+                    mb_strlen($textFilter) >= $textFilterContainsMinLength
+                    &&
+                    (
+                        $attributeType == 'text'
+                        ||
+                        in_array($field, $this->textFilterUseContainsAttributeList)
+                        ||
+                        $attributeType == 'varchar' && $this->getConfig()->get('textFilterUseContainsForVarchar')
+                    )
+                ) {
+                    $expression = '%' . $textFilter . '%';
+                } else {
+                    $expression = $textFilter . '%';
+                }
+            } else {
+                $expression = $textFilter;
+            }
+
+            if ($fullTextSearchData) {
+                if (!$useFullTextSearch) {
+                    if (in_array($field, $fullTextSearchFieldList)) {
+                        if (!array_key_exists('OR', $fullTextGroup)) {
+                            $fullTextGroup['OR'] = [];
+                        }
+                        $fullTextGroup['OR'][$field . '*'] = $expression;
+                        continue;
+                    }
+                }
+            }
+
+            $group[$field . '*'] = $expression;
         }
-        $result['whereClause'][] = array(
-            'OR' => $d
-        );
+
+        if (!$forceFullTextSearch) {
+            $this->applyAdditionalToTextFilterGroup($textFilter, $group, $result);
+        }
+
+        if (!empty($fullTextGroup)) {
+            $group['AND'] = $fullTextGroup;
+        }
+
+        if (count($group) === 0) {
+            $result['whereClause'][] = [
+                'id' => null
+            ];
+        }
+
+        $result['whereClause'][] = [
+            'OR' => $group
+        ];
+    }
+
+    protected function applyAdditionalToTextFilterGroup($textFilter, &$group, &$result)
+    {
     }
 
     public function applyAccess(&$result)
@@ -1531,19 +1871,25 @@ class Base
     protected function boolFilterOnlyMy(&$result)
     {
         if (!$this->checkIsPortal()) {
-            if ($this->hasAssignedUserField()) {
-                $result['whereClause'][] = array(
+            if ($this->hasAssignedUsersField()) {
+                $this->setDistinct(true, $result);
+                $this->addLeftJoin(['assignedUsers', 'assignedUsersAccess'], $result);
+                $result['whereClause'][] = [
+                    'assignedUsersAccess.id' => $this->getUser()->id
+                ];
+            } else if ($this->hasAssignedUserField()) {
+                $result['whereClause'][] = [
                     'assignedUserId' => $this->getUser()->id
-                );
+                ];
             } else {
-                $result['whereClause'][] = array(
+                $result['whereClause'][] = [
                     'createdById' => $this->getUser()->id
-                );
+                ];
             }
         } else {
-            $result['whereClause'][] = array(
+            $result['whereClause'][] = [
                 'createdById' => $this->getUser()->id
-            );
+            ];
         }
     }
 
@@ -1563,4 +1909,3 @@ class Base
         $this->filterFollowed($result);
     }
 }
-

application/Espo/Core/Templates/Metadata/Company/entityDefs.json

@@ -9,7 +9,8 @@
             "type": "text"
         },
         "website": {
-            "type": "url"
+            "type": "url",
+            "strip": true
         },
         "emailAddress": {
             "type": "email"

application/Espo/Core/Templates/Metadata/Person/entityDefs.json

@@ -1,7 +1,8 @@
 {
     "fields": {
         "name": {
-            "type": "personName"
+            "type": "personName",
+            "isPersonalData": true
         },
         "salutationName": {
             "type": "enum",
@@ -24,15 +25,18 @@
             "type": "text"
         },
         "emailAddress": {
-            "type": "email"
+            "type": "email",
+            "isPersonalData": true
         },
         "phoneNumber": {
             "type": "phone",
             "typeList": ["Mobile", "Office", "Home", "Fax", "Other"],
-            "defaultType": "Mobile"
+            "defaultType": "Mobile",
+            "isPersonalData": true
         },
         "address": {
-            "type": "address"
+            "type": "address",
+            "isPersonalData": true
         },
         "addressStreet": {
             "type": "text",

application/Espo/Core/Templates/Metadata/Person/scopes.json

@@ -7,5 +7,6 @@
     "aclPortalLevelList": ["all", "account", "contact", "own", "no"],
     "customizable": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "hasPersonalData": true
 }

application/Espo/Core/Templates/Services/Person.php

@@ -49,7 +49,7 @@ class Person extends \Espo\Services\Record
         if (
             ($entity->get('emailAddress') || $entity->get('emailAddressData'))
             &&
-            ($entity->isNew() || $entity->isFieldChanged('emailAddress') || $entity->isFieldChanged('emailAddressData'))
+            ($entity->isNew() || $entity->isAttributeChanged('emailAddress') || $entity->isAttributeChanged('emailAddressData'))
         ) {
             if ($entity->get('emailAddress')) {
                 $list = [$entity->get('emailAddress')];

application/Espo/Core/Templates/i18n/de_DE/BasePlus.json

@@ -1,6 +1,5 @@
 {
   "links": {
-    "meetings": "Meetings",
     "calls": "Anrufe",
     "tasks": "Aufgaben"
   },

application/Espo/Core/Templates/i18n/de_DE/Company.json

@@ -5,7 +5,6 @@
     "website": "Webseite"
   },
   "links": {
-    "meetings": "Meetings",
     "calls": "Anrufe",
     "tasks": "Aufgaben"
   },

application/Espo/Core/Templates/i18n/de_DE/Event.json

@@ -4,7 +4,6 @@
     "dateStart": "Startdatum",
     "dateEnd": "Enddatum",
     "duration": "Dauer",
-    "status": "Status",
     "reminders": "Erinnerungen"
   },
   "links": {
@@ -20,7 +19,6 @@
   "labels": {
     "Create {entityType}": "{entityTypeTranslated} erstellen",
     "Schedule {entityType}": "{entityTypeTranslated} planen",
-    "Log {entityType}": "Log {entityTypeTranslated}",
     "Set Held": "Auf durchgeführt setzen",
     "Set Not Held": "Auf nicht durchgeführt setzen"
   },

application/Espo/Core/Templates/i18n/de_DE/Person.json

@@ -3,7 +3,6 @@
     "address": "Adresse"
   },
   "links": {
-    "meetings": "Meetings",
     "calls": "Anrufe",
     "tasks": "Aufgaben"
   },

application/Espo/Core/Templates/i18n/es_MX/BasePlus.json

@@ -1,6 +1,6 @@
 {
   "links": {
-    "meetings": "Juntas",
+    "meetings": "Presentaciones",
     "calls": "Llamadas",
     "tasks": "Tareas"
   },

application/Espo/Core/Templates/i18n/es_MX/Company.json

@@ -5,7 +5,7 @@
     "website": "Sitio Web"
   },
   "links": {
-    "meetings": "Juntas",
+    "meetings": "Presentaciones",
     "calls": "Llamadas",
     "tasks": "Tareas"
   },

application/Espo/Core/Templates/i18n/es_MX/Person.json

@@ -3,7 +3,7 @@
     "address": "Dirección"
   },
   "links": {
-    "meetings": "Juntas",
+    "meetings": "Presentaciones",
     "calls": "Llamadas",
     "tasks": "Tareas"
   },

application/Espo/Core/Templates/i18n/hr_HR/Base.json

@@ -0,0 +1,5 @@
+{
+  "labels": {
+    "Create {entityType}": "Napravi {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/hr_HR/BasePlus.json

@@ -0,0 +1,10 @@
+{
+  "links": {
+    "meetings": "Sastanci",
+    "calls": "Pozivi",
+    "tasks": "Zadaci"
+  },
+  "labels": {
+    "Create {entityType}": "Kreiraj {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/hr_HR/Company.json

@@ -0,0 +1,15 @@
+{
+  "fields": {
+    "billingAddress": "Adresa za naplatu",
+    "shippingAddress": "Adresa za dostavu",
+    "website": "Sajt"
+  },
+  "links": {
+    "meetings": "Sastanci",
+    "calls": "Pozivi",
+    "tasks": "Zadaci"
+  },
+  "labels": {
+    "Create {entityType}": "Kreiraj {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/hr_HR/Event.json

@@ -0,0 +1,35 @@
+{
+  "fields": {
+    "parent": "Nadređen",
+    "dateStart": "Početni datum",
+    "dateEnd": "Završni datum",
+    "duration": "Trajanje",
+    "reminders": "Podsjetnici"
+  },
+  "links": {
+    "parent": "Nadređen"
+  },
+  "options": {
+    "status": {
+      "Planned": "Planiran",
+      "Held": "Održan",
+      "Not Held": "Nije održan"
+    }
+  },
+  "labels": {
+    "Create {entityType}": "Kreiraj {entityTypeTranslated}",
+    "Schedule {entityType}": "Zakaži {entityTypeTranslated}",
+    "Log {entityType}": "Zabilježi {entitiTipeTranslated}",
+    "Set Held": "Postavi kao održano",
+    "Set Not Held": "Postavi kao nije održano"
+  },
+  "massActions": {
+    "setHeld": "Postavi kao održano",
+    "setNotHeld": "Postavi kao nije održano"
+  },
+  "presetFilters": {
+    "planned": "Planiran",
+    "held": "Održan",
+    "todays": "Današnji"
+  }
+}

application/Espo/Core/Templates/i18n/hr_HR/Person.json

@@ -0,0 +1,13 @@
+{
+  "fields": {
+    "address": "Adresa"
+  },
+  "links": {
+    "meetings": "Sastanci",
+    "calls": "Pozivi",
+    "tasks": "Zadaci"
+  },
+  "labels": {
+    "Create {entityType}": "Kreiraj {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/hu_HU/Base.json

@@ -0,0 +1,5 @@
+{
+  "labels": {
+    "Create {entityType}": "{EntityTypeTranslated} létrehozása"
+  }
+}

application/Espo/Core/Templates/i18n/hu_HU/BasePlus.json

@@ -0,0 +1,10 @@
+{
+  "links": {
+    "meetings": "találkozók",
+    "calls": "felhívja",
+    "tasks": "feladatok"
+  },
+  "labels": {
+    "Create {entityType}": "{EntityTypeTranslated} létrehozása"
+  }
+}

application/Espo/Core/Templates/i18n/hu_HU/Company.json

@@ -0,0 +1,15 @@
+{
+  "fields": {
+    "billingAddress": "számlázási cím",
+    "shippingAddress": "szállítási cím",
+    "website": "Weboldal"
+  },
+  "links": {
+    "meetings": "találkozók",
+    "calls": "felhívja",
+    "tasks": "feladatok"
+  },
+  "labels": {
+    "Create {entityType}": "{EntityTypeTranslated} létrehozása"
+  }
+}

application/Espo/Core/Templates/i18n/hu_HU/Event.json

@@ -0,0 +1,27 @@
+{
+  "fields": {
+    "parent": "Szülő",
+    "dateStart": "Dátum kezdete",
+    "dateEnd": "Dátum vége",
+    "duration": "tartam",
+    "status": "Állapot",
+    "reminders": "Emlékeztetők"
+  },
+  "links": {
+    "parent": "Szülő"
+  },
+  "options": {
+    "status": {
+      "Planned": "Tervezett",
+      "Not Held": "Nem tartott"
+    }
+  },
+  "labels": {
+    "Create {entityType}": "{EntityTypeTranslated} létrehozása",
+    "Schedule {entityType}": "{EntityTypeTranslated} ütemezése"
+  },
+  "presetFilters": {
+    "planned": "Tervezett",
+    "todays": "A mai"
+  }
+}

application/Espo/Core/Templates/i18n/hu_HU/Person.json

@@ -0,0 +1,13 @@
+{
+  "fields": {
+    "address": "Cím"
+  },
+  "links": {
+    "meetings": "találkozók",
+    "calls": "felhívja",
+    "tasks": "feladatok"
+  },
+  "labels": {
+    "Create {entityType}": "{EntityTypeTranslated} létrehozása"
+  }
+}

application/Espo/Core/Templates/i18n/lt_LT/BasePlus.json

@@ -1,6 +1,6 @@
 {
   "links": {
-    "meetings": "Susirinkimai",
+    "meetings": "Susitikimai",
     "calls": "Skambučiai",
     "tasks": "Užduotys"
   },

application/Espo/Core/Templates/i18n/lt_LT/Company.json

@@ -2,10 +2,10 @@
   "fields": {
     "billingAddress": "Mokėtojo adresas",
     "shippingAddress": "Siuntimo adresas",
-    "website": "Interntinė Svetainė"
+    "website": "Internetinė Svetainė"
   },
   "links": {
-    "meetings": "Susirinkimai",
+    "meetings": "Susitikimai",
     "calls": "Skambučiai",
     "tasks": "Užduotys"
   },

application/Espo/Core/Templates/i18n/lt_LT/Person.json

@@ -3,7 +3,7 @@
     "address": "Adresas"
   },
   "links": {
-    "meetings": "Susirinkimai",
+    "meetings": "Susitikimai",
     "calls": "Skambučiai",
     "tasks": "Užduotys"
   },

application/Espo/Core/Templates/i18n/pl_PL/Base.json

@@ -1,5 +1,5 @@
 {
-    "labels": {
-        "Create {entityType}": "Utwórz {entityTypeTranslated}"
-    }
-}
+  "labels": {
+    "Create {entityType}": "Utwórz {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/pl_PL/BasePlus.json

@@ -1,5 +1,10 @@
 {
-    "labels": {
-        "Create {entityType}": "Utwórz {entityTypeTranslated}"
-    }
-}
+  "links": {
+    "meetings": "Spotkania",
+    "calls": "Połączenia",
+    "tasks": "Zadania"
+  },
+  "labels": {
+    "Create {entityType}": "Utwórz {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/pl_PL/Company.json

@@ -1,5 +1,15 @@
 {
-    "labels": {
-        "Create {entityType}": "Utwórz {entityTypeTranslated}"
-    }
-}
+  "fields": {
+    "billingAddress": "Adres rozliczeniowy",
+    "shippingAddress": "Adres dostawy",
+    "website": "Strona internetowa"
+  },
+  "links": {
+    "meetings": "Spotkania",
+    "calls": "Połączenia",
+    "tasks": "Zadania"
+  },
+  "labels": {
+    "Create {entityType}": "Utwórz {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/pl_PL/Event.json

@@ -1,5 +1,20 @@
 {
-    "labels": {
-        "Create {entityType}": "Utwórz {entityTypeTranslated}"
+  "fields": {
+    "dateStart": "Data rozpoczęcia",
+    "dateEnd": "Data zakończenia",
+    "duration": "Czas trwania",
+    "reminders": "Przypomnienia"
+  },
+  "options": {
+    "status": {
+      "Planned": "Planowane"
     }
-}
+  },
+  "labels": {
+    "Create {entityType}": "Utwórz {entityTypeTranslated}",
+    "Schedule {entityType}": "Zaplanuj {entityTypeTranslated} "
+  },
+  "presetFilters": {
+    "planned": "Planowane"
+  }
+}

application/Espo/Core/Templates/i18n/pl_PL/Person.json

@@ -1,5 +1,13 @@
 {
-    "labels": {
-        "Create {entityType}": "Utwórz {entityTypeTranslated}"
-    }
-}
+  "fields": {
+    "address": "Adres"
+  },
+  "links": {
+    "meetings": "Spotkania",
+    "calls": "Rozmowy",
+    "tasks": "Zadania"
+  },
+  "labels": {
+    "Create {entityType}": "Utwórz {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/ro_RO/Base.json

@@ -1,5 +1,5 @@
 {
-    "labels": {
-        "Create {entityType}": "Creare {entityTypeTranslated}"
-    }
-}
+  "labels": {
+    "Create {entityType}": "Creare {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/ro_RO/BasePlus.json

@@ -1,5 +1,5 @@
 {
-    "labels": {
-        "Create {entityType}": "Creare {entityTypeTranslated}"
-    }
-}
+  "labels": {
+    "Create {entityType}": "Creare {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/ro_RO/Company.json

@@ -1,5 +1,5 @@
 {
-    "labels": {
-        "Create {entityType}": "Creare {entityTypeTranslated}"
-    }
-}
+  "labels": {
+    "Create {entityType}": "Creare {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/ro_RO/Event.json

@@ -1,5 +1,5 @@
 {
-    "labels": {
-        "Create {entityType}": "Creare {entityTypeTranslated}"
-    }
-}
+  "labels": {
+    "Create {entityType}": "Creare {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/ro_RO/Person.json

@@ -1,5 +1,5 @@
 {
-    "labels": {
-        "Create {entityType}": "Creare {entityTypeTranslated}"
-    }
-}
+  "labels": {
+    "Create {entityType}": "Creare {entityTypeTranslated}"
+  }
+}

application/Espo/Core/Templates/i18n/sk_SK/Base.json

@@ -0,0 +1,5 @@
+{
+  "labels": {
+    "Create {entityType}": "Vytvoriť {entityTypeTranslated}"
+  }
+}