orm: revert forcing updating json object

application/Espo/Core/Application.php

@@ -128,7 +128,7 @@ 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);
         }
     }
 
@@ -177,7 +177,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);
@@ -227,7 +227,7 @@ class Application
                 $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request());
                 $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);
             }
         });
 

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

@@ -48,6 +48,6 @@ class ContainsType extends \Espo\Core\Formula\Functions\Base
             return false;
         }
 
-        return strpos($string, $needle) !== false;
+        return mb_strpos($string, $needle) !== false;
     }
 }

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/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()

application/Espo/Core/ORM/Entity.php

@@ -137,7 +137,7 @@ class Entity extends \Espo\ORM\Entity
         }
 
         $this->set($idsAttribute, $ids);
-        if (!$this->hasFetched($idsAttribute)) {
+        if (!$this->isNew() && !$this->hasFetched($idsAttribute)) {
             $this->setFetched($idsAttribute, $ids);
         }
 
@@ -170,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

@@ -465,17 +465,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) {
@@ -540,13 +544,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/SelectManagers/Base.php

@@ -161,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;
                 }
@@ -392,7 +395,8 @@ class Base
     protected function q($params, &$result)
     {
         if (isset($params['q']) && $params['q'] !== '') {
-            $this->textFilter($params['q'], $result);
+            $textFilter = $params['q'];
+            $this->textFilter($textFilter, $result);
         }
     }
 
@@ -1251,7 +1255,7 @@ class Base
 
                     $value = $item['value'];
 
-                    if (is_null($value)) break;
+                    if (is_null($value) || !$value && !is_array($value)) break;
 
                     $relationType = $seed->getRelationType($link);
 
@@ -1535,7 +1539,8 @@ class Base
             if (!$fullTextSearchMinLength) {
                 $fullTextSearchMinLength = 0;
             }
-            if (mb_strlen($textFilter) >= $fullTextSearchMinLength) {
+            $textFilterWoWildcards = str_replace('*', '', $textFilter);
+            if (mb_strlen($textFilterWoWildcards) >= $fullTextSearchMinLength) {
                 $useFullTextSearch = true;
             }
         }
@@ -1560,9 +1565,17 @@ class Base
             $useFullTextSearch = false;
         }
 
+        if ($isAuxiliaryUse) {
+            if (mb_strpos($textFilter, '@') !== false) {
+                $useFullTextSearch = false;
+            }
+        }
+
         if ($useFullTextSearch) {
+            $textFilter = str_replace(['(', ')'], '', $textFilter);
+
             if (
-                $isAuxiliaryUse
+                $isAuxiliaryUse && mb_strpos($textFilter, '*') === false
                 ||
                 mb_strpos($textFilter, ' ') === false
                 &&
@@ -1577,6 +1590,19 @@ class Base
                 $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) {
@@ -1617,15 +1643,34 @@ class Base
             $forceFullTextSearch = true;
         }
 
+        $textFilterForFullTextSearch = $textFilter;
+
         $skipWidlcards = false;
-        if (!$useFullTextSearch) {
-            if (mb_strpos($textFilter, '*') !== false) {
-                $skipWidlcards = true;
-                $textFilter = str_replace('*', '%', $textFilter);
+
+        if (mb_strpos($textFilter, '*') !== false) {
+            $skipWidlcards = true;
+            $textFilter = str_replace('*', '%', $textFilter);
+        } else {
+            if (!$useFullTextSearch) {
+                $textFilterForFullTextSearch .= '*';
             }
         }
 
-        $fullTextSearchData = $this->getFullTextSearchDataForTextFilter($textFilter, !$useFullTextSearch);
+        $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 = [];
 
@@ -1689,7 +1734,7 @@ class Base
         }
 
         if (!$forceFullTextSearch) {
-            $this->applyAdditionalToTextFilterGroup($textFilter, $group);
+            $this->applyAdditionalToTextFilterGroup($textFilter, $group, $result);
         }
 
         if (!empty($fullTextGroup)) {
@@ -1707,7 +1752,7 @@ class Base
         ];
     }
 
-    protected function applyAdditionalToTextFilterGroup($textFilter, &$group)
+    protected function applyAdditionalToTextFilterGroup($textFilter, &$group, &$result)
     {
     }
 

application/Espo/Core/Utils/Api/Output.php

@@ -42,6 +42,9 @@ class Output
         500 => 'Internal Server Error',
     );
 
+    protected $ignorePrintXStatusReasonExceptionClassNameList = [
+        'PDOException'
+    ];
 
     public function __construct(\Espo\Core\Utils\Api\Slim $slim)
     {
@@ -69,7 +72,7 @@ class Output
         echo $data;
     }
 
-    public function processError($message = 'Error', $code = 500, $isPrint = false)
+    public function processError($message = 'Error', $code = 500, $isPrint = false, $exception = null)
     {
         $currentRoute = $this->getSlim()->router()->getCurrentRoute();
 
@@ -79,7 +82,7 @@ class Output
             $GLOBALS['log']->error('API ['.$this->getSlim()->request()->getMethod().']:'.$currentRoute->getPattern().', Params:'.print_r($currentRoute->getParams(), true).', InputData: '.$inputData.' - '.$message);
         }
 
-        $this->displayError($message, $code, $isPrint);
+        $this->displayError($message, $code, $isPrint, $exception);
     }
 
     /**
@@ -90,15 +93,21 @@ class Output
     *
     * @return void
     */
-    public function displayError($text, $statusCode = 500, $isPrint = false)
+    public function displayError($text, $statusCode = 500, $isPrint = false, $exception = null)
     {
         $GLOBALS['log']->error('Display Error: '.$text.', Code: '.$statusCode.' URL: '.$_SERVER['REQUEST_URI']);
 
         ob_clean();
 
         if (!empty( $this->slim)) {
+            $toPrintXStatusReason = true;
+            if ($exception && in_array(get_class($exception), $this->ignorePrintXStatusReasonExceptionClassNameList)) {
+                $toPrintXStatusReason = false;
+            }
             $this->getSlim()->response()->setStatus($statusCode);
-            $this->getSlim()->response()->headers->set('X-Status-Reason', $text);
+            if ($toPrintXStatusReason) {
+                $this->getSlim()->response()->headers->set('X-Status-Reason', $text);
+            }
 
             if ($isPrint) {
                 $status = $this->getCodeDesc($statusCode);

application/Espo/Core/Utils/Database/DBAL/Driver/PDOMySql/Driver.php

@@ -25,16 +25,19 @@
  *
  * 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\Utils\Database\DBAL\Driver\PDOMySql;
 
-class Driver extends \Doctrine\DBAL\Driver\PDOMySql\Driver 
+class Driver extends \Doctrine\DBAL\Driver\PDOMySql\Driver
 {
-
     public function getDatabasePlatform()
     {
         return new \Espo\Core\Utils\Database\DBAL\Platforms\MySqlPlatform();
     }
-    
+
+    public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
+    {
+        return new \Espo\Core\Utils\Database\DBAL\Schema\MySqlSchemaManager($conn);
+    }
 }

application/Espo/Core/Utils/Database/DBAL/Schema/Index.php

@@ -0,0 +1,82 @@
+<?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\Utils\Database\DBAL\Schema;
+
+use Doctrine\DBAL\Schema\Index as DBALIndex;
+
+class Index extends \Doctrine\DBAL\Schema\Index
+{
+    public function addFlag($flag)
+    {
+        $this->_flags[strtolower($flag)] = true;
+
+        return $this;
+    }
+
+    public function hasFlag($flag)
+    {
+        return isset($this->_flags[strtolower($flag)]);
+    }
+
+    public function removeFlag($flag)
+    {
+        unset($this->_flags[strtolower($flag)]);
+    }
+
+    public function isFullfilledBy(DBALIndex $other)
+    {
+        if (count($other->getColumns()) != count($this->getColumns())) {
+            return false;
+        }
+
+        $sameColumns = $this->spansColumns($other->getColumns());
+
+        if ($sameColumns) {
+            $flags = $this->getFlags();
+            $otherFlags = $other->getFlags();
+
+            if ( ! $this->isUnique() && !$this->isPrimary() && $flags === $otherFlags) {
+                return true;
+            } else if ($other->isPrimary() != $this->isPrimary()) {
+                return false;
+            } else if ($other->isUnique() != $this->isUnique()) {
+                return false;
+            }
+
+            if (count($flags) != count($otherFlags) || array_diff($flags, $otherFlags) !== array_diff($otherFlags, $flags)) {
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+}

application/Espo/Core/Utils/Database/DBAL/Schema/MySqlSchemaManager.php

@@ -0,0 +1,144 @@
+<?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\Utils\Database\DBAL\Schema;
+
+use Doctrine\DBAL\Events;
+use Doctrine\DBAL\Event\SchemaIndexDefinitionEventArgs;
+
+class MySqlSchemaManager extends \Doctrine\DBAL\Schema\MySqlSchemaManager
+{
+    public function createSchema()
+    {
+        $sequences = array();
+        if ($this->_platform->supportsSequences()) {
+            $sequences = $this->listSequences();
+        }
+        $tables = $this->listTables();
+
+        return new Schema($tables, $sequences, $this->createSchemaConfig());
+    }
+
+    public function listTables()
+    {
+        $tableNames = $this->listTableNames();
+
+        $tables = array();
+        foreach ($tableNames as $tableName) {
+            $tables[] = $this->listTableDetails($tableName);
+        }
+
+        return $tables;
+    }
+
+    public function listTableDetails($tableName)
+    {
+        $columns = $this->listTableColumns($tableName);
+        $foreignKeys = array();
+        if ($this->_platform->supportsForeignKeyConstraints()) {
+            $foreignKeys = $this->listTableForeignKeys($tableName);
+        }
+        $indexes = $this->listTableIndexes($tableName);
+
+        return new Table($tableName, $columns, $indexes, $foreignKeys, false, array());
+    }
+
+    public function listTableIndexes($table)
+    {
+        $sql = $this->_platform->getListTableIndexesSQL($table, $this->_conn->getDatabase());
+
+        $tableIndexes = $this->_conn->fetchAll($sql);
+
+        return $this->_getPortableTableIndexesList($tableIndexes, $table);
+    }
+
+    protected function _getPortableTableIndexesList($tableIndexes, $tableName=null)
+    {
+        foreach($tableIndexes as $k => $v) {
+            $v = array_change_key_case($v, CASE_LOWER);
+            if($v['key_name'] == 'PRIMARY') {
+                $v['primary'] = true;
+            } else {
+                $v['primary'] = false;
+            }
+            if (strpos($v['index_type'], 'FULLTEXT') !== false) {
+                $v['flags'] = array('FULLTEXT');
+            }
+            $tableIndexes[$k] = $v;
+        }
+
+        $result = array();
+        foreach($tableIndexes as $tableIndex) {
+
+            $indexName = $keyName = $tableIndex['key_name'];
+            if ($tableIndex['primary']) {
+                $keyName = 'primary';
+            }
+            $keyName = strtolower($keyName);
+
+            if (!isset($result[$keyName])) {
+                $result[$keyName] = array(
+                    'name' => $indexName,
+                    'columns' => array($tableIndex['column_name']),
+                    'unique' => $tableIndex['non_unique'] ? false : true,
+                    'primary' => $tableIndex['primary'],
+                    'flags' => isset($tableIndex['flags']) ? $tableIndex['flags'] : array(),
+                );
+            } else {
+                $result[$keyName]['columns'][] = $tableIndex['column_name'];
+            }
+        }
+
+        $eventManager = $this->_platform->getEventManager();
+
+        $indexes = array();
+        foreach($result as $indexKey => $data) {
+            $index = null;
+            $defaultPrevented = false;
+
+            if (null !== $eventManager && $eventManager->hasListeners(Events::onSchemaIndexDefinition)) {
+                $eventArgs = new SchemaIndexDefinitionEventArgs($data, $tableName, $this->_conn);
+                $eventManager->dispatchEvent(Events::onSchemaIndexDefinition, $eventArgs);
+
+                $defaultPrevented = $eventArgs->isDefaultPrevented();
+                $index = $eventArgs->getIndex();
+            }
+
+            if ( ! $defaultPrevented) {
+                $index = new Index($data['name'], $data['columns'], $data['unique'], $data['primary'], $data['flags']);
+            }
+
+            if ($index) {
+                $indexes[$indexKey] = $index;
+            }
+        }
+
+        return $indexes;
+    }
+}

application/Espo/Core/Utils/Database/DBAL/Schema/Schema.php

@@ -28,9 +28,9 @@
  ************************************************************************/
 
 namespace Espo\Core\Utils\Database\DBAL\Schema;
+
 class Schema extends \Doctrine\DBAL\Schema\Schema
 {
-
     /**
      * Creates a new table.
      *

application/Espo/Core/Utils/Database/DBAL/Schema/Table.php

@@ -28,11 +28,12 @@
  ************************************************************************/
 
 namespace Espo\Core\Utils\Database\DBAL\Schema;
+
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Schema\SchemaException;
 
 class Table extends \Doctrine\DBAL\Schema\Table
 {
-
     /**
      * @param string $columnName
      * @param string $typeName
@@ -49,4 +50,35 @@ class Table extends \Doctrine\DBAL\Schema\Table
         return $column;
     }
 
+    public function addIndex(array $columnNames, $indexName = null, array $flags = array())
+    {
+        if($indexName == null) {
+            $indexName = $this->_generateIdentifierName(
+                array_merge(array($this->getName()), $columnNames), "idx", $this->_getMaxIdentifierLength()
+            );
+        }
+
+        return $this->_createIndex($columnNames, $indexName, false, false, $flags);
+    }
+
+    private function _createIndex(array $columnNames, $indexName, $isUnique, $isPrimary, array $flags = array())
+    {
+        if (preg_match('(([^a-zA-Z0-9_]+))', $indexName)) {
+            throw SchemaException::indexNameInvalid($indexName);
+        }
+
+        foreach ($columnNames as $columnName => $indexColOptions) {
+            if (is_numeric($columnName) && is_string($indexColOptions)) {
+                $columnName = $indexColOptions;
+            }
+
+            if ( ! $this->hasColumn($columnName)) {
+                throw SchemaException::columnDoesNotExist($columnName, $this->_name);
+            }
+        }
+
+        $this->_addIndex(new Index($indexName, $columnNames, $isUnique, $isPrimary, $flags));
+
+        return $this;
+    }
 }

application/Espo/Core/Utils/Database/Orm/Fields/AttachmentMultiple.php

@@ -40,7 +40,8 @@ class AttachmentMultiple extends Base
                         'type' => 'jsonArray',
                         'notStorable' => true,
                         'orderBy' => [['createdAt', 'ASC'], ['name', 'ASC']],
-                        'isLinkMultipleIdList' => true
+                        'isLinkMultipleIdList' => true,
+                        'relation' => $fieldName
                     ),
                     $fieldName.'Names' => array(
                         'type' => 'jsonObject',

application/Espo/Core/Utils/Database/Orm/Fields/LinkMultiple.php

@@ -33,28 +33,29 @@ class LinkMultiple extends Base
 {
     protected function load($fieldName, $entityName)
     {
-        $data = array(
-            $entityName => array (
-                'fields' => array(
-                    $fieldName.'Ids' => array(
+        $data = [
+            $entityName => [
+                'fields' => [
+                    $fieldName.'Ids' => [
                         'type' => 'jsonArray',
                         'notStorable' => true,
                         'isLinkMultipleIdList' => true,
-                        'relation' => $fieldName
-                    ),
-                    $fieldName.'Names' => array(
+                        'relation' => $fieldName,
+                        'isUnordered' => true
+                    ],
+                    $fieldName.'Names' => [
                         'type' => 'jsonObject',
                         'notStorable' => true,
                         'isLinkMultipleNameMap' => true
-                    )
-                )
-            ),
-            'unset' => array(
-                $entityName => array(
-                    'fields.'.$fieldName
-                )
-            )
-        );
+                    ]
+                ]
+            ],
+            'unset' => [
+                $entityName => [
+                    'fields.' . $fieldName
+                ]
+            ]
+        ];
 
         $fieldParams = $this->getFieldParams();
 
@@ -67,10 +68,10 @@ class LinkMultiple extends Base
 
         $columns = $this->getMetadata()->get("entityDefs.{$entityName}.fields.{$fieldName}.columns");
         if (!empty($columns)) {
-            $data[$entityName]['fields'][$fieldName . 'Columns'] = array(
+            $data[$entityName]['fields'][$fieldName . 'Columns'] = [
                 'type' => 'jsonObject',
                 'notStorable' => true,
-            );
+            ];
         }
 
         return $data;

application/Espo/Core/Utils/Database/Schema/Converter.php

@@ -181,7 +181,7 @@ class Converter
         $schema = $this->getSchema(true);
 
         $indexList = SchemaUtils::getIndexList($ormMeta);
-        $fieldListExceededIndexMaxLength = SchemaUtils::getFieldListExceededIndexMaxLength($ormMeta, $this->getMaxIndexLength(), $indexList);
+        $fieldListExceededIndexMaxLength = SchemaUtils::getFieldListExceededIndexMaxLength($ormMeta, $this->getMaxIndexLength());
 
         $tables = array();
         foreach ($ormMeta as $entityName => $entityParams) {

application/Espo/Core/Utils/Database/Schema/Utils.php

@@ -110,7 +110,7 @@ class Utils
         $fields = array();
 
         if (!isset($indexList)) {
-            $indexList = static::getIndexList($ormMeta);
+            $indexList = static::getIndexList($ormMeta, ['fulltext']);
         }
 
         foreach ($indexList as $entityName => $indexes) {

application/Espo/Core/Utils/EntityManager.php

@@ -662,7 +662,6 @@ class EntityManager
                         $link => array(
                             "type" => "linkMultiple",
                             "layoutDetailDisabled"  => !$linkMultipleField,
-                            "layoutListDisabled"  => true,
                             "layoutMassUpdateDisabled"  => !$linkMultipleField,
                             "noLoad"  => !$linkMultipleField,
                             "importDisabled" => !$linkMultipleField,
@@ -727,7 +726,6 @@ class EntityManager
                         $linkForeign => array(
                             "type" => "linkMultiple",
                             "layoutDetailDisabled"  => !$linkMultipleFieldForeign,
-                            "layoutListDisabled"  => true,
                             "layoutMassUpdateDisabled"  => !$linkMultipleFieldForeign,
                             "noLoad"  => !$linkMultipleFieldForeign,
                             "importDisabled" => !$linkMultipleFieldForeign,
@@ -751,7 +749,6 @@ class EntityManager
                         $link => array(
                             "type" => "linkMultiple",
                             "layoutDetailDisabled"  => !$linkMultipleField,
-                            "layoutListDisabled"  => true,
                             "layoutMassUpdateDisabled"  => !$linkMultipleField,
                             "importDisabled" => !$linkMultipleField,
                             "noLoad"  => !$linkMultipleField,
@@ -774,7 +771,6 @@ class EntityManager
                         $linkForeign => array(
                             "type" => "linkMultiple",
                             "layoutDetailDisabled"  => !$linkMultipleFieldForeign,
-                            "layoutListDisabled"  => true,
                             "layoutMassUpdateDisabled"  => !$linkMultipleFieldForeign,
                             "importDisabled" => !$linkMultipleFieldForeign,
                             "noLoad"  => !$linkMultipleFieldForeign,
@@ -848,7 +844,6 @@ class EntityManager
                         $link => array(
                             "type" => "linkMultiple",
                             "layoutDetailDisabled"  => !$linkMultipleField,
-                            "layoutListDisabled"  => true,
                             "layoutMassUpdateDisabled"  => !$linkMultipleField,
                             "noLoad"  => !$linkMultipleField,
                             "importDisabled" => !$linkMultipleField,
@@ -873,7 +868,6 @@ class EntityManager
                         $linkForeign => array(
                             "type" => "linkMultiple",
                             "layoutDetailDisabled"  => !$linkMultipleFieldForeign,
-                            "layoutListDisabled"  => true,
                             "layoutMassUpdateDisabled"  => !$linkMultipleFieldForeign,
                             "noLoad"  => !$linkMultipleFieldForeign,
                             "importDisabled" => !$linkMultipleFieldForeign,

application/Espo/Core/Utils/Metadata.php

@@ -358,6 +358,14 @@ class Metadata
      */
     public function saveCustom($key1, $key2, $data)
     {
+        if (is_object($data)) {
+            foreach ($data as $key => $item) {
+                if ($item == new \stdClass()) {
+                    unset($data->$key);
+                }
+            }
+        }
+
         $filePath = array($this->paths['customPath'], $key1, $key2.'.json');
         $changedData = Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
 
@@ -380,6 +388,14 @@ class Metadata
     */
     public function set($key1, $key2, $data)
     {
+        if (is_array($data)) {
+            foreach ($data as $key => $item) {
+                if (is_array($item) && empty($item)) {
+                    unset($data[$key]);
+                }
+            }
+        }
+
         $newData = array(
             $key1 => array(
                 $key2 => $data,

application/Espo/Hooks/Common/AssignmentEmailNotification.php

@@ -58,18 +58,32 @@ class AssignmentEmailNotification extends \Espo\Core\Hooks\Base
 
                 foreach ($userIdList as $userId) {
                     if (in_array($userId, $fetchedAssignedUserIdList)) continue;
-                    if ($this->getUser()->id === $userId) continue;
+                    if (!$this->isNotSelfAssignment($entity, $userId)) continue;
                     $this->createJob($entity, $userId);
                 }
             } else {
                 $userId = $entity->get('assignedUserId');
-                if (!empty($userId) && $userId != $this->getUser()->id && $entity->isAttributeChanged('assignedUserId')) {
+                if (!empty($userId) && $entity->isAttributeChanged('assignedUserId') && $this->isNotSelfAssignment($entity, $userId)) {
                     $this->createJob($entity, $userId);
                 }
             }
         }
     }
 
+    protected function isNotSelfAssignment(Entity $entity, $assignedUserId)
+    {
+        if ($entity->hasAttribute('createdById') && $entity->hasAttribute('modifiedById')) {
+            if ($entity->isNew()) {
+                $isNotSelfAssignment = $assignedUserId !== $entity->get('createdById');
+            } else {
+                $isNotSelfAssignment = $assignedUserId !== $entity->get('modifiedById');
+            }
+        } else {
+            $isNotSelfAssignment = $assignedUserId !== $this->getUser()->id;
+        }
+        return $isNotSelfAssignment;
+    }
+
     protected function createJob(Entity $entity, $userId)
     {
         $job = $this->getEntityManager()->getEntity('Job');

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json

@@ -82,8 +82,7 @@
             "view": "views/fields/teams"
         },
         "attachments": {
-            "type": "attachmentMultiple",
-            "layoutListDisabled": true
+            "type": "attachmentMultiple"
         }
     },
     "links": {

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json

@@ -66,7 +66,8 @@
                     "distinct": true
                 }
             },
-            "trim": true
+            "trim": true,
+            "textFilterDisabled": true
         },
         "description": {
             "type": "text"
@@ -130,7 +131,8 @@
             "layoutFiltersDisabled": true,
             "exportDisabled": true,
             "importDisabled": true,
-            "view": "crm:views/contact/fields/account-role"
+            "view": "crm:views/contact/fields/account-role",
+            "textFilterDisabled": true
         },
         "accountIsInactive": {
             "type": "bool",

application/Espo/Modules/Crm/Resources/metadata/entityDefs/KnowledgeBaseArticle.json

@@ -34,7 +34,8 @@
         },
         "order": {
             "type": "int",
-            "disableFormatting": true
+            "disableFormatting": true,
+            "textFilterDisabled": true
         },
         "description": {
             "type": "text"

application/Espo/Modules/Crm/Resources/metadata/entityDefs/KnowledgeBaseCategory.json

@@ -27,7 +27,8 @@
         "order": {
             "type": "int",
             "required": true,
-            "disableFormatting": true
+            "disableFormatting": true,
+            "textFilterDisabled": true
         },
         "teams": {
             "type": "linkMultiple",

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json

@@ -99,8 +99,7 @@
         },
         "attachments": {
             "type": "attachmentMultiple",
-            "sourceList": ["Document"],
-            "layoutListDisabled": true
+            "sourceList": ["Document"]
         }
     },
     "links": {

application/Espo/Modules/Crm/Resources/routes.json

@@ -1,22 +1,21 @@
 [
-  {
-      "route":"/Activities/:scope/:id/:name",
-    "method":"get",
-    "params":{
-        "controller":"Activities",
-        "action":"list",
-        "scope":":scope",
-        "id":":id",
-        "name":":name"
+    {
+        "route": "/Activities/:scope/:id/:name",
+        "method": "get",
+        "params": {
+            "controller": "Activities",
+            "action": "list",
+            "scope": ":scope",
+            "id": ":id",
+            "name": ":name"
+        }
+    },
+    {
+        "route": "/Activities",
+        "method": "get",
+        "params": {
+            "controller": "Activities",
+            "action": "listCalendarEvents"
+        }
     }
-  },
-
-  {
-      "route":"/Activities",
-    "method":"get",
-    "params":{
-        "controller":"Activities",
-        "action":"listCalendarEvents"
-    }
-  }
 ]

application/Espo/Modules/Crm/SelectManagers/CampaignLogRecord.php

@@ -33,19 +33,23 @@ class CampaignLogRecord extends \Espo\Core\SelectManagers\Base
 {
     protected function accessOnlyOwn(&$result)
     {
+        $this->addLeftJoin(['campaign', 'campaignAccess'], $result);
+
         $result['whereClause'][] = array(
-            'campaign.assignedUserId' => $this->getUser()->id
+            'campaignAccess.assignedUserId' => $this->getUser()->id
         );
     }
 
     protected function accessOnlyTeam(&$result)
     {
+        $this->addLeftJoin(['campaign', 'campaignAccess'], $result);
+
         $teamIdList = $this->user->get('teamsIds');
         if (empty($result['customWhere'])) {
             $result['customWhere'] = '';
         }
         if (empty($teamIdList)) {
-            $result['customWhere'] .= " AND campaign.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id);
+            $result['customWhere'] .= " AND campaignAccess.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id);
             return;
         }
         $arr = [];
@@ -55,12 +59,12 @@ class CampaignLogRecord extends \Espo\Core\SelectManagers\Base
             }
         }
 
-        $result['customJoin'] .= " LEFT JOIN entity_team AS teamsMiddle ON teamsMiddle.entity_type = 'Campaign' AND teamsMiddle.entity_id = campaign.id AND teamsMiddle.deleted = 0";
+        $result['customJoin'] .= " LEFT JOIN entity_team AS teamsMiddle ON teamsMiddle.entity_type = 'Campaign' AND teamsMiddle.entity_id = campaignAccess.id AND teamsMiddle.deleted = 0";
         $result['customWhere'] .= "
             AND (
                 teamsMiddle.team_id IN (" . implode(', ', $arr) . ")
                  OR
-                campaign.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id)."
+                campaignAccess.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id)."
             )
         ";
         $result['whereClause'][] = array(

application/Espo/Modules/Crm/SelectManagers/CampaignTrackingUrl.php

@@ -33,19 +33,23 @@ class CampaignTrackingUrl extends \Espo\Core\SelectManagers\Base
 {
     protected function accessOnlyOwn(&$result)
     {
+        $this->addLeftJoin(['campaign', 'campaignAccess'], $result);
+
         $result['whereClause'][] = array(
-            'campaign.assignedUserId' => $this->getUser()->id
+            'campaignAccess.assignedUserId' => $this->getUser()->id
         );
     }
 
     protected function accessOnlyTeam(&$result)
     {
+        $this->addLeftJoin(['campaign', 'campaignAccess'], $result);
+
         $teamIdList = $this->user->get('teamsIds');
         if (empty($result['customWhere'])) {
             $result['customWhere'] = '';
         }
         if (empty($teamIdList)) {
-            $result['customWhere'] .= " AND campaign.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id);
+            $result['customWhere'] .= " AND campaignAccess.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id);
             return;
         }
         $arr = [];
@@ -55,12 +59,12 @@ class CampaignTrackingUrl extends \Espo\Core\SelectManagers\Base
             }
         }
 
-        $result['customJoin'] .= " LEFT JOIN entity_team AS teamsMiddle ON teamsMiddle.entity_type = 'Campaign' AND teamsMiddle.entity_id = campaign.id AND teamsMiddle.deleted = 0";
+        $result['customJoin'] .= " LEFT JOIN entity_team AS teamsMiddle ON teamsMiddle.entity_type = 'Campaign' AND teamsMiddle.entity_id = campaignAccess.id AND teamsMiddle.deleted = 0";
         $result['customWhere'] .= "
             AND (
                 teamsMiddle.team_id IN (" . implode(', ', $arr) . ")
                  OR
-                campaign.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id)."
+                campaignAccess.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id)."
             )
         ";
         $result['whereClause'][] = array(

application/Espo/Modules/Crm/SelectManagers/MassEmail.php

@@ -45,21 +45,25 @@ class MassEmail extends \Espo\Core\SelectManagers\Base
         );
     }
 
-    protected function acessOnlyOwn(&$result)
+    protected function accessOnlyOwn(&$result)
     {
+        $this->addLeftJoin(['campaign', 'campaignAccess'], $result);
+
         $result['whereClause'][] = array(
-            'campaign.assignedUserId' => $this->getUser()->id
+            'campaignAccess.assignedUserId' => $this->getUser()->id
         );
     }
 
     protected function accessOnlyTeam(&$result)
     {
-        $teamIdList = $this->user->get('teamsIds');
+        $this->addLeftJoin(['campaign', 'campaignAccess'], $result);
+
+        $teamIdList = $this->user->getLinkMultipleIdList('teams');
         if (empty($result['customWhere'])) {
             $result['customWhere'] = '';
         }
         if (empty($teamIdList)) {
-            $result['customWhere'] .= " AND campaign.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id);
+            $result['customWhere'] .= " AND campaignAccess.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id);
             return;
         }
         $arr = [];
@@ -69,12 +73,12 @@ class MassEmail extends \Espo\Core\SelectManagers\Base
             }
         }
 
-        $result['customJoin'] .= " LEFT JOIN entity_team AS teamsMiddle ON teamsMiddle.entity_type = 'Campaign' AND teamsMiddle.entity_id = campaign.id AND teamsMiddle.deleted = 0";
+        $result['customJoin'] .= " LEFT JOIN entity_team AS teamsMiddle ON teamsMiddle.entity_type = 'Campaign' AND teamsMiddle.entity_id = campaignAccess.id AND teamsMiddle.deleted = 0";
         $result['customWhere'] .= "
             AND (
                 teamsMiddle.team_id IN (" . implode(', ', $arr) . ")
                  OR
-                campaign.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id)."
+                campaignAccess.assigned_user_id = ".$this->getEntityManager()->getPDO()->quote($this->getUser()->id)."
             )
         ";
         $result['whereClause'][] = array(

application/Espo/ORM/DB/Mapper.php

@@ -718,7 +718,7 @@ abstract class Mapper implements IMapper
 
     public function insert(IEntity $entity)
     {
-        $dataArr = $this->toArray($entity);
+        $dataArr = $this->toValueMap($entity);
 
         $fieldArr = array();
         $valArr = array();
@@ -745,33 +745,35 @@ abstract class Mapper implements IMapper
 
     public function update(IEntity $entity)
     {
-        $dataArr = $this->toArray($entity);
+        $valueMap = $this->toValueMap($entity);
 
-        $setArr = array();
-        foreach ($dataArr as $field => $value) {
-            if ($field == 'id') {
+        $setArr = [];
+
+        foreach ($valueMap as $attribute => $value) {
+            if ($attribute == 'id') {
                 continue;
             }
-            $type = $entity->fields[$field]['type'];
+            $type = $entity->getAttributeType($attribute);
 
             if ($type == IEntity::FOREIGN) {
                 continue;
             }
 
-            if ($entity->getFetched($field) === $value && $type != IEntity::JSON_ARRAY && $type != IEntity::JSON_OBJECT) {
+            if (!$entity->isAttributeChanged($attribute) && $type !== IEntity::JSON_OBJECT) {
                 continue;
             }
 
             $value = $this->prepareValueForInsert($type, $value);
 
-            $setArr[] = "`" . $this->toDb($field) . "` = " . $this->quote($value);
+            $setArr[] = "`" . $this->toDb($attribute) . "` = " . $this->quote($value);
         }
+
         if (count($setArr) == 0) {
             return $entity->id;
         }
 
         $setPart = implode(', ', $setArr);
-        $wherePart = $this->query->getWhere($entity, array('id' => $entity->id, 'deleted' => 0));
+        $wherePart = $this->query->getWhere($entity, ['id' => $entity->id, 'deleted' => 0]);
 
         $sql = $this->composeUpdateQuery($this->toDb($entity->getEntityType()), $setPart, $wherePart);
 
@@ -815,21 +817,25 @@ abstract class Mapper implements IMapper
         return $this->update($entity);
     }
 
-    protected function toArray(IEntity $entity, $onlyStorable = true)
+    protected function toValueMap(IEntity $entity, $onlyStorable = true)
     {
-        $arr = array();
-        foreach ($entity->fields as $field => $fieldDefs) {
-            if ($entity->has($field)) {
+        $data = [];
+        foreach ($entity->getAttributes() as $attribute => $defs) {
+            if ($entity->has($attribute)) {
                 if ($onlyStorable) {
-                    if (!empty($fieldDefs['notStorable']) || !empty($fieldDefs['autoincrement']) || isset($fieldDefs['source']) && $fieldDefs['source'] != 'db')
-                        continue;
-                    if ($fieldDefs['type'] == IEntity::FOREIGN)
-                        continue;
+                    if (
+                        !empty($defs['notStorable'])
+                        ||
+                        !empty($defs['autoincrement'])
+                        ||
+                        isset($defs['source']) && $defs['source'] != 'db'
+                    ) continue;
+                    if ($defs['type'] == IEntity::FOREIGN) continue;
                 }
-                $arr[$field] = $entity->get($field);
+                $data[$attribute] = $entity->get($attribute);
             }
         }
-        return $arr;
+        return $data;
     }
 
     protected function fromRow(IEntity $entity, $data)

application/Espo/ORM/DB/Query/Base.php

@@ -576,7 +576,13 @@ abstract class Base
             if (strpos($orderBy, 'LIST:') === 0) {
                 list($l, $field, $list) = explode(':', $orderBy);
                 $fieldPath = $this->getFieldPathForOrderBy($entity, $field);
-                $part = "FIELD(" . $fieldPath . ", '" . implode("', '", array_reverse(explode(",", $list))) . "') DESC";
+                $listQuoted = [];
+                $list = array_reverse(explode(',', $list));
+                foreach ($list as $i => $listItem) {
+                    $listItem = str_replace('_COMMA_', ',', $listItem);
+                    $listQuoted[] = $this->quote($listItem);
+                }
+                $part = "FIELD(" . $fieldPath . ", " . implode(", ", $listQuoted) . ") DESC";
                 return $part;
             }
 

application/Espo/ORM/Entity.php

@@ -369,25 +369,92 @@ abstract class Entity implements IEntity
         return $this->isFetched;
     }
 
-    public function isFieldChanged($fieldName)
+    public function isFieldChanged($name)
     {
-        return $this->has($fieldName) && ($this->get($fieldName) != $this->getFetched($fieldName));
+        return $this->has($name) && ($this->get($name) != $this->getFetched($name));
     }
 
-    public function isAttributeChanged($fieldName)
+    public function isAttributeChanged($name)
     {
-        return $this->has($fieldName) && ($this->get($fieldName) != $this->getFetched($fieldName));
+        if (!$this->has($name)) return false;
+
+        if (!$this->hasFetched($name)) {
+            return true;
+        }
+        return !self::areValuesEqual(
+            $this->getAttributeType($name),
+            $this->get($name),
+            $this->getFetched($name),
+            $this->getAttributeParam($name, 'isUnordered')
+        );
+
+        return $this->get($name) != $this->getFetched($name);
     }
 
-    public function setFetched($fieldName, $value)
+    public static function areValuesEqual($type, $v1, $v2, $isUnordered = false)
     {
-        $this->fetchedValuesContainer[$fieldName] = $value;
+        if ($type === self::JSON_ARRAY) {
+            if (is_array($v1) && is_array($v2)) {
+                if ($isUnordered) {
+                    sort($v1);
+                    sort($v2);
+                }
+                if ($v1 != $v2) {
+                    return false;
+                }
+                foreach ($v1 as $i => $itemValue) {
+                    if (is_object($v1[$i]) && is_object($v2[$i])) {
+                        if (!self::areValuesEqual(self::JSON_OBJECT, $v1[$i], $v2[$i])) {
+                            return false;
+                        }
+                        continue;
+                    }
+                    if ($v1[$i] !== $v2[$i]) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        } else if ($type === self::JSON_OBJECT) {
+            if (is_object($v1) && is_object($v2)) {
+                if ($v1 != $v2) {
+                    return false;
+                }
+                $a1 = get_object_vars($v1);
+                $a2 = get_object_vars($v2);
+                foreach ($v1 as $key => $itemValue) {
+                    if (is_object($a1[$key]) && is_object($a2[$key])) {
+                        if (!self::areValuesEqual(self::JSON_OBJECT, $a1[$key], $a2[$key])) {
+                            return false;
+                        }
+                        continue;
+                    }
+                    if (is_array($a1[$key]) && is_array($a2[$key])) {
+                        if (!self::areValuesEqual(self::JSON_ARRAY, $a1[$key], $a2[$key])) {
+                            return false;
+                        }
+                        continue;
+                    }
+                    if ($a1[$key] !== $a2[$key]) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+
+        return $v1 === $v2;
     }
 
-    public function getFetched($fieldName)
+    public function setFetched($name, $value)
     {
-        if (isset($this->fetchedValuesContainer[$fieldName])) {
-            return $this->fetchedValuesContainer[$fieldName];
+        $this->fetchedValuesContainer[$name] = $value;
+    }
+
+    public function getFetched($name)
+    {
+        if (isset($this->fetchedValuesContainer[$name])) {
+            return $this->fetchedValuesContainer[$name];
         }
         return null;
     }

application/Espo/Resources/metadata/entityDefs/Email.json

@@ -31,33 +31,39 @@
             "type": "varchar",
             "notStorable": true,
             "required": true,
-            "view": "views/email/fields/from-address-varchar"
+            "view": "views/email/fields/from-address-varchar",
+            "textFilterDisabled": true
         },
         "to": {
             "type": "varchar",
             "notStorable": true,
             "required": true,
-            "view": "views/email/fields/email-address-varchar"
+            "view": "views/email/fields/email-address-varchar",
+            "textFilterDisabled": true
         },
         "cc": {
             "type": "varchar",
             "notStorable": true,
-            "view": "views/email/fields/email-address-varchar"
+            "view": "views/email/fields/email-address-varchar",
+            "textFilterDisabled": true
         },
         "bcc": {
             "type": "varchar",
             "notStorable": true,
-            "view": "views/email/fields/email-address-varchar"
+            "view": "views/email/fields/email-address-varchar",
+            "textFilterDisabled": true
         },
         "replyTo": {
             "type": "varchar",
             "notStorable": true,
-            "view": "views/email/fields/email-address-varchar"
+            "view": "views/email/fields/email-address-varchar",
+            "textFilterDisabled": true
         },
         "personStringData": {
             "type": "varchar",
             "notStorable": true,
-            "disabled": true
+            "disabled": true,
+            "view": "views/email/fields/person-string-data"
         },
         "isRead": {
             "type": "bool",
@@ -98,7 +104,8 @@
         "folderId": {
             "type": "varchar",
             "notStorable": true,
-            "default": false
+            "default": false,
+            "textFilterDisabled": true
         },
         "isUsers": {
             "type": "bool",
@@ -137,7 +144,8 @@
         "messageIdInternal": {
             "type": "varchar",
             "maxLength": 300,
-            "readOnly": true
+            "readOnly": true,
+            "textFilterDisabled": true
         },
         "emailAddress": {
             "type": "base",
@@ -146,7 +154,8 @@
         },
         "fromEmailAddress": {
             "type": "link",
-            "view": "views/email/fields/from-email-address"
+            "view": "views/email/fields/from-email-address",
+            "textFilterDisabled": true
         },
         "toEmailAddresses": {
             "type": "linkMultiple"

application/Espo/Resources/metadata/entityDefs/EmailTemplate.json

@@ -85,6 +85,7 @@
     },
     "collection": {
         "sortBy": "createdAt",
-        "asc": false
+        "asc": false,
+        "textFilterFields": ["name", "bodyPlain", "body", "subject"]
     }
 }

application/Espo/Resources/metadata/entityDefs/EmailTemplateCategory.json

@@ -8,7 +8,8 @@
         "order": {
             "type": "int",
             "minValue": 1,
-            "required": true
+            "required": true,
+            "textFilterDisabled": true
         },
         "description": {
             "type": "text"

application/Espo/Resources/metadata/entityDefs/User.json

@@ -96,7 +96,8 @@
             },
             "trim": true,
             "layoutDetailDisabled": true,
-            "layoutListDisabled": true
+            "layoutListDisabled": true,
+            "textFilterDisabled": true
         },
         "emailAddress": {
             "type": "email",

application/Espo/Resources/metadata/fields/array.json

@@ -31,6 +31,7 @@
    ],
    "filter": true,
    "notCreatable": false,
+   "notSortable": true,
    "fieldDefs":{
       "type":"jsonArray"
    },

application/Espo/Resources/metadata/fields/attachmentMultiple.json

@@ -30,10 +30,8 @@
       "layoutRelationshipsDisabled": true,
       "relationName": "attachments"
    },
+   "notSortable": true,
    "filter": true,
-   "fieldDefs": {
-      "layoutListDisabled": true
-   },
    "hookClassName": "\\Espo\\Core\\Utils\\FieldManager\\Hooks\\AttachmentMultipleType",
    "personalData": true
 }

application/Espo/Resources/metadata/fields/foreign.json

@@ -13,7 +13,7 @@
          "required": true
       }
    ],
-   "fieldTypeList": ["varchar", "enum", "enumInt", "enumFloat", "int", "float", "website", "date", "datetime", "text"],
+   "fieldTypeList": ["varchar", "enum", "enumInt", "enumFloat", "int", "float", "website", "date", "datetime", "text", "number"],
    "filter": true,
    "notCreatable": false,
    "fieldDefs": {

application/Espo/Resources/metadata/fields/jsonArray.json

@@ -1,5 +1,6 @@
 {
    "notCreatable": true,
    "notMergeable": true,
+   "notSortable": true,
    "filter": false
 }

application/Espo/Resources/metadata/fields/linkMultiple.json

@@ -23,8 +23,6 @@
       "names"
    ],
    "notCreatable": true,
-   "filter": true,
-   "fieldDefs": {
-      "layoutListDisabled": true
-   }
+   "notSortable": true,
+   "filter": true
 }

application/Espo/Resources/metadata/fields/map.json

@@ -14,6 +14,7 @@
    ],
    "filter": false,
    "notCreatable": true,
+   "notSortable": true,
    "fieldDefs": {
       "notStorable": true
    }

application/Espo/Resources/metadata/fields/multiEnum.json

@@ -26,6 +26,7 @@
    ],
    "filter": true,
    "notCreatable": false,
+   "notSortable": true,
    "fieldDefs":{
       "type":"jsonArray"
    },

application/Espo/Resources/metadata/fields/password.json

@@ -6,6 +6,7 @@
          "default":false
       }
    ],
+   "notSortable": true,
    "notCreatable": true,
    "filter": false
 }

application/Espo/Resources/routes.json

@@ -1,319 +1,326 @@
 [
     {
-        "route":"/",
-        "method":"get",
-        "params":"<h1>EspoCRM REST API<\/h1>"
+        "route": "/",
+        "method": "get",
+        "params": "<h1>EspoCRM REST API<\/h1>"
     },
     {
-        "route":"/App/user",
-        "method":"get",
-        "params":{
-            "controller":"App",
-            "action":"user"
+        "route": "/App/user",
+        "method": "get",
+        "params": {
+            "controller": "App",
+            "action": "user"
         }
     },
     {
-        "route":"/Metadata",
-        "method":"get",
-        "params":{
-            "controller":"Metadata"
+        "route": "/Metadata",
+        "method": "get",
+        "params": {
+            "controller": "Metadata"
         }
     },
     {
-        "route":"I18n",
-        "method":"get",
-        "params":{
-            "controller":"I18n"
+        "route": "I18n",
+        "method": "get",
+        "params": {
+            "controller": "I18n"
         },
-        "conditions":{
-            "auth":false
+        "conditions": {
+            "auth": false
         }
     },
     {
-        "route":"/Settings",
-        "method":"get",
-        "params":{
-            "controller":"Settings"
+        "route": "/Settings",
+        "method": "get",
+        "params": {
+            "controller": "Settings"
         },
-        "conditions":{
-            "auth":false
+        "conditions": {
+            "auth": false
         }
     },
     {
-        "route":"/Settings",
-        "method":"patch",
-        "params":{
-            "controller":"Settings"
+        "route": "/Settings",
+        "method": "patch",
+        "params": {
+            "controller": "Settings"
         }
     },
     {
-        "route":"User/passwordChangeRequest",
-        "method":"post",
-        "params":{
-            "controller":"User",
-            "action":"passwordChangeRequest"
+        "route": "/Settings",
+        "method": "put",
+        "params": {
+            "controller": "Settings"
+        }
+    },
+    {
+        "route": "User/passwordChangeRequest",
+        "method": "post",
+        "params": {
+            "controller": "User",
+            "action": "passwordChangeRequest"
         },
-        "conditions":{
-            "auth":false
+        "conditions": {
+            "auth": false
         }
     },
     {
-        "route":"User/changePasswordByRequest",
-        "method":"post",
-        "params":{
-            "controller":"User",
-            "action":"changePasswordByRequest"
+        "route": "User/changePasswordByRequest",
+        "method": "post",
+        "params": {
+            "controller": "User",
+            "action": "changePasswordByRequest"
         },
-        "conditions":{
-            "auth":false
+        "conditions": {
+            "auth": false
         }
     },
     {
-        "route":"/Stream",
-        "method":"get",
-        "params":{
-            "controller":"Stream",
-            "action":"list",
-            "scope":"User"
+        "route": "/Stream",
+        "method": "get",
+        "params": {
+            "controller": "Stream",
+            "action": "list",
+            "scope": "User"
         }
     },
     {
-        "route":"/GlobalSearch",
-        "method":"get",
-        "params":{
-            "controller":"GlobalSearch",
-            "action":"search"
+        "route": "/GlobalSearch",
+        "method": "get",
+        "params": {
+            "controller": "GlobalSearch",
+            "action": "search"
         }
     },
     {
-        "route":"/:controller/action/:action",
-        "method":"post",
-        "params":{
-            "controller":":controller",
-            "action":":action"
+        "route": "/:controller/action/:action",
+        "method": "post",
+        "params": {
+            "controller": ":controller",
+            "action": ":action"
         }
     },
     {
-        "route":"/:controller/action/:action",
-        "method":"put",
-        "params":{
-            "controller":":controller",
-            "action":":action"
+        "route": "/:controller/action/:action",
+        "method": "put",
+        "params": {
+            "controller": ":controller",
+            "action": ":action"
         }
     },
     {
-        "route":"/:controller/action/:action",
-        "method":"get",
-        "params":{
-            "controller":":controller",
-            "action":":action"
+        "route": "/:controller/action/:action",
+        "method": "get",
+        "params": {
+            "controller": ":controller",
+            "action": ":action"
         }
     },
     {
-        "route":"/:controller/layout/:name",
-        "method":"get",
-        "params":{
-            "controller":"Layout",
-            "scope":":controller"
+        "route": "/:controller/layout/:name",
+        "method": "get",
+        "params": {
+            "controller": "Layout",
+            "scope": ":controller"
         }
     },
     {
-        "route":"/:controller/layout/:name",
-        "method":"put",
-        "params":{
-            "controller":"Layout",
-            "scope":":controller"
+        "route": "/:controller/layout/:name",
+        "method": "put",
+        "params": {
+            "controller": "Layout",
+            "scope": ":controller"
         }
     },
     {
-        "route":"/:controller/layout/:name",
-        "method":"patch",
-        "params":{
-            "controller":"Layout",
-            "scope":":controller"
+        "route": "/:controller/layout/:name",
+        "method": "patch",
+        "params": {
+            "controller": "Layout",
+            "scope": ":controller"
         }
     },
     {
-        "route":"/Admin/rebuild",
-        "method":"post",
-        "params":{
-            "controller":"Admin",
-            "action":"rebuild"
+        "route": "/Admin/rebuild",
+        "method": "post",
+        "params": {
+            "controller": "Admin",
+            "action": "rebuild"
         }
     },
     {
-        "route":"/Admin/clearCache",
-        "method":"post",
-        "params":{
-            "controller":"Admin",
-            "action":"clearCache"
+        "route": "/Admin/clearCache",
+        "method": "post",
+        "params": {
+            "controller": "Admin",
+            "action": "clearCache"
         }
     },
     {
-        "route":"/Admin/jobs",
-        "method":"get",
-        "params":{
-            "controller":"Admin",
-            "action":"jobs"
+        "route": "/Admin/jobs",
+        "method": "get",
+        "params": {
+            "controller": "Admin",
+            "action": "jobs"
         }
     },
     {
-        "route":"/Admin/fieldManager/:scope/:name",
-        "method":"get",
-        "params":{
-            "controller":"FieldManager",
-            "action":"read",
-            "scope":":scope",
-            "name":":name"
+        "route": "/Admin/fieldManager/:scope/:name",
+        "method": "get",
+        "params": {
+            "controller": "FieldManager",
+            "action": "read",
+            "scope": ":scope",
+            "name": ":name"
         }
     },
     {
-        "route":"/Admin/fieldManager/:scope",
-        "method":"post",
-        "params":{
-            "controller":"FieldManager",
-            "action":"create",
-            "scope":":scope"
+        "route": "/Admin/fieldManager/:scope",
+        "method": "post",
+        "params": {
+            "controller": "FieldManager",
+            "action": "create",
+            "scope": ":scope"
         }
     },
     {
-        "route":"/Admin/fieldManager/:scope/:name",
-        "method":"put",
-        "params":{
-            "controller":"FieldManager",
-            "action":"update",
-            "scope":":scope",
-            "name":":name"
+        "route": "/Admin/fieldManager/:scope/:name",
+        "method": "put",
+        "params": {
+            "controller": "FieldManager",
+            "action": "update",
+            "scope": ":scope",
+            "name": ":name"
         }
     },
     {
-        "route":"/Admin/fieldManager/:scope/:name",
-        "method":"patch",
-        "params":{
-            "controller":"FieldManager",
-            "action":"update",
-            "scope":":scope",
-            "name":":name"
+        "route": "/Admin/fieldManager/:scope/:name",
+        "method": "patch",
+        "params": {
+            "controller": "FieldManager",
+            "action": "update",
+            "scope": ":scope",
+            "name": ":name"
         }
     },
     {
-        "route":"/Admin/fieldManager/:scope/:name",
-        "method":"delete",
-        "params":{
-            "controller":"FieldManager",
-            "action":"delete",
-            "scope":":scope",
-            "name":":name"
+        "route": "/Admin/fieldManager/:scope/:name",
+        "method": "delete",
+        "params": {
+            "controller": "FieldManager",
+            "action": "delete",
+            "scope": ":scope",
+            "name": ":name"
         }
     },
     {
-        "route":"/:controller/:id",
-        "method":"get",
-        "params":{
-            "controller":":controller",
-            "action":"read",
-            "id":":id"
+        "route": "/:controller/:id",
+        "method": "get",
+        "params": {
+            "controller": ":controller",
+            "action": "read",
+            "id": ":id"
         }
     },
     {
-        "route":"/:controller",
-        "method":"get",
-        "params":{
-            "controller":":controller",
-            "action":"index"
+        "route": "/:controller",
+        "method": "get",
+        "params": {
+            "controller": ":controller",
+            "action": "index"
         }
     },
     {
-        "route":"/:controller",
-        "method":"post",
-        "params":{
-            "controller":":controller",
-            "action":"create"
+        "route": "/:controller",
+        "method": "post",
+        "params": {
+            "controller": ":controller",
+            "action": "create"
         }
     },
     {
-        "route":"/:controller/:id",
-        "method":"put",
-        "params":{
-            "controller":":controller",
-            "action":"update",
-            "id":":id"
+        "route": "/:controller/:id",
+        "method": "put",
+        "params": {
+            "controller": ":controller",
+            "action": "update",
+            "id": ":id"
         }
     },
     {
-        "route":"/:controller/:id",
-        "method":"patch",
-        "params":{
-            "controller":":controller",
-            "action":"patch",
-            "id":":id"
+        "route": "/:controller/:id",
+        "method": "patch",
+        "params": {
+            "controller": ":controller",
+            "action": "patch",
+            "id": ":id"
         }
     },
     {
-        "route":"/:controller/:id",
-        "method":"delete",
-        "params":{
-            "controller":":controller",
-            "action":"delete",
-            "id":":id"
+        "route": "/:controller/:id",
+        "method": "delete",
+        "params": {
+            "controller": ":controller",
+            "action": "delete",
+            "id": ":id"
         }
     },
     {
-        "route":"/:controller/:id/stream",
-        "method":"get",
-        "params":{
-            "controller":"Stream",
-            "action":"list",
-            "id":":id",
-            "scope":":controller"
+        "route": "/:controller/:id/stream",
+        "method": "get",
+        "params": {
+            "controller": "Stream",
+            "action": "list",
+            "id": ":id",
+            "scope": ":controller"
         }
     },
     {
-        "route":"/:controller/:id/subscription",
-        "method":"put",
-        "params":{
-            "controller":":controller",
-            "id":":id",
-            "action":"follow"
+        "route": "/:controller/:id/subscription",
+        "method": "put",
+        "params": {
+            "controller": ":controller",
+            "id": ":id",
+            "action": "follow"
         }
     },
     {
-        "route":"/:controller/:id/subscription",
-        "method":"delete",
-        "params":{
-            "controller":":controller",
-            "id":":id",
-            "action":"unfollow"
+        "route": "/:controller/:id/subscription",
+        "method": "delete",
+        "params": {
+            "controller": ":controller",
+            "id": ":id",
+            "action": "unfollow"
         }
     },
     {
-        "route":"/:controller/:id/:link",
-        "method":"get",
-        "params":{
-            "controller":":controller",
-            "action":"listLinked",
-            "id":":id",
-            "link":":link"
+        "route": "/:controller/:id/:link",
+        "method": "get",
+        "params": {
+            "controller": ":controller",
+            "action": "listLinked",
+            "id": ":id",
+            "link": ":link"
         }
     },
     {
-        "route":"/:controller/:id/:link",
-        "method":"post",
-        "params":{
-            "controller":":controller",
-            "action":"createLink",
-            "id":":id",
-            "link":":link"
+        "route": "/:controller/:id/:link",
+        "method": "post",
+        "params": {
+            "controller": ":controller",
+            "action": "createLink",
+            "id": ":id",
+            "link": ":link"
         }
     },
     {
-        "route":"/:controller/:id/:link",
-        "method":"delete",
-        "params":{
-            "controller":":controller",
-            "action":"removeLink",
-            "id":":id",
-            "link":":link"
+        "route": "/:controller/:id/:link",
+        "method": "delete",
+        "params": {
+            "controller": ":controller",
+            "action": "removeLink",
+            "id": ":id",
+            "link": ":link"
         }
     }
 ]

application/Espo/SelectManagers/Email.php

@@ -270,7 +270,7 @@ class Email extends \Espo\Core\SelectManagers\Base
         );
     }
 
-    protected function applyAdditionalToTextFilterGroup($textFilter, &$group)
+    protected function applyAdditionalToTextFilterGroup($textFilter, &$group, &$result)
     {
         if (strlen($textFilter) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH) {
             $emailAddressId = $this->getEmailAddressIdByValue($textFilter);

application/Espo/SelectManagers/EmailTemplate.php

@@ -31,24 +31,6 @@ namespace Espo\SelectManagers;
 
 class EmailTemplate extends \Espo\Core\SelectManagers\Base
 {
-
-    protected function textFilter($textFilter, &$result)
-    {
-        $d = array();
-
-        $d['name*'] = '' . $textFilter . '%';
-        $d['subject*'] = '%' . $textFilter . '%';
-
-        if (strlen($textFilter) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH) {
-            $d['bodyPlain*'] = '%' . $textFilter . '%';
-            $d['body*'] = '%' . $textFilter . '%';
-        }
-
-        $result['whereClause'][] = array(
-            'OR' => $d
-        );
-    }
-
     protected function filterActual(&$result)
     {
 
@@ -58,4 +40,3 @@ class EmailTemplate extends \Espo\Core\SelectManagers\Base
     }
 
 }
-

application/Espo/Services/Email.php

@@ -173,14 +173,26 @@ class Email extends Record
 
         if (!$smtpParams && $fromAddress === strtolower($this->getConfig()->get('outboundEmailFromAddress'))) {
             if (!$this->getConfig()->get('outboundEmailIsShared')) {
-                throw new Error('Can not use system smtp. System SMTP is not shared.');
+                throw new Error('Can not use system SMTP. System account is not shared.');
             }
-            $emailSender->setParams(array(
+            $emailSender->setParams([
                 'fromName' => $this->getConfig()->get('outboundEmailFromName')
-            ));
+            ]);
         }
 
-        $params = array();
+        if (!$smtpParams && !$this->getConfig()->get('outboundEmailIsShared')) {
+            throw new Error('No SMTP params found for '.$fromAddress.'.');
+        }
+
+        if (!$smtpParams) {
+            if (in_array($fromAddress, $userAddressList)) {
+                $emailSender->setParams([
+                    'fromName' => $this->getUser()->get('name')
+                ]);
+            }
+        }
+
+        $params = [];
 
         $parent = null;
         if ($entity->get('parentType') && $entity->get('parentId')) {

application/Espo/Services/EmailAccount.php

@@ -209,12 +209,15 @@ class EmailAccount extends Record
         if (empty($fetchData)) {
             $fetchData = new \StdClass();
         }
+        $fetchData = clone $fetchData;
         if (!property_exists($fetchData, 'lastUID')) {
-            $fetchData->lastUID = new \StdClass();;
+            $fetchData->lastUID = new \StdClass();
         }
         if (!property_exists($fetchData, 'lastDate')) {
-            $fetchData->lastDate = new \StdClass();;
+            $fetchData->lastDate = new \StdClass();
         }
+        $fetchData->lastUID = clone $fetchData->lastUID;
+        $fetchData->lastDate = clone $fetchData->lastDate;
 
         $storage = $this->getStorage($emailAccount);
 
@@ -385,7 +388,7 @@ class EmailAccount extends Record
         $emailAccount = $this->getEntityManager()->getRepository('EmailAccount')->where([
             'emailAddress' => $address,
             'assignedUserId' => $user->id,
-            'active' => true
+            'status' => 'Active'
         ])->findOne();
 
         return $emailAccount;

application/Espo/Services/InboundEmail.php

@@ -210,12 +210,15 @@ class InboundEmail extends \Espo\Services\Record
         if (empty($fetchData)) {
             $fetchData = new \StdClass();
         }
+        $fetchData = clone $fetchData;
         if (!property_exists($fetchData, 'lastUID')) {
             $fetchData->lastUID = new \StdClass();;
         }
         if (!property_exists($fetchData, 'lastDate')) {
-            $fetchData->lastDate = new \StdClass();;
+            $fetchData->lastDate = new \StdClass();
         }
+        $fetchData->lastUID = clone $fetchData->lastUID;
+        $fetchData->lastDate = clone $fetchData->lastDate;
 
         $imapParams = array(
             'host' => $emailAccount->get('host'),

application/Espo/Services/MysqlCharacter.php

@@ -29,6 +29,8 @@
 
 namespace Espo\Services;
 
+use Espo\Core\Utils\Database\Schema\Utils as SchemaUtils;
+
 class MysqlCharacter extends \Espo\Core\Services\Base
 {
     protected function init()
@@ -63,7 +65,7 @@ class MysqlCharacter extends \Espo\Core\Services\Base
             $sth->execute();
         }
 
-        $fieldListExceededIndexMaxLength = \Espo\Core\Utils\Database\Schema\Utils::getFieldListExceededIndexMaxLength($ormMeta, $maxIndexLength);
+        $fieldListExceededIndexMaxLength = SchemaUtils::getFieldListExceededIndexMaxLength($ormMeta, $maxIndexLength);
 
         foreach ($ormMeta as $entityName => $entityParams) {
 

application/Espo/Services/Record.php

@@ -1352,9 +1352,17 @@ class Record extends \Espo\Core\Services\Base
 
             $selectParams = $this->getSelectParams($p);
 
-            $collection = $repository->find($selectParams);
+            $this->getEntityManager()->getRepository($this->getEntityType())->handleSelectParams($selectParams);
+
+            $sql = $this->getEntityManager()->getQuery()->createSelectQuery($this->getEntityType(), $selectParams);
+            $sth = $this->getEntityManager()->getPdo()->prepare($sql);
+            $sth->execute();
+
+            while ($dataRow = $sth->fetch(\PDO::FETCH_ASSOC)) {
+                $entity = $this->getEntityManager()->getEntityFactory()->create($this->getEntityType());
+                $entity->set($dataRow);
+                $entity->setAsFetched();
 
-            foreach ($collection as $entity) {
                 if ($this->getAcl()->check($entity, 'edit') && $this->checkEntityForMassUpdate($entity, $data)) {
                     $entity->set($data);
                     if ($this->checkAssignment($entity)) {
@@ -1427,10 +1435,19 @@ class Record extends \Espo\Core\Services\Base
             }
 
             $selectParams = $this->getSelectParams($p);
-            $skipTextColumns['skipTextColumns'] = true;
-            $collection = $repository->find($selectParams);
+            $selectParams['skipTextColumns'] = true;
+
+            $this->getEntityManager()->getRepository($this->getEntityType())->handleSelectParams($selectParams);
+
+            $sql = $this->getEntityManager()->getQuery()->createSelectQuery($this->getEntityType(), $selectParams);
+            $sth = $this->getEntityManager()->getPdo()->prepare($sql);
+            $sth->execute();
+
+            while ($dataRow = $sth->fetch(\PDO::FETCH_ASSOC)) {
+                $entity = $this->getEntityManager()->getEntityFactory()->create($this->getEntityType());
+                $entity->set($dataRow);
+                $entity->setAsFetched();
 
-            foreach ($collection as $entity) {
                 if ($this->getAcl()->check($entity, 'delete') && $this->checkEntityForMassRemove($entity)) {
                     if ($repository->remove($entity)) {
                         $idsRemoved[] = $entity->id;
@@ -1761,19 +1778,6 @@ class Record extends \Espo\Core\Services\Base
             }
         }
 
-        /*foreach ($collection as $entity) {
-            $this->loadAdditionalFieldsForExport($entity);
-            if (method_exists($exportObj, 'loadAdditionalFields')) {
-                $exportObj->loadAdditionalFields($entity, $fieldList);
-            }
-            $row = array();
-            foreach ($attributeList as $attribute) {
-                $value = $this->getAttributeFromEntityForExport($entity, $attribute);
-                $row[$attribute] = $value;
-            }
-            $arr[] = $row;
-        }*/
-
         if (is_null($attributeList)) {
             $attributeList = [];
         }
@@ -2187,7 +2191,7 @@ class Record extends \Espo\Core\Services\Base
         }
 
         // TODO remove in 5.5.0
-        if (in_array($this->getEntityType(), ['Report', 'Workflow'])) {
+        if (in_array($this->getEntityType(), ['Report', 'Workflow', 'ReportPanel'])) {
             return null;
         }
 

application/Espo/Services/Stream.php

@@ -972,7 +972,7 @@ class Stream extends \Espo\Core\Services\Base
         foreach ($auditedFields as $field => $item) {
             $updated = false;
             foreach ($item['actualList'] as $attribute) {
-                if ($entity->get($attribute) !== $entity->getFetched($attribute)) {
+                if ($entity->hasFetched($attribute) && $entity->isAttributeChanged($attribute)) {
                     $updated = true;
                 }
             }

client/modules/crm/src/views/dashlets/opportunities-by-stage.js

@@ -135,7 +135,7 @@ Espo.define('crm:views/dashlets/opportunities-by-stage', 'crm:views/dashlets/abs
                 mouse: {
                     track: true,
                     relative: true,
-                    position: 's',
+                    position: 'w',
                     lineColor: this.hoverColor,
                     trackFormatter: function (obj) {
                         var label = (obj.series.label || self.translate('None'));

client/modules/crm/src/views/dashlets/sales-by-month.js

@@ -160,6 +160,7 @@ Espo.define('crm:views/dashlets/sales-by-month', 'crm:views/dashlets/abstract/ch
                     track: true,
                     relative: true,
                     lineColor: this.hoverColor,
+                    position: 's',
                     trackFormatter: function (obj) {
                         var i = parseInt(obj.x);
                         var value = '';

client/modules/crm/src/views/dashlets/sales-pipeline.js

@@ -137,7 +137,7 @@ Espo.define('crm:views/dashlets/sales-pipeline', 'crm:views/dashlets/abstract/ch
                 mouse: {
                     track: true,
                     relative: true,
-                    position: 'ne',
+                    position: 'n',
                     lineColor: this.hoverColor,
                     trackFormatter: function (obj) {
                         if (obj.x >= self.chartData.length) {

client/modules/crm/src/views/lead/convert.js

@@ -81,6 +81,7 @@ Espo.define('crm:views/lead/convert', 'view', function (Dep) {
                 if (scope == 'Account' && this.getConfig().get('b2cMode')) {
                     return;
                 }
+                if (this.getMetadata().get(['scopes', scope, 'disabled'])) return;
                 if (this.getAcl().check(scope, 'edit')) {
                     scopeList.push(scope);
                 }

client/res/templates/admin/layouts/rows.tpl

@@ -85,7 +85,7 @@
             <header>{{translate 'Disabled' scope='Admin'}}</header>
             <ul class="disabled connected">
                 {{#each disabledFields}}
-                    <li draggable="true" data-name="{{name}}">
+                    <li draggable="true" {{#each ../dataAttributeList}}data-{{toDom this}}="{{prop ../this this}}" {{/each}}>
                         <div class="left">
                             <label>{{label}}</label>
                         </div>

client/res/templates/email/fields/person-string-data/list.tpl

@@ -0,0 +1,4 @@
+<span class="list-icon-container pull-right"{{#unless isReplied}} style="visibility: hidden;"{{/unless}}>
+    <span class="glyphicon glyphicon-share-alt small text-muted icon-flip-horizontal" title="{{translate 'isReplied' category='fields' scope='Email'}}"></span>
+</span>
+<span title="{{value}}">{{value}}</span>

client/res/templates/email/fields/subject/list-link.tpl

@@ -1,5 +1,7 @@
 {{#if hasAttachment}}
-<span class="glyphicon glyphicon-paperclip small text-muted pull-right"></span>
+<span class="list-icon-container pull-right">
+    <span class="glyphicon glyphicon-paperclip small text-muted" title="{{translate 'hasAttachment' category='fields' scope='Email'}}"></span>
+</span>
 {{/if}}
 {{#unless isRead}}<strong>{{/unless}}
 <a href="#{{model.name}}/view/{{model.id}}" class="link{{#if isImportant}} text-warning{{/if}}" data-id="{{model.id}}" title="{{value}}">{{value}}</a>

client/res/templates/fields/array/detail.tpl

@@ -1 +1,3 @@
-{{#unless isEmpty}}{{{value}}}{{else}}{{translate 'None'}}{{/unless}}
+{{#unless isEmpty}}{{{value}}}{{else}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
+{{/unless}}

client/res/templates/fields/array/list.tpl

@@ -0,0 +1 @@
+{{#unless isEmpty}}{{{value}}}{{/unless}}

client/res/templates/fields/attachments-multiple/detail.tpl

@@ -1,6 +1,9 @@
 {{#if value}}
     {{{value}}}
 {{else}}
-    {{{translate 'None'}}}
-{{/if}}
-
+    {{#if valueIsSet}}
+        {{{translate 'None'}}}
+    {{else}}
+        ...
+    {{/if}}
+{{/if}}

client/res/templates/fields/attachments-multiple/list.tpl

@@ -0,0 +1,3 @@
+{{#if value}}
+    {{{value}}}
+{{/if}}

client/res/templates/fields/currency/detail-1.tpl

@@ -1,5 +1,5 @@
-{{#if value}}
+{{#if isNotEmpty}}
     {{value}} {{currencyValue}}
 {{else}}
-    {{translate 'None'}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}

client/res/templates/fields/currency/detail-2.tpl

@@ -1,5 +1,5 @@
-{{#if value}}
+{{#if isNotEmpty}}
     {{currencySymbol}}{{value}}
 {{else}}
-    {{translate 'None'}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}

client/res/templates/fields/currency/detail-no-currency.tpl

@@ -1,5 +1,5 @@
-{{#if value}}
+{{#if isNotEmpty}}
     {{value}}
 {{else}}
-    {{translate 'None'}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}

client/res/templates/fields/currency/detail.tpl

@@ -1,5 +1,5 @@
-{{#if value}}
+{{#if isNotEmpty}}
     {{value}} {{currencyValue}}
 {{else}}
-    {{translate 'None'}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}

client/res/templates/fields/currency/list-1.tpl

@@ -1,5 +1,3 @@
-{{#if value}}
+{{#if isNotEmpty}}
     <span title="{{value}} {{currencyValue}}">{{value}} {{currencyValue}}</span>
-{{else}}
-    {{translate 'None'}}
 {{/if}}

client/res/templates/fields/currency/list-2.tpl

@@ -1,5 +1,3 @@
-{{#if value}}
-     <span title="{{currencySymbol}}{{value}}">{{currencySymbol}}{{value}}</span>
-{{else}}
-    {{translate 'None'}}
+{{#if isNotEmpty}}
+    <span title="{{currencySymbol}}{{value}}">{{currencySymbol}}{{value}}</span>
 {{/if}}

client/res/templates/fields/currency/list.tpl

@@ -1,5 +1,3 @@
-{{#if value}}
+{{#if isNotEmpty}}
     <span title="{{value}} {{currencyValue}}">{{value}} {{currencyValue}}</span>
-{{else}}
-    {{translate 'None'}}
 {{/if}}

client/res/templates/fields/int/detail.tpl

@@ -1,3 +1,3 @@
 {{#if isNotEmpty}}{{value}}{{else}}
-    {{translate 'None'}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}

client/res/templates/fields/link-multiple/list.tpl

@@ -0,0 +1,4 @@
+{{#if value}}
+    {{{value}}}
+{{/if}}
+

client/res/templates/fields/person-name/detail.tpl

@@ -1,3 +1,3 @@
 {{#if isNotEmpty}}{{translateOption salutationValue field='salutationName' scope=scope}} {{firstValue}} {{lastValue}}{{else}}
-{{translate 'None'}}
+{{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}

client/res/templates/fields/url/detail.tpl

@@ -1,5 +1,5 @@
 {{#if value}}
 	<a href="{{url}}" target="_blank">{{value}}</a>
 {{else}}
-	{{translate 'None'}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}

client/res/templates/fields/varchar/detail.tpl

@@ -1 +1,3 @@
-{{#if isNotEmpty}}{{value}}{{else}}{{translate 'None'}}{{/if}}
+{{#if isNotEmpty}}{{value}}{{else}}
+{{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
+{{/if}}

client/res/templates/fields/wysiwyg/detail.tpl

@@ -1,6 +1,6 @@
 {{#unless isPlain}}
     {{#if useIframe}}
-    <iframe frameborder="0"  style="width: 100%;" class="hidden" scrolling="no"></iframe>
+    <iframe frameborder="0" style="width: 100%; overflow-x: hidden; overflow-y: hidden;" class="hidden"></iframe>
     {{else}}
     <div class="html-container">{{{value}}}</div>
     {{/if}}

client/res/templates/modals/select-records-with-categories.tpl

@@ -1,6 +1,6 @@
 <div class="search-container">{{{search}}}</div>
 
-<div class="row">
+<div class="row row-list-container">
     {{#unless categoriesDisabled}}
     <div class="categories-container{{#unless categoriesDisabled}} col-md-3 col-sm-4{{else}} col-md-12{{/unless}}">{{{categories}}}</div>
     {{/unless}}
@@ -9,6 +9,6 @@
 
 {{#if createButton}}
 <div class="button-container">
-    <button class="btn btn-default" data-action="create">{{translate 'Create'}}</button>
+    <button class="btn btn-default" data-action="create">{{createText}}</button>
 </div>
 {{/if}}

client/res/templates/record/list-checkbox.tpl

@@ -1 +1 @@
-<input type="checkbox" class="record-checkbox" data-id="{{model.id}}">
+<span class="record-checkbox-container"><input type="checkbox" class="record-checkbox" data-id="{{model.id}}"></span>

client/res/templates/record/panels/default-side.tpl

@@ -1,3 +1,4 @@
+{{#if fieldList.length}}
 <div class="row">
 {{#each fieldList}}
 <div class="cell form-group col-sm-6 col-md-12{{#if hidden}} hidden-cell{{/if}}" data-name="{{name}}">
@@ -8,21 +9,26 @@
 </div>
 {{/each}}
 </div>
+{{/if}}
 
 {{#unless complexDateFieldsDisabled}}
 <div class="row">
+    {{#if hasComplexCreated}}
     <div class="cell form-group col-sm-6 col-md-12" data-name="complexCreated">
         <label class="control-label" data-name="complexCreated"><span class="label-text">{{translate 'Created'}}</span></label>
         <div class="field" data-name="complexCreated">
             <span data-name="createdAt" class="field">{{{createdAtField}}}</span> <span class="text-muted">&raquo;</span> <span data-name="createdBy" class="field">{{{createdByField}}}</span>
         </div>
     </div>
+    {{/if}}
+    {{#if hasComplexModified}}
     <div class="cell form-group col-sm-6 col-md-12" data-name="complexModified">
         <label class="control-label" data-name="complexModified"><span class="label-text">{{translate 'Modified'}}</span></label>
         <div class="field" data-name="complexModified">
             <span data-name="modifiedAt" class="field">{{{modifiedAtField}}}</span> <span class="text-muted">&raquo;</span> <span data-name="modifiedBy" class="field">{{{modifiedByField}}}</span>
         </div>
     </div>
+    {{/if}}
 </div>
 {{/unless}}
 

client/res/templates/record/panels/side.tpl

@@ -1,3 +1,4 @@
+{{#if fieldList.length}}
 <div class="row">
     {{#each fieldList}}
     <div class="cell form-group col-sm-6 col-md-12{{#if hidden}} hidden-cell{{/if}}" data-name="{{name}}">
@@ -8,3 +9,4 @@
     </div>
     {{/each}}
 </div>
+{{/if}}

client/src/controllers/base.js

@@ -30,7 +30,8 @@ Espo.define('controllers/base', 'controller', function (Dep) {
     return Dep.extend({
 
         login: function () {
-            this.entire('views/login', {}, function (login) {
+            var viewName = this.getMetadata().get(['clientDefs', 'App', 'loginView']) || 'views/login';
+            this.entire(viewName, {}, function (login) {
                 login.render();
                 login.on('login', function (data) {
                     this.trigger('login', data);

client/src/dynamic-logic.js

@@ -176,7 +176,7 @@ Espo.define('dynamic-logic', [], function () {
             } else if (type === 'contains' || type === 'has') {
                 if (!setValue) return false;
                 return !!~setValue.indexOf(value);
-            } else if (type === 'notContains' || type === 'hasNot') {
+            } else if (type === 'notContains' || type === 'notHas') {
                 if (!setValue) return true;
                 return !~setValue.indexOf(value);
             } else if (type === 'greaterThan') {

client/src/model.js

@@ -50,6 +50,11 @@ Espo.define('model', [], function () {
             Dep.prototype.initialize.call(this);
         },
 
+        sync: function (method, model, options) {
+            if (method === 'patch') options.type = 'PUT';
+            return Dep.prototype.sync.call(this, method, model, options);
+        },
+
         set: function (key, val, options) {
             if (typeof key === 'object') {
                 var o = key;

client/src/views/admin/entity-manager/modals/edit-entity.js

@@ -285,6 +285,9 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
                     if (this.getMetadata().get(['entityDefs', scope, 'fields', item, 'disabled'])) {
                         return false;
                     }
+                    if (this.getMetadata().get(['entityDefs', scope, 'fields', item, 'textFilterDisabled'])) {
+                        return false;
+                    }
                     return true;
                 }, this);
 

client/src/views/admin/entity-manager/record/edit-formula.js

@@ -35,7 +35,8 @@ Espo.define('views/admin/entity-manager/record/edit-formula', 'views/record/base
         setup: function () {
             Dep.prototype.setup.call(this);
             this.createField('beforeSaveCustomScript', 'views/fields/formula', {
-                targetEntityType: this.options.targetEntityType
+                targetEntityType: this.options.targetEntityType,
+                height: 500
             }, 'edit');
         }
 

client/src/views/admin/field-manager/fields/foreign/field.js

@@ -118,6 +118,8 @@ Espo.define('views/admin/field-manager/fields/foreign/field', 'views/fields/enum
                 this.viewValue = 'views/fields/foreign-datetime';
             } else if (type == 'text') {
                 this.viewValue = 'views/fields/foreign-text';
+            } else if (type == 'number') {
+                this.viewValue = 'views/fields/foreign-varchar';
             } else {
                 this.viewValue = null;
             }

client/src/views/admin/layouts/list.js

@@ -127,10 +127,18 @@ Espo.define('views/admin/layouts/list', 'views/admin/layouts/rows', function (De
                         duplicateLabelList.push(label);
                     }
                     labelList.push(label);
-                    this.disabledFields.push({
-                        name: allFields[i],
+                    var fieldName = allFields[i];
+                    var o = {
+                        name: fieldName,
                         label: label
-                    });
+                    };
+                    var fieldType = this.getMetadata().get(['entityDefs', this.scope, 'fields', fieldName, 'type']);
+                    if (fieldType) {
+                        if (this.getMetadata().get(['fields', fieldType, 'notSortable'])) {
+                            o.notSortable = true;
+                        }
+                    }
+                    this.disabledFields.push(o);
                 }
             }
 

client/src/views/email/fields/person-string-data.js

@@ -0,0 +1,42 @@
+/************************************************************************
+ * 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.
+ ************************************************************************/
+Espo.define('views/email/fields/person-string-data', 'views/fields/varchar', function (Dep) {
+
+    return Dep.extend({
+
+        listTemplate: 'email/fields/person-string-data/list',
+
+        data: function () {
+            var data = Dep.prototype.data.call(this);
+            data.isReplied = this.model.get('isReplied');
+
+            return data;
+        }
+
+    });
+});

client/src/views/email/fields/subject.js

@@ -37,6 +37,7 @@ Espo.define('views/email/fields/subject', 'views/fields/varchar', function (Dep)
             data.isRead = (this.model.get('sentById') === this.getUser().id) || this.model.get('isRead');
             data.isImportant = this.model.get('isImportant');
             data.hasAttachment = this.model.get('hasAttachment');
+            data.isReplied = this.model.get('isReplied');
 
             if (!data.isNotEmpty) {
                 if (

client/src/views/fields/address.js

@@ -52,45 +52,41 @@ Espo.define('views/fields/address', 'views/fields/base', function (Dep) {
             var data = Dep.prototype.data.call(this);
             data.ucName = Espo.Utils.upperCaseFirst(this.name);
 
-            data.postalCodeValue = this.model.get(this.postalCodeField);
-            data.streetValue = this.model.get(this.streetField);
-            data.cityValue = this.model.get(this.cityField);
-            data.stateValue = this.model.get(this.stateField);
-            data.countryValue = this.model.get(this.countryField);
+            this.addressPartList.forEach(function (item) {
+                var value = this.model.get(this[item + 'Field']);
+                data[item + 'Value'] = value;
+            }, this);
 
             if (this.mode == 'detail' || this.mode == 'list') {
                 data.formattedAddress = this.getFormattedAddress();
             }
 
-            data.isEmpty = !(data.postalCodeValue ||
-                           data.streetValue ||
-                           data.cityValue ||
-                           data.stateValue ||
-                           data.countryValue);
+            var isNotEmpty = false;
 
             return data;
         },
 
         setupSearch: function () {
-            this.searchData.value = this.getSearchParamsData().value || this.searchParams.additionalValue; 
+            this.searchData.value = this.getSearchParamsData().value || this.searchParams.additionalValue;
         },
 
         getFormattedAddress: function () {
-            var postalCodeValue = this.model.get(this.postalCodeField);
-            var streetValue = this.model.get(this.streetField);
-            var cityValue = this.model.get(this.cityField);
-            var stateValue = this.model.get(this.stateField);
-            var countryValue = this.model.get(this.countryField);
+            var isNotEmpty = false;
+            var isSet = false;
+            this.addressAttributeList.forEach(function (attribute) {
+                isNotEmpty = isNotEmpty || this.model.get(attribute);
+                isSet = isSet || this.model.has(attribute);
+            }, this);
 
-            var isEmpty = !(
-                postalCodeValue ||
-                streetValue ||
-                cityValue ||
-                stateValue ||
-                countryValue
-            );
+            var isEmpty = !isNotEmpty;
 
             if (isEmpty) {
+                if (this.mode === 'list') {
+                    return '';
+                }
+                if (!isSet) {
+                    return this.translate('...');
+                }
                 return this.translate('None');
             }
 
@@ -320,13 +316,18 @@ Espo.define('views/fields/address', 'views/fields/base', function (Dep) {
             }
         },
 
-        init: function () {
-            this.postalCodeField = this.options.defs.name + 'PostalCode';
-            this.streetField = this.options.defs.name + 'Street';
-            this.stateField = this.options.defs.name + 'State';
-            this.cityField = this.options.defs.name + 'City';
-            this.countryField = this.options.defs.name + 'Country';
-            Dep.prototype.init.call(this);
+        setup: function () {
+            Dep.prototype.setup.call(this);
+
+            var actualAttributePartList = this.getMetadata().get(['fields', this.type, 'actualFields']) || [];
+            this.addressAttributeList = [];
+            this.addressPartList = [];
+            actualAttributePartList.forEach(function (item) {
+                var attribute = this.name + Espo.Utils.upperCaseFirst(item);
+                this.addressAttributeList.push(attribute);
+                this.addressPartList.push(item);
+                this[item + 'Field'] = attribute;
+            }, this);
         },
 
         validateRequired: function () {
@@ -397,7 +398,7 @@ Espo.define('views/fields/address', 'views/fields/base', function (Dep) {
                             type: 'like',
                             field: this.countryField,
                             value: value + '%'
-                        },
+                        }
                     ],
                     data: {
                         value: value

client/src/views/fields/array.js

@@ -32,7 +32,7 @@ Espo.define('views/fields/array', ['views/fields/base', 'lib!Selectize'], functi
 
         type: 'array',
 
-        listTemplate: 'fields/array/detail',
+        listTemplate: 'fields/array/list',
 
         detailTemplate: 'fields/array/detail',
 
@@ -51,7 +51,8 @@ Espo.define('views/fields/array', ['views/fields/base', 'lib!Selectize'], functi
                 translatedOptions: this.translatedOptions,
                 hasOptions: this.params.options ? true : false,
                 itemHtmlList: itemHtmlList,
-                isEmpty: (this.selected || []).length === 0
+                isEmpty: (this.selected || []).length === 0,
+                valueIsSet: this.model.has(this.name)
             }, Dep.prototype.data.call(this));
         },
 
@@ -109,7 +110,7 @@ Espo.define('views/fields/array', ['views/fields/base', 'lib!Selectize'], functi
             }
 
             if (this.options.customOptionList) {
-                this.setOptionList(this.options.customOptionList);
+                this.setOptionList(this.options.customOptionList, true);
             }
         },
 
@@ -146,13 +147,21 @@ Espo.define('views/fields/array', ['views/fields/base', 'lib!Selectize'], functi
 
         },
 
-        setOptionList: function (optionList) {
+        setOptionList: function (optionList, silent) {
             if (!this.originalOptionList) {
                 this.originalOptionList = this.params.options;
             }
             this.params.options = Espo.Utils.clone(optionList);
 
-            if (this.mode == 'edit') {
+            if (this.mode == 'edit' && !silent) {
+                var selectedOptionList = [];
+                this.selected.forEach(function (option) {
+                    if (~optionList.indexOf(option)) {
+                        selectedOptionList.push(option);
+                    }
+                }, this);
+                this.selected = selectedOptionList;
+
                 if (this.isRendered()) {
                     this.reRender();
                     this.trigger('change');

client/src/views/fields/attachment-multiple.js

@@ -32,7 +32,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
 
         type: 'attachmentMultiple',
 
-        listTemplate: 'fields/attachments-multiple/detail',
+        listTemplate: 'fields/attachments-multiple/list',
 
         detailTemplate: 'fields/attachments-multiple/detail',
 
@@ -137,7 +137,8 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
                 idValues: this.model.get(this.idsName),
                 idValuesString: ids ? ids.join(',') : '',
                 nameHash: this.model.get(this.nameHashName),
-                foreignScope: this.foreignScope
+                foreignScope: this.foreignScope,
+                valueIsSet: this.model.has(this.idsName)
             }, Dep.prototype.data.call(this));
 
             if (this.mode == 'edit') {
@@ -181,10 +182,6 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
             this.listenTo(this.model, 'change:' + this.nameHashName, function () {
                 this.nameHash = _.clone(this.model.get(this.nameHashName)) || {};
             }.bind(this));
-
-            if (!this.model.get(this.idsName)) {
-                this.clearIds(true);
-            }
         },
 
         setupSearch: function () {
@@ -231,7 +228,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
         },
 
         removeId: function (id) {
-            var arr = _.clone(this.model.get(this.idsName));
+            var arr = _.clone(this.model.get(this.idsName) || []);
             var i = arr.indexOf(id);
             arr.splice(i, 1);
             this.model.set(this.idsName, arr);
@@ -498,7 +495,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
                 for (var id in nameHash) {
                     var type = typeHash[id] || false;
                     var name = nameHash[id];
-                    if (this.showPreviews && ~this.previewTypeList.indexOf(type)) {
+                    if (this.showPreviews && ~this.previewTypeList.indexOf(type) && this.mode !== 'list') {
                         previews.push('<div class="attachment-preview">' + this.getDetailPreview(name, type, id) + '</div>');
                         continue;
                     }
@@ -583,7 +580,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
 
         validateRequired: function () {
             if (this.isRequired()) {
-                if (this.model.get(this.idsName).length == 0) {
+                if ((this.model.get(this.idsName) || []).length == 0) {
                     var msg = this.translate('fieldIsRequired', 'messages').replace('{field}', this.getLabelText());
                     this.showValidationMessage(msg, 'label');
                     return true;
@@ -601,7 +598,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
 
         fetch: function () {
             var data = {};
-            data[this.idsName] = this.model.get(this.idsName);
+            data[this.idsName] = this.model.get(this.idsName) || [];
             return data;
         },
 

client/src/views/fields/int.js

@@ -78,6 +78,7 @@ Espo.define('views/fields/int', 'views/fields/base', function (Dep) {
             if (this.model.get(this.name) !== null && typeof this.model.get(this.name) !== 'undefined') {
                 data.isNotEmpty = true;
             }
+            data.valueIsSet = this.model.has(this.name);
             return data;
         },
 

client/src/views/fields/link-multiple.js

@@ -32,7 +32,7 @@ Espo.define('views/fields/link-multiple', 'views/fields/base', function (Dep) {
 
         type: 'linkMultiple',
 
-        listTemplate: 'fields/link-multiple/detail',
+        listTemplate: 'fields/link-multiple/list',
 
         detailTemplate: 'fields/link-multiple/detail',
 
@@ -359,16 +359,19 @@ Espo.define('views/fields/link-multiple', 'views/fields/base', function (Dep) {
             var type = this.$el.find('select.search-type').val();
 
             if (type === 'anyOf') {
-                var values = this.ids || [];
+                var idList = this.ids || [];
 
                 var data = {
                     type: 'linkedWith',
-                    value: this.ids || [],
+                    value: idList,
                     nameHash: this.nameHash,
                     data: {
                         type: type
                     }
                 };
+                if (!idList.length) {
+                    data.value = null;
+                }
                 return data;
             } else if (type === 'noneOf') {
                 var values = this.ids || [];

client/src/views/fields/multi-enum.js

@@ -32,7 +32,7 @@ Espo.define('views/fields/multi-enum', ['views/fields/array', 'lib!Selectize'],
 
         type: 'multiEnum',
 
-        listTemplate: 'fields//array/detail',
+        listTemplate: 'fields//array/list',
 
         detailTemplate: 'fields/array/detail',