fix

allow "Ends With" and "Like (%)" on varchar field

.gitignore

@@ -6,15 +6,14 @@
 /data/config.php
 /build
 /node_modules
-/client
 /test.php
 /main.html
-/frontend/client/css/espo.css
-/frontend/client/css/espo-vertical.css
-/frontend/client/css/sakura.css
-/frontend/client/css/sakura-vertical.css
-/frontend/client/css/violet.css
-/frontend/client/css/violet-vertical.css
+/client/css/espo.css
+/client/css/espo-vertical.css
+/client/css/sakura.css
+/client/css/sakura-vertical.css
+/client/css/violet.css
+/client/css/violet-vertical.css
 /tests/testData/cache/*
 composer.phar
 vendor/

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.
+
+[Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).

Gruntfile.js

@@ -34,7 +34,7 @@ module.exports = function (grunt) {
         'client/lib/jquery.autocomplete.js',
         'client/lib/bootstrap.min.js',
         'client/lib/bootstrap-datepicker.js',
-        'client/lib/bull.min.js',
+        'client/lib/bull.js',
         'client/src/namespace.js',
         'client/src/exceptions.js',
         'client/src/loader.js',
@@ -65,7 +65,7 @@ module.exports = function (grunt) {
                     yuicompress: true,
                 },
                 files: {
-                    'frontend/client/css/espo.css': 'frontend/less/espo/main.less',
+                    'client/css/espo.css': 'frontend/less/espo/main.less',
                 }
             },
             espoVertical: {
@@ -73,7 +73,7 @@ module.exports = function (grunt) {
                     yuicompress: true,
                 },
                 files: {
-                    'frontend/client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less',
+                    'client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less',
                 }
             },
             sakura: {
@@ -81,7 +81,7 @@ module.exports = function (grunt) {
                     yuicompress: true,
                 },
                 files: {
-                    'frontend/client/css/sakura.css': 'frontend/less/sakura/main.less',
+                    'client/css/sakura.css': 'frontend/less/sakura/main.less',
                 }
             },
             sakuraVertical: {
@@ -89,7 +89,7 @@ module.exports = function (grunt) {
                     yuicompress: true,
                 },
                 files: {
-                    'frontend/client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less',
+                    'client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less',
                 }
             },
             violet: {
@@ -97,7 +97,7 @@ module.exports = function (grunt) {
                     yuicompress: true,
                 },
                 files: {
-                    'frontend/client/css/violet.css': 'frontend/less/violet/main.less',
+                    'client/css/violet.css': 'frontend/less/violet/main.less',
                 }
             },
             violetVertical: {
@@ -105,7 +105,7 @@ module.exports = function (grunt) {
                     yuicompress: true,
                 },
                 files: {
-                    'frontend/client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less',
+                    'client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less',
                 }
             }
         },
@@ -113,7 +113,7 @@ module.exports = function (grunt) {
             minify: {
                 files: {
                     'build/tmp/client/css/espo.css': [
-                        'frontend/client/css/espo.css',
+                        'client/css/espo.css',
                     ]
                 }
             },
@@ -124,13 +124,13 @@ module.exports = function (grunt) {
                 banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
             },
             'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
-                return 'frontend/' + item;
+                return '' + item;
             })
         },
         copy: {
             frontendFolders: {
                 expand: true,
-                cwd: 'frontend/client',
+                cwd: 'client',
                 src: [
                     'src/**',
                     'res/**',
@@ -151,7 +151,7 @@ module.exports = function (grunt) {
             frontendLib: {
                 expand: true,
                 dot: true,
-                cwd: 'frontend/client/lib',
+                cwd: 'client/lib',
                 src: '**',
                 dest: 'build/tmp/client/lib/',
             },
@@ -164,6 +164,7 @@ module.exports = function (grunt) {
                     'custom/**',
                     'data/.data',
                     'install/**',
+                    'portal/**',
                     'vendor/**',
                     'html/**',
                     'bootstrap.php',
@@ -213,8 +214,11 @@ module.exports = function (grunt) {
                 },
                 src: [
                     'build/EspoCRM-<%= pkg.version %>/install',
+                    'build/EspoCRM-<%= pkg.version %>/portal',
                     'build/EspoCRM-<%= pkg.version %>/api',
                     'build/EspoCRM-<%= pkg.version %>/api/v1',
+                    'build/EspoCRM-<%= pkg.version %>/api/v1/portal-access',
+                    'build/EspoCRM-<%= pkg.version %>',
                 ]
             }
         },

README.md

@@ -28,12 +28,8 @@ Never update composer dependencies if you are going to contribute code back.
 
 Now you can build. Build will create compiled css files.
 
-If your repository is accessible via a web server then you can run EspoCRM by url `http://PROJECT_URL/frontend`.
-
 To compose a proper config.php and populate database you can run install by opening `http(s)://{YOUR_CRM_URL}/install` location in a browser. Then open `data/config.php` file and add `isDeveloperMode => true`.
 
-
-
 ### How to build
 
 You need to have nodejs and Grunt CLI installed.

api/v1/portal-access/index.php

@@ -29,7 +29,11 @@
 
 require_once('../../../bootstrap.php');
 
-$portalId = explode('/', $_SERVER['REQUEST_URI'])[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
+if (!empty($_GET['portalId'])) {
+    $portalId = $_GET['portalId'];
+} else {
+    $portalId = explode('/', $_SERVER['REQUEST_URI'])[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
+}
 
 $app = new \Espo\Core\Portal\Application($portalId);
 $app->run();

api/v1/portal-access/web.config

@@ -5,8 +5,8 @@
         <rewrite>
             <rules>
                 <rule name="rule 1G" stopProcessing="true">
-					<match url="^"  />
-					<action type="Rewrite" url="index.php"  appendQueryString="true" />
+                    <match url="^"  />
+                    <action type="Rewrite" url="index.php"  appendQueryString="true" />
 				</rule>
             </rules>
         </rewrite>

application/Espo/Acl/Attachment.php

@@ -40,6 +40,10 @@ class Attachment extends \Espo\Core\Acl\Base
             return true;
         }
 
+        if ($entity->get('parentType') === 'Settings') {
+            return true;
+        }
+
         $parent = null;
         $hasParent = false;
         if ($entity->get('parentId') && $entity->get('parentType')) {

application/Espo/AclPortal/Attachment.php

@@ -40,6 +40,10 @@ class Attachment extends \Espo\Core\AclPortal\Base
             return true;
         }
 
+        if ($entity->get('parentType') === 'Settings') {
+            return true;
+        }
+
         $parent = null;
         $hasParent = false;
         if ($entity->get('parentId') && $entity->get('parentType')) {

application/Espo/Controllers/EntityManager.php

@@ -78,6 +78,9 @@ class EntityManager extends \Espo\Core\Controllers\Base
         if (!empty($data['sortDirection'])) {
             $params['asc'] = $data['sortDirection'] === 'asc';
         }
+        if (isset($data['textFilterFields']) && is_array($data['textFilterFields'])) {
+            $params['textFilterFields'] = $data['textFilterFields'];
+        }
 
         $result = $this->getContainer()->get('entityManagerUtil')->create($name, $type, $params);
 

application/Espo/Controllers/Job.php

@@ -41,17 +41,17 @@ class Job extends \Espo\Core\Controllers\Record
         }
     }
 
-    public function actionCreate($params, $data)
+    public function actionCreate($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionPatch($params, $data)
+    public function actionPatch($params, $data, $request)
     {
         throw new Forbidden();
     }
@@ -66,12 +66,12 @@ class Job extends \Espo\Core\Controllers\Record
         throw new Forbidden();
     }
 
-    public function actionCreateLink($params, $data)
+    public function actionCreateLink($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
     {
         throw new Forbidden();
     }

application/Espo/Controllers/Notification.php

@@ -37,9 +37,6 @@ class Notification extends \Espo\Core\Controllers\Record
 
     public function actionList($params, $data, $request)
     {
-        $scope = $params['scope'];
-        $id = $params['id'];
-
         $userId = $this->getUser()->id;
 
         $offset = intval($request->get('offset'));

application/Espo/Controllers/Preferences.php

@@ -132,6 +132,7 @@ class Preferences extends \Espo\Core\Controllers\Base
 
         $entity->set('smtpEmailAddress', $user->get('emailAddress'));
         $entity->set('name', $user->get('name'));
+        $entity->set('isPortalUser', $user->get('isPortalUser'));
 
         $entity->clear('smtpPassword');
 

application/Espo/Controllers/Settings.php

@@ -28,6 +28,7 @@
  ************************************************************************/
 
 namespace Espo\Controllers;
+
 use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
 use \Espo\Core\Exceptions\BadRequest;

application/Espo/Core/Acl/Table.php

@@ -97,8 +97,6 @@ class Table
             throw new Error('User must be fetched before ACL check.');
         }
 
-        $this->user->loadLinkMultipleField('teams');
-
         if ($fileManager) {
             $this->fileManager = $fileManager;
         }
@@ -119,7 +117,7 @@ class Table
 
     protected function initCacheFilePath()
     {
-        $this->cacheFilePath = 'data/cache/application/acl/' . $this->user->id . '.php';
+        $this->cacheFilePath = 'data/cache/application/acl/' . $this->getUser()->id . '.php';
     }
 
     protected function getUser()
@@ -175,7 +173,7 @@ class Table
     public function getLevel($scope, $action)
     {
         if (isset($this->data->table->$scope)) {
-            if (isset($this->table->$scope->$action)) {
+            if (isset($this->data->table->$scope->$action)) {
                 return $this->data->table->$scope->$action;
             }
         }
@@ -189,7 +187,10 @@ class Table
             $valuePermissionLists->$permission = [];
         }
 
-        if (!$this->user->isAdmin()) {
+        $aclTableList = [];
+        $fieldTableList = [];
+
+        if (!$this->getUser()->isAdmin()) {
             $roleList = $this->getRoleList();
 
             foreach ($roleList as $role) {
@@ -206,6 +207,7 @@ class Table
             $this->applyDefault($aclTable, $fieldTable);
             $this->applyDisabled($aclTable, $fieldTable);
             $this->applyMandatory($aclTable, $fieldTable);
+            $this->applyAdditional($aclTable, $fieldTable, $valuePermissionLists);
         } else {
             $aclTable = (object) [];
             foreach ($this->getScopeList() as $scope) {
@@ -239,7 +241,7 @@ class Table
 
         $this->fillFieldTableQuickAccess();
 
-        if (!$this->user->isAdmin()) {
+        if (!$this->getUser()->isAdmin()) {
             foreach ($this->valuePermissionList as $permission) {
                 $this->data->$permission = $this->mergeValueList($valuePermissionLists->$permission, $this->metadata->get('app.'.$this->type.'.default.' . $permission, 'yes'));
                 if ($this->metadata->get('app.'.$this->type.'.mandatory.' . $permission)) {
@@ -263,11 +265,17 @@ class Table
         $roleList = [];
 
         $userRoleList = $this->getUser()->get('roles');
+        if (!(is_array($userRoleList) || $userRoleList instanceof \Traversable)) {
+            throw new Error();
+        }
         foreach ($userRoleList as $role) {
             $roleList[] = $role;
         }
 
         $teamList = $this->getUser()->get('teams');
+        if (!(is_array($teamList) || $teamList instanceof \Traversable)) {
+            throw new Error();
+        }
         foreach ($teamList as $team) {
             $teamRoleList = $team->get('roles');
             foreach ($teamRoleList as $role) {
@@ -393,7 +401,7 @@ class Table
 
     protected function applyDefault(&$table, &$fieldTable)
     {
-        if ($this->user->isAdmin()) {
+        if ($this->getUser()->isAdmin()) {
             return;
         }
 
@@ -458,7 +466,7 @@ class Table
 
     protected function applyMandatory(&$table, &$fieldTable)
     {
-        if ($this->user->isAdmin()) {
+        if ($this->getUser()->isAdmin()) {
             return;
         }
 
@@ -484,6 +492,9 @@ class Table
 
             foreach (array_merge($mandatoryFieldData, $mandatoryScopeFieldData) as $field => $f) {
                 if (!in_array($field, $fieldList)) continue;
+                if (!isset($fieldTable->$scope)) {
+                    $fieldTable->$scope = (object) [];
+                }
                 $fieldTable->$scope->$field = (object) [];
                 foreach ($this->fieldActionList as $action) {
                     $level = 'no';
@@ -502,18 +513,31 @@ class Table
 
     protected function applyDisabled(&$table, &$fieldTable)
     {
-        if ($this->user->isAdmin()) {
+        if ($this->getUser()->isAdmin()) {
             return;
         }
 
         foreach ($this->getScopeList() as $scope) {
             if ($this->getMetadata()->get('scopes.' . $scope . '.disabled')) {
-                $aclTable->$scope = false;
+                $table->$scope = false;
                 unset($fieldTable->$scope);
             }
         }
     }
 
+    protected function applyAdditional(&$table, &$fieldTable, &$valuePermissionLists)
+    {
+        if ($this->getUser()->get('isPortalUser')) {
+            foreach ($this->getScopeList() as $scope) {
+                $table->$scope = false;
+                unset($fieldTable->$scope);
+            }
+            foreach ($this->valuePermissionList as $permission) {
+                $valuePermissionLists->{$permission}[] = 'no';
+            }
+        }
+    }
+
     private function mergeValueList(array $list, $defaultValue)
     {
         $result = null;

application/Espo/Core/AclManager.php

@@ -98,7 +98,10 @@ class AclManager
 
     protected function getTable(User $user)
     {
-        $key = spl_object_hash($user);
+        $key = $user->id;
+        if (empty($key)) {
+            $key = spl_object_hash($user);
+        }
 
         if (empty($this->tableHashMap[$key])) {
             $config = $this->getContainer()->get('config');
@@ -181,7 +184,7 @@ class AclManager
         return $this->getImplementation($entity->getEntityType())->checkIsOwner($user, $entity);
     }
 
-    public function checkInTeam(User $user, Entity $entity, $action)
+    public function checkInTeam(User $user, Entity $entity)
     {
         return $this->getImplementation($entity->getEntityType())->checkInTeam($user, $entity);
     }

application/Espo/Core/AclPortal/Table.php

@@ -76,11 +76,17 @@ class Table extends \Espo\Core\Acl\Table
         $roleList = [];
 
         $userRoleList = $this->getUser()->get('portalRoles');
+        if (!(is_array($userRoleList) || $userRoleList instanceof \Traversable)) {
+            throw new Error();
+        }
         foreach ($userRoleList as $role) {
             $roleList[] = $role;
         }
 
         $portalRoleList = $this->getPortal()->get('portalRoles');
+        if (!(is_array($portalRoleList) || $portalRoleList instanceof \Traversable)) {
+            throw new Error();
+        }
         foreach ($portalRoleList as $role) {
             $roleList[] = $role;
         }
@@ -115,11 +121,15 @@ class Table extends \Espo\Core\Acl\Table
     {
         foreach ($this->getScopeList() as $scope) {
             $d = $this->getMetadata()->get('scopes.' . $scope);
-            if ($d['disabled'] || $d['portalDisabled']) {
-                $aclTable->$scope = false;
+            if (!empty($d['disabled']) || !empty($d['portalDisabled'])) {
+                $table->$scope = false;
                 unset($fieldTable->$scope);
             }
         }
     }
+
+    protected function applyAdditional(&$table, &$fieldTable, &$valuePermissionLists)
+    {
+    }
 }
 

application/Espo/Core/Application.php

@@ -93,7 +93,7 @@ class Application
         $this->getContainer()->get('clientManager')->display();
     }
 
-    public function runEntryPoint($entryPoint)
+    public function runEntryPoint($entryPoint, $data = array(), $final = false)
     {
         if (empty($entryPoint)) {
             throw new \Error();
@@ -102,18 +102,27 @@ class Application
         $slim = $this->getSlim();
         $container = $this->getContainer();
 
-        $slim->get('/', function() {});
-        $slim->post('/', function() {});
+        $slim->any('.*', function() {});
 
         $entryPointManager = new \Espo\Core\EntryPointManager($container);
 
         try {
-            $auth = new \Espo\Core\Utils\Auth($this->container, $entryPointManager->checkNotStrictAuth($entryPoint));
-            $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
+            $authRequired = $entryPointManager->checkAuthRequired($entryPoint);
+            $authNotStrict = $entryPointManager->checkNotStrictAuth($entryPoint);
+            if ($authRequired && !$authNotStrict) {
+                if (!$final && $portalId = $this->detectedPortalId()) {
+                    $app = new \Espo\Core\Portal\Application($portalId);
+                    $app->setBasePath($this->getBasePath());
+                    $app->runEntryPoint($entryPoint, $data, true);
+                    exit;
+                }
+            }
+            $auth = new \Espo\Core\Utils\Auth($this->container, $authNotStrict);
+            $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $authRequired, true);
             $slim->add($apiAuth);
 
-            $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
-                $entryPointManager->run($entryPoint);
+            $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container, $data) {
+                $entryPointManager->run($entryPoint, $data);
             });
 
             $slim->run();
@@ -289,5 +298,37 @@ class Application
 
         $classLoader->register(true);
     }
+
+    public function setBasePath($basePath)
+    {
+        $this->getContainer()->get('clientManager')->setBasePath($basePath);
+    }
+
+    public function getBasePath()
+    {
+        return $this->getContainer()->get('clientManager')->getBasePath();
+    }
+
+    public function detectedPortalId()
+    {
+        if (!empty($_GET['portalId'])) {
+            return $_GET['portalId'];
+        }
+        if (!empty($_COOKIE['auth-token'])) {
+            $token = $this->getContainer()->get('entityManager')->getRepository('AuthToken')->where(array('token'=>$_COOKIE['auth-token']))->findOne();
+
+            if ($token && $token->get('portalId')) {
+                return $token->get('portalId');
+            }
+        }
+        return null;
+    }
+
+    public function setupSystemUser()
+    {
+        $user = $this->getContainer()->get('entityManager')->getEntity('User', 'system');
+        $this->getContainer()->setUser($user);
+        $this->getContainer()->get('entityManager')->setUser($user);
+    }
 }
 

application/Espo/Core/Container.php

@@ -200,7 +200,9 @@ class Container
             $this->get('entityManager'),
             $this->get('user'),
             $this->get('acl'),
-            $this->get('metadata')
+            $this->get('aclManager'),
+            $this->get('metadata'),
+            $this->get('config')
         );
     }
 

application/Espo/Core/Controllers/Record.php

@@ -64,7 +64,7 @@ class Record extends Base
         return $service;
     }
 
-    public function actionRead($params)
+    public function actionRead($params, $data, $request)
     {
         $id = $params['id'];
         $entity = $this->getRecordService()->getEntity($id);
@@ -128,7 +128,7 @@ class Record extends Base
         $where = $request->get('where');
         $offset = $request->get('offset');
         $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc') === 'true';
+        $asc = $request->get('asc', 'true') === 'true';
         $sortBy = $request->get('sortBy');
         $q = $request->get('q');
         $primaryFilter = $request->get('primaryFilter');
@@ -174,7 +174,7 @@ class Record extends Base
         $where = $request->get('where');
         $offset = $request->get('offset');
         $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc') === 'true';
+        $asc = $request->get('asc', 'true') === 'true';
         $sortBy = $request->get('sortBy');
         $q = $request->get('q');
         $textFilter = $request->get('textFilter');
@@ -292,7 +292,6 @@ class Record extends Base
             $params['where'] = $where;
         }
         if (array_key_exists('ids', $data)) {
-            $where = json_decode(json_encode($data['where']), true);
             $params['ids'] = $data['ids'];
         }
 
@@ -411,17 +410,18 @@ class Record extends Base
             throw new BadRequest();
         }
 
-        if (empty($data['targetId']) || empty($data['sourceIds']) || !is_array($data['sourceIds'])) {
+        if (empty($data['targetId']) || empty($data['sourceIds']) || !is_array($data['sourceIds']) || !($data['attributes'] instanceof \StdClass)) {
             throw new BadRequest();
         }
         $targetId = $data['targetId'];
         $sourceIds = $data['sourceIds'];
+        $attributes = get_object_vars($data['attributes']);
 
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
         }
 
-        return $this->getRecordService()->merge($targetId, $sourceIds);
+        return $this->getRecordService()->merge($targetId, $sourceIds, $attributes);
     }
 }
 

application/Espo/Core/CronManager.php

@@ -35,15 +35,21 @@ use Espo\Core\Exceptions\NotFound;
 class CronManager
 {
     private $container;
+
     private $config;
+
     private $fileManager;
+
     private $entityManager;
 
     private $scheduledJobUtil;
 
     const PENDING = 'Pending';
+
     const RUNNING = 'Running';
+
     const SUCCESS = 'Success';
+
     const FAILED = 'Failed';
 
     protected $lastRunTime = 'data/cache/application/cronLastRunTime.php';
@@ -149,19 +155,15 @@ class CronManager
 
         $this->setLastRunTime(time());
 
-        $entityManager = $this->getEntityManager();
-
-        $cronJob = $this->getCronJob();
-        $cronScheduledJob = $this->getCronScheduledJob();
-
-        //Check scheduled jobs and create related jobs
+        $this->getCronJob()->markFailedJobs();
+        $this->getCronJob()->updateFailedJobAttempts();
         $this->createJobsFromScheduledJobs();
+        $this->getCronJob()->removePendingJobDuplicates();
 
-        $pendingJobs = $cronJob->getPendingJobs();
+        $pendingJobList = $this->getCronJob()->getPendingJobList();
 
-        foreach ($pendingJobs as $job) {
-
-            $jobEntity = $entityManager->getEntity('Job', $job['id']);
+        foreach ($pendingJobList as $job) {
+            $jobEntity = $this->getEntityManager()->getEntity('Job', $job['id']);
 
             if (!isset($jobEntity)) {
                 $GLOBALS['log']->error('CronManager: empty Job entity ['.$job['id'].'].');
@@ -169,7 +171,7 @@ class CronManager
             }
 
             $jobEntity->set('status', self::RUNNING);
-            $entityManager->saveEntity($jobEntity);
+            $this->getEntityManager()->saveEntity($jobEntity);
 
             $isSuccess = true;
 
@@ -187,11 +189,10 @@ class CronManager
             $status = $isSuccess ? self::SUCCESS : self::FAILED;
 
             $jobEntity->set('status', $status);
-            $entityManager->saveEntity($jobEntity);
+            $this->getEntityManager()->saveEntity($jobEntity);
 
-            //set status in the schedulerJobLog
             if (!empty($job['scheduled_job_id'])) {
-                $cronScheduledJob->addLogRecord($job['scheduled_job_id'], $status);
+                $this->getCronScheduledJob()->addLogRecord($job['scheduled_job_id'], $status, null, $job['target_id'], $job['target_type']);
             }
         }
     }
@@ -213,12 +214,20 @@ class CronManager
         }
 
         $jobClass = new $className($this->container);
-        $method = $this->getScheduledJobUtil()->getMethodName();
+        $method = 'run';
         if (!method_exists($jobClass, $method)) {
             throw new NotFound();
         }
 
-        $jobClass->$method();
+        $data = null;
+        if (!empty($job['data'])) {
+            $data = $job['data'];
+            if (Json::isJSON($data)) {
+                $data = Json::decode($data, true);
+            }
+        }
+
+        $jobClass->$method($data, $job['target_id'], $job['target_type']);
     }
 
     /**
@@ -248,7 +257,7 @@ class CronManager
             $data = Json::decode($data, true);
         }
 
-        $service->$serviceMethod($data);
+        $service->$serviceMethod($data, $job['target_id'], $job['target_type']);
     }
 
     /**
@@ -258,55 +267,56 @@ class CronManager
      */
     protected function createJobsFromScheduledJobs()
     {
-        $entityManager = $this->getEntityManager();
+        $activeScheduledJobList = $this->getCronScheduledJob()->getActiveScheduledJobList();
 
-        $activeScheduledJobs = $this->getCronScheduledJob()->getActiveJobs();
-
-        $cronJob = $this->getCronJob();
-        $runningScheduledJobs = $cronJob->getActiveJobs('scheduled_job_id', self::RUNNING, PDO::FETCH_COLUMN);
-
-        $createdJobs = array();
-        foreach ($activeScheduledJobs as $scheduledJob) {
-
-            if (in_array($scheduledJob['id'], $runningScheduledJobs)) {
-                continue;
-            }
+        $runningScheduledJobIdList = $this->getCronJob()->getRunningScheduledJobIdList();
 
+        $createdJobIdList = array();
+        foreach ($activeScheduledJobList as $scheduledJob) {
             $scheduling = $scheduledJob['scheduling'];
-
             $cronExpression = \Cron\CronExpression::factory($scheduling);
 
             try {
-                $prevDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
+                $previousDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
             } catch (\Exception $e) {
                 $GLOBALS['log']->error('CronManager: ScheduledJob ['.$scheduledJob['id'].']: CronExpression - Impossible CRON expression ['.$scheduling.']');
                 continue;
             }
 
             if ($cronExpression->isDue()) {
-                $prevDate = date('Y-m-d H:i:s');
+                $previousDate = date('Y-m-d H:i:s');
             }
 
-            $existsJob = $cronJob->getJobByScheduledJob($scheduledJob['id'], $prevDate);
-
-            if (!isset($existsJob) || empty($existsJob)) {
-                //create a new job
-                $jobEntity = $entityManager->getEntity('Job');
-                $jobEntity->set(array(
-                    'name' => $scheduledJob['name'],
-                    'status' => self::PENDING,
-                    'scheduledJobId' => $scheduledJob['id'],
-                    'executeTime' => $prevDate,
-                    'method' => $scheduledJob['job'],
-                ));
-                $jobEntityId = $entityManager->saveEntity($jobEntity);
-                if (!empty($jobEntityId)) {
-                    $createdJobs[] = $jobEntityId;
+            $className = $this->getScheduledJobUtil()->get($scheduledJob['job']);
+            if ($className) {
+                if (method_exists($className, 'prepare')) {
+                    $implementation = new $className($this->container);
+                    $implementation->prepare($scheduledJob, $previousDate);
+                    continue;
                 }
             }
+
+            if (in_array($scheduledJob['id'], $runningScheduledJobIdList)) {
+                continue;
+            }
+
+            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $previousDate);
+            if ($existingJob) continue;
+
+            $jobEntity = $this->getEntityManager()->getEntity('Job');
+            $jobEntity->set(array(
+                'name' => $scheduledJob['name'],
+                'status' => self::PENDING,
+                'scheduledJobId' => $scheduledJob['id'],
+                'executeTime' => $previousDate,
+                'method' => $scheduledJob['job']
+            ));
+            $this->getEntityManager()->saveEntity($jobEntity);
+
+            $createdJobIdList[] = $jobEntity->id;
         }
 
-        return $createdJobs;
+        return $createdJobIdList;
     }
 }
 

application/Espo/Core/EntryPointManager.php

@@ -90,7 +90,7 @@ class EntryPointManager
         return $className::$notStrictAuth;
     }
 
-    public function run($name)
+    public function run($name, $data = array())
     {
         $className = $this->getClassName($name);
         if (!$className) {
@@ -98,7 +98,7 @@ class EntryPointManager
         }
         $entryPoint = new $className($this->container);
 
-        $entryPoint->run();
+        $entryPoint->run($data);
     }
 
     protected function getClassName($name)

application/Espo/Core/EntryPoints/Base.php

@@ -106,7 +106,5 @@ abstract class Base
         $this->container = $container;
     }
 
-    abstract public function run();
-
 }
 

application/Espo/Core/HookManager.php

@@ -131,7 +131,7 @@ class HookManager
             }
             return $hook;
         }
-        $GLOBALS['log']->error("Hook class '{$name}' does not exist.");
+        $GLOBALS['log']->error("Hook class '{$className}' does not exist.");
     }
 
     /**

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -46,11 +46,19 @@ class Htmlizer
 
     protected $config;
 
-    public function __construct(FileManager $fileManager, DateTime $dateTime, Number $number)
+    protected $acl;
+
+    public function __construct(FileManager $fileManager, DateTime $dateTime, Number $number, $acl = null)
     {
         $this->fileManager = $fileManager;
         $this->dateTime = $dateTime;
         $this->number = $number;
+        $this->acl = $acl;
+    }
+
+    protected function getAcl()
+    {
+        return $this->acl;
     }
 
     protected function formatNumber($value)
@@ -68,20 +76,25 @@ class Htmlizer
         return $value;
     }
 
-    protected function getDataFromEntity(Entity $entity)
+    protected function getDataFromEntity(Entity $entity, $notLinks = false)
     {
         $data = $entity->toArray();
 
-
-
         $fieldDefs = $entity->getFields();
         $fieldList = array_keys($fieldDefs);
 
+        $forbidenAttributeList = [];
+
+        if ($this->getAcl()) {
+            $forbidenAttributeList = $this->getAcl()->getScopeForbiddenAttributeList($entity->getEntityType(), 'read');
+        }
+
         foreach ($fieldList as $field) {
-            $type = null;
-            if (!empty($fieldDefs[$field]['type'])) {
-                $type = $fieldDefs[$field]['type'];
-            }
+            if (in_array($field, $forbidenAttributeList)) continue;
+
+
+            $type = $entity->getAttributeType($field);
+
             if ($type == Entity::DATETIME) {
                 if (!empty($data[$field])) {
                     $data[$field] = $this->dateTime->convertSystemDateTime($data[$field]);
@@ -116,6 +129,8 @@ class Htmlizer
                         $data[$field][$k] = $this->format($data[$field][$k]);
                     }
                 }
+            } else if ($type === Entity::PASSWORD) {
+                unset($data[$field]);
             }
 
             if (array_key_exists($field, $data)) {
@@ -123,6 +138,25 @@ class Htmlizer
             }
         }
 
+        if (!$notLinks) {
+            $relationDefs = $entity->getRelations();
+            foreach ($entity->getRelationList() as $relation) {
+                if (
+                    !empty($relationDefs[$relation]['type'])
+                    &&
+                    ($entity->getRelationType($relation) === 'belongsTo' || $entity->getRelationType($relation) === 'belongsToParent')
+                ) {
+                    $relatedEntity = $entity->get($relation);
+                    if (!$relatedEntity) continue;
+                    if ($this->getAcl()) {
+                        if (!$this->getAcl()->check($relatedEntity, 'read')) continue;
+                    }
+
+                    $data[$relation] = $this->getDataFromEntity($relatedEntity, true);
+                }
+            }
+        }
+
         return $data;
     }
 

application/Espo/Core/Jobs/Base.php

@@ -70,7 +70,5 @@ abstract class Base
         $this->container = $container;
     }
 
-    abstract public function run();
-
 }
 

application/Espo/Core/Loaders/EntityManager.php

@@ -40,6 +40,7 @@ class EntityManager extends Base
             'port' => $config->get('database.port'),
             'dbname' => $config->get('database.dbname'),
             'user' => $config->get('database.user'),
+            'charset' => $config->get('database.charset', 'utf8'),
             'password' => $config->get('database.password'),
             'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(),
             'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory',

application/Espo/Core/Mail/Importer.php

@@ -71,7 +71,7 @@ class Importer
         return $this->filtersMatcher;
     }
 
-    public function importMessage($message, $assignedUserId = null, $teamsIdList = [], $userIdList = [], $filterList = [])
+    public function importMessage($message, $assignedUserId = null, $teamsIdList = [], $userIdList = [], $filterList = [], $fetchOnlyHeader = false)
     {
         try {
             $email = $this->getEntityManager()->getEntity('Email');
@@ -166,28 +166,37 @@ class Importer
 
             $inlineIds = array();
 
-            if ($message->isMultipart()) {
-                foreach (new \RecursiveIteratorIterator($message) as $part) {
-                    $this->importPartDataToEmail($email, $part, $inlineIds);
+            if (!$fetchOnlyHeader) {
+                if ($message->isMultipart()) {
+                    foreach (new \RecursiveIteratorIterator($message) as $part) {
+                        $this->importPartDataToEmail($email, $part, $inlineIds);
+                    }
+                } else {
+                    $this->importPartDataToEmail($email, $message, $inlineIds, 'text/plain');
+                }
+
+                if (!$email->get('body') && $email->get('bodyPlain')) {
+                    $email->set('body', $email->get('bodyPlain'));
+                }
+
+                $body = $email->get('body');
+                if (!empty($body)) {
+                    foreach ($inlineIds as $cid => $attachmentId) {
+                        if (strpos($body, 'cid:' . $cid) !== false) {
+                            $body = str_replace('cid:' . $cid, '?entryPoint=attachment&id=' . $attachmentId, $body);
+                        } else {
+                            $email->addLinkMultipleId('attachments', $attachmentId);
+                        }
+                    }
+                    $email->set('body', $body);
+                }
+
+                if ($this->getFiltersMatcher()->matchBody($email, $filterList)) {
+                    return false;
                 }
             } else {
-                $this->importPartDataToEmail($email, $message, $inlineIds, 'text/plain');
-            }
-
-            if (!$email->get('body') && $email->get('bodyPlain')) {
-                $email->set('body', $email->get('bodyPlain'));
-            }
-
-            $body = $email->get('body');
-            if (!empty($body)) {
-                foreach ($inlineIds as $cid => $attachmentId) {
-                    $body = str_replace('cid:' . $cid, '?entryPoint=attachment&id=' . $attachmentId, $body);
-                }
-                $email->set('body', $body);
-            }
-
-            if ($this->getFiltersMatcher()->matchBody($email, $filterList)) {
-                return false;
+                $email->set('body', '(Not fetched)');
+                $email->set('isHtml', false);
             }
 
             $parentFound = false;
@@ -352,6 +361,8 @@ class Importer
                 } else if (strpos(strtolower($part->ContentDisposition), 'inline') === 0) {
                     $contentDisposition = 'inline';
                 }
+            } else if (isset($part->contentID)) {
+                $contentDisposition = 'inline';
             }
 
             if (empty($type)) {
@@ -395,7 +406,6 @@ class Importer
                 $contentId = null;
 
                 if ($contentDisposition) {
-
                     if ($contentDisposition === 'attachment') {
                         $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
                         if ($fileName) {
@@ -454,24 +464,61 @@ class Importer
         } catch (\Exception $e) {}
     }
 
-    protected function fetchFileNameFromContentDisposition($contentDisposition)
+    protected function decodeAttachmentFileName($fileName)
     {
-        $m = array();
-        if (preg_match('/filename="?([^"]+)"?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-            return $fileName;
-        } else if (preg_match('/filename\*="?([^"]+)"?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-            if ($fileName && stripos($fileName, "''") !== false) {
-                list($encoding, $fileName) = explode("''", $fileName);
-                $fileName = rawurldecode($fileName);
-                if (strtoupper($encoding) !== 'UTF-8') {
+        if ($fileName && stripos($fileName, "''") !== false) {
+            list($encoding, $fileName) = explode("''", $fileName);
+            $fileName = rawurldecode($fileName);
+            if (strtoupper($encoding) !== 'UTF-8') {
+                if ($encoding) {
                     $fileName = mb_convert_encoding($fileName, 'UTF-8', $encoding);
                 }
-                return $fileName;
             }
         }
-        return false;
+        return $fileName;
+    }
+
+    protected function fetchFileNameFromContentDisposition($contentDisposition)
+    {
+        $contentDisposition = preg_replace('/\\\\"/', "{{_!Q!U!O!T!E!_}}", $contentDisposition);
+
+        $fileName = false;
+        $m = array();
+
+        if (preg_match('/filename="([^"]+)";?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+        } else if (preg_match('/filename=([^";]+);?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+        } else if (preg_match('/filename\*="([^"]+)";?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $fileName = $this->decodeAttachmentFileName($fileName);
+        } else if (preg_match('/filename\*=([^";]+);?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $fileName = $this->decodeAttachmentFileName($fileName);
+        } else {
+            $fileName = '';
+            foreach (['0', '1'] as $i) {
+                if (preg_match('/filename\*'.$i.'[\*]?="([^"]+)";?/i', $contentDisposition, $m)) {
+                    $part = $m[1];
+                    $fileName .= $part;
+                } else if (preg_match('/filename\*'.$i.'[\*]?=([^";]+);?/i', $contentDisposition, $m)) {
+                    $part = $m[1];
+                    $fileName .= $part;
+                }
+            }
+
+            if ($fileName === '') {
+                $fileName = null;
+            } else {
+                $fileName = $this->decodeAttachmentFileName($fileName);
+            }
+        }
+
+        if ($fileName) {
+            $fileName = str_replace('{{_!Q!U!O!T!E!_}}', '"', $fileName);
+        }
+
+        return $fileName;
     }
 
     protected function getContentFromPart($part)

application/Espo/Core/Mail/Mail/Storage/Message.php

@@ -34,6 +34,7 @@ use Zend\Mail\Header\HeaderInterface;
 use Zend\Mime;
 use Zend\Mail\Storage\Exception;
 use Zend\Mail\Storage\AbstractStorage;
+use Zend\Stdlib\ErrorHandler;
 
 class Message extends \Zend\Mail\Storage\Message
 {

application/Espo/Core/ORM/Entity.php

@@ -94,9 +94,6 @@ class Entity extends \Espo\ORM\Entity
     {
         $columnsField = $field . 'Columns';
 
-        if (!$this->has($columnsField)) {
-            $this->loadLinkMultipleField($field, true);
-        }
         if (!$this->has($columnsField)) {
             return;
         }
@@ -125,7 +122,7 @@ class Entity extends \Espo\ORM\Entity
 
         if (!$this->has($idsField)) {
             if (!$this->isNew()) {
-                $this->loadLinkMultipleField($field, true);
+                $this->loadLinkMultipleField($field);
             } else {
                 $this->set($idsField, []);
             }
@@ -148,7 +145,7 @@ class Entity extends \Espo\ORM\Entity
 
         if (!$this->has($idsField)) {
             if (!$this->isNew()) {
-                $this->loadLinkMultipleField($field, true);
+                $this->loadLinkMultipleField($field);
             }
         }
         $valueList = $this->get($idsField);
@@ -166,7 +163,7 @@ class Entity extends \Espo\ORM\Entity
 
         if (!$this->has($idsField)) {
             if (!$this->isNew()) {
-                $this->loadLinkMultipleField($field, true);
+                $this->loadLinkMultipleField($field);
             }
         }
 

application/Espo/Core/Portal/AclManager.php

@@ -37,6 +37,10 @@ class AclManager extends \Espo\Core\AclManager
 {
     protected $tableClassName = '\\Espo\\Core\\AclPortal\\Table';
 
+    private $mainManager = null;
+
+    private $portal = null;
+
     public function getImplementation($scope)
     {
         if (empty($this->implementationHashMap[$scope])) {
@@ -70,16 +74,42 @@ class AclManager extends \Espo\Core\AclManager
         return $this->implementationHashMap[$scope];
     }
 
+    public function setMainManager($mainManager)
+    {
+        $this->mainManager = $mainManager;
+    }
+
+    protected function getMainManager()
+    {
+        return $this->mainManager;
+    }
+
+    public function setPortal($portal)
+    {
+        $this->portal = $portal;
+    }
+
+    protected function getPortal()
+    {
+        if ($this->portal) {
+            return $this->portal;
+        }
+        return $this->getContainer()->get('portal');
+    }
+
     protected function getTable(User $user)
     {
-        $key = spl_object_hash($user);
+        $key = $user->id;
+        if (empty($key)) {
+            $key = spl_object_hash($user);
+        }
 
         if (empty($this->tableHashMap[$key])) {
             $config = $this->getContainer()->get('config');
             $fileManager = $this->getContainer()->get('fileManager');
             $metadata = $this->getContainer()->get('metadata');
             $fieldManager = $this->getContainer()->get('fieldManager');
-            $portal = $this->getContainer()->get('portal');
+            $portal = $this->getPortal();
 
             $this->tableHashMap[$key] = new $this->tableClassName($user, $portal, $config, $fileManager, $metadata, $fieldManager);
         }
@@ -115,5 +145,114 @@ class AclManager extends \Espo\Core\AclManager
         return $this->getImplementation($entity->getEntityType())->checkIsOwnContact($user, $entity);
     }
 
+    public function getMap(User $user)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getMap($user);
+        }
+        return parent::getMap($user);
+    }
+
+    public function getLevel(User $user, $scope, $action)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getLevel($user, $scope, $action);
+        }
+        return parent::getLevel($user, $scope, $action);
+    }
+
+    public function get(User $user, $permission)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->get($user, $permission);
+        }
+        return parent::get($user, $permission);
+    }
+
+    public function checkReadOnlyTeam(User $user, $permission)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkReadOnlyTeam($user, $permission);
+        }
+        return false;
+    }
+
+    public function checkReadOnlyOwn(User $user, $permission)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkReadOnlyOwn($user, $permission);
+        }
+        return false;
+    }
+
+    public function check(User $user, $subject, $action = null)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->check($user, $subject, $action);
+        }
+        return parent::check($user, $subject, $action);
+    }
+
+    public function checkEntity(User $user, Entity $entity, $action = 'read')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkEntity($user, $entity, $action);
+        }
+        return parent::checkEntity($user, $entity, $action);
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkIsOwner($user, $entity);
+        }
+        return parent::checkIsOwner($user, $entity);
+    }
+
+    public function checkInTeam(User $user, Entity $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkInTeam($user, $entity);
+        }
+        return parent::checkInTeam($user, $entity);
+    }
+
+    public function checkScope(User $user, $scope, $action = null)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkScope($user, $scope, $action);
+        }
+        return parent::checkScope($user, $scope, $action);
+    }
+
+    public function checkUser(User $user, $permission, User $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkUser($user, $permission, $entity);
+        }
+        return parent::checkUser($user, $permission, $entity);
+    }
+
+    public function getScopeForbiddenAttributeList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getScopeForbiddenAttributeList($user, $scope, $action, $thresholdLevel);
+        }
+        return parent::getScopeForbiddenAttributeList($user, $scope, $action, $thresholdLevel);
+    }
+
+    public function getScopeForbiddenFieldList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getScopeForbiddenFieldList($user, $scope, $action, $thresholdLevel);
+        }
+        return parent::getScopeForbiddenFieldList($user, $scope, $action, $thresholdLevel);
+    }
+
+    protected function checkUserIsNotPortal($user)
+    {
+        return !$user->get('isPortalUser');
+    }
+
 }
 

application/Espo/Core/Portal/Application.php

@@ -45,6 +45,8 @@ class Application extends \Espo\Core\Application
             throw new Error("Portal id was not passed to ApplicationPortal.");
         }
 
+        $GLOBALS['log'] = $this->getContainer()->get('log');
+
         $portal = $this->getContainer()->get('entityManager')->getEntity('Portal', $portalId);
 
         if (!$portal) {
@@ -58,8 +60,6 @@ class Application extends \Espo\Core\Application
 
         $this->getContainer()->setPortal($portal);
 
-        $GLOBALS['log'] = $this->getContainer()->get('log');
-
         $this->initAutoloads();
     }
 

application/Espo/Core/Portal/Container.php

@@ -38,12 +38,27 @@ class Container extends \Espo\Core\Container
         return $className;
     }
 
+    protected function getServiceMainClassName($name, $default)
+    {
+        $metadata = $this->get('metadata');
+        $className = $metadata->get('app.serviceContainer.classNames.' . $name, $default);
+        return $className;
+    }
+
     protected function loadAclManager()
     {
         $className = $this->getServiceClassName('aclManager', '\\Espo\\Core\\Portal\\AclManager');
-        return new $className(
+        $mainClassName = $this->getServiceMainClassName('aclManager', '\\Espo\\Core\\AclManager');
+
+        $obj = new $className(
             $this->get('container')
         );
+        $objMain = new $mainClassName(
+            $this->get('container')
+        );
+        $obj->setMainManager($objMain);
+
+        return $obj;
     }
 
     protected function loadAcl()

application/Espo/Core/Repositories/CategoryTree.php

@@ -29,11 +29,11 @@
 
 namespace Espo\Core\Repositories;
 
-use \Espo\Core\Entities\CategoryTreeItem as Entity;
+use \Espo\ORM\Entity;
 
 class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
 {
-	public function afterSave(Entity $entity, $options)
+	protected function afterSave(Entity $entity, array $options = array())
 	{
 		parent::afterSave($entity, $options);
 
@@ -86,7 +86,7 @@ class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
 		}
 	}
 
-	public function afterRemove(Entity $entity, $options)
+	protected function afterRemove(Entity $entity, array $options = array())
 	{
 		parent::afterRemove($entity, $options);
 

application/Espo/Core/SelectManagerFactory.php

@@ -43,12 +43,14 @@ class SelectManagerFactory
 
     private $metadata;
 
-    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
+    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, AclManager $aclManager, Utils\Metadata $metadata, Utils\Config $config)
     {
         $this->entityManager = $entityManager;
         $this->user = $user;
         $this->acl = $acl;
+        $this->aclManager = $aclManager;
         $this->metadata = $metadata;
+        $this->config = $config;
     }
 
     public function create($entityType)
@@ -68,7 +70,7 @@ class SelectManagerFactory
             }
         }
 
-        $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->metadata);
+        $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->aclManager, $this->metadata, $this->config);
         $selectManager->setEntityType($entityType);
 
         return $selectManager;

application/Espo/Core/SelectManagers/Base.php

@@ -33,6 +33,9 @@ use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
 
 use \Espo\Core\Acl;
+use \Espo\Core\AclManager;
+use \Espo\Core\Utils\Metadata;
+use \Espo\Core\Utils\Config;
 
 class Base
 {
@@ -48,6 +51,8 @@ class Base
 
     protected $metadata;
 
+    private $config;
+
     private $seed = null;
 
     private $userTimeZone = null;
@@ -56,13 +61,15 @@ class Base
 
     const MIN_LENGTH_FOR_CONTENT_SEARCH = 4;
 
-    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
+    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, AclManager $aclManager, Metadata $metadata, Config $config)
     {
         $this->entityManager = $entityManager;
         $this->user = $user;
         $this->acl = $acl;
+        $this->aclManager = $aclManager;
 
         $this->metadata = $metadata;
+        $this->config = $config;
     }
 
     protected function getEntityManager()
@@ -80,6 +87,16 @@ class Base
         return $this->acl;
     }
 
+    protected function getConfig()
+    {
+        return $this->config;
+    }
+
+    protected function getAclManager()
+    {
+        return $this->aclManager;
+    }
+
     public function setEntityType($entityType)
     {
         $this->entityType = $entityType;
@@ -277,7 +294,7 @@ class Base
 
             $foreignEntity = $defs['entity'];
             if (empty($foreignEntity)) {
-                continue;
+                return;
             }
 
             $pathName = lcfirst($query->sanitize($foreignEntity . 'Path'));
@@ -875,6 +892,9 @@ class Base
                 case 'startsWith':
                     $part[$item['field'] . '*'] = $item['value'] . '%';
                     break;
+                case 'endsWith':
+                    $part[$item['field'] . '*'] = $item['value'] . '%';
+                    break;
                 case 'contains':
                     $part[$item['field'] . '*'] = '%' . $item['value'] . '%';
                     break;
@@ -906,6 +926,7 @@ class Base
                     $part[$item['field'] . '='] = null;
                     break;
                 case 'isNotNull':
+                case 'ever':
                     $part[$item['field'] . '!='] = null;
                     break;
                 case 'isTrue':
@@ -1068,7 +1089,7 @@ class Base
 
     public function hasLeftJoin($leftJoin, &$result)
     {
-        return in_array($leftJoin, $result['leftJoin']);
+        return in_array($leftJoin, $result['leftJoins']);
     }
 
     public function addJoin($join, &$result)
@@ -1162,15 +1183,21 @@ class Base
         $d = array();
 
         foreach ($fieldList as $field) {
+            $expression = $textFilter . '%';
             if (
                 strlen($textFilter) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH
                 &&
-                !empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
+                (
+                    !empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
+                    ||
+                    $this->getConfig()->get('textFilterUseContainsForVarchar')
+                )
             ) {
-                $d[$field . '*'] = '%' . $textFilter . '%';
+                $expression = '%' . $textFilter . '%';
             } else {
-                $d[$field . '*'] = $textFilter . '%';
+                $expression = $textFilter . '%';
             }
+            $d[$field . '*'] = $expression;
         }
         $result['whereClause'][] = array(
             'OR' => $d

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

@@ -2,7 +2,8 @@
     "fields": {
         "name": {
             "type": "varchar",
-            "required": true
+            "required": true,
+            "trim": true
         },
         "description": {
             "type": "text"
@@ -28,10 +29,11 @@
         "assignedUser": {
             "type": "link",
             "required": true,
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         }
     },
     "links": {

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

@@ -2,7 +2,8 @@
     "fields": {
         "name": {
             "type": "varchar",
-            "required": true
+            "required": true,
+            "trim": true
         },
         "order": {
             "type": "int",

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

@@ -70,10 +70,11 @@
         "assignedUser": {
             "type": "link",
             "required": false,
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         }
     },
     "links": {

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

@@ -32,6 +32,39 @@ namespace Espo\Core\Templates\Services;
 
 class Person extends \Espo\Services\Record
 {
+    protected function getDuplicateWhereClause(Entity $entity, $data = array())
+    {
+        $data = array(
+            'OR' => array(
+                array(
+                    'firstName' => $entity->get('firstName'),
+                    'lastName' => $entity->get('lastName'),
+                )
+            )
+        );
+        if (
+            ($entity->get('emailAddress') || $entity->get('emailAddressData'))
+            &&
+            ($entity->isNew() || $entity->isFieldChanged('emailAddress') || $entity->isFieldChanged('emailAddressData'))
+        ) {
+            if ($entity->get('emailAddress')) {
+                $list = [$entity->get('emailAddress')];
+            }
+            if ($entity->get('emailAddressData')) {
+                foreach ($entity->get('emailAddressData') as $row) {
+                    if (!in_array($row->emailAddress, $list)) {
+                        $list[] = $row->emailAddress;
+                    }
+                }
+            }
+            foreach ($list as $emailAddress) {
+                $data['OR'][] = array(
+                    'emailAddress' => $emailAddress
+                );
+            }
+        }
 
+        return $data;
+    }
 }
 

application/Espo/Core/Upgrades/Actions/Base.php

@@ -32,7 +32,7 @@ use Espo\Core\Utils\Util;
 use Espo\Core\Utils\System;
 use Espo\Core\Utils\Json;
 use Espo\Core\Exceptions\Error;
-use vierbergenlars\SemVer;
+use Composer\Semver\Semver;
 
 abstract class Base
 {
@@ -221,20 +221,12 @@ abstract class Base
             $versionList = (array) $versionList;
         }
 
-        try {
-            $semver = new SemVer\version($currentVersion);
-        } catch (\Exception $e) {
-            $GLOBALS['log']->error('Cannot recognize currentVersion ['.$currentVersion.'], error: '.$e->getMessage().'.');
-            return false;
-        }
-
         foreach ($versionList as $version) {
-
             $isInRange = false;
             try {
-                $isInRange = $semver->satisfies(new SemVer\expression($version));
+                $isInRange = Semver::satisfies($currentVersion, $version);
             } catch (\Exception $e) {
-                $GLOBALS['log']->error('Version identification error: '.$e->getMessage().'.');
+                $GLOBALS['log']->error('SemVer: Version identification error: '.$e->getMessage().'.');
             }
 
             if ($isInRange) {

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

@@ -39,33 +39,19 @@ class Slim extends \Slim\Slim
      */
     public function run()
     {
-        //set_error_handler(array('\Slim\Slim', 'handleErrors')); //Espo: no needs to use this handler
-
-        //Apply final outer middleware layers
-        if ($this->config('debug')) {
-            //Apply pretty exceptions only in debug to avoid accidental information leakage in production
-            //$this->add(new \Slim\Middleware\PrettyExceptions()); //Espo: no needs to use this handler
-        }
-
-        //Invoke middleware and application stack
         $this->middleware[0]->call();
 
-        //Fetch status, header, and body
         list($status, $headers, $body) = $this->response->finalize();
 
-        // Serialize cookies (with optional encryption)
         \Slim\Http\Util::serializeCookies($headers, $this->response->cookies, $this->settings);
 
-        //Send headers
         if (headers_sent() === false) {
-            //Send status
             if (strpos(PHP_SAPI, 'cgi') === 0) {
                 header(sprintf('Status: %s', \Slim\Http\Response::getMessageForCode($status)));
             } else {
                 header(sprintf('HTTP/%s %s', $this->config('http.version'), \Slim\Http\Response::getMessageForCode($status)));
             }
 
-            //Send headers
             foreach ($headers as $name => $value) {
                 $hValues = explode("\n", $value);
                 foreach ($hValues as $hVal) {
@@ -74,12 +60,9 @@ class Slim extends \Slim\Slim
             }
         }
 
-        //Send body, but only if it isn't a HEAD request
         if (!$this->request->isHead()) {
             echo $body;
         }
-
-        //restore_error_handler(); //Espo: no needs to use this handler
     }
 
     public function printError($error, $status)
@@ -87,5 +70,4 @@ class Slim extends \Slim\Slim
         echo static::generateTemplateMarkup($status, '<p>'.$error.'</p><a href="' . $this->request->getRootUri() . '/">Visit the Home Page</a>');
     }
 
-
 }

application/Espo/Core/Utils/Auth.php

@@ -163,6 +163,8 @@ class Auth
                     return false;
                 }
                 $user->set('portalId', $this->getPortal()->id);
+            } else {
+                $user->loadLinkMultipleField('teams');
             }
 
             $this->getEntityManager()->setUser($user);

application/Espo/Core/Utils/ClientManager.php

@@ -41,6 +41,8 @@ class ClientManager
 
     protected $runScript = "app.start();";
 
+    protected $basePath = '';
+
     public function __construct(Config $config, ThemeManager $themeManager)
     {
         $this->config = $config;
@@ -57,6 +59,24 @@ class ClientManager
         return $this->config;
     }
 
+    public function setBasePath($basePath)
+    {
+        $this->basePath = $basePath;
+    }
+
+    public function getBasePath()
+    {
+        return $this->basePath;
+    }
+
+    protected function getCacheTimestamp()
+    {
+        if (!$this->getConfig()->get('useCache')) {
+            return (string) time();
+        }
+        return $this->getConfig()->get('cacheTimestamp', 0);
+    }
+
     public function display($runScript = null, $htmlFilePath = null, $vars = array())
     {
         if (is_null($runScript)) {
@@ -76,10 +96,12 @@ class ClientManager
         foreach ($vars as $key => $value) {
             $html = str_replace('{{'.$key.'}}', $value, $html);
         }
-        $html = str_replace('{{cacheTimestamp}}', $this->getConfig()->get('cacheTimestamp', 0), $html);
-        $html = str_replace('{{useCache}}', $this->getConfig()->get('useCache') ? 'true' : 'false' , $html);
+        $html = str_replace('{{applicationName}}', $this->getConfig()->get('applicationName', 'EspoCRM'), $html);
+        $html = str_replace('{{cacheTimestamp}}', $this->getCacheTimestamp(), $html);
+        $html = str_replace('{{useCache}}', $this->getConfig()->get('useCache') ? 'true' : 'false', $html);
         $html = str_replace('{{stylesheet}}', $this->getThemeManager()->getStylesheet(), $html);
         $html = str_replace('{{runScript}}', $runScript , $html);
+        $html = str_replace('{{basePath}}', $this->basePath , $html);
 
         echo $html;
         exit;

application/Espo/Core/Utils/Config.php

@@ -53,6 +53,13 @@ class Config
      */
     protected $adminItems = array();
 
+    protected $associativeArrayAttributeList = [
+        'currencyRates',
+        'database',
+        'logger',
+        'defaultPermissions',
+    ];
+
 
     /**
      * Contains content of config
@@ -124,6 +131,9 @@ class Config
         }
 
         foreach ($name as $key => $value) {
+            if (in_array($key, $this->associativeArrayAttributeList) && is_object($value)) {
+                $value = (array) $value;
+            }
             $this->data[$key] = $value;
             if (!$dontMarkDirty) {
                 $this->changedData[$key] = $value;
@@ -244,7 +254,7 @@ class Config
         $values = array();
         foreach ($data as $key => $item) {
             if (!in_array($key, $restrictItems)) {
-                $values[$key]= $item;
+                $values[$key] = $item;
             }
         }
 

application/Espo/Core/Utils/Cron/Job.php

@@ -69,20 +69,18 @@ class Job
      *
      * @return array
      */
-    public function getPendingJobs()
+    public function getPendingJobList()
     {
-        /** Mark Failed old jobs and remove pending duplicates */
-        $this->markFailedJobs();
-        $this->markJobAttempts();
-        $this->removePendingJobDuplicates();
+        $jobConfigs = $this->getConfig()->get('cron');
+        $limit = !empty($jobConfigs['maxJobNumber']) ? intval($jobConfigs['maxJobNumber']) : 0;
 
-        $jobList = $this->getActiveJobs();
+        $jobList = $this->getJobList(CronManager::PENDING, $limit);
 
-        $runningScheduledJobs = $this->getActiveJobs('scheduled_job_id', CronManager::RUNNING, PDO::FETCH_COLUMN);
+        $runningScheduledJobIdList = $this->getRunningScheduledJobIdList();
 
-        $list = array();
+        $list = [];
         foreach ($jobList as $row) {
-            if (!in_array($row['scheduled_job_id'], $runningScheduledJobs)) {
+            if (!in_array($row['scheduled_job_id'], $runningScheduledJobIdList)) {
                 $list[] = $row;
             }
         }
@@ -90,32 +88,63 @@ class Job
         return $list;
     }
 
-    /**
-     * Get active Jobs, which execution date in jobPeriod time
-     *
-     * @param  string $displayColumns
-     * @param  string $status
-     *
-     * @return array
-     */
-    public function getActiveJobs($displayColumns = '*', $status = CronManager::PENDING, $fetchMode = PDO::FETCH_ASSOC)
+    public function getRunningScheduledJobIdList()
     {
-        $jobConfigs = $this->getConfig()->get('cron');
-
-        $currentTime = time();
-        $limit = empty($jobConfigs['maxJobNumber']) ? '' : 'LIMIT '.$jobConfigs['maxJobNumber'];
-
-        $query = "SELECT " . $displayColumns . " FROM job WHERE
-                    `status` = '" . $status . "'
-                    AND execute_time <= '".date('Y-m-d H:i:s', $currentTime)."'
-                    AND deleted = 0
-                    ORDER BY execute_time ASC ".$limit;
+        $list = [];
 
         $pdo = $this->getEntityManager()->getPDO();
+
+        $query = "
+            SELECT scheduled_job_id FROM job
+            WHERE
+                `status` = 'Running' AND
+                scheduled_job_id IS NOT NULL AND
+                target_id IS NULL AND
+                deleted = 0
+            ORDER BY execute_time
+        ";
         $sth = $pdo->prepare($query);
         $sth->execute();
 
-        $rows = $sth->fetchAll($fetchMode);
+        $rowList = $sth->fetchAll(PDO::FETCH_ASSOC);
+        foreach ($rowList as $row) {
+            $list[] = $row['scheduled_job_id'];
+        }
+
+        return $list;
+    }
+
+    /**
+     * Get job list, which execution date in jobPeriod time
+     *
+     * @param  string $status
+     * @param  int $limit
+     *
+     * @return array
+     */
+    public function getJobList($status = CronManager::PENDING, $limit = null)
+    {
+        $currentTime = time();
+
+        $pdo = $this->getEntityManager()->getPDO();
+
+        $query = "
+            SELECT * FROM job
+            WHERE
+                `status` = " . $pdo->quote($status) . "
+                AND execute_time <= '".date('Y-m-d H:i:s', $currentTime)."'
+                AND deleted = 0
+            ORDER BY execute_time ASC
+        ";
+
+        if ($limit) {
+            $query .= " LIMIT " . $limit ;
+        }
+
+        $sth = $pdo->prepare($query);
+        $sth->execute();
+
+        $rows = $sth->fetchAll(PDO::FETCH_ASSOC);
 
         return $rows;
     }
@@ -133,13 +162,17 @@ class Job
         $dateObj = new \DateTime($time);
         $timeWithoutSeconds = $dateObj->format('Y-m-d H:i:');
 
-        $query = "SELECT * FROM job WHERE
-                    scheduled_job_id = '".$scheduledJobId."'
-                    AND execute_time LIKE '".$timeWithoutSeconds."%'
-                    AND deleted = 0
-                    LIMIT 1";
-
         $pdo = $this->getEntityManager()->getPDO();
+
+        $query = "
+            SELECT * FROM job
+            WHERE
+                scheduled_job_id = ".$pdo->quote($scheduledJobId)."
+                AND execute_time LIKE ". $pdo->quote($timeWithoutSeconds . '%') . "
+                AND deleted = 0
+            LIMIT 1
+        ";
+
         $sth = $pdo->prepare($query);
         $sth->execute();
 
@@ -153,7 +186,7 @@ class Job
      *
      * @return void
      */
-    protected function markFailedJobs()
+    public function markFailedJobs()
     {
         $jobConfigs = $this->getConfig()->get('cron');
 
@@ -162,9 +195,11 @@ class Job
 
         $pdo = $this->getEntityManager()->getPDO();
 
-        $select = "SELECT id, scheduled_job_id, execute_time FROM `job` WHERE
-                    (`status` = '" . CronManager::RUNNING ."')
-                    AND execute_time < '".date('Y-m-d H:i:s', $periodTime)."' ";
+        $select = "
+            SELECT id, scheduled_job_id, execute_time, target_id, target_type FROM `job`
+            WHERE
+            `status` = '" . CronManager::RUNNING ."' AND execute_time < '".date('Y-m-d H:i:s', $periodTime)."'
+        ";
         $sth = $pdo->prepare($select);
         $sth->execute();
 
@@ -173,7 +208,11 @@ class Job
            $jobData[$row['id']] = $row;
         }
 
-        $update = "UPDATE job SET `status` = '". CronManager::FAILED ."' WHERE id IN ('".implode("', '", array_keys($jobData))."')";
+        $update = "
+            UPDATE job
+            SET `status` = '". CronManager::FAILED ."'
+            WHERE id IN ('".implode("', '", array_keys($jobData))."')
+        ";
         $sth = $pdo->prepare($update);
         $sth->execute();
 
@@ -181,7 +220,7 @@ class Job
         $cronScheduledJob = $this->getCronScheduledJob();
         foreach ($jobData as $jobId => $job) {
             if (!empty($job['scheduled_job_id'])) {
-                $cronScheduledJob->addLogRecord($job['scheduled_job_id'], CronManager::FAILED, $job['execute_time']);
+                $cronScheduledJob->addLogRecord($job['scheduled_job_id'], CronManager::FAILED, $job['execute_time'], $job['target_id'], $job['target_type']);
             }
         }
     }
@@ -191,38 +230,50 @@ class Job
      *
      * @return void
      */
-    protected function removePendingJobDuplicates()
+    public function removePendingJobDuplicates()
     {
         $pdo = $this->getEntityManager()->getPDO();
 
-        $query = "SELECT scheduled_job_id FROM job
-                    WHERE
-                    scheduled_job_id IS NOT NULL
-                    AND `status` = '".CronManager::PENDING."'
-                    AND execute_time <= '".date('Y-m-d H:i:s')."'
-                    AND deleted = 0
-                    GROUP BY scheduled_job_id
-                    HAVING count( * ) > 1
-                    ORDER BY execute_time ASC";
+        $query = "
+            SELECT scheduled_job_id
+            FROM job
+            WHERE
+                scheduled_job_id IS NOT NULL AND
+                `status` = '".CronManager::PENDING."' AND
+                execute_time <= '".date('Y-m-d H:i:s')."' AND
+                target_id IS NULL AND
+                deleted = 0
+            GROUP BY scheduled_job_id
+            HAVING count( * ) > 1
+            ORDER BY MAX(execute_time) ASC
+        ";
         $sth = $pdo->prepare($query);
         $sth->execute();
 
-        $duplicateJobs = $sth->fetchAll(PDO::FETCH_ASSOC);
+        $duplicateJobList = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-        foreach ($duplicateJobs as $row) {
+        foreach ($duplicateJobList as $row) {
             if (!empty($row['scheduled_job_id'])) {
 
                 /* no possibility to use limit in update or subqueries */
-                $query = "SELECT id FROM `job` WHERE scheduled_job_id = '" . $row['scheduled_job_id'] . "'
-                            AND `status` = '" . CronManager::PENDING ."'
-                            ORDER BY execute_time
-                            DESC LIMIT 1, 100000 ";
+                $query = "
+                    SELECT id FROM `job`
+                    WHERE
+                        scheduled_job_id = '" . $row['scheduled_job_id'] . "' AND
+                        `status` = '" . CronManager::PENDING ."'
+                        ORDER BY execute_time
+                        DESC LIMIT 1, 100000
+                    ";
                 $sth = $pdo->prepare($query);
                 $sth->execute();
                 $jobIds = $sth->fetchAll(PDO::FETCH_COLUMN);
 
-                $update = "UPDATE job SET deleted = 1 WHERE
-                            id IN ('". implode("', '", $jobIds)."') ";
+                $update = "
+                    UPDATE job
+                    SET deleted = 1
+                    WHERE
+                        id IN ('". implode("', '", $jobIds)."')
+                ";
 
                 $sth = $pdo->prepare($update);
                 $sth->execute();
@@ -235,13 +286,16 @@ class Job
      *
      * @return void
      */
-    protected function markJobAttempts()
+    public function updateFailedJobAttempts()
     {
-        $query = "SELECT * FROM job WHERE
-                    `status` = '" . CronManager::FAILED . "'
-                    AND deleted = 0
-                    AND execute_time <= '".date('Y-m-d H:i:s')."'
-                    AND attempts > 0";
+        $query = "
+            SELECT * FROM job
+            WHERE
+                `status` = '" . CronManager::FAILED . "' AND
+                deleted = 0 AND
+                execute_time <= '".date('Y-m-d H:i:s')."' AND
+                attempts > 0
+        ";
 
         $pdo = $this->getEntityManager()->getPDO();
         $sth = $pdo->prepare($query);
@@ -255,12 +309,14 @@ class Job
                 $attempts = $row['attempts'] - 1;
                 $failedAttempts = $row['failed_attempts'] + 1;
 
-                $update = "UPDATE job SET
-                            `status` = '" . CronManager::PENDING ."',
-                            attempts = '".$attempts."',
-                            failed_attempts = '".$failedAttempts."'
-                            WHERE
-                            id = '".$row['id']."'
+                $update = "
+                    UPDATE job
+                    SET
+                        `status` = '" . CronManager::PENDING ."',
+                        attempts = '".$attempts."',
+                        failed_attempts = '".$failedAttempts."'
+                    WHERE
+                        id = '".$row['id']."'
                 ";
                 $pdo->prepare($update)->execute();
             }

application/Espo/Core/Utils/Cron/ScheduledJob.php

@@ -59,11 +59,14 @@ class ScheduledJob
      *
      * @return array
      */
-    public function getActiveJobs()
+    public function getActiveScheduledJobList()
     {
-        $query = "SELECT * FROM scheduled_job WHERE
-                    `status` = 'Active'
-                    AND deleted = 0";
+        $query = "
+            SELECT * FROM scheduled_job
+            WHERE
+                `status` = 'Active' AND
+                deleted = 0
+        ";
 
         $pdo = $this->getEntityManager()->getPDO();
         $sth = $pdo->prepare($query);
@@ -87,7 +90,7 @@ class ScheduledJob
      *
      * @return string ID of created ScheduledJobLogRecord
      */
-    public function addLogRecord($scheduledJobId, $status, $runTime = null)
+    public function addLogRecord($scheduledJobId, $status, $runTime = null, $targetId = null, $targetType = null)
     {
         if (!isset($runTime)) {
             $runTime = date('Y-m-d H:i:s');
@@ -96,6 +99,11 @@ class ScheduledJob
         $entityManager = $this->getEntityManager();
 
         $scheduledJob = $entityManager->getEntity('ScheduledJob', $scheduledJobId);
+
+        if (!$scheduledJob) {
+            return;
+        }
+
         $scheduledJob->set('lastRun', $runTime);
         $entityManager->saveEntity($scheduledJob);
 
@@ -105,6 +113,8 @@ class ScheduledJob
             'name' => $scheduledJob->get('name'),
             'status' => $status,
             'executionTime' => $runTime,
+            'targetId' => $targetId,
+            'targetType' => $targetType
         ));
         $scheduledJobLogId = $entityManager->saveEntity($scheduledJobLog);
 

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

@@ -82,15 +82,11 @@ class Converter
     */
     public function process()
     {
-        $GLOBALS['log']->debug('Orm\Converter - Start: orm convertation');
-
         $ormMeta = $this->getOrmConverter()->process();
 
         //save database meta to a file espoMetadata.php
         $result = $this->getMetadata()->setOrmMetadata($ormMeta);
 
-        $GLOBALS['log']->debug('Orm\Converter - End: orm convertation, result=['.$result.']');
-
         return $result;
     }
 }

application/Espo/Core/Utils/Database/DBAL/FieldTypes/BoolType.php

@@ -31,7 +31,7 @@ namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
 use Doctrine\DBAL\Types\BooleanType;
 
-class Bool extends BooleanType
+class BoolType extends BooleanType
 {
     const BOOL = 'bool';
 

application/Espo/Core/Utils/Database/DBAL/FieldTypes/IntType.php

@@ -31,7 +31,7 @@ namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
 use Doctrine\DBAL\Types\IntegerType;
 
-class Int extends IntegerType
+class IntType extends IntegerType
 {
     const INTtype = 'int';
 

application/Espo/Core/Utils/Database/DBAL/FieldTypes/JsonArrayType.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
-class JsonArray extends \Doctrine\DBAL\Types\JsonArrayType
+class JsonArrayType extends \Doctrine\DBAL\Types\JsonArrayType
 {
     const JSON_ARRAY = 'jsonArray';
 

application/Espo/Core/Utils/Database/DBAL/FieldTypes/JsonObjectType.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
-class JsonObject extends \Doctrine\DBAL\Types\ObjectType
+class JsonObjectType extends \Doctrine\DBAL\Types\ObjectType
 {
     const JSON_OBJECT = 'jsonObject';
 

application/Espo/Core/Utils/Database/DBAL/FieldTypes/PasswordType.php

@@ -31,7 +31,7 @@ namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
 use Doctrine\DBAL\Types\StringType;
 
-class Password extends StringType
+class PasswordType extends StringType
 {
     const PASSWORD = 'password';
 

application/Espo/Core/Utils/Database/DBAL/FieldTypes/VarcharType.php

@@ -31,7 +31,7 @@ namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
 use Doctrine\DBAL\Types\StringType;
 
-class Varchar extends StringType
+class VarcharType extends StringType
 {
     const VARCHAR = 'varchar';
 

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

@@ -66,7 +66,9 @@ class Currency extends Base
                         "<" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate < {value}",
                         ">=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate >= {value}",
                         "<=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <= {value}",
-                        "<>" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <> {value}"
+                        "<>" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <> {value}",
+                        "IS NULL" => Util::toUnderScore($entityName) . "." . $currencyColumnName . ' IS NULL',
+                        "IS NOT NULL" => Util::toUnderScore($entityName) . "." . $currencyColumnName . ' IS NOT NULL',
                 ),
                 'notStorable' => true,
                 'orderBy' => $converedFieldName . " {direction}"

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

@@ -48,22 +48,36 @@ class Email extends Base
                                     entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
                                     email_address.deleted = 0 AND email_address.name LIKE {value}
                             )",
-                            '=' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
-                                SELECT entity_id
-                                FROM entity_email_address
-                                JOIN email_address ON email_address.id = entity_email_address.email_address_id
-                                WHERE
-                                    entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
-                                    email_address.deleted = 0 AND email_address.name = {value}
-                            )",
-                            '<>' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
-                                SELECT entity_id
-                                FROM entity_email_address
-                                JOIN email_address ON email_address.id = entity_email_address.email_address_id
-                                WHERE
-                                    entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
-                                    email_address.deleted = 0 AND email_address.name <> {value}
-                            )"
+                            '=' => array(
+                                'leftJoins' => [['emailAddresses', 'emailAddressesMultiple']],
+                                'sql' => 'emailAddressesMultiple.name = {value}',
+                                'distinct' => true
+                            ),
+                            '<>' => array(
+                                'leftJoins' => [['emailAddresses', 'emailAddressesMultiple']],
+                                'sql' => 'emailAddressesMultiple.name <> {value}',
+                                'distinct' => true
+                            ),
+                            'IN' => array(
+                                'leftJoins' => [['emailAddresses', 'emailAddressesMultiple']],
+                                'sql' => 'emailAddressesMultiple.name IN {value}',
+                                'distinct' => true
+                            ),
+                            'NOT IN' => array(
+                                'leftJoins' => [['emailAddresses', 'emailAddressesMultiple']],
+                                'sql' => 'emailAddressesMultiple.name NOT IN {value}',
+                                'distinct' => true
+                            ),
+                            'IS NULL' => array(
+                                'leftJoins' => [['emailAddresses', 'emailAddressesMultiple']],
+                                'sql' => 'emailAddressesMultiple.name IS NULL',
+                                'distinct' => true
+                            ),
+                            'IS NOT NULL' => array(
+                                'leftJoins' => [['emailAddresses', 'emailAddressesMultiple']],
+                                'sql' => 'emailAddressesMultiple.name IS NOT NULL',
+                                'distinct' => true
+                            )
                         ),
                         'orderBy' => 'emailAddresses.name {direction}',
                     ),
@@ -73,7 +87,7 @@ class Email extends Base
                     ),
                 ),
                 'relations' => array(
-                    $fieldName.'es' => array(
+                    'emailAddresses' => array(
                         'type' => 'manyMany',
                         'entity' => 'EmailAddress',
                         'relationName' => 'entityEmailAddress',

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

@@ -48,22 +48,36 @@ class Phone extends Base
                                     entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
                                     phone_number.deleted = 0 AND phone_number.name LIKE {value}
                             )",
-                            '=' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
-                                SELECT entity_id
-                                FROM entity_phone_number
-                                JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
-                                WHERE
-                                    entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
-                                    phone_number.deleted = 0 AND phone_number.name = {value}
-                            )",
-                            '<>' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
-                                SELECT entity_id
-                                FROM entity_phone_number
-                                JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
-                                WHERE
-                                    entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
-                                    phone_number.deleted = 0 AND phone_number.name <> {value}
-                            )"
+                            '=' => array(
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbersMultiple']],
+                                'sql' => 'phoneNumbersMultiple.name = {value}',
+                                'distinct' => true
+                            ),
+                            '<>' => array(
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbersMultiple']],
+                                'sql' => 'phoneNumbersMultiple.name <> {value}',
+                                'distinct' => true
+                            ),
+                            'IN' => array(
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbersMultiple']],
+                                'sql' => 'phoneNumbersMultiple.name IN {value}',
+                                'distinct' => true
+                            ),
+                            'NOT IN' => array(
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbersMultiple']],
+                                'sql' => 'phoneNumbersMultiple.name NOT IN {value}',
+                                'distinct' => true
+                            ),
+                            'IS NULL' => array(
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbersMultiple']],
+                                'sql' => 'phoneNumbersMultiple.name IS NULL',
+                                'distinct' => true
+                            ),
+                            'IS NOT NULL' => array(
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbersMultiple']],
+                                'sql' => 'phoneNumbersMultiple.name IS NOT NULL',
+                                'distinct' => true
+                            )
                         ),
                         'orderBy' => 'phoneNumbers.name {direction}',
                     ),
@@ -73,7 +87,7 @@ class Phone extends Base
                     ),
                 ),
                 'relations' => array(
-                    $fieldName.'s' => array(
+                    'phoneNumbers' => array(
                         'type' => 'manyMany',
                         'entity' => 'PhoneNumber',
                         'relationName' => 'entityPhoneNumber',

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

@@ -161,11 +161,11 @@ class Schema
 
             $typeList = $this->getFileManager()->getFileList($path, false, '\.php$');
             if ($typeList !== false) {
-                foreach($typeList as $name) {
-                    $typeName = preg_replace('/\.php$/i', '', $name);
+                foreach ($typeList as $name) {
+                    $typeName = preg_replace('/Type\.php$/i', '', $name);
                     $dbalTypeName = strtolower($typeName);
 
-                    $filePath = Util::concatPath($path, $typeName);
+                    $filePath = Util::concatPath($path, $typeName . 'Type');
                     $class = Util::getClassName($filePath);
 
                     if( ! Type::hasType($dbalTypeName) ) {

application/Espo/Core/Utils/EntityManager.php

@@ -82,6 +82,8 @@ class EntityManager
             throw new Error();
         }
 
+        $name = trim($name);
+
         $normalizedName = Util::normilizeClassName($name);
 
         $contents = "<" . "?" . "php\n\n".
@@ -217,6 +219,15 @@ class EntityManager
             $this->getMetadata()->set('entityDefs', $name, $entityDefsData);
         }
 
+        if (isset($data['textFilterFields'])) {
+            $entityDefsData = array(
+                'collection' => array(
+                    'textFilterFields' => $data['textFilterFields']
+                )
+            );
+            $this->getMetadata()->set('entityDefs', $name, $entityDefsData);
+        }
+
         $this->getMetadata()->save();
         $this->getLanguage()->save();
 
@@ -270,9 +281,9 @@ class EntityManager
         $linkType = $params['linkType'];
 
         $entity = $params['entity'];
-        $link = $params['link'];
+        $link = trim($params['link']);
         $entityForeign = $params['entityForeign'];
-        $linkForeign = $params['linkForeign'];
+        $linkForeign = trim($params['linkForeign']);
 
         $label = $params['label'];
         $labelForeign = $params['labelForeign'];
@@ -320,9 +331,15 @@ class EntityManager
 
         switch ($linkType) {
             case 'oneToMany':
-                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.field.' . $linkForeign)) {
+                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign)) {
                     throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'] already exists.');
                 }
+                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign . 'Id')) {
+                    throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'Id] already exists.');
+                }
+                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign . 'Name')) {
+                    throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'Name] already exists.');
+                }
                 $dataLeft = array(
                     'fields' => array(
                         $link => array(
@@ -361,9 +378,15 @@ class EntityManager
                 );
                 break;
             case 'manyToOne':
-                if ($this->getMetadata()->get('entityDefs.' . $entity . '.field.' . $link)) {
+                if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link)) {
                     throw new Conflict('Field ['.$entity.'::'.$link.'] already exists.');
                 }
+                if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link . 'Id')) {
+                    throw new Conflict('Field ['.$entity.'::'.$link.'Id] already exists.');
+                }
+                if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link . 'Name')) {
+                    throw new Conflict('Field ['.$entity.'::'.$link.'Name] already exists.');
+                }
                 $dataLeft = array(
                     'fields' => array(
                         $link => array(

application/Espo/Core/Utils/FieldManager.php

@@ -89,6 +89,7 @@ class FieldManager
 
     public function update($name, $fieldDefs, $scope)
     {
+        $name = trim($name);
         /*Add option to metadata to identify the custom field*/
         if (!$this->isCore($name, $scope)) {
             $fieldDefs[$this->customOptionName] = true;
@@ -99,7 +100,7 @@ class FieldManager
             $this->setLabel($name, $fieldDefs['label'], $scope);
         }
 
-        if (isset($fieldDefs['type']) && ($fieldDefs['type'] == 'enum' || $fieldDefs['type'] == 'phone')) {
+        if (isset($fieldDefs['type']) && $this->getMetadata()->get(['fields', $fieldDefs['type'], 'translatedOptions'])) {
             if (isset($fieldDefs['translatedOptions'])) {
                 $this->setTranslatedOptions($name, $fieldDefs['translatedOptions'], $scope);
             }

application/Espo/Core/Utils/File/Manager.php

@@ -249,7 +249,7 @@ class Manager
     public function putContentsJson($path, $data)
     {
         if (!Utils\Json::isJSON($data)) {
-            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
+            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
         }
 
         return $this->putContents($path, $data, LOCK_EX);
@@ -290,7 +290,7 @@ class Manager
         $data = Utils\Util::merge($savedDataArray, $newDataArray);
 
         if ($isReturnJson) {
-            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
+            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
         }
 
         if ($isPhp) {

application/Espo/Core/Utils/Metadata.php

@@ -187,7 +187,7 @@ class Metadata
     /**
     * Get Metadata
     *
-    * @param string $key
+    * @param mixed string|array $key
     * @param mixed $default
     *
     * @return array
@@ -308,7 +308,7 @@ class Metadata
      *
      * @return bool
      */
-    public function delete($key1, $key2, $unsets)
+    public function delete($key1, $key2, $unsets = null)
     {
         if (!is_array($unsets)) {
             $unsets = (array) $unsets;

application/Espo/Core/Utils/Util.php

@@ -394,33 +394,35 @@ class Util
             $unsets = (array) $unsets;
         }
 
-        foreach($unsets as $rootKey => $unsetItem){
+        foreach ($unsets as $rootKey => $unsetItem) {
             $unsetItem = is_array($unsetItem) ? $unsetItem : (array) $unsetItem;
 
-            foreach($unsetItem as $unsetSett){
-                if (!empty($unsetSett)){
-                    $keyItems = explode('.', $unsetSett);
-                    $currVal = isset($content[$rootKey]) ? "\$content['{$rootKey}']" : "\$content";
+            foreach ($unsetItem as $unsetString) {
+                if (is_string($rootKey)) {
+                    $unsetString = $rootKey . '.' . $unsetString;
+                }
 
-                    $lastKey = array_pop($keyItems);
-                    foreach($keyItems as $keyItem){
-                        $currVal .= "['{$keyItem}']";
-                    }
+                $keyСhain = explode('.', $unsetString);
+                $keyChainCount = count($keyСhain) - 1;
 
-                    $unsetElem = $currVal . "['{$lastKey}']";
+                $elem = & $content;
+                for ($i = 0; $i <= $keyChainCount; $i++) {
 
-                    $evalString = "
-                    if (isset({$unsetElem}) || ( is_array({$currVal}) && array_key_exists('{$lastKey}', {$currVal}) )) {
-                        unset({$unsetElem});
-                    } ";
-                    eval($evalString);
+                    if (is_array($elem) && array_key_exists($keyСhain[$i], $elem)) {
+
+                        if ($i == $keyChainCount) {
+
+                            unset($elem[$keyСhain[$i]]);
+
+                            if ($unsetParentEmptyArray && is_array($elem) && empty($elem)) {
+                                unset($keyСhain[$i]);
+                                $content = static::unsetInArray($content, implode('.', $keyСhain), false);
+                            }
+
+                        } else if (is_array($elem[$keyСhain[$i]])) {
+                            $elem = & $elem[$keyСhain[$i]];
+                        }
 
-                    if ($unsetParentEmptyArray) {
-                        $evalString = "
-                        if (is_array({$currVal}) && empty({$currVal})) {
-                            unset({$currVal});
-                        } ";
-                        eval($evalString);
                     }
                 }
             }
@@ -449,7 +451,7 @@ class Util
      * Return values of defined $key.
      *
      * @param  array $array
-     * @param  string $key     Ex. of key is "entityDefs", "entityDefs.User"
+     * @param  mixed array|string $key     Ex. of key is "entityDefs", "entityDefs.User"
      * @param  mixed $default
      * @return mixed
      */
@@ -459,7 +461,11 @@ class Util
             return $array;
         }
 
-        $keys = explode('.', $key);
+        if (is_array($key)) {
+            $keys = $key;
+        } else {
+            $keys = explode('.', $key);
+        }
 
         $lastItem = $array;
         foreach($keys as $keyName) {

application/Espo/Core/defaults/config.php

@@ -32,6 +32,7 @@ return array (
         'driver' => 'pdo_mysql',
         'host' => 'localhost',
         'port' => '',
+        'charset' => 'utf8',
         'dbname' => '',
         'user' => '',
         'password' => '',
@@ -63,9 +64,11 @@ return array (
     'smtpPassword' => '',
     'languageList' => [
         'en_US',
+        'cs_CZ',
         'de_DE',
         'es_ES',
         'fr_FR',
+        'id_ID',
         'nl_NL',
         'tr_TR',
         'ro_RO',
@@ -92,7 +95,7 @@ return array (
         'Opportunity',
     ),
     "tabList" => ["Account", "Contact", "Lead", "Opportunity", "Calendar", "Meeting", "Call", "Task", "Case", "Email", "Document", "Campaign", "KnowledgeBaseArticle"],
-    "quickCreateList" => ["Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case"],
+    "quickCreateList" => ["Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case", "Email"],
     'calendarDefaultEntity' => 'Meeting',
     'exportDisabled' => false,
     'assignmentEmailNotifications' => false,
@@ -112,6 +115,8 @@ return array (
     'authTokenLifetime' => 0,
     'authTokenMaxIdleTime' => 120,
     'userNameRegularExpression' => '[^a-z0-9\-@_\.\s]',
+    'addressFormat' => 1,
+    'displayListViewRecordCount' => true,
     'dashboardLayout' => [
         (object) [
             'name' => 'My Espo',

application/Espo/Entities/Email.php

@@ -51,6 +51,11 @@ class Email extends \Espo\Core\ORM\Entity
         }
     }
 
+    public function isManuallyArchived()
+    {
+        return $this->get('status') === 'Archived' && $this->get('createdById') !== 'system';
+    }
+
     public function addAttachment(\Espo\Entities\Attachment $attachment)
     {
         if (!empty($this->id)) {

application/Espo/EntryPoints/Avatar.php

@@ -36,11 +36,13 @@ use \Espo\Core\Exceptions\Error;
 
 class Avatar extends Image
 {
-    public static $authRequired = true;
+    public static $authRequired = false;
 
     public static $notStrictAuth = true;
 
-    private $colorList = [
+    protected $systemColor = [212,114,155];
+
+    protected $colorList = [
         [111,168,214],
         [237,197,85],
         [212,114,155],
@@ -73,7 +75,6 @@ class Avatar extends Image
 
         $userId = $_GET['id'];
 
-
         $user = $this->getEntityManager()->getEntity('User', $userId);
         if (!$user) {
             throw new NotFound();
@@ -106,9 +107,14 @@ class Avatar extends Image
                 header('Cache-Control: max-age=360000, must-revalidate');
                 header('Content-Type: image/png');
 
-                ob_clean();
-                flush();
-                echo $identicon->getImageData($userId, $width, $this->getColor($userId));
+                $hash = $userId;
+                $color = $this->getColor($userId);
+                if ($hash === 'system') {
+                    $color = $this->systemColor;
+                }
+
+                $imgContent = $identicon->getImageData($hash, $width, $color);
+                echo $imgContent;
                 exit;
             }
         }

application/Espo/EntryPoints/Download.php

@@ -73,6 +73,9 @@ class Download extends \Espo\Core\EntryPoints\Base
             throw new NotFound();
         }
 
+        $outputFileName = $attachment->get('name');
+        $outputFileName = str_replace("\"", "\\\"", $outputFileName);
+
         $type = $attachment->get('type');
 
         $disposition = 'attachment';
@@ -84,7 +87,7 @@ class Download extends \Espo\Core\EntryPoints\Base
         if ($type) {
             header('Content-Type: ' . $type);
         }
-        header("Content-Disposition: " . $disposition . ";filename=\"" . $attachment->get('name') . "\"");
+        header("Content-Disposition: " . $disposition . ";filename=\"" . $outputFileName . "\"");
         header('Expires: 0');
         header('Cache-Control: must-revalidate');
         header('Pragma: public');

application/Espo/EntryPoints/Portal.php

@@ -37,10 +37,12 @@ class Portal extends \Espo\Core\EntryPoints\Base
 {
     public static $authRequired = false;
 
-    public function run()
+    public function run($data = array())
     {
         if (!empty($_GET['id'])) {
             $id = $_GET['id'];
+        } else if (!empty($data['id'])) {
+            $id = $data['id'];
         } else {
             $id = $this->getConfig()->get('defaultPortalId');
             if (!$id) {
@@ -49,6 +51,7 @@ class Portal extends \Espo\Core\EntryPoints\Base
         }
 
         $application = new \Espo\Core\Portal\Application($id);
+        $application->setBasePath($this->getContainer()->get('clientManager')->getBasePath());
         $application->runClient();
     }
 }

application/Espo/Hooks/Common/Notifications.php

@@ -151,7 +151,10 @@ class Notifications extends \Espo\Core\Hooks\Base
         $query = $this->getEntityManager()->getQuery();
         $sql = "
             DELETE FROM `notification`
-            WHERE related_id = ".$query->quote($entity->id)." AND related_type = ".$query->quote($entity->getEntityType()) ."
+            WHERE
+                (related_id = ".$query->quote($entity->id)." AND related_type = ".$query->quote($entity->getEntityType()) .")
+                OR
+                (related_parent_id = ".$query->quote($entity->id)." AND related_parent_type = ".$query->quote($entity->getEntityType()) .")
         ";
         $this->getEntityManager()->getPDO()->query($sql);
     }

application/Espo/Modules/Crm/Acl/Call.php

@@ -0,0 +1,39 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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\Modules\Crm\Acl;
+
+use \Espo\Entities\User;
+use \Espo\ORM\Entity;
+
+class Call extends Meeting
+{
+
+}
+

application/Espo/Modules/Crm/Acl/Meeting.php

@@ -0,0 +1,54 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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\Modules\Crm\Acl;
+
+use \Espo\Entities\User;
+use \Espo\ORM\Entity;
+
+class Meeting extends \Espo\Core\Acl\Base
+{
+    public function checkEntityRead(User $user, Entity $entity, $data)
+    {
+        if ($this->checkEntity($user, $entity, $data, 'read')) {
+            return true;
+        }
+
+        if (is_object($data)) {
+            if ($data->read === 'own' || $data->read === 'team') {
+                if ($entity->hasLinkMultipleId('users', $user->id)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+}
+

application/Espo/Modules/Crm/Business/Event/Invitations.php

@@ -45,11 +45,9 @@ class Invitations
 
     protected $language;
 
-    protected $fileManager;
-
     protected $ics;
 
-    public function __construct($entityManager, $smtpParams, $mailSender, $config, $dateTime, $language, $fileManager)
+    public function __construct($entityManager, $smtpParams, $mailSender, $config, $dateTime, $language)
     {
         $this->entityManager = $entityManager;
         $this->smtpParams = $smtpParams;
@@ -57,7 +55,6 @@ class Invitations
         $this->config = $config;
         $this->dateTime = $dateTime;
         $this->language = $language;
-        $this->fileManager = $fileManager;
     }
 
     protected function getEntityManager()
@@ -75,17 +72,28 @@ class Invitations
             $key = '{'.$field.'}';
             switch ($d['type']) {
                 case 'datetime':
-                    $contents = str_replace($key, $this->dateTime->convertSystemDateTime($entity->get($field)), $contents);
+                    $value = $entity->get($field);
+                    if ($value) {
+                        $value = $this->dateTime->convertSystemDateTime($value);
+                    }
+                    $contents = str_replace($key, $value, $contents);
                     break;
                 case 'date':
-                    $contents = str_replace($key, $this->dateTime->convertSystemDate($entity->get($field)), $contents);
+                    $value = $entity->get($field);
+                    if ($value) {
+                        $value = $this->dateTime->convertSystemDate($value);
+                    }
+                    $contents = str_replace($key, $value, $contents);
                     break;
                 case 'jsonArray':
                     break;
                 case 'jsonObject':
                     break;
                 default:
-                    $contents = str_replace($key, $entity->get($field), $contents);
+                    $value = $entity->get($field);
+                    if (is_string($value) || $value === null || is_scalar($value) || is_callable([$value, '__toString'])) {
+                        $contents = str_replace($key, $value, $contents);
+                    }
             }
         }
 
@@ -108,7 +116,7 @@ class Invitations
         if ($uid) {
             $contents = str_replace('{acceptLink}', $siteUrl . '?entryPoint=eventConfirmation&action=accept&uid=' . $uid->get('name'), $contents);
             $contents = str_replace('{declineLink}', $siteUrl . '?entryPoint=eventConfirmation&action=decline&uid=' . $uid->get('name'), $contents);
-            $contents = str_replace('{tentativeLink}', $siteUrl . '?entryPoint=eventConfirmation&action=tentativeLink&uid=' . $uid->get('name'), $contents);
+            $contents = str_replace('{tentativeLink}', $siteUrl . '?entryPoint=eventConfirmation&action=tentative&uid=' . $uid->get('name'), $contents);
         }
         return $contents;
     }

application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php

@@ -136,13 +136,10 @@ class EmailReminder
         $email->set('subject', $subject);
         $email->set('body', $body);
         $email->set('isHtml', true);
-        $this->getEntityManager()->saveEntity($email);
 
         $emailSender = $this->mailSender;
 
         $emailSender->send($email);
-
-        $this->getEntityManager()->removeEntity($email);
     }
 }
 

application/Espo/Modules/Crm/Controllers/Activities.php

@@ -35,6 +35,9 @@ use \Espo\Core\Exceptions\Error,
 
 class Activities extends \Espo\Core\Controllers\Base
 {
+    protected $maxCalendarRange = 123;
+
+    protected $maxSizeLimit = 200;
 
     public function actionListCalendarEvents($params, $data, $request)
     {
@@ -49,18 +52,38 @@ class Activities extends \Espo\Core\Controllers\Base
             throw new BadRequest();
         }
 
-        $service = $this->getService('Activities');
-
-        $userId = $request->get('userId');
-        if (!$userId) {
-            $userId = $this->getUser()->id;
+        if (strtotime($to) - strtotime($from) > $this->maxCalendarRange * 24 * 3600) {
+            throw new Forbidden('Too long range.');
         }
 
+        $service = $this->getService('Activities');
+
         $scopeList = null;
         if ($request->get('scopeList') !== null) {
             $scopeList = explode(',', $request->get('scopeList'));
         }
 
+        $userId = $request->get('userId');
+        $userIdList = $request->get('userIdList');
+
+        if ($userIdList) {
+            $userIdList = explode(',', $userIdList);
+
+            $resultList = [];
+            foreach ($userIdList as $userId) {
+                $userResultList = $service->getEvents($userId, $from, $to, $scopeList);
+                foreach ($userResultList as $item) {
+                    $item['userId'] = $userId;
+                    $resultList[] = $item;
+                }
+            }
+            return $resultList;
+        } else {
+            if (!$userId) {
+                $userId = $this->getUser()->id;
+            }
+        }
+
         return $service->getEvents($userId, $from, $to, $scopeList);
     }
 
@@ -76,6 +99,13 @@ class Activities extends \Espo\Core\Controllers\Base
         $offset = intval($request->get('offset'));
         $maxSize = intval($request->get('maxSize'));
 
+        if (empty($maxSize)) {
+            $maxSize = $this->maxSizeLimit;
+        }
+        if ($maxSize > $this->maxSizeLimit) {
+            throw new Forbidden("Max should should not exceed " . $this->maxSizeLimit . ". Use pagination (offset, limit).");
+        }
+
         return $service->getUpcomingActivities($userId, array(
             'offset' => $offset,
             'maxSize' => $maxSize
@@ -131,6 +161,13 @@ class Activities extends \Espo\Core\Controllers\Base
         $sortBy = $request->get('sortBy');
         $where = $request->get('where');
 
+        if (empty($maxSize)) {
+            $maxSize = $this->maxSizeLimit;
+        }
+        if ($maxSize > $this->maxSizeLimit) {
+            throw new Forbidden("Max should should not exceed " . $this->maxSizeLimit . ". Use pagination (offset, limit).");
+        }
+
         $scope = null;
         if (is_array($where) && !empty($where[0]) && $where[0] !== 'false') {
             $scope = $where[0];

application/Espo/Modules/Crm/Controllers/KnowledgeBaseArticle.php

@@ -31,5 +31,13 @@ namespace Espo\Modules\Crm\Controllers;
 
 class KnowledgeBaseArticle extends \Espo\Core\Controllers\Record
 {
+    public function postActionGetCopiedAttachments($params, $data, $request)
+    {
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+        $id = $data['id'];
 
+        return $this->getRecordService()->getCopiedAttachments($id);
+    }
 }

application/Espo/Modules/Crm/Controllers/Opportunity.php

@@ -25,7 +25,7 @@
  *
  * 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\Modules\Crm\Controllers;
 
@@ -37,52 +37,52 @@ class Opportunity extends \Espo\Core\Controllers\Record
     public function actionReportByLeadSource($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-                
+
         return $this->getService('Opportunity')->reportByLeadSource($dateFrom, $dateTo);
     }
-    
+
     public function actionReportByStage($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-        
+
         return $this->getService('Opportunity')->reportByStage($dateFrom, $dateTo);
     }
-    
+
     public function actionReportSalesByMonth($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-                
-        return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);        
+
+        return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);
     }
-    
+
     public function actionReportSalesPipeline($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-        
+
         return $this->getService('Opportunity')->reportSalesPipeline($dateFrom, $dateTo);
     }
 }

application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php

@@ -81,6 +81,17 @@ class CampaignTrackOpened extends \Espo\Core\EntryPoints\Base
         }
         $campaignService = $this->getServiceFactory()->create('Campaign');
         $campaignService->logOpened($campaignId, $queueItemId, $target, null, $queueItem->get('isTest'));
+
+        header('Content-Type: image/png');
+
+        $img  = imagecreatetruecolor(1, 1);
+        imagesavealpha($img, true);
+        $color = imagecolorallocatealpha($img, 0, 0, 0, 127);
+        imagefill($img, 0, 0, $color);
+
+        imagepng($img);
+        imagecolordeallocate($background);
+        imagedestroy( $tt_image );
     }
 }
 

application/Espo/Modules/Crm/Jobs/CheckEmailAccounts.php

@@ -29,20 +29,61 @@
 
 namespace Espo\Modules\Crm\Jobs;
 
-use \Espo\Core\Exceptions;
+use \Espo\Core\Exceptions\Error;
 
 class CheckEmailAccounts extends \Espo\Core\Jobs\Base
 {
-    public function run()
+    public function run($data, $targetId)
     {
+        if (!$targetId) {
+            throw new Error();
+        }
+
         $service = $this->getServiceFactory()->create('EmailAccount');
-        $collection = $this->getEntityManager()->getRepository('EmailAccount')->where(array('status' => 'Active'))->find();
+        $entity = $this->getEntityManager()->getEntity('EmailAccount', $targetId);
+
+        if (!$entity) {
+            throw new Error("Job CheckEmailAccounts '".$targetId."': EmailAccount does not exist.");
+        };
+
+        if ($entity->get('status') !== 'Active') {
+            throw new Error("Job CheckEmailAccounts '".$targetId."': EmailAccount is not active.");
+        }
+
+        try {
+            $service->fetchFromMailServer($entity);
+        } catch (\Exception $e) {
+            throw new Error('Job CheckEmailAccounts '.$entity->id.': [' . $e->getCode() . '] ' .$e->getMessage());
+        }
+        return true;
+    }
+
+    public function prepare($data, $executeTime)
+    {
+        $collection = $this->getEntityManager()->getRepository('EmailAccount')->where(array(
+            'status' => 'Active'
+        ))->find();
         foreach ($collection as $entity) {
-            try {
-                $service->fetchFromMailServer($entity);
-            } catch (\Exception $e) {
-                $GLOBALS['log']->error('Job CheckEmailAccounts '.$entity->id.': [' . $e->getCode() . '] ' .$e->getMessage());
-            }
+            $running = $this->getEntityManager()->getRepository('Job')->where(array(
+                'scheduledJobId' => $data['id'],
+                'status' => ['Running', 'Pending'],
+                'targetType' => 'EmailAccount',
+                'targetId' => $entity->id
+            ))->findOne();
+            if ($running) continue;
+
+            $job = $this->getEntityManager()->getEntity('Job');
+
+            $jobEntity = $this->getEntityManager()->getEntity('Job');
+            $jobEntity->set(array(
+                'name' => $data['name'],
+                'scheduledJobId' => $data['id'],
+                'executeTime' => $executeTime,
+                'method' => 'CheckEmailAccounts',
+                'targetType' => 'EmailAccount',
+                'targetId' => $entity->id
+            ));
+            $this->getEntityManager()->saveEntity($jobEntity);
         }
 
         return true;

application/Espo/Modules/Crm/Jobs/SendEmailReminders.php

@@ -45,7 +45,7 @@ class SendEmailReminders extends \Espo\Core\Jobs\Base
         $collection = $this->getEntityManager()->getRepository('Reminder')->where(array(
             'type' => 'Email',
             'remindAt<=' => $now,
-            'startAt>' => $nowShifted,
+            'startAt>' => $nowShifted
         ))->find();
 
         if (!empty($collection)) {

application/Espo/Modules/Crm/Repositories/Account.php

@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 class Account extends \Espo\Core\ORM\Repositories\RDB
 {
-    public function afterSave(Entity $entity, array $options)
+    public function afterSave(Entity $entity, array $options = array())
     {
         parent::afterSave($entity, $options);
 

application/Espo/Modules/Crm/Repositories/CaseObj.php

@@ -33,14 +33,14 @@ use Espo\ORM\Entity;
 
 class CaseObj extends \Espo\Core\ORM\Repositories\RDB
 {
-    public function afterSave(Entity $entity, array $options)
+    public function afterSave(Entity $entity, array $options = array())
     {
         $result = parent::afterSave($entity, $options);
         $this->handleAfterSaveContacts($entity, $options);
         return $result;
     }
 
-    protected function handleAfterSaveContacts(Entity $entity, array $options)
+    protected function handleAfterSaveContacts(Entity $entity, array $options = array())
     {
         $contactIdChanged = $entity->has('contactId') && $entity->get('contactId') != $entity->getFetched('contactId');
 

application/Espo/Modules/Crm/Repositories/Contact.php

@@ -47,7 +47,7 @@ class Contact extends \Espo\Core\ORM\Repositories\RDB
         ";
     }
 
-    public function afterSave(Entity $entity, array $options)
+    public function afterSave(Entity $entity, array $options = array())
     {
         $result = parent::afterSave($entity, $options);
         $this->handleAfterSaveAccounts($entity, $options);
@@ -59,7 +59,7 @@ class Contact extends \Espo\Core\ORM\Repositories\RDB
         return $result;
     }
 
-    protected function handleAfterSaveAccounts(Entity $entity, array $options)
+    protected function handleAfterSaveAccounts(Entity $entity, array $options = array())
     {
         $accountIdChanged = $entity->has('accountId') && $entity->get('accountId') != $entity->getFetched('accountId');
         $titleChanged = $entity->has('title') && $entity->get('title') != $entity->getFetched('title');

application/Espo/Modules/Crm/Repositories/Lead.php

@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 class Lead extends \Espo\Core\ORM\Repositories\RDB
 {
-    public function afterSave(Entity $entity, array $options)
+    public function afterSave(Entity $entity, array $options = array())
     {
         parent::afterSave($entity, $options);
 

application/Espo/Modules/Crm/Repositories/Meeting.php

@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 class Meeting extends \Espo\Core\ORM\Repositories\RDB
 {
-    protected function beforeSave(Entity $entity, array $options)
+    protected function beforeSave(Entity $entity, array $options = array())
     {
         parent::beforeSave($entity, $options);
 
@@ -83,7 +83,7 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
                         $usersColumns = new \StdClass();
                     }
                     if ($usersColumns instanceof \StdClass) {
-                        if (!($usersColumns->$currentUserId instanceof \StdClass)) {
+                        if (empty($usersColumns->$currentUserId) || !($usersColumns->$currentUserId instanceof \StdClass)) {
                             $usersColumns->$currentUserId = new \StdClass();
                         }
                         if (empty($usersColumns->$currentUserId->status)) {
@@ -93,21 +93,40 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
                 }
             }
         }
+
+        if (!$entity->isNew()) {
+            if ($entity->isFieldChanged('dateStart') && $entity->isFieldChanged('dateStart') && !$entity->isFieldChanged('dateEnd')) {
+                $dateEndPrevious = $entity->getFetched('dateEnd');
+                $dateStartPrevious = $entity->getFetched('dateStart');
+                if ($dateStartPrevious && $dateEndPrevious) {
+                    $dtStart = new \DateTime($dateStartPrevious);
+                    $dtEnd = new \DateTime($dateEndPrevious);
+                    $dt = new \DateTime($entity->get('dateStart'));
+
+                    if ($dtStart && $dtEnd && $dt) {
+                        $duration = ($dtEnd->getTimestamp() - $dtStart->getTimestamp());
+                        $dt->modify('+' . $duration . ' seconds');
+                        $dateEnd = $dt->format('Y-m-d H:i:s');
+                        $entity->set('dateEnd', $dateEnd);
+                    }
+                }
+            }
+        }
     }
 
-    public function getEntityReminders(Entity $entity)
+    public function getEntityReminderList(Entity $entity)
     {
         $pdo = $this->getEntityManager()->getPDO();
-        $reminders = array();
+        $reminderList = [];
 
         $sql = "
-            SELECT id, `seconds`, `type`
+            SELECT DISTINCT `seconds`, `type`
             FROM `reminder`
             WHERE
                 `entity_type` = ".$pdo->quote($entity->getEntityType())." AND
                 `entity_id` = ".$pdo->quote($entity->id)." AND
                 `deleted` = 0
-                ORDER BY `seconds` ASC
+            ORDER BY `seconds` ASC
         ";
 
         $sth = $pdo->prepare($sql);
@@ -118,19 +137,20 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
             $o = new \StdClass();
             $o->seconds = intval($row['seconds']);
             $o->type = $row['type'];
-            $reminders[] = $o;
+            $reminderList[] = $o;
         }
 
-        return $reminders;
+        return $reminderList;
     }
 
-    protected function afterSave(Entity $entity, array $options)
+    protected function afterSave(Entity $entity, array $options = array())
     {
         parent::afterSave($entity, $options);
 
         if (
             $entity->isNew() ||
             $entity->isFieldChanged('assignedUserId') ||
+            $entity->isFieldChanged('usersIds') ||
             $entity->isFieldChanged('dateStart') ||
             $entity->has('reminders')
         ) {
@@ -139,9 +159,9 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
             $reminderTypeList = $this->getMetadata()->get('entityDefs.Reminder.fields.type.options');
 
             if (!$entity->has('reminders')) {
-                $reminders = $this->getEntityReminders($entity);
+                $reminderList = $this->getEntityReminderList($entity);
             } else {
-                $reminders = $entity->get('reminders');
+                $reminderList = $entity->get('reminders');
             }
 
             if (!$entity->isNew()) {
@@ -155,32 +175,28 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
                 $pdo->query($sql);
             }
 
-            if (empty($reminders) || !is_array($reminders)) return;
+            if (empty($reminderList) || !is_array($reminderList)) return;
 
             $entityType = $entity->getEntityName();
 
             $dateStart = $entity->get('dateStart');
-            $assignedUserId = $entity->get('assignedUserId');
 
-            if (!$dateStart || !$assignedUserId) {
+            if (!$dateStart) {
                 $e = $this->get($entity->id);
                 if ($e) {
                     $dateStart = $e->get('dateStart');
-                    $assignedUserId = $e->get('assignedUserId');
                 }
             }
 
-            if (!$dateStart || !$assignedUserId) {
-                return;
-            }
+            $userIdList = $entity->getLinkMultipleIdList('users');
 
+            if (!$dateStart) return;
+            if (empty($userIdList)) return;
 
             $dateStartObj = new \DateTime($dateStart);
-            if (!$dateStartObj) {
-                return;
-            }
+            if (!$dateStartObj) return;
 
-            foreach ($reminders as $item) {
+            foreach ($reminderList as $item) {
                 $remindAt = clone $dateStartObj;
                 $seconds = intval($item->seconds);
                 $type = $item->type;
@@ -189,25 +205,26 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
 
                 $remindAt->sub(new \DateInterval('PT' . $seconds . 'S'));
 
-                $id = uniqid();
-
-                $sql = "
-                    INSERT
-                    INTO `reminder`
-                    (id, entity_id, entity_type, `type`, user_id, remind_at, start_at, `seconds`)
-                    VALUES (
-                        ".$pdo->quote($id).",
-                        ".$pdo->quote($entity->id).",
-                        ".$pdo->quote($entityType).",
-                        ".$pdo->quote($type).",
-                        ".$pdo->quote($assignedUserId).",
-                        ".$pdo->quote($remindAt->format('Y-m-d H:i:s')).",
-                        ".$pdo->quote($dateStart).",
-                        ".$pdo->quote($seconds)."
-                    )
-                ";
-                $pdo->query($sql);
+                foreach ($userIdList as $userId) {
+                    $id = uniqid(true);
 
+                    $sql = "
+                        INSERT
+                        INTO `reminder`
+                        (id, entity_id, entity_type, `type`, user_id, remind_at, start_at, `seconds`)
+                        VALUES (
+                            ".$pdo->quote($id).",
+                            ".$pdo->quote($entity->id).",
+                            ".$pdo->quote($entityType).",
+                            ".$pdo->quote($type).",
+                            ".$pdo->quote($userId).",
+                            ".$pdo->quote($remindAt->format('Y-m-d H:i:s')).",
+                            ".$pdo->quote($dateStart).",
+                            ".$pdo->quote($seconds)."
+                        )
+                    ";
+                    $pdo->query($sql);
+                }
             }
         }
     }

application/Espo/Modules/Crm/Repositories/Opportunity.php

@@ -33,6 +33,16 @@ use Espo\ORM\Entity;
 
 class Opportunity extends \Espo\Core\ORM\Repositories\RDB
 {
+    public function beforeSave(Entity $entity, array $options = array())
+    {
+        parent::beforeSave($entity, $options);
 
+        if ($entity->isNew()) {
+            if (!$entity->has('probability') && $entity->get('stage')) {
+                $probability = $this->getMetadata()->get('entityDefs.Opportunity.probabilityMap.' . $entity->get('stage'), 0);
+                $entity->set('probability', $probability);
+            }
+        }
+    }
 }
 

application/Espo/Modules/Crm/Repositories/Task.php

@@ -64,7 +64,7 @@ class Task extends \Espo\Core\ORM\Repositories\RDB
         return null;
     }
 
-    protected function beforeSave(Entity $entity, array $options)
+    protected function beforeSave(Entity $entity, array $options = array())
     {
         parent::beforeSave($entity, $options);
 

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Account.json

@@ -0,0 +1,73 @@
+{
+    "fields": {
+        "name": "Název",
+        "emailAddress": "Email",
+        "website": "Web",
+        "phoneNumber": "Telefon",
+        "billingAddress": "Fakturační adresa",
+        "shippingAddress": "Doručovací adresa",
+        "description": "Popis",
+        "sicCode": "IČ",
+        "industry": "Průmysl",
+        "type": "Typ",
+        "contactRole": "Pozice",
+        "campaign": "Kampaň"
+    },
+    "links": {
+        "contacts": "Kontakty",
+        "opportunities": "Případy",
+        "cases": "Události",
+        "documents": "Dokumenty",
+        "meetingsPrimary": "Schůzky (rozšířené)",
+        "callsPrimary": "Volání (rozšířené)",
+        "tasksPrimary": "Úkoly (rozšířené)",
+        "emailsPrimary": "Emaily (rozšířené)",
+        "targetLists": "Cílové seznamy",
+        "campaignLogRecords": "Log kampaně",
+        "campaign": "Kampaň"
+    },
+    "options": {
+        "type": {
+            "Customer": "Zákazník",
+            "Investor": "Investor",
+            "Partner": "Partner",
+            "Reseller": "Prodejce"
+        },
+        "industry": {
+            "Agriculture": "Zeměděltví",
+            "Advertising": "Reklama",
+            "Apparel & Accessories": "Oblečení a doplňky",
+            "Automotive": "Automotive",
+            "Banking": "Bankovnictví",
+            "Biotechnology": "Biotechnologie",
+            "Chemical": "Chemie",
+            "Computer": "Počítače",
+            "Education": "Vzdělání",
+            "Electronics": "Elektronika",
+            "Entertainment & Leisure": "Zábava a volný čas",
+            "Finance": "Finance",
+            "Food & Beverage": "Stravování a nápoje",
+            "Grocery": "Potraviny",
+            "Insurance": "Pojištění",
+            "Legal": "Právo",
+            "Publishing": "Vydavatelství",
+            "Real Estate": "Nemovitosti",
+            "Service": "Služby",
+            "Sports": "Sport",
+            "Software": "Software",
+            "Technology": "Technologie",
+            "Telecommunications": "Telekomunikace",
+            "Television": "TV",
+            "Transportation": "Doprava",
+            "Venture Capital": "Rizikový kapitál"
+        }
+    },
+    "labels": {
+        "Create Account": "Vytvořit organizaci",
+        "Copy Billing": "Zkopírovat fakturační údaje"
+    },
+    "presetFilters": {
+        "customers": "Zákazníci",
+        "partners": "Partneři"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Admin.json

@@ -0,0 +1,6 @@
+{
+    "layouts": {
+        "detailConvert": "Konvertovat stopu",
+        "listForAccount": "Seznam (pro organizace)"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Calendar.json

@@ -0,0 +1,13 @@
+{
+    "modes": {
+        "month": "Měsíc",
+        "week": "Týden",
+        "day": "Den",
+        "agendaWeek": "Týden",
+        "agendaDay": "Den"
+    },
+    "labels": {
+        "Today": "Dnes",
+        "Create": "Vytvořit"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Call.json

@@ -0,0 +1,51 @@
+{
+    "fields": {
+        "name": "Název",
+        "parent": "Rodič",
+        "status": "Status",
+        "dateStart": "Datum zahájení",
+        "dateEnd": "Datum ukončení",
+        "direction": "Směr",
+        "duration": "Trvání",
+        "description": "Popis",
+        "users": "Uživatelé",
+        "contacts": "Kontakty",
+        "leads": "Stopy",
+        "reminders": "Připomenutí",
+        "account": "Organizace"
+    },
+    "links": {
+    },
+    "options": {
+        "status": {
+            "Planned": "Plánovaný",
+            "Held": "Uskutečněný",
+            "Not Held": "Neuskutečněný"
+        },
+        "direction": {
+            "Outbound": "Odchozí",
+            "Inbound": "Příchozí"
+        },
+        "acceptanceStatus": {
+            "None": "None",
+            "Accepted": "Přijatý",
+            "Declined": "Odmítnutý",
+            "Tentative": "Předběžný"
+        }
+    },
+    "massActions": {
+        "setHeld": "Nastavit jako uskutečněný",
+        "setNotHeld": "Nastavit jako neuskutečněný"
+    },
+    "labels": {
+        "Create Call": "Vytvořit volání",
+        "Set Held": "Nastavit jako uskutečněný",
+        "Set Not Held": "Nastavit jako neuskutečněný",
+        "Send Invitations": "Poslat pozvánky"
+    },
+    "presetFilters": {
+        "planned": "Plánovaný",
+        "held": "Uskutečněný",
+        "todays": "Dnešní"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Campaign.json

@@ -0,0 +1,55 @@
+{
+    "fields": {
+        "name": "Název",
+        "description": "Popis",
+        "status": "Status",
+        "type": "Typ",
+        "startDate": "Datum zahájení",
+        "endDate": "Datum ukončení",
+        "targetLists": "Cílové seznamy",
+        "sentCount": "Poslané",
+        "openedCount": "Otevřené",
+        "clickedCount": "Kliknuté",
+        "optedOutCount": "Odhlášené",
+        "bouncedCount": "Odmítnuté",
+        "hardBouncedCount": "Tvrdě odmítnuté",
+        "softBouncedCount": "Měkce odmítnuté",
+        "leadCreatedCount": "Vytvořených stop",
+        "revenue": "Příjem",
+        "revenueConverted": "příjem (konvertováno)"
+    },
+    "links": {
+        "targetLists": "Cílové seznamy",
+        "accounts": "Organizace",
+        "contacts": "Kontakty",
+        "leads": "Stopy",
+        "opportunities": "Případy",
+        "campaignLogRecords": "Log"
+    },
+    "options": {
+        "type": {
+            "Email": "Email",
+            "Web": "Web",
+            "Television": "TV",
+            "Radio": "Rádio",
+            "Newsletter": "Newsletter",
+            "Mail": "Email"
+        },
+        "status": {
+            "Planning": "Plánované",
+            "Active": "Aktivní",
+            "Inactive": "Neaktivní",
+            "Complete": "Kompletní"
+        }
+    },
+    "labels": {
+        "Create Campaign": "Vytvořit kampaň",
+        "Target Lists": "Cílové seznamy",
+        "Statistics": "Statistiky",
+        "hard": "těžký",
+        "soft": "měkký"
+    },
+    "presetFilters": {
+        "active": "Aktivní"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/CampaignLogRecord.json

@@ -0,0 +1,24 @@
+{
+    "fields": {
+        "action": "Akce",
+        "actionDate": "Datum",
+        "data": "Data",
+        "campaign": "Kampaň",
+        "parent": "Cíl",
+        "object": "Objekt",
+        "application": "Aplikace"
+    },
+    "options": {
+    	"action": {
+            "Sent": "Poslané",
+            "Opened": "Otevřené",
+            "Opted Out": "Odhlášené",
+            "Bounced": "Odmítnuté",
+            "Clicked": "Kliknuté",
+            "Lead Created": "Vytvořeno stop"
+    	}
+    },
+    "labels": {
+        "All": "Vše"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Case.json

@@ -0,0 +1,42 @@
+{
+    "fields": {
+        "name": "Název",
+        "number": "Číslo",
+        "status": "Status",
+        "account": "Organizace",
+        "contact": "Kontakt",
+        "priority": "Priorita",
+        "type": "Typ",
+        "description": "Popis"
+    },
+    "links": {
+    },
+    "options": {
+        "status": {
+            "New": "Nový",
+            "Assigned": "Přiřazený",
+            "Pending": "Čekající",
+            "Closed": "Uzavřený",
+            "Rejected": "Odmítnutý",
+            "Duplicate": "Duplikovaný"
+        },
+        "priority" : {
+            "Low": "Malá",
+            "Normal": "Normální",
+            "High": "Vysoká",
+            "Urgent": "Urgentní"
+        },
+        "type": {
+            "Question": "Otázka",
+            "Incident": "Incident",
+            "Problem": "Problém"
+        }
+    },
+    "labels": {
+        "Create Case": "Vytvořit událost"
+    },
+    "presetFilters": {
+        "open": "Otevřený",
+        "closed": "Zavřený"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Contact.json

@@ -0,0 +1,37 @@
+{
+    "fields": {
+        "name": "Název",
+        "emailAddress": "Email",
+        "title": "Pozice",
+        "account": "Organizace",
+        "accounts": "Organizace",
+        "phoneNumber": "Telefon",
+        "accountType": "Typ organizace",
+        "doNotCall": "Nevolat",
+        "address": "Adresa",
+        "opportunityRole": "Pozice vzhledem k případu",
+        "accountRole": "Pozice",
+        "description": "Popis",
+        "campaign": "Kampaň",
+        "targetLists": "Cílové seznamy",
+        "targetList": "Cílový seznam"
+    },
+    "links": {
+        "opportunities": "Případy",
+        "cases": "Události",
+        "targetLists": "Cílové seznamy",
+        "campaignLogRecords": "Log kampaně",
+        "campaign": "Kampaň"
+    },
+    "labels": {
+        "Create Contact": "Vytvořit kontakt"
+    },
+    "options": {
+        "opportunityRole": {
+            "": "--",
+            "Decision Maker": "Rozhoduje",
+            "Evaluator": "Hodnotí",
+            "Influencer": "Má vliv"
+        }
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Document.json

@@ -0,0 +1,42 @@
+{
+    "labels": {
+        "Create Document": "Vytvořit dokument",
+        "Details": "Detaily"
+    },
+    "fields": {
+        "name": "Název",
+        "status": "Status",
+        "file": "Soubor",
+        "type": "Typ",
+        "source": "Zdroj",
+        "publishDate": "Datum publikace",
+        "expirationDate": "Datum expirace",
+        "description": "Popis",
+        "accounts": "Organizace",
+        "folder": "Složka"
+    },
+    "links": {
+        "accounts": "Organizace",
+        "opportunities": "Případy",
+        "folder": "Složka"
+    },
+    "options": {
+        "status": {
+            "Active": "Aktivní",
+            "Draft": "Draft",
+            "Expired": "Expirovaný",
+            "Canceled": "Zrušený"
+        },
+        "type": {
+            "": "-",
+            "Contract": "Kontrakt",
+            "NDA": "NDA",
+            "EULA": "EULA",
+            "License Agreement": "Licenční smlouva"
+        }
+    },
+    "presetFilters": {
+        "active": "Aktivní",
+        "draft": "Draft"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/DocumentFolder.json

@@ -0,0 +1,10 @@
+{
+    "labels": {
+        "Create DocumentFolder": "Vytvořit složku",
+        "Manage Categories": "Spravovat složky",
+        "documents": "Dokumenty"
+    },
+    "links": {
+        "documents": "Dokumenty"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Email.json

@@ -0,0 +1,8 @@
+{
+    "labels": {
+        "Create Lead": "Vytvořit stopu",
+        "Create Contact": "Vytvořit kontakt",
+        "Create Task": "Vytvořit úkol",
+        "Create Case": "Vytvořit událost"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Global.json

@@ -0,0 +1,100 @@
+{
+    "scopeNames": {
+        "Account": "Organizace",
+        "Contact": "Kontakt",
+        "Lead": "Stopa",
+        "Target": "Cíl",
+        "Opportunity": "Případ",
+        "Meeting": "Schůzka",
+        "Calendar": "Kalendář",
+        "Call": "Volání",
+        "Task": "Úkol",
+        "Case": "Událost",
+        "Document": "Dokument",
+        "DocumentFolder": "Složka dokumentů",
+        "Campaign": "Kampaň",
+        "TargetList": "Cílový seznam"
+    },
+    "scopeNamesPlural": {
+        "Account": "Organizace",
+        "Contact": "Kontakty",
+        "Lead": "Stopy",
+        "Target": "Cíle",
+        "Opportunity": "Případy",
+        "Meeting": "Schůzky",
+        "Calendar": "Kalendáře",
+        "Call": "Volání",
+        "Task": "Úkoly",
+        "Case": "Události",
+        "Document": "Dokumenty",
+        "DocumentFolder": "Složky dokumentů",
+        "Campaign": "Kampaně",
+        "TargetList": "Cílové seznamy"
+    },
+    "dashlets": {
+        "Leads": "Moje stopy",
+        "Opportunities": "Moje případy",
+        "Tasks": "Moje úkoly",
+        "Cases": "Moje události",
+        "Calendar": "Kalendář",
+        "Calls": "Moje volání",
+        "Meetings": "Moje schůzky",
+        "OpportunitiesByStage": "Případy podle stavu",
+        "OpportunitiesByLeadSource": "Případy podle zdroje",
+        "SalesByMonth": "Prodeje za měsíc",
+        "SalesPipeline": "Prodejní pipeline"
+    },
+    "labels": {
+        "Create InboundEmail": "Vytvořit příchodí email",
+        "Activities": "Aktivity",
+        "History": "Historie",
+        "Attendees": "Účastníci",
+        "Schedule Meeting": "Plánovaná schůzka",
+        "Schedule Call": "Plánované volání",
+        "Compose Email": "Sestavit email",
+        "Log Meeting": "Zapsat schůzku",
+        "Log Call": "Zapsat volání",
+        "Archive Email": "Archivovat email",
+        "Create Task": "Vytvořit úkol",
+        "Tasks": "Úkoly"        
+    },
+    "fields": {
+        "billingAddressCity": "Město",
+        "billingAddressCountry": "Země",
+        "billingAddressPostalCode": "PSČ",
+        "billingAddressState": "Kraj",
+        "billingAddressStreet": "Ulice",
+        "addressCity": "Město",
+        "addressStreet": "Ulice",
+        "addressCountry": "Země",
+        "addressState": "Kraj",
+        "addressPostalCode": "PSČ",        
+        "shippingAddressCity": "Město (doručovací)",
+        "shippingAddressStreet": "Ulice (doručovací)",
+        "shippingAddressCountry": "Země (doručovací)",
+        "shippingAddressState": "Kraj (doručovací)",
+        "shippingAddressPostalCode": "PSČ (doručovací)"
+    },
+    "links": {
+        "contacts": "Kontakty",
+        "opportunities": "Případy",
+        "leads": "Stopy",        
+        "meetings": "Schůzky",
+        "calls": "Volání",
+        "tasks": "Úkoly",
+        "emails": "Emaily",
+        "accounts": "Organizace",
+        "cases": "Události",
+        "documents": "Dokumenty",
+        "account": "Organizace",
+        "opportunity": "Případ",        
+        "contact": "Kontakt",
+        "parent": "Rodič"
+    },
+    "options": {
+        "reminderTypes": {
+            "Popup": "Vyskakovací",
+            "Email": "Email"
+        }
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Lead.json

@@ -0,0 +1,58 @@
+{
+    "labels": {
+        "Converted To": "Konvertováno do",
+        "Create Lead": "Vytvořit stopu",
+        "Convert": "Konvertovat"
+    },
+    "fields": {
+        "name": "Název",
+        "emailAddress": "Email",
+        "title": "Pozice",
+        "website": "Web",
+        "phoneNumber": "Telefon",
+        "accountName": "Název organizace",
+        "doNotCall": "Nevolat",
+        "address": "Adresa",
+        "status": "Status",
+        "source": "Zdroj",
+        "opportunityAmount": "Částka případu",
+        "opportunityAmountConverted": "Částka případu (konvertováno)",
+        "description": "Popis",
+        "createdAccount": "Organizace",
+        "createdContact": "Kontakt",
+        "createdOpportunity": "Případ",
+        "campaign": "Kampaň",
+        "targetLists": "Cílové seznamy",
+        "targetList": "Cílový seznam"
+    },
+    "links": {
+        "targetLists": "Cílové seznamy",
+        "campaignLogRecords": "Log kampaně",
+        "campaign": "Kampaň"
+    },
+    "options": {
+        "status": {
+            "New": "Nový",
+            "Assigned": "Přiřazený",
+            "In Process": "V procesu",
+            "Converted": "Konvertovaný",
+            "Recycled": "Recyklovaný",
+            "Dead": "Mrtvý"
+        },
+        "source": {
+            "": "-",
+            "Call": "Volání",
+            "Email": "Email",
+            "Existing Customer": "Existující zákazník",
+            "Partner": "Partner",
+            "Public Relations": "Veřejné vztahy",
+            "Web Site": "Web",
+            "Campaign": "Kampaň",
+            "Other": "Ostatní"
+        }
+    },
+    "presetFilters": {
+        "active": "Aktivní",
+        "converted": "Konvertovaný"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/cs_CZ/Meeting.json

@@ -0,0 +1,48 @@
+{
+    "fields": {
+        "name": "Název",
+        "parent": "Rodič",
+        "status": "Status",
+        "dateStart": "Datum zahájení",
+        "dateEnd": "Datum ukončení",
+        "duration": "Trvání",
+        "description": "Popis",
+        "users": "Uživatelé",
+        "contacts": "Kontakty",
+        "leads": "Stopy",
+        "reminders": "Připomenutí",
+        "account": "Organizace"
+    },
+    "links": {
+    },
+    "options": {
+        "status": {
+            "Planned": "Planovaný",
+            "Held": "Uskutečněný",
+            "Not Held": "Neuskutečněný"
+        },
+        "acceptanceStatus": {
+            "None": "-",
+            "Accepted": "Přijatý",
+            "Declined": "Odmítnutý",
+            "Tentative": "Předběžný"
+        }
+    },
+    "massActions": {
+        "setHeld": "Nastavit jako uskutečněný",
+        "setNotHeld": "Nastavit jako neuskutečněný"
+    },
+    "labels": {
+        "Create Meeting": "Vytvořit schůzku",
+        "Set Held": "Nastavit jako uskutečněný",
+        "Set Not Held": "Nastavit jako neuskutečněný",
+        "Send Invitations": "Odeslat pozvánky",
+        "on time": "na čas",
+        "before": "před"
+    },
+    "presetFilters": {
+        "planned": "Plánovaný",
+        "held": "Uskutečněný",
+        "todays": "Dnešní"
+    }
+}