Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

.gitignore

@@ -13,4 +13,4 @@
 /tests/testData/cache/*
 composer.phar
 vendor/
-/custom/Espo/Custom/Resources/*
+/custom/Espo/Custom/*

README.md

@@ -6,6 +6,13 @@ It's a web application with a frontend designed as a single page application bas
 
 Download the latest release from our [website](http://www.espocrm.com).
 
+### Requirements
+
+* PHP 5.4 or above (with pdo, json, gd, mcrypt extensions);
+* MySQL 5.1 or above.
+
+For more information about server configuration see [this article](http://blog.espocrm.com/administration/server-configuration-for-espocrm/).
+
 ### How to report bug
 
 Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/bug-reports?routestring=forum/bug-reports).

application/Espo/Acl/Email.php

@@ -0,0 +1,72 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User;
+use \Espo\ORM\Entity;
+
+class Email extends \Espo\Core\Acl\Base
+{
+
+    public function checkEntityRead(User $user, Entity $entity, $data)
+    {
+        if ($this->checkEntity($user, $entity, $data, 'read')) {
+            return true;
+        }
+
+        if ($data === false) {
+            return false;
+        }
+        if (is_array($data)) {
+            if (empty($data['read']) || $data['read'] == 'no') {
+                return false;
+            }
+        }
+
+        if (!$entity->has('usersIds')) {
+            $entity->loadLinkMultipleField('users');
+        }
+        $userIdList = $entity->get('usersIds');
+        if (is_array($userIdList) && in_array($user->id, $userIdList)) {
+            return true;
+        }
+        return false;
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($entity->has('assignedUserId')) {
+            if ($user->id === $entity->get('assignedUserId')) {
+                return true;
+            }
+        }
+
+        if ($user->id === $entity->get('createdById')) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
+

application/Espo/Controllers/App.php

@@ -33,7 +33,7 @@ class App extends \Espo\Core\Controllers\Base
 
         return array(
             'user' => $this->getUser()->toArray(),
-            'acl' => $this->getAcl()->toArray(),
+            'acl' => $this->getAcl()->getMap(),
             'preferences' => $preferences,
             'token' => $this->getUser()->get('token')
         );

application/Espo/Controllers/EmailAccount.php

@@ -31,7 +31,7 @@ class EmailAccount extends \Espo\Core\Controllers\Record
         return $this->getRecordService()->getFolders(array(
             'host' => $request->get('host'),
             'port' => $request->get('port'),
-            'ssl' => $request->get('ssl'),
+            'ssl' => $request->get('ssl') === 'true',
             'username' => $request->get('username'),
             'password' => $request->get('password'),
             'id' => $request->get('id')

application/Espo/Controllers/EntityManager.php

@@ -62,6 +62,12 @@ class EntityManager extends \Espo\Core\Controllers\Base
         if (!empty($data['stream'])) {
             $params['stream'] = $data['stream'];
         }
+        if (!empty($data['sortBy'])) {
+            $params['sortBy'] = $data['sortBy'];
+        }
+        if (!empty($data['sortDirection'])) {
+            $params['asc'] = $data['sortDirection'] === 'asc';
+        }
 
         $result = $this->getContainer()->get('entityManagerUtil')->create($name, $type, $params);
 
@@ -90,6 +96,10 @@ class EntityManager extends \Espo\Core\Controllers\Base
         $name = $data['name'];
         $name = filter_var($name, \FILTER_SANITIZE_STRING);
 
+        if (!empty($data['sortDirection'])) {
+            $data['asc'] = $data['sortDirection'] === 'asc';
+        }
+
         $result = $this->getContainer()->get('entityManagerUtil')->update($name, $data);
 
         if ($result) {

application/Espo/Controllers/InboundEmail.php

@@ -20,7 +20,7 @@
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
  ************************************************************************/
 
-namespace Espo\Modules\Crm\Controllers;
+namespace Espo\Controllers;
 
 class InboundEmail extends \Espo\Core\Controllers\Record
 {
@@ -36,7 +36,7 @@ class InboundEmail extends \Espo\Core\Controllers\Record
         return $this->getRecordService()->getFolders(array(
             'host' => $request->get('host'),
             'port' => $request->get('port'),
-            'ssl' => $request->get('ssl'),
+            'ssl' => $request->get('ssl') === 'true',
             'username' => $request->get('username'),
             'password' => $request->get('password'),
             'id' => $request->get('id')

application/Espo/Controllers/User.php

@@ -45,9 +45,7 @@ class User extends \Espo\Core\Controllers\Record
             throw new NotFound();
         }
 
-        $acl = new \Espo\Core\Acl($user, $this->getConfig(), $this->getContainer()->get('fileManager'), $this->getMetadata());
-
-        return $acl->toArray();
+        return $this->getAclManager()->getMap($user);
     }
 
     public function actionChangeOwnPassword($params, $data, $request)
@@ -89,7 +87,7 @@ class User extends \Espo\Core\Controllers\Record
         if (!$request->isPost()) {
             throw new Forbidden();
         }
-        
+
         if (empty($data['userName']) || empty($data['emailAddress'])) {
             throw new BadRequest();
         }

application/Espo/Core/Acl.php

@@ -22,305 +22,61 @@
 
 namespace Espo\Core;
 
-use \Espo\Core\Exceptions\Error;
-
-use \Espo\ORM\Entity;
-
 class Acl
 {
-    private $data = array(
-        'table' => array()
-    );
+    private $user;
 
-    private $cacheFile;
+    private $aclManager;
 
-    private $actionList = array('read', 'edit', 'delete');
-
-    private $levelList = array('all', 'team', 'own', 'no');
-
-    protected $fileManager;
-
-    protected $metadata;
-
-    public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
+    public function __construct(AclManager $aclManager, \Espo\Entities\User $user)
     {
+        $this->aclManager = $aclManager;
         $this->user = $user;
-
-        $this->metadata = $metadata;
-
-        if (!$this->user->isFetched()) {
-            throw new Error();
-        }
-
-        $this->user->loadLinkMultipleField('teams');
-
-        if ($fileManager) {
-            $this->fileManager = $fileManager;
-        }
-
-        $this->cacheFile = 'data/cache/application/acl/' . $user->id . '.php';
-
-        if ($config && $config->get('useCache') && file_exists($this->cacheFile)) {
-            $cached = include $this->cacheFile;
-            $this->data = $cached;
-            $this->initSolid();
-        } else {
-            $this->load();
-            $this->initSolid();
-            if ($config && $fileManager && $config->get('useCache')) {
-                $this->buildCache();
-            }
-        }
-
     }
 
-    public function checkScope($scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
+    protected function getAclManager()
     {
-        if (array_key_exists($scope, $this->data['table'])) {
-            if ($this->data['table'][$scope] === false) {
-                return false;
-            }
-            if ($this->data['table'][$scope] === true) {
-                return true;
-            }
-            if (!is_null($action)) {
-                if (array_key_exists($action, $this->data['table'][$scope])) {
-                    $value = $this->data['table'][$scope][$action];
-
-                    if ($value === 'all' || $value === true) {
-                        return true;
-                    }
-
-                    if (!$value || $value === 'no') {
-                        return false;
-                    }
-
-                    if (is_null($isOwner)) {
-                        return true;
-                    }
-
-                    if ($isOwner) {
-                        if ($value === 'own' || $value === 'team') {
-                            return true;
-                        }
-                    }
-                    if ($inTeam === null && $entity) {
-                        $inTeam = $this->checkInTeam($entity);
-                    }
-
-                    if ($inTeam) {
-                        if ($value === 'team') {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-            }
-            return true;
-        }
-        return true;
+        return $this->aclManager;
     }
 
-    public function toArray()
+    protected function getUser()
     {
-        return $this->data;
+        return $this->user;
     }
 
-    public function get($permission)
+    public function getMap()
     {
-        if ($this->user->isAdmin()) {
-            return true;
-        }
-        if ($permission == 'table') {
-            return null;
-        }
-
-        if (array_key_exists($permission, $this->data)) {
-            return $this->data[$permission];
-        }
-        return null;
+        return $this->getAclManager()->getMap($this->getUser());
     }
 
     public function getLevel($scope, $action)
     {
-        if ($this->user->isAdmin()) {
-            return 'all';
-        }
-        if (array_key_exists($scope, $this->data['table'])) {
-            if (array_key_exists($action, $this->data['table'][$scope])) {
-                return $this->data['table'][$scope][$action];
-            }
-        }
-        return false;
+        return $this->getAclManager()->getLevel($this->getUser(), $scope, $action);
     }
 
-    public function check($subject, $action = null, $isOwner = null, $inTeam = null)
+    public function get($permission)
     {
-        if ($this->user->isAdmin()) {
-            return true;
-        }
-        if (is_string($subject)) {
-            return $this->checkScope($subject, $action, $isOwner, $inTeam);
-        } else {
-            $entity = $subject;
-            if ($entity instanceof Entity) {
-                $entityName = $entity->getEntityName();
-                return $this->checkScope($entityName, $action, $this->checkIsOwner($entity), $inTeam, $entity);
-            }
-        }
+        return $this->getAclManager()->get($this->getUser(), $permission);
     }
 
     public function checkReadOnlyTeam($scope)
     {
-        if (isset($this->data['table'][$scope]) && isset($this->data['table'][$scope]['read'])) {
-            return $this->data['table'][$scope]['read'] === 'team';
-        }
-        return false;
+        return $this->getAclManager()->checkReadOnlyTeam($this->getUser(), $scope);
     }
 
     public function checkReadOnlyOwn($scope)
     {
-        if ($this->user->isAdmin()) {
-            return false;
-        }
-        if (isset($this->data['table'][$scope]) && isset($this->data['table'][$scope]['read'])) {
-            return $this->data['table'][$scope]['read'] === 'own';
-        }
-        return false;
+        return $this->getAclManager()->checkReadOnlyOwn($this->getUser(), $scope);
     }
 
-    public function checkIsOwner($entity)
+    public function check($subject, $action = null, $isOwner = null, $inTeam = null)
     {
-        if ($this->user->isAdmin()) {
-            return false;
-        }
-        $userId = $this->user->id;
-        if ($userId === $entity->get('assignedUserId') || $userId === $entity->get('createdById')) {
-            return true;
-        }
-        return false;
+        return $this->getAclManager()->check($this->getUser(), $subject, $action, $isOwner, $inTeam) ;
     }
 
-    public function checkInTeam($entity)
+    public function checkScope($scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
     {
-        $userTeamIds = $this->user->get('teamsIds');
-
-        if (!$entity->hasRelation('teams') || !$entity->hasField('teamsIds')) {
-            return false;
-        }
-
-        if (!$entity->has('teamsIds')) {
-            $entity->loadLinkMultipleField('teams');
-        }
-
-        $teamIds = $entity->get('teamsIds');
-
-        if (empty($teamIds)) {
-            return false;
-        }
-
-        foreach ($userTeamIds as $id) {
-            if (in_array($id, $teamIds)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private function load()
-    {
-        $aclTables = [];
-        $assignmentPermissionList = [];
-
-        $userRoles = $this->user->get('roles');
-
-        foreach ($userRoles as $role) {
-            $aclTables[] = $role->get('data');
-            $assignmentPermissionList[] = $role->get('assignmentPermission');
-        }
-
-        $teams = $this->user->get('teams');
-        foreach ($teams as $team) {
-            $teamRoles = $team->get('roles');
-            foreach ($teamRoles as $role) {
-                $aclTables[] = $role->get('data');
-                $assignmentPermissionList[] = $role->get('assignmentPermission');
-            }
-        }
-
-        $this->data['table'] = $this->merge($aclTables);
-        $this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, 'all');
-    }
-
-    private function initSolid()
-    {
-        if (!$this->metadata) {
-            return;
-        }
-
-        $data = $this->metadata->get('app.acl.solid', array());
-
-        foreach ($data as $entityName => $item) {
-            $this->data['table'][$entityName] = $item;
-        }
-    }
-
-    private function mergeValues(array $list, $defaultValue)
-    {
-        $result = null;
-        foreach ($list as $level) {
-            if ($level != 'not-set') {
-                if (is_null($result)) {
-                    $result = $level;
-                    continue;
-                }
-                if (array_search($result, $this->levelList) > array_search($level, $this->levelList)) {
-                    $result = $level;
-                }
-            }
-        }
-        if (is_null($result)) {
-            $result = $defaultValue;
-        }
-        return $result;
-    }
-
-    private function merge($tables)
-    {
-        $data = array();
-        foreach ($tables as $table) {
-            foreach ($table as $scope => $row) {
-                if ($row == false) {
-                    if (!isset($data[$scope])) {
-                        $data[$scope] = false;
-                    }
-                } else {
-                    if (!isset($data[$scope])) {
-                        $data[$scope] = array();
-                    }
-                    if ($data[$scope] == false) {
-                        $data[$scope] = array();
-                    }
-                    foreach ($row as $action => $level) {
-                        if (!isset($data[$scope][$action])) {
-                            $data[$scope][$action] = $level;
-                        } else {
-                            if (array_search($data[$scope][$action], $this->levelList) > array_search($level, $this->levelList)) {
-                                $data[$scope][$action] = $level;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return $data;
-    }
-
-    private function buildCache()
-    {
-        $contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
-        $this->fileManager->putContents($this->cacheFile, $contents);
+        return $this->getAclManager()->checkScope($this->getUser(), $subject, $action, $isOwner, $inTeam, $entity) ;
     }
 }
 

application/Espo/Core/Acl/Base.php

@@ -0,0 +1,223 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Acl;
+
+use \Espo\Core\Interfaces\Injectable;
+
+use \Espo\Entities\User;
+use \Espo\ORM\Entity;
+
+class Base implements Injectable
+{
+    protected $dependencies = array(
+        'config',
+        'entityManager',
+        'aclManager'
+    );
+
+    protected $injections = array();
+
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
+
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    protected function init()
+    {
+    }
+
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
+
+    protected function addDependency($name)
+    {
+        $this->dependencies[] = $name;
+    }
+
+    public function getDependencyList()
+    {
+        return $this->dependencies;
+    }
+
+    protected function getConfig()
+    {
+        return $this->getInjection('config');
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->getInjection('entityManager');
+    }
+
+    protected function getAclManager()
+    {
+        return $this->getInjection('aclManager');
+    }
+
+    public function checkReadOnlyTeam(User $user, $scope, $data)
+    {
+        if (empty($data) || !is_array($data) || !isset($data['read'])) {
+            return false;
+        }
+        return $data['read'] === 'team';
+    }
+
+    public function checkReadOnlyOwn(User $user, $scope, $data)
+    {
+        if (empty($data) || !is_array($data) || !isset($data['read'])) {
+            return false;
+        }
+        return $data['read'] === 'own';
+    }
+
+    public function checkEntity(User $user, Entity $entity, $data, $action)
+    {
+        return $this->checkScope($user, $data, $entity->getEntityType(), $action, null, null, $entity);
+    }
+
+    public function checkScope(User $user, $data, $scope, $action = null, $isOwner = null, $inTeam = null, Entity $entity = null)
+    {
+        if (is_null($data)) {
+            return true;
+        }
+        if ($data === false) {
+            return false;
+        }
+        if ($data === true) {
+            return true;
+        }
+
+        if (!is_null($action)) {
+            if (array_key_exists($action, $data)) {
+                $value = $data[$action];
+
+                if ($value === 'all' || $value === true) {
+                    return true;
+                }
+
+                if (!$value || $value === 'no') {
+                    return false;
+                }
+
+                if (is_null($isOwner)) {
+                    if ($entity) {
+                        $isOwner = $this->checkIsOwner($user, $entity);
+                    } else {
+                        return true;
+                    }
+                }
+
+                if ($isOwner) {
+                    if ($value === 'own' || $value === 'team') {
+                        return true;
+                    }
+                }
+                if (is_null($inTeam) && $entity) {
+                    $inTeam = $this->checkInTeam($user, $entity);
+                }
+
+                if ($inTeam) {
+                    if ($value === 'team') {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($entity->has('assignedUserId')) {
+            if ($user->id === $entity->get('assignedUserId')) {
+                return true;
+            }
+        }
+        if ($entity->has('createdById')) {
+            if ($user->id === $entity->get('createdById')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function checkInTeam(User $user, Entity $entity)
+    {
+        $userTeamIds = $user->get('teamsIds');
+
+        if (!$entity->hasRelation('teams') || !$entity->hasField('teamsIds')) {
+            return false;
+        }
+
+        if (!$entity->has('teamsIds')) {
+            $entity->loadLinkMultipleField('teams');
+        }
+
+        $teamIds = $entity->get('teamsIds');
+
+        if (empty($teamIds)) {
+            return false;
+        }
+
+        foreach ($userTeamIds as $id) {
+            if (in_array($id, $teamIds)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, $data)
+    {
+        $result = $this->checkEntity($user, $entity, $data, 'delete');
+        if (!$result) {
+            if (is_array($data)) {
+                if ($data['edit'] != 'no') {
+                    if ($entity->has('createdById') && $entity->get('createdById') == $user->id) {
+                        if (!$entity->has('assignedUserId')) {
+                            return true;
+                        } else {
+                            if (!$entity->get('assignedUserId')) {
+                                return true;
+                            }
+                            if ($entity->get('assignedUserId') == $entity->get('createdById')) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+}
+

application/Espo/Core/Acl/Table.php

@@ -0,0 +1,239 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Acl;
+
+use \Espo\Core\Exceptions\Error;
+
+use \Espo\ORM\Entity;
+
+class Table
+{
+    private $data = array(
+        'table' => array()
+    );
+
+    private $cacheFile;
+
+    private $actionList = array('read', 'edit', 'delete');
+
+    private $levelList = array('all', 'team', 'own', 'no');
+
+    protected $fileManager;
+
+    protected $metadata;
+
+    public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
+    {
+        $this->user = $user;
+
+        $this->metadata = $metadata;
+
+        if (!$this->user->isFetched()) {
+            throw new Error();
+        }
+
+        $this->user->loadLinkMultipleField('teams');
+
+        if ($fileManager) {
+            $this->fileManager = $fileManager;
+        }
+
+        $this->cacheFile = 'data/cache/application/acl/' . $user->id . '.php';
+
+        if ($config && $config->get('useCache') && file_exists($this->cacheFile)) {
+            $cached = include $this->cacheFile;
+            $this->data = $cached;
+            $this->initSolid();
+        } else {
+            $this->load();
+            $this->initSolid();
+            if ($config && $fileManager && $config->get('useCache')) {
+                $this->buildCache();
+            }
+        }
+    }
+
+    public function getMap()
+    {
+        return $this->data;
+    }
+
+    public function getScopeData($scope)
+    {
+        if (array_key_exists($scope, $this->data['table'])) {
+            return $this->data['table'][$scope];
+        }
+        return null;
+    }
+
+    public function get($permission)
+    {
+        if ($permission == 'table') {
+            return null;
+        }
+
+        if (array_key_exists($permission, $this->data)) {
+            return $this->data[$permission];
+        }
+        return null;
+    }
+
+    public function getLevel($scope, $action)
+    {
+        if (array_key_exists($scope, $this->data['table'])) {
+            if (array_key_exists($action, $this->data['table'][$scope])) {
+                return $this->data['table'][$scope][$action];
+            }
+        }
+        return false;
+    }
+
+    private function load()
+    {
+        $aclTables = [];
+        $assignmentPermissionList = [];
+
+        $userRoles = $this->user->get('roles');
+
+        foreach ($userRoles as $role) {
+            $aclTables[] = $role->get('data');
+            $assignmentPermissionList[] = $role->get('assignmentPermission');
+        }
+
+        $teams = $this->user->get('teams');
+        foreach ($teams as $team) {
+            $teamRoles = $team->get('roles');
+            foreach ($teamRoles as $role) {
+                $aclTables[] = $role->get('data');
+                $assignmentPermissionList[] = $role->get('assignmentPermission');
+            }
+        }
+
+        $this->data['table'] = $this->merge($aclTables);
+        $this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, 'all');
+    }
+
+    private function initSolid()
+    {
+        if (!$this->metadata) {
+            return;
+        }
+
+        $data = $this->metadata->get('app.acl.solid', array());
+
+        foreach ($data as $entityType => $item) {
+            $this->data['table'][$entityType] = $item;
+        }
+    }
+
+    private function mergeValues(array $list, $defaultValue)
+    {
+        $result = null;
+        foreach ($list as $level) {
+            if ($level != 'not-set') {
+                if (is_null($result)) {
+                    $result = $level;
+                    continue;
+                }
+                if (array_search($result, $this->levelList) > array_search($level, $this->levelList)) {
+                    $result = $level;
+                }
+            }
+        }
+        if (is_null($result)) {
+            $result = $defaultValue;
+        }
+        return $result;
+    }
+
+    private function getScopeList()
+    {
+        $scopeList = [];
+        $scopes = $this->metadata->get('scopes');
+        foreach ($scopes as $scope => $d) {
+        	if (!empty($d['acl'])) {
+        		$scopeList[] = $scope;
+        	}
+        }
+        return $scopeList;
+    }
+
+    private function merge($tables)
+    {
+        $data = array();
+        $scopeList = $this->getScopeList();
+
+        foreach ($tables as $table) {
+            foreach ($scopeList as $scope) {
+            	if (!isset($table->$scope)) {
+            		continue;
+            	}
+            	$row = $table->$scope;
+
+                if ($row == false) {
+                    if (!isset($data[$scope])) {
+                        $data[$scope] = false;
+                    }
+                } else if ($row === true) {
+                    $data[$scope] = true;
+                } else {
+                    if (!isset($data[$scope])) {
+                        $data[$scope] = array();
+                    }
+                    if ($data[$scope] == false) {
+                        $data[$scope] = array();
+                    }
+
+                    if (is_array($row) || $row instanceof \stdClass) {
+                        foreach ($row as $action => $level) {
+                            if (!isset($data[$scope][$action])) {
+                                $data[$scope][$action] = $level;
+                            } else {
+                                if (array_search($data[$scope][$action], $this->levelList) > array_search($level, $this->levelList)) {
+                                    $data[$scope][$action] = $level;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        foreach ($scopeList as $scope) {
+        	if (!array_key_exists($scope, $data)) {
+        		$aclType = $this->metadata->get('scopes.' . $scope . '.acl');
+        		if (!empty($aclType) && ($aclType === true || $aclType === 'record')) {
+	        		$data[$scope] = $this->metadata->get('app.acl.recordDefault');
+        		}
+        	}
+        }
+        return $data;
+    }
+
+    private function buildCache()
+    {
+        $contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
+        $this->fileManager->putContents($this->cacheFile, $contents);
+    }
+}
+

application/Espo/Core/AclManager.php

@@ -0,0 +1,181 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core;
+
+use \Espo\Core\Exceptions\Error;
+
+use \Espo\ORM\Entity;
+use \Espo\Entities\User;
+use \Espo\Core\Utils\Util;
+
+class AclManager
+{
+    private $container;
+
+    private $metadata;
+
+    private $implementationHashMap = array();
+
+    private $tableHashMap = array();
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+        $this->metadata = $container->get('metadata');
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function getImplementation($scope)
+    {
+        if (empty($this->implementationHashMap[$scope])) {
+            $normalizedName = Util::normilizeClassName($scope);
+
+            $className = '\\Espo\\Custom\\Acl\\' . $normalizedName;
+            if (!class_exists($className)) {
+                $moduleName = $this->metadata->getScopeModuleName($scope);
+                if ($moduleName) {
+                    $className = '\\Espo\\Modules\\' . $moduleName . '\\Acl\\' . $normalizedName;
+                } else {
+                    $className = '\\Espo\\Acl\\' . $normalizedName;
+                }
+                if (!class_exists($className)) {
+                    $className = '\\Espo\\Core\\Acl\\Base';
+                }
+            }
+
+            if (class_exists($className)) {
+                $acl = new $className();
+                $dependencies = $acl->getDependencyList();
+                foreach ($dependencies as $name) {
+                    $acl->inject($name, $this->container->get($name));
+                }
+                $this->implementationHashMap[$scope] = $acl;
+            } else {
+                throw new Error();
+            }
+        }
+
+        return $this->implementationHashMap[$scope];
+    }
+
+    protected function getTable(User $user)
+    {
+        $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');
+
+            $this->tableHashMap[$key] = new \Espo\Core\Acl\Table($user, $config, $fileManager, $metadata);
+        }
+
+        return $this->tableHashMap[$key];
+    }
+
+    public function getMap(User $user)
+    {
+        return $this->getTable($user)->getMap();
+    }
+
+    public function getLevel(User $user, $scope, $action)
+    {
+        if ($user->isAdmin()) {
+            return 'all';
+        }
+        return $this->getTable($user)->getLevel($scope, $action);
+    }
+
+    public function get(User $user, $permission)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        $this->getTable($user)->get($permission);
+    }
+
+    public function checkReadOnlyTeam(User $user, $scope)
+    {
+        if ($user->isAdmin()) {
+            return false;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkReadOnlyTeam($user, $scope, $data);
+    }
+
+    public function checkReadOnlyOwn(User $user, $scope)
+    {
+        if ($user->isAdmin()) {
+            return false;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkReadOnlyOwn($user, $scope, $data);
+    }
+
+    public function check(User $user, $subject, $action = null, $isOwner = null, $inTeam = null)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        if (is_string($subject)) {
+            return $this->checkScope($user, $subject, $action, $isOwner, $inTeam);
+        } else {
+            $entity = $subject;
+            if ($entity instanceof Entity) {
+                $entityType = $entity->getEntityType();
+
+                $impl = $this->getImplementation($entityType);
+                $methodName = 'checkEntity' . ucfirst($action);
+                if (method_exists($impl, $methodName)) {
+                    $data = $this->getTable($user)->getScopeData($entityType);
+                    return $impl->$methodName($user, $entity, $data);
+                }
+
+                return $this->checkEntity($user, $entity, $action);
+            }
+        }
+    }
+
+    public function checkEntity(User $user, Entity $entity, $action)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        $data = $this->getTable($user)->getScopeData($entity->getEntityType());
+        return $this->getImplementation($scope)->checkEntity($user, $entity, $data, $action);
+    }
+
+    public function checkScope(User $user, $scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkScope($user, $data, $scope, $action, $isOwner, $inTeam, $entity);
+    }
+}
+

application/Espo/Core/Container.php

@@ -194,14 +194,20 @@ class Container
         );
     }
 
+    private function loadAclManager()
+    {
+        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\AclManager');
+        return new $className(
+            $this->get('container')
+        );
+    }
+
     private function loadAcl()
     {
         $className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
         return new $className(
-            $this->get('user'),
-            $this->get('config'),
-            $this->get('fileManager'),
-            $this->get('metadata')
+            $this->get('aclManager'),
+            $this->get('user')
         );
     }
 

application/Espo/Core/Controllers/Base.php

@@ -90,6 +90,11 @@ abstract class Base
         return $this->container->get('acl');
     }
 
+    protected function getAclManager()
+    {
+        return $this->container->get('aclManager');
+    }
+
     protected function getConfig()
     {
         return $this->container->get('config');

application/Espo/Core/Controllers/Record.php

@@ -34,6 +34,8 @@ class Record extends Base
 
     public static $defaultAction = 'list';
 
+    protected $defaultRecordServiceName = 'Record';
+
     protected function getEntityManager()
     {
         return $this->getContainer()->get('entityManager');
@@ -48,7 +50,7 @@ class Record extends Base
         if ($this->getServiceFactory()->checkExists($name)) {
             $service = $this->getServiceFactory()->create($name);
         } else {
-            $service = $this->getServiceFactory()->create('Record');
+            $service = $this->getServiceFactory()->create($this->defaultRecordServiceName);
             $service->setEntityName($name);
         }
 

application/Espo/Core/Controllers/RecordTree.php

@@ -0,0 +1,57 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Controllers;
+
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Utils\Util;
+
+class RecordTree extends Record
+{
+
+    public static $defaultAction = 'list';
+
+    protected $defaultRecordServiceName = 'RecordTree';
+
+    public function actionListTree($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        $where = $request->get('where');
+        $parentId = $request->get('parentId');
+        $maxDepth = $request->get('maxDepth');
+
+        $collection = $this->getRecordService()->getTree($parentId, array(
+            'where' => $where
+        ), 0, $maxDepth);
+        return array(
+            'list' => $collection->toArray(),
+            'path' => $this->getRecordService()->getTreeItemPath($parentId)
+        );
+    }
+}
+

application/Espo/Core/Entities/CategoryTreeItem.php

@@ -0,0 +1,43 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Entities;
+
+class CategoryTreeItem extends \Espo\Core\ORM\Entity
+{
+    public function toArray()
+    {
+        $data = parent::toArray();
+        $childList = $this->get('childList');
+        if (is_null($childList)) {
+            $data['childList'] = null;
+        } else {
+            $arr = [];
+            foreach ($childList as $entity) {
+                $arr[] = $entity->toArray();
+            }
+            $data['childList'] = $arr;
+        }
+        return $data;
+    }
+}
+

application/Espo/Core/EntryPoints/Base.php

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\EntryPoints;
 
@@ -29,50 +29,50 @@ use \Espo\Core\Exceptions\Forbidden;
 abstract class Base
 {
     private $container;
-    
+
     public static $authRequired = true;
-    
+
     protected function getContainer()
     {
         return $this->container;
     }
-    
+
     protected function getUser()
     {
         return $this->getContainer()->get('user');
     }
-    
+
     protected function getAcl()
     {
         return $this->getContainer()->get('acl');
     }
-    
+
     protected function getEntityManager()
     {
         return $this->getContainer()->get('entityManager');
     }
-    
+
     protected function getServiceFactory()
     {
         return $this->getContainer()->get('serviceFactory');
-    }    
-    
+    }
+
     protected function getConfig()
     {
         return $this->getContainer()->get('config');
     }
-    
+
     protected function getMetadata()
     {
         return $this->getContainer()->get('metadata');
-    }    
-    
+    }
+
     public function __construct(Container $container)
     {
         $this->container = $container;
     }
-    
-    abstract public function run();    
+
+    abstract public function run();
 
 }
 

application/Espo/Core/Mail/Importer.php

@@ -95,7 +95,12 @@ class Importer
             }
 
             if ($duplicate = $this->findDuplicate($email)) {
-                $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'users', $userId);
+            	$duplicate->loadLinkMultipleField('users');
+            	$usersIds = $duplicate->get('usersIds');
+            	$usersIds[] = $userId;
+            	$duplicate->set('usersIds', $usersIds);
+            	$this->getEntityManager()->saveEntity($duplicate);
+
                 if (!empty($teamsIds)) {
                     foreach ($teamsIds as $teamId) {
                         $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);

application/Espo/Core/Mail/Sender.php

@@ -284,11 +284,18 @@ class Sender
 
         $message->setBody($body);
 
-        if (!$message->getHeaders()->has('content-type')) {
-            $contentTypeHeader = new \Zend\Mail\Header\ContentType();
-            $message->getHeaders()->addHeader($contentTypeHeader);
+        if ($messageType == 'text/plain') {
+            if ($message->getHeaders()->has('content-type')) {
+                $message->getHeaders()->removeHeader('content-type');
+            }
+            $message->getHeaders()->addHeaderLine('Content-Type', 'text/plain; charset=UTF-8');
+        } else {
+            if (!$message->getHeaders()->has('content-type')) {
+                $contentTypeHeader = new \Zend\Mail\Header\ContentType();
+                $message->getHeaders()->addHeader($contentTypeHeader);
+            }
+            $message->getHeaders()->get('content-type')->setType($messageType);
         }
-        $message->getHeaders()->get('content-type')->setType($messageType);
 
         $message->setEncoding('UTF-8');
 

application/Espo/Core/Repositories/CategoryTree.php

@@ -0,0 +1,95 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Repositories;
+
+use \Espo\Core\Entities\CategoryTreeItem as Entity;
+
+class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
+{
+	public function afterSave(Entity $entity, $options)
+	{
+		parent::afterSave($entity, $options);
+
+		$pdo = $this->getEntityManager()->getPDO();
+		$query = $this->getEntityManager()->getQuery();
+
+		$parentId = $entity->get('parentId');
+		$pathsTableName = $query->toDb($entity->getEntityType() . 'Path');
+
+		if ($entity->isNew()) {
+			if ($parentId) {
+				$sql = "
+					INSERT INTO `".$pathsTableName."` (ascendor_id, descendor_id)
+						SELECT ascendor_id, ".$pdo->quote($entity->id)."
+						FROM `".$pathsTableName."`
+						WHERE descendor_id = ".$pdo->quote($parentId)."
+						UNION ALL
+						SELECT ".$pdo->quote($entity->id).", ".$pdo->quote($entity->id)."
+				";
+			} else {
+				$sql = "
+					INSERT INTO `".$pathsTableName."` (ascendor_id, descendor_id)
+					VALUES
+					(".$pdo->quote($entity->id).", ".$pdo->quote($entity->id).")
+				";
+			}
+			$pdo->query($sql);
+		} else {
+			if ($entity->isFieldChanged('parentId')) {
+				$sql = "
+					DELETE a FROM `".$pathsTableName."` AS a
+					JOIN `".$pathsTableName."` AS d ON a.descendor_id = d.descendor_id
+					LEFT JOIN `".$pathsTableName."` AS x ON x.ascendor_id = d.ascendor_id AND x.descendor_id = a.ascendor_id
+					WHERE d.ascendor_id = ".$pdo->quote($entity->id)." AND x.ascendor_id IS NULL
+				";
+				$pdo->query($sql);
+				if (!empty($parentId)) {
+					$sql = "
+						INSERT INTO `".$pathsTableName."` (ascendor_id, descendor_id)
+							SELECT supertree.ascendor_id, subtree.descendor_id
+							FROM `".$pathsTableName."` AS supertree
+							JOIN `".$pathsTableName."` AS subtree
+							WHERE
+								subtree.ascendor_id = ".$pdo->quote($entity->id)." AND
+								supertree.descendor_id = ".$pdo->quote($parentId)."
+					";
+					$pdo->query($sql);
+				}
+			}
+		}
+	}
+
+	public function afterRemove(Entity $entity, $options)
+	{
+		parent::afterRemove($entity, $options);
+
+		$pdo = $this->getEntityManager()->getPDO();
+		$query = $this->getEntityManager()->getQuery();
+
+		$pathsTableName = $query->toDb($entity->getEntityType() . 'Path');
+
+		$sql = "DELETE FROM `".$pathsTableName."` WHERE descendor_id = ".$pdo->quote($entity->id)."";
+		$pdo->query($sql);
+	}
+}
+

application/Espo/Core/SelectManagerFactory.php

@@ -44,13 +44,13 @@ class SelectManagerFactory
         $this->metadata = $metadata;
     }
 
-    public function create($entityName)
+    public function create($entityType)
     {
-        $normalizedName = Util::normilizeClassName($entityName);
+        $normalizedName = Util::normilizeClassName($entityType);
 
         $className = '\\Espo\\Custom\\SelectManagers\\' . $normalizedName;
         if (!class_exists($className)) {
-            $moduleName = $this->metadata->getScopeModuleName($entityName);
+            $moduleName = $this->metadata->getScopeModuleName($entityType);
             if ($moduleName) {
                 $className = '\\Espo\\Modules\\' . $moduleName . '\\SelectManagers\\' . $normalizedName;
             } else {
@@ -62,7 +62,7 @@ class SelectManagerFactory
         }
 
         $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->metadata);
-        $selectManager->setEntityName($entityName);
+        $selectManager->setEntityType($entityType);
 
         return $selectManager;
     }

application/Espo/Core/SelectManagers/Base.php

@@ -36,7 +36,7 @@ class Base
 
     protected $entityManager;
 
-    protected $entityName;
+    protected $entityType;
 
     protected $metadata;
 
@@ -65,9 +65,14 @@ class Base
         return $this->user;
     }
 
-    public function setEntityName($entityName)
+    public function setEntityType($entityType)
     {
-        $this->entityName = $entityName;
+        $this->entityType = $entityType;
+    }
+
+    protected function getEntityType()
+    {
+        return $this->entityType;
     }
 
     protected function limit($params, &$result)
@@ -84,7 +89,7 @@ class Base
     {
         if (!empty($params['sortBy'])) {
             $result['orderBy'] = $params['sortBy'];
-            $type = $this->metadata->get("entityDefs.{$this->entityName}.fields." . $result['orderBy'] . ".type");
+            $type = $this->metadata->get("entityDefs.{$this->entityType}.fields." . $result['orderBy'] . ".type");
             if ($type == 'link') {
                 $result['orderBy'] .= 'Name';
             } else if ($type == 'linkParent') {
@@ -102,13 +107,13 @@ class Base
 
     protected function getTextFilterFields()
     {
-        return $this->metadata->get("entityDefs.{$this->entityName}.collection.textFilterFields", array('name'));
+        return $this->metadata->get("entityDefs.{$this->entityType}.collection.textFilterFields", array('name'));
     }
 
     protected function getSeed()
     {
         if (empty($this->seed)) {
-            $this->seed = $this->entityManager->getEntity($this->entityName);
+            $this->seed = $this->entityManager->getEntity($this->entityType);
         }
         return $this->seed;
     }
@@ -159,7 +164,9 @@ class Base
             }
 
             $linkedWith = array();
-            $ignoreList = array('linkedWith', 'bool', 'primary');
+            $inCategory = array();
+
+            $ignoreList = ['linkedWith', 'inCategory', 'bool', 'primary'];
             foreach ($params['where'] as $item) {
                 if (!in_array($item['type'], $ignoreList)) {
                     $part = $this->getWherePart($item);
@@ -169,51 +176,117 @@ class Base
                 } else {
                     if ($item['type'] == 'linkedWith' && !empty($item['value'])) {
                         $linkedWith[$item['field']] = $item['value'];
+                    } else if ($item['type'] == 'inCategory' && !empty($item['value'])) {
+                        $inCategory[$item['field']] = $item['value'];
                     }
                 }
             }
 
-            if (!empty($linkedWith)) {
-                $joins = array();
-
-                $part = array();
-                foreach ($linkedWith as $link => $idsValue) {
-                    if (is_array($idsValue) && count($idsValue) == 1) {
-                        $idsValue = $idsValue[0];
-                    }
-
-                    $relDefs = $this->getSeed()->getRelations();
-
-                    if (!empty($relDefs[$link])) {
-                        $defs = $relDefs[$link];
-                        if ($defs['type'] == 'manyMany') {
-                            $joins[] = $link;
-                            if (!empty($defs['relationName']) && !empty($defs['midKeys'])) {
-                                $key = $defs['midKeys'][1];
-                                $relationName = lcfirst($defs['relationName']);
-                                $part[$relationName . '.' . $key] = $idsValue;
-                            }
-                        } else if ($defs['type'] == 'belongsTo') {
-                            if (!empty($defs['type']['key'])) {
-                                $key = $defs['type']['key'];
-                                $part[$key] = $idsValue;
-                            }
-                        }
-                    }
-                }
-
-                if (!empty($part)) {
-                    $where[] = $part;
-                }
-                $result['joins'] = $joins;
-                $result['distinct'] = true;
-
-            }
-
             $result['whereClause'] = array_merge($result['whereClause'], $where);
+
+            if (!empty($linkedWith)) {
+                $this->handleLinkedWith($linkedWith, $result);
+            }
+            if (!empty($inCategory)) {
+                $this->handleInCategory($inCategory, $result);
+            }
         }
     }
 
+    protected function handleLinkedWith($linkedWith, &$result)
+    {
+        $joins = [];
+
+        $part = array();
+        foreach ($linkedWith as $link => $idsValue) {
+            if (is_array($idsValue) && count($idsValue) == 1) {
+                $idsValue = $idsValue[0];
+            }
+
+            $relDefs = $this->getSeed()->getRelations();
+
+            if (!empty($relDefs[$link])) {
+                $defs = $relDefs[$link];
+                if ($defs['type'] == 'manyMany') {
+                    $joins[] = $link;
+                    if (!empty($defs['relationName']) && !empty($defs['midKeys'])) {
+                        $key = $defs['midKeys'][1];
+                        $relationName = lcfirst($defs['relationName']);
+                        $part[$relationName . '.' . $key] = $idsValue;
+                    }
+                } else if ($defs['type'] == 'belongsTo') {
+                    if (!empty($defs['key'])) {
+                        $key = $defs['key'];
+                        $part[$key] = $idsValue;
+                    }
+                }
+            }
+        }
+
+        if (!empty($part)) {
+            $result['whereClause'][] = $part;
+        }
+        $result['joins'] = array_merge($result['joins'], $joins);
+        $result['distinct'] = true;
+    }
+
+    protected function handleInCategory($inCategory, &$result)
+    {
+        $joins = [];
+
+        $part = array();
+
+        $query = $this->getEntityManager()->getQuery();
+
+        $tableName = $query->toDb($this->getSeed()->getEntityType());
+
+        foreach ($inCategory as $link => $val) {
+
+            $relDefs = $this->getSeed()->getRelations();
+
+            if (!empty($relDefs[$link])) {
+                $defs = $relDefs[$link];
+
+                $foreignEntity = $defs['entity'];
+                if (empty($foreignEntity)) {
+                    continue;
+                }
+
+                $pathName = lcfirst($query->sanitize($foreignEntity . 'Path'));
+
+                if ($defs['type'] == 'manyMany') {
+
+                    if (!empty($defs['relationName']) && !empty($defs['midKeys'])) {
+                        $result['distinct'] = true;
+                        $result['joins'][] = $link;
+                        $key = $defs['midKeys'][1];
+
+                        $relationName = lcfirst($defs['relationName']);
+
+                        $result['customJoin'] .= "
+                            JOIN " . $query->toDb($pathName) . " AS `{$pathName}` ON {$pathName}.descendor_id = ".$query->sanitize($relationName) . "." . $query->toDb($key) . "
+                        ";
+                        $part[$pathName . '.ascendorId'] = $val;
+                    }
+                } else if ($defs['type'] == 'belongsTo') {
+                    if (!empty($defs['key'])) {
+                        $key = $defs['key'];
+                        $result['customJoin'] .= "
+                            JOIN " . $query->toDb($pathName) . " AS `{$pathName}` ON {$pathName}.descendor_id = {$tableName}." . $query->toDb($key) . "
+                        ";
+                        $part[$pathName . '.ascendorId'] = $val;
+                    }
+                }
+            }
+        }
+
+
+        if (!empty($part)) {
+            $result['whereClause'][] = $part;
+        }
+
+    }
+
     protected function q($params, &$result)
     {
         if (!empty($params['q'])) {
@@ -243,10 +316,10 @@ class Base
 
     protected function access(&$result)
     {
-        if ($this->acl->checkReadOnlyOwn($this->entityName)) {
+        if ($this->acl->checkReadOnlyOwn($this->entityType)) {
             $this->accessOnlyOwn($result);
         }
-        if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityName)) {
+        if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityType)) {
             $this->accessOnlyTeam($result);
         }
     }
@@ -288,9 +361,10 @@ class Base
     public function getSelectParams(array $params, $withAcl = false)
     {
         $result = array(
-            'joins' => array(),
-            'leftJoins' => array(),
-            'whereClause' => array()
+            'joins' => [],
+            'leftJoins' => [],
+            'whereClause' => [],
+            'customJoin' => ''
         );
 
         $this->order($params, $result);
@@ -444,6 +518,12 @@ class Base
                 case 'on':
                     $part[$item['field'] . '='] = $item['value'];
                     break;
+                case 'startsWith':
+                    $part[$item['field'] . '*'] = $item['value'] . '%';
+                    break;
+                case 'contains':
+                    $part[$item['field'] . '*'] = '%' . $item['value'] . '%';
+                    break;
                 case 'notEquals':
                 case 'notOn':
                     $part[$item['field'] . '!='] = $item['value'];
@@ -468,6 +548,12 @@ class Base
                 case 'notIn':
                     $part[$item['field'] . '!='] = $item['value'];
                     break;
+                case 'isNull':
+                    $part[$item['field'] . '='] = null;
+                    break;
+                case 'isNotNull':
+                    $part[$item['field'] . '!='] = null;
+                    break;
                 case 'isTrue':
                     $part[$item['field'] . '='] = true;
                     break;
@@ -578,5 +664,21 @@ class Base
             'assignedUserId' => $this->getUser()->id
         );
     }
+
+    protected function filterFollowed(&$result)
+    {
+        $query = $this->getEntityManager()->getQuery();
+        $result['customJoin'] .= "
+            JOIN subscription ON
+                subscription.entity_type = ".$query->quote($this->getEntityType())." AND
+                subscription.entity_id = ".$query->toDb($this->getEntityType()).".id AND
+                subscription.user_id = ".$query->quote($this->getUser()->id)."
+        ";
+    }
+
+    protected function boolFilterFollowed(&$result)
+    {
+        $this->filterFollowed($result);
+    }
 }
 

application/Espo/Core/Templates/Controllers/CategoryTree.php

@@ -0,0 +1,30 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Controllers;
+
+
+class CategoryTree extends \Espo\Core\Controllers\RecordTree
+{
+
+}
+

application/Espo/Core/Templates/Entities/CategoryTree.php

@@ -0,0 +1,29 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Entities;
+
+class CategoryTree extends \Espo\Core\Entities\CategoryTreeItem
+{
+
+}
+

application/Espo/Core/Templates/Layouts/CategoryTree/detail.json

@@ -0,0 +1,21 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                {
+                    "name": "order"
+                }
+            ],
+            [
+                false,
+                {
+                    "name": "parent"
+                }
+            ]
+        ]
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/detailSmall.json

@@ -0,0 +1,22 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                }
+            ],
+            [
+                {
+                    "name": "order"
+                }
+            ],
+            [
+                {
+                    "name": "parent"
+                }
+            ]
+        ]
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/filters.json

@@ -0,0 +1,3 @@
+[
+    "parent"
+]

application/Espo/Core/Templates/Layouts/CategoryTree/list.json

@@ -0,0 +1,14 @@
+[
+    {
+        "name": "name",
+        "width": 40,
+        "link": true
+    },
+    {
+        "name": "order",
+        "width": 15
+    },
+    {
+        "name": "parent"
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/listSmall.json

@@ -0,0 +1,14 @@
+[
+    {
+        "name": "name",
+        "width": 40,
+        "link": true
+    },
+    {
+        "name": "order",
+        "width": 15
+    },
+    {
+        "name": "parent"
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/massUpdate.json

@@ -0,0 +1,3 @@
+[
+
+]

application/Espo/Core/Templates/Layouts/CategoryTree/relationships.json

@@ -0,0 +1,3 @@
+[
+    "children"
+]

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

@@ -0,0 +1,26 @@
+{
+    "controller": "Controllers.RecordTree",
+    "collection": "Collections.Tree",
+    "menu": {
+        "listTree": {
+            "buttons": [
+                {
+                    "label": "List View",
+                    "link": "#{entityType}/list",
+                    "acl": "read",
+                    "style": "default"
+                }
+            ]
+        },
+        "list": {
+            "buttons": [
+                {
+                    "label": "Tree View",
+                    "link": "#{entityType}",
+                    "acl": "read",
+                    "style": "default"
+                }
+            ]
+        }
+    }
+}

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

@@ -0,0 +1,106 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "required": true
+        },
+        "order": {
+            "type": "int",
+            "required": true,
+            "default": 1
+        },
+        "description": {
+            "type": "text"
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "teams": {
+            "type": "linkMultiple"
+        },
+        "parent": {
+            "type": "link"
+        },
+        "childList": {
+            "type": "jsonArray",
+            "notStorable": true,
+            "disabled": true
+        }
+    },
+    "links": {
+        "createdBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "modifiedBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "teams": {
+            "type": "hasMany",
+            "entity": "Team",
+            "relationName": "EntityTeam",
+            "layoutRelationshipsDisabled": true
+        },
+        "parent": {
+            "type": "belongsTo",
+            "foreign": "children",
+            "entity": "{entityType}",
+            "isCustom": true
+        },
+        "children": {
+            "type": "hasMany",
+            "foreign": "parent",
+            "entity": "{entityType}",
+            "isCustom": true
+        }
+    },
+    "collection": {
+        "sortBy": "parent",
+        "asc": true
+    },
+    "indexes": {
+        "name": {
+            "columns": [
+                "name",
+                "deleted"
+            ]
+        }
+    },
+    "additionalTables": {
+        "{entityType}Path": {
+            "fields": {
+                "id": {
+                    "type": "id",
+                    "dbType": "int",
+                    "len": "11",
+                    "autoincrement": true,
+                    "unique" : true
+                },
+                "ascendorId": {
+                    "type": "varchar",
+                    "len": "100",
+                    "index": true
+                },
+                "descendorId": {
+                    "type": "varchar",
+                    "len": "24",
+                    "index": true
+                }
+            }
+        }
+    }
+}

application/Espo/Core/Templates/Repositories/CategoryTree.php

@@ -0,0 +1,30 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Repositories;
+
+
+class CategoryTree extends \Espo\Core\Repositories\CategoryTree
+{
+
+}
+

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

@@ -0,0 +1,30 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Services;
+
+
+class CategoryTree extends \Espo\Services\RecordTree
+{
+
+}
+

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

@@ -27,13 +27,6 @@ use Espo\Core\Utils\Util;
 
 class Install extends \Espo\Core\Upgrades\Actions\Base
 {
-    /**
-     * Is copied extension files to Espo
-     *
-     * @var [type]
-     */
-    protected $isCopied = null;
-
     /**
      * Main installation process
      *
@@ -54,8 +47,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
 
         $this->initialize();
 
-        $this->isCopied = false;
-
         /** check if an archive is unzipped, if no then unzip */
         $packagePath = $this->getPackagePath();
         if (!file_exists($packagePath)) {
@@ -77,7 +68,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
         if (!$this->copyFiles()) {
             $this->throwErrorAndRemovePackage('Cannot copy files.');
         }
-        $this->isCopied = true;
 
         /* remove files defined in a manifest */
         $this->deleteFiles(true);
@@ -103,10 +93,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
 
     protected function restoreFiles()
     {
-        if (!$this->isCopied) {
-            return;
-        }
-
         $GLOBALS['log']->info('Installer: Restore previous files.');
 
         $backupPath = $this->getPath('backupPath');

application/Espo/Core/Upgrades/Actions/Extension/Install.php

@@ -160,7 +160,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
         $extensionEntity = $this->getExtensionEntity();
 
         if (isset($extensionEntity)) {
-            $comparedVersion = version_compare($manifest['version'], $extensionEntity->get('version'));
+            $comparedVersion = version_compare($manifest['version'], $extensionEntity->get('version'), '>=');
             if ($comparedVersion <= 0) {
                 $this->throwErrorAndRemovePackage('You cannot install an older version of this extension.');
             }

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

@@ -33,10 +33,14 @@ class Job
 
     private $entityManager;
 
+    private $cronScheduledJob;
+
     public function __construct(Config $config, EntityManager $entityManager)
     {
         $this->config = $config;
         $this->entityManager = $entityManager;
+
+        $this->cronScheduledJob = new ScheduledJob($this->config, $this->entityManager);
     }
 
     protected function getConfig()
@@ -49,6 +53,11 @@ class Job
         return $this->entityManager;
     }
 
+    protected function getCronScheduledJob()
+    {
+        return $this->cronScheduledJob;
+    }
+
     /**
      * Get Pending Jobs
      *
@@ -145,13 +154,30 @@ class Job
         $currentTime = time();
         $periodTime = $currentTime - intval($jobConfigs['jobPeriod']);
 
-        $update = "UPDATE job SET `status` = '" . CronManager::FAILED ."' WHERE
+        $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)."' ";
+        $sth = $pdo->prepare($select);
+        $sth->execute();
 
-        $pdo = $this->getEntityManager()->getPDO();
+        $jobData = array();
+        while ($row = $sth->fetch(PDO::FETCH_ASSOC)){
+           $jobData[$row['id']] = $row;
+        }
+
+        $update = "UPDATE job SET `status` = '". CronManager::FAILED ."' WHERE id IN ('".implode("', '", array_keys($jobData))."')";
         $sth = $pdo->prepare($update);
         $sth->execute();
+
+        //add status 'Failed' to SchediledJobLog
+        $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']);
+            }
+        }
     }
 
     /**

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

@@ -81,14 +81,16 @@ class ScheduledJob
      *
      * @return string ID of created ScheduledJobLogRecord
      */
-    public function addLogRecord($scheduledJobId, $status)
+    public function addLogRecord($scheduledJobId, $status, $runTime = null)
     {
-        $lastRun = date('Y-m-d H:i:s');
+        if (!isset($runTime)) {
+            $runTime = date('Y-m-d H:i:s');
+        }
 
         $entityManager = $this->getEntityManager();
 
         $scheduledJob = $entityManager->getEntity('ScheduledJob', $scheduledJobId);
-        $scheduledJob->set('lastRun', $lastRun);
+        $scheduledJob->set('lastRun', $runTime);
         $entityManager->saveEntity($scheduledJob);
 
         $scheduledJobLog = $entityManager->getEntity('ScheduledJobLogRecord');
@@ -96,7 +98,7 @@ class ScheduledJob
             'scheduledJobId' => $scheduledJobId,
             'name' => $scheduledJob->get('name'),
             'status' => $status,
-            'executionTime' => $lastRun,
+            'executionTime' => $runTime,
         ));
         $scheduledJobLogId = $entityManager->saveEntity($scheduledJobLog);
 

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

@@ -29,7 +29,7 @@ class Converter
 {
     private $metadata;
     private $fileManager;
-    private $metadataUtils;
+    private $metadataHelper;
 
     private $relationManager;
 
@@ -82,6 +82,15 @@ class Converter
         'len' => '24',
     );
 
+    /**
+     * Permitted Entity options which will be moved to ormMetadata
+     *
+     * @var array
+     */
+    protected $permittedEntityOptions = array(
+        'indexes',
+        'additionalTables',
+    );
 
     public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\File\Manager $fileManager)
     {
@@ -90,10 +99,9 @@ class Converter
 
         $this->relationManager = new RelationManager($this->metadata);
 
-        $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
+        $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
     }
 
-
     protected function getMetadata()
     {
         return $this->metadata;
@@ -118,9 +126,9 @@ class Converter
         return $this->relationManager;
     }
 
-    protected function getMetadataUtils()
+    protected function getMetadataHelper()
     {
-        return $this->metadataUtils;
+        return $this->metadataHelper;
     }
 
     public function process()
@@ -153,8 +161,10 @@ class Converter
             ),
         );
 
-        if (isset($entityMeta['indexes'])) {
-            $ormMeta[$entityName]['indexes'] = $entityMeta['indexes'];
+        foreach ($this->permittedEntityOptions as $optionName) {
+            if (isset($entityMeta[$optionName])) {
+                $ormMeta[$entityName][$optionName] = $entityMeta[$optionName];
+            }
         }
 
         $ormMeta[$entityName]['fields'] = $this->convertFields($entityName, $entityMeta);
@@ -225,31 +235,16 @@ class Converter
         foreach($entityMeta['fields'] as $fieldName => $fieldParams) {
 
             /** check if "fields" option exists in $fieldMeta */
-            $fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams);
+            $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
 
-            if (isset($fieldTypeMeta['fields']) && is_array($fieldTypeMeta['fields'])) {
-
-                foreach($fieldTypeMeta['actualFields'] as $subFieldName) {
-
-                    $subField = $this->convertActualFields($entityName, $fieldName, $fieldParams, $subFieldName, $fieldTypeMeta);
-
-                    if (!isset($outputMeta[ $subField['naming'] ])) {
-                        $subFieldDefs = $this->convertField($entityName, $subField['name'], $subField['params']);
-                        if ($subFieldDefs !== false) {
-                            $outputMeta[ $subField['naming'] ] = $subFieldDefs; //push fieldDefs to the main array
-                        }
-                    }
-                }
-            } else {
-                $fieldDefs = $this->convertField($entityName, $fieldName, $fieldParams, $fieldTypeMeta);
-                if ($fieldDefs !== false) {
-                    $outputMeta[$fieldName] = $fieldDefs; //push fieldDefs to the main array
-                }
+            $fieldDefs = $this->convertField($entityName, $fieldName, $fieldParams, $fieldTypeMeta);
+            if ($fieldDefs !== false) {
+                $outputMeta[$fieldName] = $fieldDefs; //push fieldDefs to the main array
             }
 
             /** check and set the linkDefs from 'fields' metadata */
             if (isset($fieldTypeMeta['linkDefs'])) {
-                $linkDefs = $this->getMetadataUtils()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']);
+                $linkDefs = $this->getMetadataHelper()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']);
                 if (isset($linkDefs)) {
                     if (!isset($entityMeta['links'])) {
                         $entityMeta['links'] = array();
@@ -329,15 +324,15 @@ class Converter
 
         /** merge fieldDefs option from field definition */
         if (!isset($fieldTypeMeta)) {
-            $fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams);
+            $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
         }
 
         if (isset($fieldTypeMeta['fieldDefs'])) {
             $fieldParams = Util::merge($fieldParams, $fieldTypeMeta['fieldDefs']);
         }
 
-        /** check if need to skip this field in ORM metadata */
-        if (isset($fieldParams['skip']) && $fieldParams['skip'] === true) {
+        /** check if need to skipOrmDefs this field in ORM metadata */
+        if (isset($fieldParams['skipOrmDefs']) && $fieldParams['skipOrmDefs'] === true) {
             return false;
         }
 
@@ -361,37 +356,6 @@ class Converter
         return $fieldDefs;
     }
 
-    protected function convertActualFields($entityName, $fieldName, $fieldParams, $subFieldName, $fieldTypeMeta)
-    {
-        $subField = array();
-
-        $subField['params'] = $this->getInitValues($fieldParams);
-
-        if (isset($fieldTypeMeta['fieldDefs'])) {
-            $subField['params'] = Util::merge($subField['params'], $fieldTypeMeta['fieldDefs']);
-        }
-
-        //if empty field name, then use the main field
-        if (trim($subFieldName) == '') {
-
-            $subField['name'] = $fieldName;
-            $subField['naming'] = $fieldName;
-
-        } else {
-
-            $namingType = isset($fieldTypeMeta['naming']) ? $fieldTypeMeta['naming'] : $this->defaultNaming;
-
-            $subField['name'] = $subFieldName;
-            $subField['naming'] = Util::getNaming($fieldName, $subFieldName, $namingType);
-            if (isset($fieldTypeMeta['fields'][$subFieldName])) {
-                $subField['params'] = Util::merge($subField['params'], $fieldTypeMeta['fields'][$subFieldName]);
-            }
-
-        }
-
-        return $subField;
-    }
-
     protected function convertLinks($entityName, $entityMeta, $ormMeta)
     {
         if (!isset($entityMeta['links'])) {

application/Espo/Core/Utils/Database/Orm/Relations/Base.php

@@ -22,6 +22,8 @@
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
+use Espo\Core\Utils\Util;
+
 class Base extends \Espo\Core\Utils\Database\Orm\Base
 {
     private $params;
@@ -119,8 +121,11 @@ class Base extends \Espo\Core\Utils\Database\Orm\Base
 
                 $additionalParrams = $this->getAllowedAdditionalParams($name);
 
-                if (isset($additionalParrams) && !isset($linkParams[$name])) {
+                if (isset($additionalParrams)) {
                     $linkParams[$name] = $additionalParrams;
+                    if (isset($linkParams[$name]) && is_array($linkParams[$name])) {
+                        $linkParams[$name] = Util::merge($linkParams[$name], $additionalParrams);
+                    }
                 }
             }
         }

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

@@ -89,7 +89,7 @@ class Converter
         $GLOBALS['log']->debug('Schema\Converter - Start: building schema');
 
         //check if exist files in "Tables" directory and merge with ormMetadata
-        $ormMeta = Util::merge($ormMeta, $this->getCustomTables());
+        $ormMeta = Util::merge($ormMeta, $this->getCustomTables($ormMeta));
 
         //unset some keys in orm
         if (isset($ormMeta['unset'])) {
@@ -335,11 +335,14 @@ class Converter
         return $keyList;
     }
 
-
-    /*
-     * @return array - ormMeta
+    /**
+     * Get custom table defenition in "application/Espo/Core/Utils/Database/Schema/tables/" and in metadata 'additionalTables'
+     *
+     * @param  array  $ormMeta
+     *
+     * @return array
      */
-    protected function getCustomTables()
+    protected function getCustomTables(array $ormMeta)
     {
         $customTables = array();
 
@@ -352,6 +355,13 @@ class Converter
             }
         }
 
+        //get custom tables from metdata 'additionalTables'
+        foreach ($ormMeta as $entityName => $entityParams) {
+            if (isset($entityParams['additionalTables']) && is_array($entityParams['additionalTables'])) {
+                $customTables = Util::merge($customTables, $entityParams['additionalTables']);
+            }
+        }
+
         return $customTables;
     }
 

application/Espo/Core/Utils/EntityManager.php

@@ -35,7 +35,7 @@ class EntityManager
 
     private $fileManager;
 
-    private $metadataUtils;
+    private $metadataHelper;
 
     public function __construct(Metadata $metadata, Language $language, File\Manager $fileManager)
     {
@@ -43,7 +43,7 @@ class EntityManager
         $this->language = $language;
         $this->fileManager = $fileManager;
 
-        $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
+        $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
     }
 
     protected function getMetadata()
@@ -61,9 +61,9 @@ class EntityManager
         return $this->fileManager;
     }
 
-    protected function getMetadataUtils()
+    protected function getMetadataHelper()
     {
-        return $this->metadataUtils;
+        return $this->metadataHelper;
     }
 
     public function create($name, $type, $params = array())
@@ -77,8 +77,8 @@ class EntityManager
 
         $normalizedName = Util::normilizeClassName($name);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Entities;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Entities;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Entities\\{$type}\n".
             "{\n".
             "    protected \$entityType = \"$name\";\n".
@@ -87,24 +87,24 @@ class EntityManager
         $filePath = "custom/Espo/Custom/Entities/{$normalizedName}.php";
         $this->getFileManager()->putContents($filePath, $contents);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Controllers;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Controllers;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Controllers\\{$type}\n".
             "{\n".
             "}\n";
         $filePath = "custom/Espo/Custom/Controllers/{$normalizedName}.php";
         $this->getFileManager()->putContents($filePath, $contents);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Services;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Services;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Services\\{$type}\n".
             "{\n".
             "}\n";
         $filePath = "custom/Espo/Custom/Services/{$normalizedName}.php";
         $this->getFileManager()->putContents($filePath, $contents);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Repositories;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Repositories;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Repositories\\{$type}\n".
             "{\n".
             "}\n";
@@ -142,11 +142,15 @@ class EntityManager
         $this->getMetadata()->set('scopes', $name, $scopeData);
 
         $filePath = "application/Espo/Core/Templates/Metadata/{$type}/entityDefs.json";
-        $entityDefsData = Json::decode($this->getFileManager()->getContents($filePath), true);
+        $entityDefsDataContents = $this->getFileManager()->getContents($filePath);
+        $entityDefsDataContents = str_replace('{entityType}', $name, $entityDefsDataContents);
+        $entityDefsData = Json::decode($entityDefsDataContents, true);
         $this->getMetadata()->set('entityDefs', $name, $entityDefsData);
 
         $filePath = "application/Espo/Core/Templates/Metadata/{$type}/clientDefs.json";
-        $clientDefsData = Json::decode($this->getFileManager()->getContents($filePath), true);
+        $clientDefsContents = $this->getFileManager()->getContents($filePath);
+        $clientDefsContents = str_replace('{entityType}', $name, $clientDefsContents);
+        $clientDefsData = Json::decode($clientDefsContents, true);
         $this->getMetadata()->set('clientDefs', $name, $clientDefsData);
 
         $this->getLanguage()->set('Global', 'scopeNames', $name, $labelSingular);
@@ -156,6 +160,11 @@ class EntityManager
         $this->getMetadata()->save();
         $this->getLanguage()->save();
 
+        $layoutsPath = "application/Espo/Core/Templates/Layouts/{$type}";
+        if ($this->getFileManager()->isDir($layoutsPath)) {
+            $this->getFileManager()->copy($layoutsPath, 'custom/Espo/Custom/Resources/layouts/' . $name);
+        }
+
         return true;
     }
 
@@ -184,6 +193,16 @@ class EntityManager
             $this->getLanguage()->set('Global', 'scopeNamesPlural', $name, $labelPlural);
         }
 
+        if (isset($data['sortBy'])) {
+            $entityDefsData = array(
+                'collection' => array(
+                    'sortBy' => $data['sortBy'],
+                    'asc' => !empty($data['asc'])
+                )
+            );
+            $this->getMetadata()->set('entityDefs', $name, $entityDefsData);
+        }
+
         $this->getMetadata()->save();
         $this->getLanguage()->save();
 
@@ -343,6 +362,10 @@ class EntityManager
                         )
                     )
                 );
+                if ($entityForeign == $entity) {
+                    $dataLeft['links'][$link]['midKeys'] = ['leftId', 'rightId'];
+                    $dataRight['links'][$linkForeign]['midKeys'] = ['rightId', 'leftId'];
+                }
                 break;
         }
 

application/Espo/Core/Utils/FieldManager.php

@@ -31,7 +31,7 @@ class FieldManager
 
     private $language;
 
-    private $metadataUtils;
+    private $metadataHelper;
 
     protected $isChanged = null;
 
@@ -44,7 +44,7 @@ class FieldManager
         $this->metadata = $metadata;
         $this->language = $language;
 
-        $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
+        $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
     }
 
     protected function getMetadata()
@@ -57,9 +57,9 @@ class FieldManager
         return $this->language;
     }
 
-    protected function getMetadataUtils()
+    protected function getMetadataHelper()
     {
-        return $this->metadataUtils;
+        return $this->metadataHelper;
     }
 
     public function read($name, $scope)
@@ -187,11 +187,6 @@ class FieldManager
             }
         }
 
-        if (isset($fieldDef['linkDefs'])) {
-            $linkDefs = $fieldDef['linkDefs'];
-            unset($fieldDef['linkDefs']);
-        }
-
         $currentOptionList = array_keys((array) $this->getFieldDef($name, $scope));
         foreach ($fieldDef as $defName => $defValue) {
             if ( (!isset($defValue) || $defValue === '') && !in_array($defName, $currentOptionList) ) {
@@ -214,11 +209,16 @@ class FieldManager
     {
         $fieldDef = $this->prepareFieldDef($fieldName, $fieldDef, $scope);
 
-        $metaFieldDef = $this->getMetadataUtils()->getFieldDefsInFieldMeta($fieldDef);
+        $metaFieldDef = $this->getMetadataHelper()->getFieldDefsInFieldMeta($fieldDef);
         if (isset($metaFieldDef)) {
             $fieldDef = Util::merge($metaFieldDef, $fieldDef);
         }
 
+        if (isset($fieldDef['linkDefs'])) {
+            $linkDefs = $fieldDef['linkDefs'];
+            unset($fieldDef['linkDefs']);
+        }
+
         $defs = array(
             'fields' => array(
                 $fieldName => $fieldDef,
@@ -226,7 +226,7 @@ class FieldManager
         );
 
         /** Save links for a field. */
-        $metaLinkDef = $this->getMetadataUtils()->getLinkDefsInFieldMeta($scope, $fieldDef);
+        $metaLinkDef = $this->getMetadataHelper()->getLinkDefsInFieldMeta($scope, $fieldDef);
         if (isset($linkDefs) || isset($metaLinkDef)) {
             $linkDefs = Util::merge((array) $metaLinkDef, (array) $linkDefs);
             $defs['links'] = array(

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

@@ -472,7 +472,7 @@ class Manager
             $sourceFile = is_file($sourcePath) ? $sourcePath : $this->concatPaths(array($sourcePath, $file));
             $destFile = $this->concatPaths(array($destPath, $file));
 
-            if (file_exists($sourceFile)) {
+            if (file_exists($sourceFile) && is_file($sourceFile)) {
                 $res &= copy($sourceFile, $destFile);
             }
         }
@@ -669,6 +669,17 @@ class Manager
         return (bool) $res;
     }
 
+    /**
+     * Check if $dirname is directory.
+     *
+     * @param  string  $dirname
+     * @return boolean
+     */
+    public function isDir($dirname)
+    {
+        return is_dir($dirname);
+    }
+
     /**
      * Check if $filename is file. If $filename doesn'ot exist, check by pathinfo
      *

application/Espo/Core/Utils/Language.php

@@ -163,7 +163,7 @@ class Language
         return $translated;
     }
 
-    public function translateOption($value, $field, $scope)
+    public function translateOption($value, $field, $scope = 'Global')
     {
         $options = $this->get($scope. '.options.' . $field);
         if (array_key_exists($value, $options)) {

application/Espo/Core/Utils/Metadata.php

@@ -35,6 +35,7 @@ class Metadata
     private $fileManager;
     private $converter;
     private $moduleConfig;
+    private $metadataHelper;
 
     /**
      * @var string - uses for loading default values
@@ -76,12 +77,6 @@ class Metadata
     {
         $this->config = $config;
         $this->fileManager = $fileManager;
-
-        $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager);
-
-        $this->converter = new \Espo\Core\Utils\Database\Converter($this, $this->fileManager);
-
-        $this->moduleConfig = new \Espo\Core\Utils\Module($this->config, $this->fileManager);
     }
 
     protected function getConfig()
@@ -89,26 +84,47 @@ class Metadata
         return $this->config;
     }
 
-    protected function getUnifier()
-    {
-        return $this->unifier;
-    }
-
     protected function getFileManager()
     {
         return $this->fileManager;
     }
 
+    protected function getUnifier()
+    {
+        if (!isset($this->unifier)) {
+            $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager);
+        }
+
+        return $this->unifier;
+    }
+
     protected function getConverter()
     {
+        if (!isset($this->converter)) {
+            $this->converter = new \Espo\Core\Utils\Database\Converter($this, $this->fileManager);
+        }
+
         return $this->converter;
     }
 
     protected function getModuleConfig()
     {
+        if (!isset($this->moduleConfig)) {
+            $this->moduleConfig = new \Espo\Core\Utils\Module($this->config, $this->fileManager);
+        }
+
         return $this->moduleConfig;
     }
 
+    protected function getMetadataHelper()
+    {
+        if (!isset($this->metadataHelper)) {
+            $this->metadataHelper = new Metadata\Helper($this);
+        }
+
+        return $this->metadataHelper;
+    }
+
     public function isCached()
     {
         if (!$this->getConfig()->get('useCache')) {
@@ -139,6 +155,7 @@ class Metadata
         } else {
             $this->meta = $this->getUnifier()->unify($this->name, $this->paths, true);
             $this->meta = $this->setLanguageFromConfig($this->meta);
+            $this->meta = $this->addAdditionalFields($this->meta);
 
             if ($this->getConfig()->get('useCache')) {
                 $isSaved = $this->getFileManager()->putPhpContents($this->cacheFile, $this->meta);
@@ -197,6 +214,7 @@ class Metadata
     }
 
     /**
+     * todo: move to a separate file
      * Set language list and default for Settings, Preferences metadata
      *
      * @param array $data Meta
@@ -222,6 +240,37 @@ class Metadata
         return $data;
     }
 
+    /**
+     * todo: move to a separate file
+     * Add additional fields defined from metadata -> fields
+     *
+     * @param array $meta
+     */
+    protected function addAdditionalFields(array $meta)
+    {
+        $metaCopy = $meta;
+        $definitionList = $meta['fields'];
+
+        foreach ($metaCopy['entityDefs'] as $entityName => $entityParams) {
+            foreach ($entityParams['fields'] as $fieldName => $fieldParams) {
+
+                $additionalFields = $this->getMetadataHelper()->getAdditionalFieldList($fieldName, $fieldParams, $definitionList);
+                if (!empty($additionalFields)) {
+                    //merge or add to the end of meta array
+                    foreach ($additionalFields as $subFieldName => $subFieldParams) {
+                        if (isset($entityParams['fields'][$subFieldName])) {
+                            $meta['entityDefs'][$entityName]['fields'][$subFieldName] = Util::merge($subFieldParams, $entityParams['fields'][$subFieldName]);
+                        } else {
+                            $meta['entityDefs'][$entityName]['fields'][$subFieldName] = $subFieldParams;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $meta;
+    }
+
     /**
     * Set Metadata data
     * Ex. $key1 = menu, $key2 = Account then will be created a file metadataFolder/menu/Account.json

application/Espo/Core/Utils/Metadata/Helper.php

@@ -22,10 +22,26 @@
 
 namespace Espo\Core\Utils\Metadata;
 
-class Utils
+use Espo\Core\Utils\Util;
+
+class Helper
 {
     private $metadata;
 
+    protected $defaultNaming = 'postfix';
+
+    /**
+     * List of copied params for metadata -> 'fields' from parent items
+     */
+    protected $copiedDefParams = array(
+        'readOnly',
+        'notStorable',
+        'layoutListDisabled',
+        'layoutDetailDisabled',
+        'layoutMassUpdateDisabled',
+        'layoutFiltersDisabled',
+    );
+
     public function __construct(\Espo\Core\Utils\Metadata $metadata)
     {
         $this->metadata = $metadata;
@@ -102,7 +118,41 @@ class Utils
         return $linkFieldDefsByType;
     }
 
-}
+    /**
+     * Get additional field list based on field definition in metadata 'fields'
+     *
+     * @param  string     $fieldName
+     * @param  array     $fieldParams
+     * @param  array|null $definitionList
+     *
+     * @return array
+     */
+    public function getAdditionalFieldList($fieldName, array $fieldParams, array $definitionList = null)
+    {
+        if (empty($fieldParams['type'])) {
+            return;
+        }
 
+        $fieldType = $fieldParams['type'];
+        $fieldDefinition = isset($definitionList[$fieldType]) ? $definitionList[$fieldType] : $this->getMetadata()->get('fields.'.$fieldType);
 
-?>
+        if (!empty($fieldDefinition['fields']) && is_array($fieldDefinition['fields'])) {
+
+            $copiedParams = array_intersect_key($fieldParams, array_flip($this->copiedDefParams));
+
+            $additionalFields = array();
+
+            //add additional fields
+            foreach ($fieldDefinition['fields'] as $subFieldName => $subFieldParams) {
+                $namingType = isset($fieldDefinition['naming']) ? $fieldDefinition['naming'] : $this->defaultNaming;
+
+                $subFieldNaming = Util::getNaming($fieldName, $subFieldName, $namingType);
+                $additionalFields[$subFieldNaming] = array_merge($copiedParams, $subFieldParams);
+            }
+
+            return $additionalFields;
+        }
+
+    }
+
+}

application/Espo/Core/defaults/config.php

@@ -100,6 +100,7 @@ return array (
     'disabledCountQueryEntityList' => array('Email'),
     'maxEmailAccountCount' => 2,
     'followCreatedEntities' => false,
+    'b2cMode' => false,
     'isInstalled' => false,
 );
 

application/Espo/Entities/InboundEmail.php

@@ -18,9 +18,9 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
-namespace Espo\Modules\Crm\Entities;
+namespace Espo\Entities;
 
 class InboundEmail extends \Espo\Core\ORM\Entity
 {

application/Espo/Hooks/Common/Stream.php

@@ -73,6 +73,12 @@ class Stream extends \Espo\Core\Hooks\Base
         if ($this->checkHasStream($entity)) {
             $this->getStreamService()->unfollowAllUsersFromEntity($entity);
         }
+        $query = $this->getEntityManager()->getQuery();
+        $sql = "
+            DELETE FROM `note`
+            WHERE related_id = ".$query->quote($entity->id)." AND related_type = ".$query->quote($entity->getEntityType()) ."
+        ";
+        $this->getEntityManager()->getPDO()->query($sql);
     }
 
     protected function handleCreateRelated(Entity $entity)
@@ -178,6 +184,10 @@ class Stream extends \Espo\Core\Hooks\Base
                     $this->getStreamService()->noteCreate($entity);
                 }
 
+                if (in_array($this->getUser()->id, $userIdList)) {
+                	$entity->set('isFollowed', true);
+                }
+
                 $autofollowUserIdList = $this->getAutofollowUserIdList($entity, $userIdList);
                 foreach ($autofollowUserIdList as $i => $userId) {
                     if (in_array($userId, $userIdList)) {
@@ -207,6 +217,10 @@ class Stream extends \Espo\Core\Hooks\Base
                         if (!empty($assignedUserId)) {
                             $this->getStreamService()->followEntity($entity, $assignedUserId);
                             $this->getStreamService()->noteAssign($entity);
+
+			                if ($this->getUser()->id === $assignedUserId) {
+			                	$entity->set('isFollowed', true);
+			                }
                         }
                     }
                     $this->getStreamService()->handleAudited($entity);

application/Espo/Jobs/Cleanup.php

@@ -49,21 +49,26 @@ class Cleanup extends \Espo\Core\Jobs\Base
 
     protected function cleanupScheduledJobLog()
     {
-        $lastTenRecords = "SELECT c.id FROM (
-            SELECT i1.id
-            FROM scheduled_job_log_record i1
-            CROSS JOIN scheduled_job_log_record i2 ON ( i1.scheduled_job_id = i2.scheduled_job_id
-            AND i1.id < i2.id )
-            GROUP BY i1.id
-            HAVING COUNT( * ) <10
-            ORDER BY i1.created_at DESC
-        ) AS c";
-
-        $query = "DELETE FROM `scheduled_job_log_record` WHERE DATE(created_at) < '".$this->getDate()."' AND id NOT IN (".$lastTenRecords.") ";
-
         $pdo = $this->getEntityManager()->getPDO();
-        $sth = $pdo->prepare($query);
+
+        $sql = "SELECT id FROM scheduled_job";
+        $sth = $pdo->prepare($sql);
         $sth->execute();
+        while ($row = $sth->fetch(\PDO::FETCH_ASSOC)) {
+            $id = $row['id'];
+
+            $lastRowsSql = "SELECT id FROM scheduled_job_log_record WHERE scheduled_job_id = '".$id."' ORDER BY created_at DESC LIMIT 0,10";
+            $lastRowsSth = $pdo->prepare($lastRowsSql);
+            $lastRowsSth->execute();
+            $lastRowIds = $lastRowsSth->fetchAll(\PDO::FETCH_COLUMN, 0);
+
+            $delSql = "DELETE FROM `scheduled_job_log_record`
+                    WHERE scheduled_job_id = '".$id."'
+                    AND DATE(created_at) < '".$this->getDate()."'
+                    AND id NOT IN ('".implode("', '", $lastRowIds)."')
+                ";
+            $pdo->query($delSql);
+        }
     }
 
     protected function getDate($format = 'Y-m-d')

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

@@ -73,6 +73,10 @@ class Invitations
                 case 'date':
                     $contents = str_replace($key, $this->dateTime->convertSystemDateToGlobal($entity->get($field)), $contents);
                     break;
+                case 'jsonArray':
+                    break;
+                case 'jsonObject':
+                    break;
                 default:
                     $contents = str_replace($key, $entity->get($field), $contents);
             }

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

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Modules\Crm\Controllers;
 
@@ -30,22 +30,40 @@ class Call extends \Espo\Core\Controllers\Record
 {
 
     public function actionSendInvitations($params, $data)
-    {        
+    {
         if (empty($data['id'])) {
             throw new BadRequest();
         }
-        
+
         $entity = $this->getRecordService()->getEntity($data['id']);
-        
+
         if (!$entity) {
             throw new NotFound();
-        }    
-        
+        }
+
         if (!$this->getAcl()->check($entity, 'edit')) {
             throw new Forbidden();
         }
-        
+
         return $this->getRecordService()->sendInvitations($entity);
     }
 
+    public function actionMassSetHeld($params, $data)
+    {
+        if (empty($data['ids']) && !is_array($data['ids'])) {
+            throw new BadRequest();
+        }
+
+        return $this->getRecordService()->massSetHeld($data['ids']);
+    }
+
+    public function actionMassSetNotHeld($params, $data)
+    {
+        if (empty($data['ids']) && !is_array($data['ids'])) {
+            throw new BadRequest();
+        }
+
+        return $this->getRecordService()->massSetNotHeld($data['ids']);
+    }
+
 }

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

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Modules\Crm\Controllers;
 
@@ -27,25 +27,43 @@ use \Espo\Core\Exceptions\BadRequest;
 use \Espo\Core\Exceptions\NotFound;
 
 class Meeting extends \Espo\Core\Controllers\Record
-{    
-    
+{
+
     public function actionSendInvitations($params, $data)
-    {        
+    {
         if (empty($data['id'])) {
             throw new BadRequest();
         }
-        
+
         $entity = $this->getRecordService()->getEntity($data['id']);
-        
+
         if (!$entity) {
             throw new NotFound();
-        }    
-        
+        }
+
         if (!$this->getAcl()->check($entity, 'edit')) {
             throw new Forbidden();
         }
-        
+
         return $this->getRecordService()->sendInvitations($entity);
     }
 
+    public function actionMassSetHeld($params, $data)
+    {
+        if (empty($data['ids']) && !is_array($data['ids'])) {
+            throw new BadRequest();
+        }
+
+        return $this->getRecordService()->massSetHeld($data['ids']);
+    }
+
+    public function actionMassSetNotHeld($params, $data)
+    {
+        if (empty($data['ids']) && !is_array($data['ids'])) {
+            throw new BadRequest();
+        }
+
+        return $this->getRecordService()->massSetNotHeld($data['ids']);
+    }
+
 }

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

@@ -61,6 +61,14 @@ class Task extends \Espo\Core\ORM\Repositories\RDB
     {
         parent::beforeSave($entity, $options);
 
+        if ($entity->isFieldChanged('status')) {
+            if ($entity->get('status') == 'Completed') {
+                $entity->set('dateCompleted', date('Y-m-d H:i:s'));
+            } else {
+                $entity->set('dateCompleted', null);
+            }
+        }
+
         if ($entity->has('dateStartDate')) {
             $dateStartDate = $entity->get('dateStartDate');
             if (!empty($dateStartDate)) {

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

@@ -64,5 +64,9 @@
     "labels": {
         "Create Account": "Create Account",
         "Copy Billing": "Copy Billing"
+    },
+    "presetFilters": {
+        "customers": "Customers",
+        "partners": "Partners"
     }
 }

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

@@ -1,5 +1,6 @@
 {
     "layouts": {
-        "detailConvert": "Convert Lead"
+        "detailConvert": "Convert Lead",
+        "listForAccount": "List (for Account)"
     }
 }

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

@@ -33,6 +33,10 @@
             "Tentative": "Tentative"
         }
     },
+    "massActions": {
+        "setHeld": "Set Held",
+        "setNotHeld": "Set Not Held"
+    },
     "labels": {
         "Create Call": "Create Call",
         "Set Held": "Set Held",

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

@@ -0,0 +1,7 @@
+{
+    "labels": {
+        "Create Lead": "Create Lead",
+        "Create Contact": "Create Contact",
+        "Create Task": "Create Task"
+    }
+}

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

@@ -10,7 +10,6 @@
         "Call": "Call",
         "Task": "Task",
         "Case": "Case",
-        "InboundEmail": "Inbound Email",
         "Document": "Document",
         "Campaign": "Campaign",
         "TargetList": "Target List"
@@ -26,7 +25,6 @@
         "Call": "Calls",
         "Task": "Tasks",
         "Case": "Cases",
-        "InboundEmail": "Inbound Emails",
         "Document": "Documents",
         "Campaign": "Campaigns",
         "TargetList": "Target Lists"

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

@@ -50,6 +50,7 @@
         }
     },
     "presetFilters": {
-        "active": "Active"
+        "active": "Active",
+        "converted": "Converted"
     }
 }

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

@@ -28,6 +28,10 @@
             "Tentative": "Tentative"
         }
     },
+    "massActions": {
+        "setHeld": "Set Held",
+        "setNotHeld": "Set Not Held"
+    },
     "labels": {
         "Create Meeting": "Create Meeting",
         "Set Held": "Set Held",

application/Espo/Modules/Crm/Resources/i18n/en_US/Task.json

@@ -10,9 +10,12 @@
         "priority": "Priority",
         "description": "Description",
         "isOverdue": "Is Overdue",
-        "account": "Account"
+        "account": "Account",
+        "dateCompleted": "Date Completed",
+        "attachments": "Attachments"
     },
     "links": {
+        "attachments": "Attachments"
     },
     "options": {
         "status": {

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

@@ -2,39 +2,67 @@
     "fields": {
         "name": "Nom",
         "emailAddress": "Email",
-        "website": "Site Web",
+        "website": "Site internet",
         "phoneNumber": "Téléphone",
-        "billingAddress": "Adresse de Facturation",
-        "shippingAddress": "Adresse de Livraison",
+        "billingAddress": "Adresse de facturation",
+        "shippingAddress": "Adresse de livraison",
         "description": "Description",
-        "sicCode": "Code SIC",
+        "sicCode": "Sic Code",
         "industry": "Industrie",
         "type": "Type",
-        "contactRole": "Rôle"
+        "contactRole": "Titre",
+        "campaign": "Campagne"
     },
     "links": {
         "contacts": "Contacts",
         "opportunities": "Opportunités",
-        "cases": "Tickets"
+        "cases": "Tickets",
+        "documents": "Documents",
+        "meetingsPrimary": "Rendez-vous (étendus)",
+        "callsPrimary": "Appels (étendus)",
+        "tasksPrimary": "Tâches (étendues)",
+        "emailsPrimary": "Emails (étendus)",
+        "targetLists": "Listes de cible",
+        "campaignLogRecords": "Log de Campagne"
     },
     "options": {
         "type": {
-            "Customer": "Clients",
+            "Customer": "Client",
             "Investor": "Investisseur",
             "Partner": "Partenaire",
-            "Reseller": "Revendeur"
+            "Reseller": "Commercialisateur"
         },
         "industry": {
-            "Apparel": "Vêtements",
+            "Agriculture": "Agriculture",
+            "Advertising": "Publicité",
+            "Apparel & Accessories": "Mode et accessoires",
+            "Automotive": "Auto",
             "Banking": "Banque",
-            "Computer Software": "Logiciel Informatique",
+            "Biotechnology": "Biotechnologie",
+            "Chemical": "Chimie",
+            "Computer": "Informatique",
             "Education": "Education",
             "Electronics": "Electronique",
+            "Entertainment & Leisure": "Divertissement et loisir",
             "Finance": "Finance",
-            "Insurance": "Assurance"
+            "Food & Beverage": "Alimentation",
+            "Grocery": "Epicerie",
+            "Insurance": "Assurance",
+            "Legal": "Droit",
+            "Publishing": "Publication",
+            "Real Estate": "Immobilier",
+            "Service": "Service",
+            "Sports": "Sports",
+            "Software": "Logiciel",
+            "Technology": "Technologie",
+            "Telecommunications": "Télécommunications",
+            "Television": "Télévision",
+            "Transportation": "Transport",
+            "Venture Capital": "Investissement"
         }
     },
     "labels": {
-        "Create Account": "Nouveau Compte"
+        "Create Account": "Créer un compte",
+        "Copy Billing": "Copie de facturation"
     }
 }

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

@@ -0,0 +1,5 @@
+{
+    "layouts": {
+        "detailConvert": "Convertir le prospect"
+    }
+}

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

@@ -3,32 +3,45 @@
         "name": "Nom",
         "parent": "Parent",
         "status": "Statut",
-        "dateStart": "Date de Début",
-        "dateEnd": "Date de Fin",
+        "dateStart": "Date de début",
+        "dateEnd": "Date de fin",
         "direction": "Direction",
         "duration": "Durée",
         "description": "Description",
         "users": "Utilisateurs",
         "contacts": "Contacts",
-        "leads": "Leads"
+        "leads": "Prospects",
+        "reminders": "Rappels",
+        "account": "Compte"
     },
     "links": {
     },
     "options": {
         "status": {
-            "Planned": "Plannifié",
-            "Held": "Fait",
-            "Not Held": "Pas Fait"
+            "Planned": "Prévu",
+            "Held": "Tenu",
+            "Not Held": "Non tenu"
         },
         "direction": {
-            "Outbound": "Sortie",
-            "Inbound": "Entrée"
+            "Outbound": "Sortant",
+            "Inbound": "Entrant"
+        },
+        "acceptanceStatus": {
+            "None": "Aucun",
+            "Accepted": "Accepté",
+            "Declined": "Décliné",
+            "Tentative": "Tentative"
         }
     },
     "labels": {
-        "Create Call": "Générer l'appel",
-        "Set Held": "Marquer Fait",
-        "Set Not Held": "Marquer Pas Fait",
-        "Send Invitations": "Envoi d'Invitations"        
+        "Create Call": "Créer un Appel",
+        "Set Held": "Qualifier en Tenu",
+        "Set Not Held": "Qualifier en Non tenu",
+        "Send Invitations": "Envoyer les invitations"
+    },
+    "presetFilters": {
+        "planned": "Prévu",
+        "held": "Tenu",
+        "todays": "Aujourd'hui"
     }
 }

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

@@ -0,0 +1,54 @@
+{
+    "fields": {
+        "name": "Nom",
+        "description": "Description",
+        "status": "Statut",
+        "type": "Type",
+        "startDate": "Date de début",
+        "endDate": "Date de fin",
+        "targetLists": "Listes de cibles",
+        "sentCount": "Envoyé",
+        "openedCount": "Ouvert",
+        "clickedCount": "Cliqué",
+        "optedOutCount": "Désinscrit",
+        "bouncedCount": "Renvoyé",
+        "hardBouncedCount": "Rejeté fortement",
+        "softBouncedCount": "Rejeté",
+        "leadCreatedCount": "Prospects créés",
+        "revenue": "Revenu"
+    },
+    "links": {
+        "targetLists": "Listes de cibles",
+        "accounts": "Comptes",
+        "contacts": "Contacts",
+        "leads": "Prospects",
+        "opportunities": "Opportunités",
+        "campaignLogRecords": "Enregistrer"
+    },
+    "options": {
+        "type": {
+            "Email": "Email",
+            "Web": "Web",
+            "Television": "Télévision",
+            "Radio": "Radio",
+            "Newsletter": "Newsletter",
+            "Mail": "Mail"
+        },
+        "status": {
+            "Planning": "Planning",
+            "Active": "Actif",
+            "Inactive": "Inactif",
+            "Complete": "Terminer"
+        }
+    },
+    "labels": {
+        "Create Campaign": "Créer une Campagne",
+        "Target Lists": "Listes de cibles",
+        "Statistics": "Statistiques",
+        "hard": "fort",
+        "soft": "faible"
+    },
+    "presetFilters": {
+        "active": "Actif"
+    }
+}

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

@@ -0,0 +1,24 @@
+{
+    "fields": {
+        "action": "Action",
+        "actionDate": "Date",
+        "data": "Donnée",
+        "campaign": "Campagne",
+        "parent": "Cible",
+        "object": "Objet",
+        "application": "Application"
+    },
+    "options": {
+    	"action": {
+            "Sent": "Envoyé",
+            "Opened": "Ouvert",
+            "Opted Out": "Désinscrit",
+            "Bounced": "Renvoyé",
+            "Clicked": "Cliqué",
+            "Lead Created": "Prospect créé"
+    	}
+    },
+    "labels": {
+        "All": "Tous"
+    }
+}

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

@@ -1,7 +1,7 @@
 {
     "fields": {
         "name": "Nom",
-        "number": "Numéro",
+        "number": "Nombre",
         "status": "Statut",
         "account": "Compte",
         "contact": "Contact",
@@ -15,16 +15,16 @@
         "status": {
             "New": "Nouveau",
             "Assigned": "Assigné",
-            "Pending": "En attente",
+            "Pending": "En cours",
             "Closed": "Fermé",
             "Rejected": "Rejeté",
-            "Duplicate": "Doublon"
+            "Duplicate": "Dupliquer"
         },
         "priority" : {
-            "Low": "Bas",
-            "Normal": "Normal",
-            "High": "Haut",
-            "Urgent": "Urgent"
+            "Low": "Basse",
+            "Normal": "Normale",
+            "High": "Haute",
+            "Urgent": "Urgente"
         },
         "type": {
             "Question": "Question",
@@ -33,6 +33,10 @@
         }
     },
     "labels": {
-        "Create Case": "Créer un Ticket"
+        "Create Case": "Créer un ticket"
+    },
+    "presetFilters": {
+        "open": "Ouvert",
+        "closed": "Fermé"
     }
 }

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

@@ -6,26 +6,31 @@
         "account": "Compte",
         "accounts": "Comptes",
         "phoneNumber": "Téléphone",
-        "accountType": "Type de Compte",
-        "doNotCall": "Ne Pas Appeler",
+        "accountType": "Type de compte",
+        "doNotCall": "Ne pas appeler",
         "address": "Adresse",
-        "opportunityRole": "Rôle de Challenge",
-        "accountRole": "Rôle",
-        "description": "Description"
+        "opportunityRole": "Rôle d'opportunité",
+        "accountRole": "Titre",
+        "description": "Description",
+        "campaign": "Campagne",
+        "targetLists": "Listes de cibles",
+        "targetList": "Liste de cibles"
     },
     "links": {
         "opportunities": "Opportunités",
-        "cases": "Tickets"
+        "cases": "Tickets",
+        "targetLists": "Listes de cibles",
+        "campaignLogRecords": "Rapporter une campagne"
     },
     "labels": {
-        "Create Contact": "Créer un contact"
+        "Create Contact": "Créer un Contact"
     },
     "options": {
         "opportunityRole": {
             "": "--Aucun--",
             "Decision Maker": "Décisionnaire",
-            "Evaluator": "*Evaluator",
-            "Influencer": "Prescripteur"
+            "Evaluator": "Évaluateur",
+            "Influencer": "Influenceur"
         }
     }
 }

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

@@ -0,0 +1,32 @@
+{
+    "labels": {
+        "Create Document": "Créer un Document",
+        "Details": "Détails"
+    },
+    "fields": {
+        "name": "Nom",
+        "status": "Statut",
+        "file": "Fichier",
+        "type": "Type",
+        "source": "Source",
+        "publishDate": "Date de publication",
+        "expirationDate": "Date d'expiration",
+        "description": "Description"
+    },
+    "links": {
+        "accounts": "Comptes",
+        "opportunities": "Opportunités"
+    },
+    "options": {
+        "status": {
+            "Active": "Actif",
+            "Draft": "Brouillon",
+            "Expired": "Expiré",
+            "Canceled": "Annulé"
+        }
+    },
+    "presetFilters": {
+        "active": "Actif",
+        "draft": "Brouillon"
+    }
+}

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

@@ -2,20 +2,23 @@
     "scopeNames": {
         "Account": "Compte",
         "Contact": "Contact",
-        "Lead": "Lead",
+        "Lead": "Prospect",
         "Target": "Cible",
-        "Opportunity": "Challenge",
+        "Opportunity": "Opportunité",
         "Meeting": "Rendez-vous",
         "Calendar": "Calendrier",
         "Call": "Appel",
         "Task": "Tâche",
         "Case": "Ticket",
-        "InboundEmail": "Email Entrant"
+        "InboundEmail": "Email entrant",
+        "Document": "Document",
+        "Campaign": "Campagne",
+        "TargetList": "Liste de cibles"
     },
     "scopeNamesPlural": {
         "Account": "Comptes",
         "Contact": "Contacts",
-        "Lead": "Leads",
+        "Lead": "Prospects",
         "Target": "Cibles",
         "Opportunity": "Opportunités",
         "Meeting": "Rendez-vous",
@@ -23,57 +26,75 @@
         "Call": "Appels",
         "Task": "Tâches",
         "Case": "Tickets",
-        "InboundEmail": "Emails Entrants"
+        "InboundEmail": "Emails entrants",
+        "Document": "Documents",
+        "Campaign": "Campagnes",
+        "TargetList": "Listes de cibles"
     },
     "dashlets": {
-        "Leads": "My Leads",
-        "Opportunities": "Mes Challenges",
-        "Tasks": "Mes Tâches",
-        "Cases": "Mes Tickets",
+        "Leads": "Mes prospects",
+        "Opportunities": "Mes opportunités",
+        "Tasks": "Mes tâches",
+        "Cases": "Mes tickets",
         "Calendar": "Calendrier",
-        "OpportunitiesByStage": "*Challenges par étages",
-        "OpportunitiesByLeadSource": "Challenges par Lead Source",
-        "SalesByMonth": "Ventes par Mois",
-        "SalesPipeline": "Tuyaux des ventes"    
+        "Calls": "Mes appels",
+        "Meetings": "Mes rendez-vous",
+        "OpportunitiesByStage": "Opportunités par étape",
+        "OpportunitiesByLeadSource": "Opportunités par source de prospects",
+        "SalesByMonth": "Ventes par mois",
+        "SalesPipeline": "Canaux de vente"    
     },
     "labels": {
-        "Create InboundEmail": "Créer une boîte email",
+        "Create InboundEmail": "Créer un email entrant",
         "Activities": "Activités",
         "History": "Historique",
         "Attendees": "Participants",
-        "Schedule Meeting": "Rendez-vous Planifiés",
-        "Schedule Call": "Appels Planifiés",
-        "Compose Email": "Créer un Email",
-        "Log Meeting": "Journal des Rendez-vous",
-        "Log Call": "Journal d'appels",
-        "Archive Email": "Archiver les Emails",
-        "Create Task": "Créer une tâche",
+        "Schedule Meeting": "Planifier un rendez-vous",
+        "Schedule Call": "Programmer un appel",
+        "Compose Email": "Composer un Email",
+        "Log Meeting": "Rapporter un rendez-vous",
+        "Log Call": "Rapporter un appel",
+        "Archive Email": "Archiver l'Email",
+        "Create Task": "Créer une Tâche",
         "Tasks": "Tâches"        
     },
     "fields": {
         "billingAddressCity": "Ville",
         "billingAddressCountry": "Pays",
         "billingAddressPostalCode": "Code Postal",
-        "billingAddressState": "Département",
+        "billingAddressState": "Région",
         "billingAddressStreet": "Rue",
         "addressCity": "Ville",
         "addressStreet": "Rue",
         "addressCountry": "Pays",
-        "addressState": "Département",
+        "addressState": "Régions",
         "addressPostalCode": "Code Postal",        
-        "shippingAddressCity": "City (Shipping)",
-        "shippingAddressStreet": "Street (Shipping)",
-        "shippingAddressCountry": "Country (Shipping)",
-        "shippingAddressState": "State (Shipping)",
-        "shippingAddressPostalCode": "Postal Code (Shipping)"
+        "shippingAddressCity": "Ville (livraison)",
+        "shippingAddressStreet": "Rue (livraison)",
+        "shippingAddressCountry": "Pays (livraison)",
+        "shippingAddressState": "Région (livraison)",
+        "shippingAddressPostalCode": "Code Postal (livraison)"
     },
     "links": {
         "contacts": "Contacts",
         "opportunities": "Opportunités",
-        "leads": "Leads",        
+        "leads": "Prospects",        
         "meetings": "Rendez-vous",
         "calls": "Appels",
         "tasks": "Tâches",
-        "emails": "Courriers"
+        "emails": "Emails",
+        "accounts": "Comptes",
+        "cases": "Tickets",
+        "documents": "Documents",
+        "account": "Compte",
+        "opportunity": "Opportunité",        
+        "contact": "Contact",
+        "parent": "Parent"
+    },
+    "options": {
+        "reminderTypes": {
+            "Popup": "Popup",
+            "Email": "Email"
+        }
     }
 }

application/Espo/Modules/Crm/Resources/i18n/fr_FR/InboundEmail.json

@@ -1,41 +1,52 @@
 {
     "fields": {
         "name": "Nom",
-        "team": "Equipe",
+        "team": "Équipe",
         "status": "Statut",
-        "assignToUser": "Assigné à l'Utilisateur",
+        "assignToUser": "Assigner à l'utilisateur",
         "host": "Hôte",
         "username": "Nom d'utilisateur",
-        "password": "Mot de Passe",
-        "port": "Porte",
-        "monitoredFolders": "Dossiers Surveillés",
+        "password": "Mot de passe",
+        "port": "Port",
+        "monitoredFolders": "Dossiers gérés",
         "trashFolder": "Corbeille",
-        "ssl": "SSL",        
-        "createCase": "Créer un Ticket",
-        "reply": "Répondre",
+        "ssl": "SSL",
+        "createCase": "Créer un ticket",
+        "reply": "Réponse automatique",
         "caseDistribution": "Distribution de tickets",
-        "replyEmailTemplate": "Modèle de Réponse par Email",
-        "replyFromAddress": "Répondre Depuis l'Adresse",
-        "replyFromName": "Répondre Depuis le Nom"
+        "replyEmailTemplate": "Modèle email de réponse",
+        "replyFromAddress": "Répondre depuis l'adresse",
+        "replyToAddress": "Répondre à l'adresse",
+        "replyFromName": "Répondre au nom de",
+        "targetUserPosition": "Position de l'utilisateur cible"
+    },
+    "tooltips": {
+        "reply": "Avertissez les expéditeurs par courrier électronique que leurs e-mails ont été reçus.",
+        "createCase": "Automatiquement créer un ticket à la réception d'un mail.",
+        "replyToAddress": "Spécifier l'adresse email de cette boîte pour que les réponses arrivent ici.",
+        "caseDistribution": "Comment les cas seront assignés. Assignés directement à l'utilisateur ou parmi l'équipe.",
+        "assignToUser": "Les e-mails / tickets de l'utilisateur y seront affectés.",
+        "team": "Les e-mails / tickets de l'équipe seront liés.",
+        "targetUserPosition": "Définir la position des utilisateurs qui se partageront les tickets."
     },
     "links": {
     },
     "options": {
         "status": {
-            "Active": "Activer",
-            "Inactive": "Désactiver"
+            "Active": "Actif",
+            "Inactive": "Inactif"
         },
         "caseDistribution": {
-            "Direct-Assignment": "Assignation Directe",
+            "Direct-Assignment": "Direct-Affectation",
             "Round-Robin": "Round-Robin",
-            "Least-Busy": "Least-Busy"
+            "Least-Busy": "Moins-Occupé"
         }
     },
     "labels": {
-        "Create InboundEmail": "Créer une boîte email",
+        "Create InboundEmail": "Créer un email entrant",
         "IMAP": "IMAP",
         "Actions": "Actions",
-        "Main": "Principal"        
+        "Main": "Principale"
     },
     "messages": {
         "couldNotConnectToImap": "Impossible de se connecter au serveur IMAP"

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

@@ -1,46 +1,55 @@
 {
     "labels": {
-        "Converted To": "Convertir Vers",
-        "Create Lead": "Créer Lead",
+        "Converted To": "Converti en",
+        "Create Lead": "Créer un prospect",
         "Convert": "Convertir"
     },
     "fields": {
         "name": "Nom",
         "emailAddress": "Email",
         "title": "Titre",
-        "website": "Site Web",
+        "website": "Site internet",
         "phoneNumber": "Téléphone",
-        "accountName": "Nom du Compte",
-        "doNotCall": "Ne Pas Appeler",
+        "accountName": "Nom du compte",
+        "doNotCall": "Ne pas appeler",
         "address": "Adresse",
         "status": "Statut",
         "source": "Source",
-        "opportunityAmount": "Montant du Challenge",
+        "opportunityAmount": "Montant en jeu de l'opportunité",
+        "opportunityAmountConverted": "Montant en jeu de l'opportunité (converti)",
         "description": "Description",
         "createdAccount": "Compte",
         "createdContact": "Contact",
-        "createdOpportunity": "Challenge"
+        "createdOpportunity": "Opportunité",
+        "campaign": "Campagne",
+        "targetLists": "Listes de cibles",
+        "targetList": "Liste de cibles"
     },
     "links": {
+        "targetLists": "Listes de cibles",
+        "campaignLogRecords": "Log de campagne"
     },
     "options": {
         "status": {
             "New": "Nouveau",
             "Assigned": "Assigné",
-            "In Process": "En Cours de Traitement",
+            "In Process": "En cours",
             "Converted": "Converti",
-            "Recycled": "Supprimé",
-            "Dead": "Mort"
+            "Recycled": "Recyclé",
+            "Dead": "Dead"
         },
         "source": {
             "Call": "Appel",
             "Email": "Email",
-            "Existing Customer": "Client Existant",
+            "Existing Customer": "Client existant",
             "Partner": "Partenaire",
             "Public Relations": "Relations publiques",
-            "Web Site": "Site Web",
+            "Web Site": "Site internet",
             "Campaign": "Campagne",
             "Other": "Autre"
         }
+    },
+    "presetFilters": {
+        "active": "Actif"
     }
 }

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

@@ -3,27 +3,42 @@
         "name": "Nom",
         "parent": "Parent",
         "status": "Statut",
-        "dateStart": "Date de Début",
-        "dateEnd": "Date de Fin",
+        "dateStart": "Date de début",
+        "dateEnd": "Date de fin",
         "duration": "Durée",
         "description": "Description",
         "users": "Utilisateurs",
         "contacts": "Contacts",
-        "leads": "Leads"
+        "leads": "Prospects",
+        "reminders": "Rappels",
+        "account": "Compte"
     },
     "links": {
     },
     "options": {
         "status": {
-            "Planned": "Plannifié",
-            "Held": "Fait",
-            "Not Held": "Pas Fait"
+            "Planned": "Prévu",
+            "Held": "Tenu",
+            "Not Held": "Non tenu"
+        },
+        "acceptanceStatus": {
+            "None": "Aucun",
+            "Accepted": "Accepté",
+            "Declined": "Décliné",
+            "Tentative": "Tentative"
         }
     },
     "labels": {
         "Create Meeting": "Créer un Rendez-vous",
-        "Set Held": "Marquer Fait",
-        "Set Not Held": "Marquer Pas Fait",
-        "Send Invitations": "Envoi d'Invitations"
+        "Set Held": "Qualifier en tenu",
+        "Set Not Held": "Qualifier en non tenu",
+        "Send Invitations": "Envoyer des Invitations",
+        "on time": "à l'heure",
+        "before": "en avance"
+    },
+    "presetFilters": {
+        "planned": "Prévu",
+        "held": "Tenu",
+        "todays": "Aujourd'hui"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/fr_FR/Opportunity.json

@@ -2,33 +2,41 @@
     "fields": {
         "name": "Nom",
         "account": "Compte",
-        "stage": "Etage",
+        "stage": "Etape",
         "amount": "Montant",
         "probability": "Probabilité, %",
-        "leadSource": "Lead Source",
-        "doNotCall": "Ne Pas Appeler",
+        "leadSource": "Source du prospect",
+        "doNotCall": "Ne pas appeler",
         "closeDate": "Date de fermeture",
         "contacts": "Contacts",
-        "description": "Description"
+        "description": "Description",
+        "amountConverted": "Montant (converti)",
+        "amountWeightedConverted": "Montant pondéré",
+        "campaign": "Campagne"
     },
     "links": {
-        "contacts": "Contacts"
+        "contacts": "Contacts",
+        "documents": "Documents"
     },
     "options": {
         "stage": {
-            "Prospecting": "En Prospection",
+            "Prospecting": "Prospection",
             "Qualification": "Qualification",
             "Needs Analysis": "Analyse des besoins",
-            "Value Proposition": "Montant de la Proposition",
-            "Id. Decision Makers": "Id. Décisionnaire",
+            "Value Proposition": "Valeur de la proposition",
+            "Id. Decision Makers": "Id. Decisionnaire",
             "Perception Analysis": "Analyse de la perception",
-            "Proposal/Price Quote": "Proposition/Devis",
-            "Negotiation/Review": "Négociation/avis",
-            "Closed Won": "Closed Won",
-            "Closed Lost": "Closed Lost" 
+            "Proposal/Price Quote": "Proposition/devis",
+            "Negotiation/Review": "Négociation/évaluation",
+            "Closed Won": "Conclusion gagnante",
+            "Closed Lost": "Conclusion perdante"
         }
     },
     "labels": {
-        "Create Opportunity": "Créer un Challenge"
+        "Create Opportunity": "Créer une opportunité"
+    },
+    "presetFilters": {
+        "open": "Ouvrir",
+        "won": "Gagné"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/fr_FR/ScheduledJob.json

@@ -0,0 +1,10 @@
+{
+
+    "options": {
+        "job": {
+            "CheckInboundEmails": "Vérifier les emails entrants",
+            "CheckEmailAccounts": "Vérifier ses comptes emails personnels",
+            "SendEmailReminders": "Envoyer des emails de rappel"
+        }
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/fr_FR/Target.json

@@ -3,17 +3,17 @@
         "name": "Nom",
         "emailAddress": "Email",
         "title": "Titre",
-        "website": "Site Web",
-        "accountName": "Nom du Compte",
+        "website": "Site internet",
+        "accountName": "Nom du compte",
         "phoneNumber": "Téléphone",
-        "doNotCall": "Ne Pas Appeler",
+        "doNotCall": "Ne pas appeler",
         "address": "Adresse",
         "description": "Description"
     },
     "links": {
     },
     "labels": {
-        "Create Target": "Créer une Cible",
-        "Convert to Lead": "Convertir en Lead"
+        "Create Target": "Créer une cible",
+        "Convert to Lead": "Convertir en prospect"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/fr_FR/TargetList.json

@@ -0,0 +1,28 @@
+{
+    "fields": {
+        "name": "Nom",
+        "description": "Description",
+        "entryCount": "Compteur d'entrées",
+        "campaigns": "Campagnes",
+        "endDate": "Date de fin",
+        "targetLists": "Listes de cibles"
+    },
+    "links": {
+        "accounts": "Comptes",
+        "contacts": "Contacts",
+        "leads": "Prospects",
+        "campaigns": "Campagnes"
+    },
+    "options": {
+        "type": {
+            "Email": "Email",
+            "Web": "Web",
+            "Television": "Télévision",
+            "Radio": "Radio",
+            "Newsletter": "Newsletter"
+        }
+    },
+    "labels": {
+        "Create TargetList": "Créer une liste de cibles"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/fr_FR/Task.json

@@ -3,29 +3,40 @@
         "name": "Nom",
         "parent": "Parent",
         "status": "Statut",
-        "dateStart": "Date de Début",
+        "dateStart": "Date de début",
         "dateEnd": "Date d'échéance",
+        "dateStartDate": "Date de début (toute la journée)",
+        "dateEndDate": "Date de fin (toute la journée)",
         "priority": "Priorité",
         "description": "Description",
-        "isOverdue": "Est en Retard"
+        "isOverdue": "En retard",
+        "account": "Compte"
     },
     "links": {
     },
     "options": {
         "status": {
-            "Not Started": "Pas Commencé",
-            "Started": "Commencé",
+            "Not Started": "N'a pas démarré",
+            "Started": "Démarré",
             "Completed": "Terminé",
-            "Canceled": "Annulé"
+            "Canceled": "Annulé",
+            "Deferred": "Reporté"
         },
         "priority" : {
-            "Low": "Bas",
-            "Normal": "Normal",
-            "High": "Haut",
-            "Urgent": "Urgent"
+            "Low": "Basse",
+            "Normal": "Normale",
+            "High": "Haute",
+            "Urgent": "Urgente"
         }
     },
     "labels": {
-        "Create Task": "Créer une tâche"
+        "Create Task": "Créer une Tâche",
+        "Complete": "Terminer"
+    },
+    "presetFilters": {
+        "actual": "En cours",
+        "completed": "Terminés",
+        "todays": "Aujourd'hui",
+        "overdue": "En retard"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/fr_FR/User.json

@@ -0,0 +1,5 @@
+{
+    "links": {
+        "targetLists": "Listes de cibles"
+    }
+}

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

@@ -1,68 +1,72 @@
 {
     "fields": {
         "name": "Ім'я",
-        "emailAddress": "Електронна пошта",
-        "website": "Інтернет сайт",
+        "emailAddress": "Емейл",
+        "website": "Вебсайт",
         "phoneNumber": "Телефон",
-        "billingAddress": "Платіжний адреса",
+        "billingAddress": "Платіжна адреса",
         "shippingAddress": "Поштова адреса",
         "description": "Опис",
-        "sicCode": "SicCode",
+        "sicCode": "Код SIC",
         "industry": "Промисловість",
         "type": "Тип",
-        "contactRole": "Назва",
+        "contactRole": "Посада",
         "campaign": "Кампанія"
     },
     "links": {
         "contacts": "Контакти",
         "opportunities": "Угоди",
-        "cases": "Звернення",
+        "cases": "Кейси",
         "documents": "Документи",
         "meetingsPrimary": "Meetings (expanded)",
         "callsPrimary": "Calls (expanded)",
         "tasksPrimary": "Tasks (expanded)",
         "emailsPrimary": "Emails (expanded)",
-        "targetLists": "Цільові Списки",
-        "campaignLogRecords": "Кампанія Журналу"
+        "targetLists": "Цільові списки",
+        "campaignLogRecords": "Журнал кампанія"
     },
     "options": {
         "type": {
             "Customer": "Замовник",
-            "Investor": "Вкладник",
+            "Investor": "Інвестор",
             "Partner": "Партнер",
             "Reseller": "Посередник"
         },
         "industry": {
             "Agriculture": "Сільське господарство",
             "Advertising": "Реклама",
-            "Apparel & Accessories": "Одяг Та Аксесуари",
+            "Apparel & Accessories": "Одяг та аксесуари",
             "Automotive": "Автомобільні",
-            "Banking": "Банківська справа",
+            "Banking": "Банкінґ",
             "Biotechnology": "Біотехнології",
-            "Chemical": "Хімічний",
-            "Computer": "Комп'ютер",
+            "Chemical": "Хемія",
+            "Computer": "Комп'ютери",
             "Education": "Освіта",
             "Electronics": "Електроніка",
-            "Entertainment & Leisure": "Розваги Та Відпочинок",
+            "Entertainment & Leisure": "Розваги та дозвілля",
             "Finance": "Фінанси",
-            "Food & Beverage": "Їжа І Напої",
+            "Food & Beverage": "Їжа та напої",
             "Grocery": "Доставка",
             "Insurance": "Страхування",
-            "Legal": "Юридичні",
-            "Publishing": "Публікації",
+            "Legal": "Право",
+            "Publishing": "Видавництво",
             "Real Estate": "Нерухомість",
             "Service": "Сервіс",
             "Sports": "Спорт",
-            "Software": "Програмне забезпечення",
-            "Technology": "Технологія",
+            "Software": "Проґрамне забезпечення",
+            "Technology": "Технолоґія",
             "Telecommunications": "Телекомунікації",
             "Television": "Телебачення",
             "Transportation": "Транспорт",
-            "Venture Capital": "Венчурний Капітал"
+            "Venture Capital": "Венчурний капітал"
         }
     },
     "labels": {
-        "Create Account": "Створити контрагента",
-        "Copy Billing": "Копію Білінгу"
+        "Create Account": "Створити контраґента",
+        "Copy Billing": "Копія рахунку"
+    },
+    "presetFilters": {
+        "customers": "Customers",
+        "partners": "Partners"
     }
 }

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

@@ -1,5 +1,6 @@
 {
     "layouts": {
-        "detailConvert": "Перетворити потенційного клієнта"
+        "detailConvert": "Конвертувати лід",
+        "listForAccount": "List (for Account)"
     }
 }

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

@@ -5,43 +5,47 @@
         "status": "статус",
         "dateStart": "Дата початку",
         "dateEnd": "Дата закінчення",
-        "direction": "Категорія",
+        "direction": "Напрямок",
         "duration": "Тривалість",
         "description": "Опис",
         "users": "Користувачі",
         "contacts": "Контакти",
-        "leads": "Потенційні клієнти",
+        "leads": "Ліди",
         "reminders": "Нагадування",
-        "account": "Контрагент"
+        "account": "Контраґент"
     },
     "links": {
     },
     "options": {
         "status": {
-            "Planned": "Запланований",
-            "Held": "Виконаний",
-            "Not Held": "Не відбувся"
+            "Planned": "Заплановано",
+            "Held": "Виконано",
+            "Not Held": "Не відбулося"
         },
         "direction": {
-            "Outbound": "Вихідний",
-            "Inbound": "Вхідний"
+            "Outbound": "Вихідне",
+            "Inbound": "Вхідне"
         },
         "acceptanceStatus": {
             "None": "Нема",
-            "Accepted": "Прийнятий",
-            "Declined": "Відхилений",
-            "Tentative": "Попередній"
+            "Accepted": "Прийнято",
+            "Declined": "Відхилено",
+            "Tentative": "Попереднє"
         }
     },
+    "massActions": {
+        "setHeld": "Позначити виконаним",
+        "setNotHeld": "Позначити невиконаним"
+    },
     "labels": {
-        "Create Call": "Новий дзвінок",
-        "Set Held": "Був виконаний",
-        "Set Not Held": "Набір Не Проводиться",
+        "Create Call": "Створити дзвінок",
+        "Set Held": "Позначити виконаним",
+        "Set Not Held": "Позначити невиконаним",
         "Send Invitations": "Відправити запрошення"
     },
     "presetFilters": {
-        "planned": "Запланований",
-        "held": "Виконаний",
-        "todays": "На сьогодні"
+        "planned": "Заплановано",
+        "held": "Виконано",
+        "todays": "Сьогоднішнє"
     }
 }

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

@@ -6,32 +6,32 @@
         "type": "Тип",
         "startDate": "Дата Початку",
         "endDate": "Дата Закінчення",
-        "targetLists": "Цільові Списки",
+        "targetLists": "Цільові списки",
         "sentCount": "Відправлено",
-        "openedCount": "Відкритий",
-        "clickedCount": "Натиснув",
+        "openedCount": "Відкрито",
+        "clickedCount": "Цикнуте",
         "optedOutCount": "Відмовлено",
-        "bouncedCount": "Відскочив",
-        "hardBouncedCount": "Жорсткий Відскочив",
-        "softBouncedCount": "М'яка Відскочив",
-        "leadCreatedCount": "Призводить Створена",
+        "bouncedCount": "Відшито",
+        "hardBouncedCount": "Жорстко відшито",
+        "softBouncedCount": "М'яко відшито",
+        "leadCreatedCount": "Ліди створені",
         "revenue": "Виручка"
     },
     "links": {
-        "targetLists": "Цільові Списки",
-        "accounts": "Контрагенти",
+        "targetLists": "Цільові списки",
+        "accounts": "Контраґенти",
         "contacts": "Контакти",
-        "leads": "Потенційні клієнти",
+        "leads": "Ліди",
         "opportunities": "Угоди",
         "campaignLogRecords": "Лоґ"
     },
     "options": {
         "type": {
-            "Email": "Електронна пошта",
-            "Web": "Веб -",
+            "Email": "Емейл",
+            "Web": "Веб",
             "Television": "Телебачення",
             "Radio": "Радіо",
-            "Newsletter": "Розсилку",
+            "Newsletter": "Розсилка",
             "Mail": "Пошта"
         },
         "status": {
@@ -42,11 +42,11 @@
         }
     },
     "labels": {
-        "Create Campaign": "Створити Кампанію",
-        "Target Lists": "Цільові Списки",
+        "Create Campaign": "Створити кампанію",
+        "Target Lists": "Цільові списки",
         "Statistics": "Статистика",
-        "hard": "жорсткий",
-        "soft": "м'який"
+        "hard": "жорстко",
+        "soft": "м'яко"
     },
     "presetFilters": {
         "active": "Активний"

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

@@ -4,18 +4,18 @@
         "actionDate": "Дата",
         "data": "Дані",
         "campaign": "Кампанія",
-        "parent": "Цільовий",
+        "parent": "Ціль",
         "object": "Об'єкт",
         "application": "Додаток"
     },
     "options": {
     	"action": {
             "Sent": "Відправлено",
-            "Opened": "Відкритий",
+            "Opened": "Відкрито",
             "Opted Out": "Відмовлено",
-            "Bounced": "Відскочив",
-            "Clicked": "Натиснув",
-            "Lead Created": "Привести Створена"
+            "Bounced": "Відшито",
+            "Clicked": "Цикнуте",
+            "Lead Created": "Лід створено"
     	}
     },
     "labels": {

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

@@ -1,9 +1,9 @@
 {
     "fields": {
         "name": "Ім'я",
-        "number": "Номер",
+        "number": "Нумер",
         "status": "статус",
-        "account": "Контрагент",
+        "account": "Контраґент",
         "contact": "Контакт",
         "priority": "Пріоритет",
         "type": "Тип",
@@ -21,19 +21,19 @@
             "Duplicate": "Дуплікат"
         },
         "priority" : {
-            "Low": "Низький",
+            "Low": "Низько",
             "Normal": "Нормальний",
-            "High": "Високий",
+            "High": "Високо",
             "Urgent": "Терміново"
         },
         "type": {
             "Question": "Питання",
-            "Incident": "Подія",
+            "Incident": "Випадок",
             "Problem": "Проблема"
         }
     },
     "labels": {
-        "Create Case": "Створити звернення"
+        "Create Case": "Створити кейс"
     },
     "presetFilters": {
         "open": "Відкрити",

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

@@ -1,36 +1,36 @@
 {
     "fields": {
         "name": "Ім'я",
-        "emailAddress": "Електронна пошта",
-        "title": "Назва",
-        "account": "Контрагент",
-        "accounts": "Контрагенти",
+        "emailAddress": "Емейл",
+        "title": "Посада",
+        "account": "Контраґент",
+        "accounts": "Контраґенти",
         "phoneNumber": "Телефон",
-        "accountType": "Тип контрагента",
+        "accountType": "Тип контраґента",
         "doNotCall": "Не дзвонити",
         "address": "Адреса",
         "opportunityRole": "Роль угоди",
-        "accountRole": "Назва",
+        "accountRole": "Посада",
         "description": "Опис",
         "campaign": "Кампанія",
-        "targetLists": "Цільові Списки",
-        "targetList": "Цільовий Список"
+        "targetLists": "Цільові списки",
+        "targetList": "Цільовий список"
     },
     "links": {
         "opportunities": "Угоди",
-        "cases": "Звернення",
-        "targetLists": "Цільові Списки",
-        "campaignLogRecords": "Кампанія Журналу"
+        "cases": "Кейси",
+        "targetLists": "Цільові списки",
+        "campaignLogRecords": "Журнал кампанія"
     },
     "labels": {
         "Create Contact": "Створити контакт"
     },
     "options": {
         "opportunityRole": {
-            "": "--Ні--",
+            "": "--Немає--",
             "Decision Maker": "Приймає рішення",
             "Evaluator": "Оцінювач",
-            "Influencer": "Консультант"
+            "Influencer": "Впливає"
         }
     }
 }

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

@@ -1,6 +1,6 @@
 {
     "labels": {
-        "Create Document": "Створити Документ",
+        "Create Document": "Створити документ",
         "Details": "Деталі"
     },
     "fields": {
@@ -9,19 +9,19 @@
         "file": "Файл",
         "type": "Тип",
         "source": "Джерело",
-        "publishDate": "Дата Публікації",
-        "expirationDate": "Термін Придатності",
+        "publishDate": "Дата публікації",
+        "expirationDate": "Термін придатности",
         "description": "Опис"
     },
     "links": {
-        "accounts": "Контрагенти",
+        "accounts": "Контраґенти",
         "opportunities": "Угоди"
     },
     "options": {
         "status": {
             "Active": "Активний",
             "Draft": "Чернетка",
-            "Expired": "Закінчився",
+            "Expired": "Прострочено",
             "Canceled": "Скасовано"
         }
     },

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

@@ -0,0 +1,7 @@
+{
+    "labels": {
+        "Create Lead": "Створили лід",
+        "Create Contact": "Створити контакт",
+        "Create Task": "Створити завдання"
+    }
+}

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

@@ -1,47 +1,45 @@
 {
     "scopeNames": {
-        "Account": "Контрагент",
+        "Account": "Контраґент",
         "Contact": "Контакт",
-        "Lead": "Потенційний клієнт",
-        "Target": "Цільовий",
+        "Lead": "Лід",
+        "Target": "Ціль",
         "Opportunity": "Угода",
         "Meeting": "Зустріч",
         "Calendar": "Календар",
-        "Call": "Виклик",
+        "Call": "Дзвінок",
         "Task": "Завдання",
-        "Case": "Звернення",
-        "InboundEmail": "Вхідна пошта",
+        "Case": "Кейс",
         "Document": "Документ",
         "Campaign": "Кампанія",
-        "TargetList": "Цільовий Список"
+        "TargetList": "Цільовий список"
     },
     "scopeNamesPlural": {
-        "Account": "Контрагенти",
+        "Account": "Контраґенти",
         "Contact": "Контакти",
-        "Lead": "Потенційні клієнти",
+        "Lead": "Ліди",
         "Target": "Цілі",
         "Opportunity": "Угоди",
         "Meeting": "Зустрічі",
         "Calendar": "Календар",
         "Call": "Дзвінки",
         "Task": "Завдання",
-        "Case": "Звернення",
-        "InboundEmail": "Вхідні повідомлення",
+        "Case": "Кейси",
         "Document": "Документи",
-        "Campaign": "Кампаній",
-        "TargetList": "Цільові Списки"
+        "Campaign": "Кампанії",
+        "TargetList": "Цільові списки"
     },
     "dashlets": {
-        "Leads": "Мої потенційні клієнти",
+        "Leads": "Мої ліди",
         "Opportunities": "Мої угоди",
         "Tasks": "Мої завдання",
-        "Cases": "Мої звернення",
+        "Cases": "Мої кейси",
         "Calendar": "Календар",
         "Calls": "Мої дзвінки",
         "Meetings": "Мої зустрічі",
         "OpportunitiesByStage": "Угоди на стадії",
-        "OpportunitiesByLeadSource": "Операції з джерела потенційного клієнта",
-        "SalesByMonth": "Продажу по місяцях",
+        "OpportunitiesByLeadSource": "Угоди за джерелом лідів",
+        "SalesByMonth": "Продажі по місяцях",
         "SalesPipeline": "Джерела продажу"    
     },
     "labels": {
@@ -49,11 +47,11 @@
         "Activities": "Заходи",
         "History": "Історія",
         "Attendees": "Учасники",
-        "Schedule Meeting": "Запланувати зустріч",
-        "Schedule Call": "Запланувати дзвінок",
-        "Compose Email": "Створити e-mail",
-        "Log Meeting": "Записати зустріч",
-        "Log Call": "Записати дзвінок",
+        "Schedule Meeting": "Розклад зустрічей",
+        "Schedule Call": "Розклад дзвінків",
+        "Compose Email": "Написати емейл",
+        "Log Meeting": "Протокол зустрічей",
+        "Log Call": "Протокол дзвінків",
         "Archive Email": "Архівувати листа",
         "Create Task": "Створити завдання",
         "Tasks": "Завдання"        
@@ -78,15 +76,15 @@
     "links": {
         "contacts": "Контакти",
         "opportunities": "Угоди",
-        "leads": "Потенційні клієнти",        
+        "leads": "Ліди",        
         "meetings": "Зустрічі",
         "calls": "Дзвінки",
         "tasks": "Завдання",
         "emails": "Листи",
-        "accounts": "Контрагенти",
-        "cases": "Звернення",
+        "accounts": "Контраґенти",
+        "cases": "Кейси",
         "documents": "Документи",
-        "account": "Контрагент",
+        "account": "Контраґент",
         "opportunity": "Угода",        
         "contact": "Контакт",
         "parent": "Джерело"
@@ -94,7 +92,7 @@
     "options": {
         "reminderTypes": {
             "Popup": "Спливаюче вікно",
-            "Email": "Електронна пошта"
+            "Email": "Емейл"
         }
     }
 }

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

@@ -1,55 +1,56 @@
 {
     "labels": {
-        "Converted To": "Перетворений в",
-        "Create Lead": "Створити потенційного клієнта",
-        "Convert": "Перетворити"
+        "Converted To": "Перетворено на",
+        "Create Lead": "Створили лід",
+        "Convert": "Конвертувати"
     },
     "fields": {
         "name": "Ім'я",
-        "emailAddress": "Електронна пошта",
-        "title": "Назва",
-        "website": "Інтернет сайт",
+        "emailAddress": "Емейл",
+        "title": "Посада",
+        "website": "Вебсайт",
         "phoneNumber": "Телефон",
-        "accountName": "Ім'я контрагента",
+        "accountName": "Ім'я контраґента",
         "doNotCall": "Не дзвонити",
         "address": "Адреса",
         "status": "статус",
         "source": "Джерело",
         "opportunityAmount": "Сума угоди",
-        "opportunityAmountConverted": "Сума угоди (конвертований)",
+        "opportunityAmountConverted": "Сума угоди (конвертована)",
         "description": "Опис",
-        "createdAccount": "Контрагент",
+        "createdAccount": "Контраґент",
         "createdContact": "Контакт",
         "createdOpportunity": "Угода",
         "campaign": "Кампанія",
-        "targetLists": "Цільові Списки",
-        "targetList": "Цільовий Список"
+        "targetLists": "Цільові списки",
+        "targetList": "Цільовий список"
     },
     "links": {
-        "targetLists": "Цільові Списки",
-        "campaignLogRecords": "Кампанія Журналу"
+        "targetLists": "Цільові списки",
+        "campaignLogRecords": "Журнал кампанія"
     },
     "options": {
         "status": {
             "New": "Новий",
             "Assigned": "На розгляді",
             "In Process": "У процесі",
-            "Converted": "Перетворене",
-            "Recycled": "Відновлений",
-            "Dead": "Мертвий"
+            "Converted": "Конвертована",
+            "Recycled": "У кошику",
+            "Dead": "Мертве"
         },
         "source": {
-            "Call": "Виклик",
-            "Email": "Електронна пошта",
-            "Existing Customer": "Існуючі Служби",
+            "Call": "Дзвінок",
+            "Email": "Емейл",
+            "Existing Customer": "Існуючі замовники",
             "Partner": "Партнер",
-            "Public Relations": "Зв'язки З Громадськістю",
-            "Web Site": "Веб-Сайт",
+            "Public Relations": "Зв'язки із громадськістю",
+            "Web Site": "Вебсайт",
             "Campaign": "Кампанія",
             "Other": "Додатково"
         }
     },
     "presetFilters": {
-        "active": "Активний"
+        "active": "Активний",
+        "converted": "Конвертована"
     }
 }

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

@@ -9,36 +9,40 @@
         "description": "Опис",
         "users": "Користувачі",
         "contacts": "Контакти",
-        "leads": "Потенційні клієнти",
+        "leads": "Ліди",
         "reminders": "Нагадування",
-        "account": "Контрагент"
+        "account": "Контраґент"
     },
     "links": {
     },
     "options": {
         "status": {
-            "Planned": "Запланований",
-            "Held": "Виконаний",
-            "Not Held": "Не відбувся"
+            "Planned": "Заплановано",
+            "Held": "Виконано",
+            "Not Held": "Не відбулося"
         },
         "acceptanceStatus": {
             "None": "Нема",
-            "Accepted": "Прийнятий",
-            "Declined": "Відхилений",
-            "Tentative": "Попередній"
+            "Accepted": "Прийнято",
+            "Declined": "Відхилено",
+            "Tentative": "Попереднє"
         }
     },
+    "massActions": {
+        "setHeld": "Позначити виконаним",
+        "setNotHeld": "Позначити невиконаним"
+    },
     "labels": {
         "Create Meeting": "Створити зустріч",
-        "Set Held": "Був виконаний",
-        "Set Not Held": "Набір Не Проводиться",
+        "Set Held": "Позначити виконаним",
+        "Set Not Held": "Позначити невиконаним",
         "Send Invitations": "Відправити запрошення",
         "on time": "на час",
         "before": "перед"
     },
     "presetFilters": {
-        "planned": "Запланований",
-        "held": "Виконаний",
-        "todays": "На сьогодні"
+        "planned": "Заплановано",
+        "held": "Виконано",
+        "todays": "Сьогоднішнє"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/uk_UA/Opportunity.json

@@ -1,17 +1,17 @@
 {
     "fields": {
         "name": "Ім'я",
-        "account": "Контрагент",
+        "account": "Контраґент",
         "stage": "Стадія",
         "amount": "Сума",
-        "probability": "Ймовірність успіху, %",
-        "leadSource": "Джерело потенційного клієнта",
+        "probability": "Імовірність, %",
+        "leadSource": "Джерело ліда",
         "doNotCall": "Не дзвонити",
         "closeDate": "Дата закриття",
         "contacts": "Контакти",
         "description": "Опис",
-        "amountConverted": "Сума (сконвертирована)",
-        "amountWeightedConverted": "Сума Зважених",
+        "amountConverted": "Сума (конвертирована)",
+        "amountWeightedConverted": "Зважена сума",
         "campaign": "Кампанія"
     },
     "links": {
@@ -20,16 +20,16 @@
     },
     "options": {
         "stage": {
-            "Prospecting": "Залучення клієнта",
-            "Qualification": "Оцінка можливості",
+            "Prospecting": "Проспектінґ",
+            "Qualification": "Кваліфікація",
             "Needs Analysis": "Вимагає аналізу",
-            "Value Proposition": "Вибір пропозиції/оферти",
-            "Id. Decision Makers": "Визначення відповідальної особи",
-            "Perception Analysis": "Проведення аналізу",
-            "Proposal/Price Quote": "Відправлено пропозиція/оферта",
-            "Negotiation/Review": "Узгодження/розгляд",
-            "Closed Won": "Закрито - Успіх",
-            "Closed Lost": "Закрито - Провал"
+            "Value Proposition": "Цінова пропозиція",
+            "Id. Decision Makers": "Визначення осіб, приймаючих рішення",
+            "Perception Analysis": "Аналізу сприйняття",
+            "Proposal/Price Quote": "Квота пропозицій/цін",
+            "Negotiation/Review": "Заперечення/перегляд",
+            "Closed Won": "Закрито переможно",
+            "Closed Lost": "Закрито провалом"
         }
     },
     "labels": {
@@ -37,6 +37,6 @@
     },
     "presetFilters": {
         "open": "Відкрити",
-        "won": "Успішні"
+        "won": "Переможні"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/uk_UA/ScheduledJob.json

@@ -3,8 +3,8 @@
     "options": {
         "job": {
             "CheckInboundEmails": "Перевірити пошту",
-            "CheckEmailAccounts": "Перевірка Особистих Облікових Записів Електронної Пошти",
-            "SendEmailReminders": "Відправляти Нагадування По Електронній Пошті"
+            "CheckEmailAccounts": "Перевірити особисті емейл-акаунти",
+            "SendEmailReminders": "Відправити нагадування емейлом"
         }
     }
 }

application/Espo/Modules/Crm/Resources/i18n/uk_UA/Target.json

@@ -1,10 +1,10 @@
 {
     "fields": {
         "name": "Ім'я",
-        "emailAddress": "Електронна пошта",
-        "title": "Назва",
-        "website": "Інтернет сайт",
-        "accountName": "Ім'я контрагента",
+        "emailAddress": "Емейл",
+        "title": "Посада",
+        "website": "Вебсайт",
+        "accountName": "Ім'я контраґента",
         "phoneNumber": "Телефон",
         "doNotCall": "Не дзвонити",
         "address": "Адреса",
@@ -13,7 +13,7 @@
     "links": {
     },
     "labels": {
-        "Create Target": "Створити мета",
-        "Convert to Lead": "Перетворити потенційного клієнта"
+        "Create Target": "Створити ціль",
+        "Convert to Lead": "Конвертувати на лід"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/uk_UA/TargetList.json

@@ -2,27 +2,27 @@
     "fields": {
         "name": "Ім'я",
         "description": "Опис",
-        "entryCount": "Запис Графа",
-        "campaigns": "Кампаній",
+        "entryCount": "Облік записа",
+        "campaigns": "Кампанії",
         "endDate": "Дата Закінчення",
-        "targetLists": "Цільові Списки"
+        "targetLists": "Цільові списки"
     },
     "links": {
-        "accounts": "Контрагенти",
+        "accounts": "Контраґенти",
         "contacts": "Контакти",
-        "leads": "Потенційні клієнти",
-        "campaigns": "Кампаній"
+        "leads": "Ліди",
+        "campaigns": "Кампанії"
     },
     "options": {
         "type": {
-            "Email": "Електронна пошта",
-            "Web": "Веб -",
+            "Email": "Емейл",
+            "Web": "Веб",
             "Television": "Телебачення",
             "Radio": "Радіо",
-            "Newsletter": "Розсилку"
+            "Newsletter": "Розсилка"
         }
     },
     "labels": {
-        "Create TargetList": "Створити Цільовий Список"
+        "Create TargetList": "Створити цільовий список"
     }
 }

application/Espo/Modules/Crm/Resources/i18n/uk_UA/Task.json

@@ -4,28 +4,31 @@
         "parent": "Джерело",
         "status": "статус",
         "dateStart": "Дата початку",
-        "dateEnd": "Дата Зв'язку",
+        "dateEnd": "Належна дата",
         "dateStartDate": "Date Start (all day)",
         "dateEndDate": "Date End (all day)",
         "priority": "Пріоритет",
         "description": "Опис",
-        "isOverdue": "Прострочена",
-        "account": "Контрагент"
+        "isOverdue": "Прострочено",
+        "account": "Контраґент",
+        "dateCompleted": "Date Completed",
+        "attachments": "Вкладення"
     },
     "links": {
+        "attachments": "Вкладення"
     },
     "options": {
         "status": {
-            "Not Started": "Не почалася",
-            "Started": "Почалася",
+            "Not Started": "Не почалося",
+            "Started": "Почалося",
             "Completed": "Завершено",
             "Canceled": "Скасовано",
-            "Deferred": "Відстрочені"
+            "Deferred": "Відстрочено"
         },
         "priority" : {
-            "Low": "Низький",
+            "Low": "Низько",
             "Normal": "Нормальний",
-            "High": "Високий",
+            "High": "Високо",
             "Urgent": "Терміново"
         }
     },
@@ -34,9 +37,9 @@
         "Complete": "Повне"
     },
     "presetFilters": {
-        "actual": "Фактичні",
+        "actual": "Актуально",
         "completed": "Завершено",
-        "todays": "На сьогодні",
-        "overdue": "Прострочені"
+        "todays": "Сьогоднішнє",
+        "overdue": "Прострочено"
     }
 }