fix dashboard

Fix ifAttrNotEmpty failing with boolean attributes

.htaccess

@@ -15,6 +15,7 @@ DirectoryIndex index.php index.html
   RewriteRule ^/?data/logs/ - [F]
   RewriteRule ^/?data/cache/ - [F]
   RewriteRule ^/?data/upload/ - [F]
+  RewriteRule ^/?data/\.backup/ - [F]
   RewriteRule ^/?application/ - [F]
   RewriteRule ^/?custom/ - [F]
   RewriteRule ^/?vendor/ - [F]

Gruntfile.js

@@ -21,7 +21,7 @@
 module.exports = function (grunt) {
 
     var jsFilesToMinify = [
-        'client/lib/jquery-2.0.2.min.js',
+        'client/lib/jquery-2.1.4.min.js',
         'client/lib/underscore-min.js',
         'client/lib/backbone-min.js',
         'client/lib/handlebars.js',
@@ -36,34 +36,8 @@ module.exports = function (grunt) {
         'client/lib/bull.min.js',
         'client/src/namespace.js',
         'client/src/exceptions.js',
-        'client/src/app.js',
-        'client/src/utils.js',
-        'client/src/storage.js',
         'client/src/loader.js',
-        'client/src/pre-loader.js',
-        'client/src/ui.js',
-        'client/src/acl.js',
-        'client/src/model.js',
-        'client/src/model-offline.js',
-        'client/src/metadata.js',
-        'client/src/language.js',
-        'client/src/cache.js',
-        'client/src/controller.js',
-        'client/src/router.js',
-        'client/src/date-time.js',
-        'client/src/field-manager.js',
-        'client/src/search-manager.js',
-        'client/src/collection.js',
-        'client/src/multi-collection.js',
-        'client/src/view-helper.js',
-        'client/src/layout-manager.js',
-        'client/src/model-factory.js',
-        'client/src/collection-factory.js',
-        'client/src/models/settings.js',
-        'client/src/models/user.js',
-        'client/src/models/preferences.js',
-        'client/src/controllers/base.js',
-        'client/src/view.js',
+        'client/src/utils.js'
     ];
 
     grunt.initConfig({

application/Espo/Controllers/App.php

@@ -31,8 +31,13 @@ class App extends \Espo\Core\Controllers\Base
         $preferences = $this->getPreferences()->toArray();
         unset($preferences['smtpPassword']);
 
+        $user = $this->getUser();
+        if (!$user->has('teamsIds')) {
+            $user->loadLinkMultipleField('teams');
+        }
+
         return array(
-            'user' => $this->getUser()->toArray(),
+            'user' => $user->toArray(),
             'acl' => $this->getAcl()->getMap(),
             'preferences' => $preferences,
             'token' => $this->getUser()->get('token')

application/Espo/Controllers/Attachment.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\Controllers;
 
@@ -26,17 +26,17 @@ class Attachment extends \Espo\Core\Controllers\Record
 {
 
     public function actionUpload($params, $data)
-    {        
+    {
         list($prefix, $contents) = explode(',', $data);
         $contents = base64_decode($contents);
-        
+
         $attachment = $this->getEntityManager()->getEntity('Attachment');
-        $this->getEntityManager()->saveEntity($attachment);        
+        $this->getEntityManager()->saveEntity($attachment);
         $this->getContainer()->get('fileManager')->putContents('data/upload/' . $attachment->id, $contents);
-        
+
         return array(
             'attachmentId' => $attachment->id
-        );    
+        );
     }
 
 }

application/Espo/Controllers/Stream.php

@@ -38,6 +38,7 @@ class Stream extends \Espo\Core\Controllers\Base
         $offset = intval($request->get('offset'));
         $maxSize = intval($request->get('maxSize'));
         $after = $request->get('after');
+        $filter = $request->get('filter');
 
         $service = $this->getService('Stream');
 
@@ -52,6 +53,7 @@ class Stream extends \Espo\Core\Controllers\Base
             'offset' => $offset,
             'maxSize' => $maxSize,
             'after' => $after,
+            'filter' => $filter
         ));
 
         return array(

application/Espo/Controllers/Template.php

@@ -0,0 +1,31 @@
+<?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\Controllers;
+
+use \Espo\Core\Exceptions\Error;
+
+class Template extends \Espo\Core\Controllers\Record
+{
+
+}
+

application/Espo/Controllers/User.php

@@ -53,7 +53,10 @@ class User extends \Espo\Core\Controllers\Record
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        return $this->getService('User')->changePassword($this->getUser()->id, $data['password']);
+        if (!array_key_exists('password', $data) || !array_key_exists('currentPassword', $data)) {
+            throw new BadRequest();
+        }
+        return $this->getService('User')->changePassword($this->getUser()->id, $data['password'], true, $data['currentPassword']);
     }
 
     public function actionChangePasswordByRequest($params, $data, $request)

application/Espo/Core/Acl/Base.php

@@ -105,7 +105,7 @@ class Base implements Injectable
     public function checkScope(User $user, $data, $scope, $action = null, $isOwner = null, $inTeam = null, Entity $entity = null)
     {
         if (is_null($data)) {
-            return true;
+            return false;
         }
         if ($data === false) {
             return false;

application/Espo/Core/Acl/Table.php

@@ -34,9 +34,9 @@ class Table
 
     private $cacheFile;
 
-    private $actionList = array('read', 'edit', 'delete');
+    private $actionList = ['read', 'edit', 'delete'];
 
-    private $levelList = array('all', 'team', 'own', 'no');
+    private $levelList = ['all', 'team', 'own', 'no'];
 
     protected $fileManager;
 
@@ -112,12 +112,14 @@ class Table
     {
         $aclTables = [];
         $assignmentPermissionList = [];
+        $userPermissionList = [];
 
         $userRoles = $this->user->get('roles');
 
         foreach ($userRoles as $role) {
             $aclTables[] = $role->get('data');
             $assignmentPermissionList[] = $role->get('assignmentPermission');
+            $userPermissionList[] = $role->get('userPermission');
         }
 
         $teams = $this->user->get('teams');
@@ -126,11 +128,14 @@ class Table
             foreach ($teamRoles as $role) {
                 $aclTables[] = $role->get('data');
                 $assignmentPermissionList[] = $role->get('assignmentPermission');
+                $userPermissionList[] = $role->get('userPermission');
             }
         }
 
         $this->data['table'] = $this->merge($aclTables);
-        $this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, 'all');
+
+        $this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, $this->metadata->get('app.acl.valueDefaults.assignmentPermission', 'all'));
+        $this->data['userPermission'] = $this->mergeValues($userPermissionList, $this->metadata->get('app.acl.valueDefaults.userPermission', 'no'));
     }
 
     private function initSolid()
@@ -222,8 +227,11 @@ class Table
         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');
+                if ($aclType === true) {
+                    $aclType = 'recordAllTeamOwnNo';
+                }
+        		if (!empty($aclType)) {
+	        		$data[$scope] = $this->metadata->get('app.acl.defaults.' . $aclType, true);
         		}
         	}
         }

application/Espo/Core/AclManager.php

@@ -115,7 +115,7 @@ class AclManager
         if ($user->isAdmin()) {
             return true;
         }
-        $this->getTable($user)->get($permission);
+        return $this->getTable($user)->get($permission);
     }
 
     public function checkReadOnlyTeam(User $user, $scope)

application/Espo/Core/Application.php

@@ -105,22 +105,23 @@ class Application
         $container = $this->getContainer();
 
         $slim->get('/', function() {});
+        $slim->post('/', function() {});
 
         $entryPointManager = new \Espo\Core\EntryPointManager($container);
 
-        $auth = $this->getAuth();
-        $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
-        $slim->add($apiAuth);
+        try {
+            $auth = $this->getAuth();
+            $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
+            $slim->add($apiAuth);
 
-        $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
-            try {
+            $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
                 $entryPointManager->run($entryPoint);
-            } catch (\Exception $e) {
-                $container->get('output')->processError($e->getMessage(), $e->getCode(), true);
-            }
-        });
+            });
 
-        $slim->run();
+            $slim->run();
+        } catch (\Exception $e) {
+            $container->get('output')->processError($e->getMessage(), $e->getCode(), true);
+        }
     }
 
     public function runCron()

application/Espo/Core/Container.php

@@ -161,6 +161,14 @@ class Container
         );
     }
 
+    private function loadNumber()
+    {
+        return new \Espo\Core\Utils\Number(
+            $this->get('config')->get('decimalMark'),
+            $this->get('config')->get('thousandSeparator')
+        );
+    }
+
     private function loadServiceFactory()
     {
         return new \Espo\Core\ServiceFactory(
@@ -236,6 +244,7 @@ class Container
         return new \Espo\Core\Utils\Language(
             $this->get('fileManager'),
             $this->get('config'),
+            $this->get('metadata'),
             $this->get('preferences')
         );
     }

application/Espo/Core/Controllers/Record.php

@@ -51,7 +51,7 @@ class Record extends Base
             $service = $this->getServiceFactory()->create($name);
         } else {
             $service = $this->getServiceFactory()->create($this->defaultRecordServiceName);
-            $service->setEntityName($name);
+            $service->setEntityType($name);
         }
 
         return $service;
@@ -69,13 +69,17 @@ class Record extends Base
         return $entity->toArray();
     }
 
-    public function actionPatch($params, $data)
+    public function actionPatch($params, $data, $request)
     {
-        return $this->actionUpdate($params, $data);
+        return $this->actionUpdate($params, $data, $request);
     }
 
-    public function actionCreate($params, $data)
+    public function actionCreate($params, $data, $request)
     {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
         }
@@ -89,8 +93,12 @@ class Record extends Base
         throw new Error();
     }
 
-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
     {
+        if (!$request->isPut() && !$request->isPatch()) {
+            throw new BadRequest();
+        }
+
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
         }
@@ -135,7 +143,7 @@ class Record extends Base
 
         return array(
             'total' => $result['total'],
-            'list' => $result['collection']->toArray()
+            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
         );
     }
 
@@ -170,12 +178,16 @@ class Record extends Base
 
         return array(
             'total' => $result['total'],
-            'list' => $result['collection']->toArray()
+            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
         );
     }
 
-    public function actionDelete($params)
+    public function actionDelete($params, $data, $request)
     {
+        if (!$request->isDelete()) {
+            throw new BadRequest();
+        }
+
         $id = $params['id'];
 
         if ($this->getRecordService()->deleteEntity($id)) {
@@ -212,6 +224,10 @@ class Record extends Base
 
     public function actionMassUpdate($params, $data, $request)
     {
+        if (!$request->isPut()) {
+            throw new BadRequest();
+        }
+
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
         }
@@ -235,6 +251,9 @@ class Record extends Base
 
     public function actionMassDelete($params, $data, $request)
     {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
         if (!$this->getAcl()->check($this->name, 'delete')) {
             throw new Forbidden();
         }
@@ -254,10 +273,14 @@ class Record extends Base
         return $idsRemoved;
     }
 
-    public function actionCreateLink($params, $data)
+    public function actionCreateLink($params, $data, $request)
     {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
         if (empty($params['id']) || empty($params['link'])) {
-            throw BadRequest();
+            throw new BadRequest();
         }
 
         $id = $params['id'];
@@ -294,13 +317,17 @@ class Record extends Base
         throw new Error();
     }
 
-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
     {
+        if (!$request->isDelete()) {
+            throw new BadRequest();
+        }
+
         $id = $params['id'];
         $link = $params['link'];
 
         if (empty($params['id']) || empty($params['link'])) {
-            throw BadRequest();
+            throw new BadRequest();
         }
 
         $foreignIds = array();
@@ -326,8 +353,11 @@ class Record extends Base
         throw new Error();
     }
 
-    public function actionFollow($params)
+    public function actionFollow($params, $data, $request)
     {
+        if (!$request->isPut()) {
+            throw new BadRequest();
+        }
         if (!$this->getAcl()->check($this->name, 'read')) {
             throw new Forbidden();
         }
@@ -335,8 +365,11 @@ class Record extends Base
         return $this->getRecordService()->follow($id);
     }
 
-    public function actionUnfollow($params)
+    public function actionUnfollow($params, $data, $request)
     {
+        if (!$request->isDelete()) {
+            throw new BadRequest();
+        }
         if (!$this->getAcl()->check($this->name, 'read')) {
             throw new Forbidden();
         }

application/Espo/Core/EntryPointManager.php

@@ -28,9 +28,9 @@ use \Espo\Core\Exceptions\NotFound,
 
 class EntryPointManager
 {
-    private $container;    
-    
-    private $fileManager;    
+    private $container;
+
+    private $fileManager;
 
     protected $data = null;
 
@@ -38,7 +38,7 @@ class EntryPointManager
 
     protected $allowedMethods = array(
         'run',
-    );    
+    );
 
     /**
      * @var array - path to entryPoint files
@@ -46,14 +46,14 @@ class EntryPointManager
     private $paths = array(
         'corePath' => 'application/Espo/EntryPoints',
         'modulePath' => 'application/Espo/Modules/{*}/EntryPoints',
-        'customPath' => 'custom/Espo/Custom/EntryPoints',                                              
+        'customPath' => 'custom/Espo/Custom/EntryPoints',
     );
 
 
     public function __construct(\Espo\Core\Container $container)
     {
-        $this->container = $container;        
-        $this->fileManager = $container->get('fileManager');        
+        $this->container = $container;
+        $this->fileManager = $container->get('fileManager');
     }
 
     protected function getContainer()
@@ -69,16 +69,16 @@ class EntryPointManager
     public function checkAuthRequired($name)
     {
         $className = $this->getClassName($name);
-        if ($className === false) {
+        if (!$className) {
             throw new NotFound();
         }
-        return $className::$authRequired;        
+        return $className::$authRequired;
     }
 
-    public function run($name) 
+    public function run($name)
     {
         $className = $this->getClassName($name);
-        if ($className === false) {
+        if (!$className) {
             throw new NotFound();
         }
         $entryPoint = new $className($this->container);
@@ -89,7 +89,7 @@ class EntryPointManager
     protected function getClassName($name)
     {
         $name = Util::normilizeClassName($name);
-        
+
         if (!isset($this->data)) {
             $this->init();
         }
@@ -98,8 +98,8 @@ class EntryPointManager
         if (isset($this->data[$name])) {
             return $this->data[$name];
         }
-        
-        return false; 
+
+        return false;
     }
 
 
@@ -108,8 +108,7 @@ class EntryPointManager
         $classParser = $this->getContainer()->get('classParser');
         $classParser->setAllowedMethods($this->allowedMethods);
         $this->data = $classParser->getData($this->paths, $this->cacheFile);
-    }    
-     
+    }
 
 }
 

application/Espo/Core/EntryPoints/Base.php

@@ -67,6 +67,21 @@ abstract class Base
         return $this->getContainer()->get('metadata');
     }
 
+    protected function getDateTime()
+    {
+        return $this->getContainer()->get('dateTime');
+    }
+
+    protected function getNumber()
+    {
+        return $this->getContainer()->get('number');
+    }
+
+    protected function getFileManager()
+    {
+        return $this->getContainer()->get('fileManager');
+    }
+
     public function __construct(Container $container)
     {
         $this->container = $container;

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -0,0 +1,140 @@
+<?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\Htmlizer;
+
+use Espo\ORM\Entity;
+use Espo\Core\Exceptions\Error;
+
+use Espo\Core\Utils\File\Manager as FileManager;
+use Espo\Core\Utils\DateTime;
+use Espo\Core\Utils\Number;
+
+require('vendor/zordius/lightncandy/src/lightncandy.php');
+
+class Htmlizer
+{
+    protected $fileManager;
+
+    protected $dateTime;
+
+    protected $config;
+
+    public function __construct(FileManager $fileManager, DateTime $dateTime, Number $number)
+    {
+        $this->fileManager = $fileManager;
+        $this->dateTime = $dateTime;
+        $this->number = $number;
+    }
+
+    protected function formatNumber($value)
+    {
+        return $this->number->format($value);
+    }
+
+    protected function format($value)
+    {
+        if (is_float($value) || is_int($value)) {
+            $value = $this->formatNumber($value);
+        } else if (is_string($value)) {
+            $value = nl2br($value);
+        }
+        return $value;
+    }
+
+    protected function getDataFromEntity(Entity $entity)
+    {
+        $data = $entity->toArray();
+
+
+
+        $fieldDefs = $entity->getFields();
+        $fieldList = array_keys($fieldDefs);
+
+        foreach ($fieldList as $field) {
+            $type = null;
+            if (!empty($fieldDefs[$field]['type'])) {
+                $type = $fieldDefs[$field]['type'];
+            }
+            if ($type == Entity::DATETIME) {
+                if (!empty($data[$field])) {
+                    $data[$field] = $this->dateTime->convertSystemDateTime($data[$field]);
+                }
+            } else if ($type == Entity::DATE) {
+                if (!empty($data[$field])) {
+                    $data[$field] = $this->dateTime->convertSystemDate($data[$field]);
+                }
+            } else if ($type == Entity::JSON_ARRAY) {
+                if (!empty($data[$field])) {
+                    $list = $data[$field];
+                    $newList = [];
+                    foreach ($list as $item) {
+                        $v = $item;
+                        if ($item instanceof \StdClass) {
+                            $v = get_object_vars($v);
+                        }
+                        foreach ($v as $k => $w) {
+                            $v[$k] = $this->format($v[$k]);
+                        }
+                        $newList[] = $v;
+                    }
+                    $data[$field] = $newList;
+                }
+            } else if ($type == Entity::JSON_OBJECT) {
+                if (!empty($data[$field])) {
+                    $value = $data[$field];
+                    if ($value instanceof \StdClass) {
+                        $data[$field] = get_object_vars($value);
+                    }
+                    foreach ($data[$field] as $k => $w) {
+                        $data[$field][$k] = $this->format($data[$field][$k]);
+                    }
+                }
+            }
+
+            if (array_key_exists($field, $data)) {
+               $data[$field] = $this->format($data[$field]);
+            }
+        }
+
+        return $data;
+    }
+
+    public function render(Entity $entity, $template)
+    {
+        $code = \LightnCandy::compile($template);
+        $id = uniqid('', true);
+        $fileName = 'data/cache/template-' . $id;
+        $this->fileManager->putContents($fileName, $code);
+        $renderer = include($fileName);
+        $this->fileManager->removeFile($fileName);
+
+        $data = $this->getDataFromEntity($entity);
+
+        $html = $renderer($data);
+
+        $html = str_replace('?entryPoint=attachment&amp;', '?entryPoint=attachment&', $html);
+        $html = preg_replace('/\?entryPoint=attachment\&id=(.*)/', 'data/upload/$1', $html);
+
+        return $html;
+    }
+}

application/Espo/Core/Mail/Importer.php

@@ -300,9 +300,19 @@ class Importer
                             $disposition = 'attachment';
                         }
                     } else if (strpos($part->ContentDisposition, 'inline') === 0) {
-                        $contentId = trim($part->contentID, '<>');
-                        $fileName = $contentId;
-                        $disposition = 'inline';
+                        if (isset($part->contentID)) {
+                            $contentId = trim($part->contentID, '<>');
+                            $fileName = $contentId;
+                            $disposition = 'inline';
+                        } else {
+                            // hack for iOS not proper attachments
+                            if (empty($fileName)) {
+                                if (preg_match('/filename="?([^"]+)"?/i', $part->ContentDisposition, $m)) {
+                                    $fileName = $m[1];
+                                    $disposition = 'attachment';
+                                }
+                            }
+                        }
                     }
                 }
 

application/Espo/Core/Mail/Mail/Headers.php

@@ -10,37 +10,5 @@ use Zend\Loader\PluginClassLocator;
 
 class Headers extends \Zend\Mail\Headers
 {
-    public static function fromString($string, $EOL = self::EOL)
-    {
-        $headers     = new static();
-        $currentLine = '';
 
-        // iterate the header lines, some might be continuations
-        foreach (explode($EOL, $string) as $line) {
-            // check if a header name is present
-            if (preg_match('/^(?P<name>[\x21-\x39\x3B-\x7E]+):.*$/', $line, $matches)) {
-                if ($currentLine) {
-                    // a header name was present, then store the current complete line
-                    $headers->addHeaderLine($currentLine);
-                }
-                $currentLine = trim($line);
-            } elseif (preg_match('/^\s+.*$/', $line, $matches)) {
-                // continuation: append to current line
-                $currentLine .= $line;
-            } elseif (preg_match('/^\s*$/', $line)) {
-                // empty line indicates end of headers
-                break;
-            } else {
-                // Line does not match header format!
-                throw new Exception\RuntimeException(sprintf(
-                    'Line "%s"does not match header format!',
-                    $line
-                ));
-            }
-        }
-        if ($currentLine) {
-            $headers->addHeaderLine($currentLine);
-        }
-        return $headers;
-    }
 }

application/Espo/Core/Mail/Sender.php

@@ -131,7 +131,7 @@ class Sender
         return $this;
     }
 
-    public function send(Email $email, $params = array())
+    public function send(Email $email, $params = array(), &$message = null)
     {
         $message = new Message();
         $config = $this->config;
@@ -164,6 +164,10 @@ class Sender
             $message->addFrom($fromAddress, $fromName);
         }
 
+        if (!$email->get('from')) {
+            $email->set('from', $fromAddress);
+        }
+
         if (!empty($params['replyToAddress'])) {
             $replyToName = null;
             if (!empty($params['replyToName'])) {

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

@@ -162,8 +162,6 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
     public function remove(Entity $entity, array $options = array())
     {
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity, $options);
-
         $result = parent::remove($entity, $options);
         if ($result) {
             $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity, $options);

application/Espo/Core/Pdf/Tcpdf.php

@@ -0,0 +1,50 @@
+<?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\Pdf;
+
+require "vendor/tecnick.com/tcpdf/tcpdf.php";
+
+class Tcpdf extends \TCPDF
+{
+    protected $footerHtml = '';
+
+    protected $footerPosition = 15;
+
+    public function setFooterHtml($html)
+    {
+        $this->footerHtml = $html;
+    }
+
+    public function setFooterPosition($position)
+    {
+        $this->footerPosition = $position;
+    }
+
+    public function Footer() {
+        $this->SetY((-1) * $this->footerPosition);
+
+        $html = str_replace('{pageNumber}', '{:pnp:}', $this->footerHtml);
+        $this->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, '', 0, false, 'T');
+    }
+
+}

application/Espo/Core/SelectManagers/Base.php

@@ -209,10 +209,9 @@ class Base
                 $defs = $relDefs[$link];
                 if ($defs['type'] == 'manyMany') {
                     $joins[] = $link;
-                    if (!empty($defs['relationName']) && !empty($defs['midKeys'])) {
+                    if (!empty($defs['midKeys'])) {
                         $key = $defs['midKeys'][1];
-                        $relationName = lcfirst($defs['relationName']);
-                        $part[$relationName . '.' . $key] = $idsValue;
+                        $part[$link . 'Middle.' . $key] = $idsValue;
                     }
                 } else if ($defs['type'] == 'belongsTo') {
                     if (!empty($defs['key'])) {

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

@@ -0,0 +1,9 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "customizable": true,
+    "importable": true,
+    "notifications": true
+}

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

@@ -0,0 +1,9 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "customizable": true,
+    "importable": false,
+    "notifications": false
+}

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

@@ -0,0 +1,9 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "customizable": true,
+    "importable": true,
+    "notifications": true
+}

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

@@ -57,10 +57,10 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
         //check permissions copied and deleted files
         $this->checkIsWritable();
 
-        $this->backupExistingFiles();
-
         $this->beforeRunAction();
 
+        $this->backupExistingFiles();
+
         /* run before install script */
         $this->runScript('before');
 

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

@@ -56,17 +56,17 @@ class Uninstall extends \Espo\Core\Upgrades\Actions\Base
 
             /* copy core files */
             if (!$this->copyFiles()) {
-                throw new $this->throwErrorAndRemovePackage('Cannot copy files.');
+                $this->throwErrorAndRemovePackage('Cannot copy files.');
             }
 
             /* remove extension files, saved in fileList */
             if (!$this->deleteFiles(true)) {
-                throw new $this->throwErrorAndRemovePackage('Permission denied to delete files.');
+                $this->throwErrorAndRemovePackage('Permission denied to delete files.');
             }
         }
 
         if (!$this->systemRebuild()) {
-            throw new $this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
+            $this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
         }
 
         /* run after uninstall script */

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

@@ -33,16 +33,8 @@ class Converter
 
     private $schemaConverter;
 
-
-
     private $schemaFromMetadata = null;
 
-    /**
-    * @var array $meta - metadata array
-    */
-    //private $meta;
-
-
     public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\File\Manager $fileManager)
     {
         $this->metadata = $metadata;
@@ -53,7 +45,6 @@ class Converter
         $this->schemaConverter = new Schema\Converter($this->fileManager);
     }
 
-
     protected function getMetadata()
     {
         return $this->metadata;
@@ -69,13 +60,11 @@ class Converter
         return $this->schemaConverter;
     }
 
-
     public function getSchemaFromMetadata($entityList = null)
     {
         $ormMeta = $this->getMetadata()->getOrmMetadata();
-        $entityDefs = $this->getMetadata()->get('entityDefs');
 
-        $this->schemaFromMetadata = $this->getSchemaConverter()->process($ormMeta, $entityDefs, $entityList);
+        $this->schemaFromMetadata = $this->getSchemaConverter()->process($ormMeta, $entityList);
 
         return $this->schemaFromMetadata;
     }
@@ -98,11 +87,4 @@ class Converter
 
         return $result;
     }
-
-
-
-
-}
-
-
-?>
+}

application/Espo/Core/Utils/Database/DBAL/Platforms/MySqlPlatform.php

@@ -22,12 +22,13 @@
 
 namespace Espo\Core\Utils\Database\DBAL\Platforms;
 
-use Doctrine\DBAL\Schema\TableDiff,
-    Doctrine\DBAL\Schema\Index,
-    Doctrine\DBAL\Schema\Table,
-    Doctrine\DBAL\Schema\Constraint,
-    Doctrine\DBAL\Schema\ForeignKeyConstraint;
-
+use Doctrine\DBAL\Schema\TableDiff;
+use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Schema\Constraint;
+use Doctrine\DBAL\Schema\ForeignKeyConstraint;
+use Doctrine\DBAL\Schema\ColumnDiff;
+use Doctrine\DBAL\Schema\Column;
 
 class MySqlPlatform extends \Doctrine\DBAL\Platforms\MySqlPlatform
 {
@@ -39,21 +40,52 @@ class MySqlPlatform extends \Doctrine\DBAL\Platforms\MySqlPlatform
             $queryParts[] = 'RENAME TO ' . $diff->newName;
         }
 
-        foreach ($diff->addedColumns as $column) {
-            if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
+        //espo: It works not correctly. It can rename some existing fields
+        foreach ($diff->renamedColumns as $oldColumnName => $column) {
+            if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
                 continue;
             }
 
+            //espo: remaned autoincrement field
+            if ($column->getAutoincrement()) {
+                $diff->removedColumns[$oldColumnName] = new Column($oldColumnName, $column->getType(), $column->toArray());
+
+                $columnName = $column->getQuotedName($this);
+                $diff->addedColumns[$columnName] = $column;
+                continue;
+            }
+            //END espo
+
             $columnArray = $column->toArray();
             $columnArray['comment'] = $this->getColumnComment($column);
-            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
-        }
+            /*$queryParts[] =  'CHANGE ' . $oldColumnName . ' '
+                    . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); */
+            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); //espo: fixed the problem
+        } //espo: END
 
         foreach ($diff->removedColumns as $column) {
             if ($this->onSchemaAlterTableRemoveColumn($column, $diff, $columnSql)) {
                 continue;
             }
 
+            //espo: remove autoincrement option
+            if ($column->getAutoincrement()) {
+
+                $columnName = $column->getQuotedName($this);
+
+                $changedColumn = clone $column;
+                $changedColumn->setNotNull(false);
+                $changedColumn->setAutoincrement(false);
+
+                $changedProperties = array(
+                    'notnull',
+                    'autoincrement',
+                );
+
+                $diff->changedColumns[$columnName] = new ColumnDiff($columnName, $changedColumn, $changedProperties, $column);
+            }
+            //END espo
+
             //$queryParts[] =  'DROP ' . $column->getQuotedName($this); //espo: no needs to remove columns
         }
 
@@ -71,19 +103,15 @@ class MySqlPlatform extends \Doctrine\DBAL\Platforms\MySqlPlatform
                     . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
         }
 
-        //espo: It works not correctly. It can rename some existing fields
-        foreach ($diff->renamedColumns as $oldColumnName => $column) {
-            if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
+        foreach ($diff->addedColumns as $column) {
+            if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
                 continue;
             }
 
             $columnArray = $column->toArray();
             $columnArray['comment'] = $this->getColumnComment($column);
-            /*$queryParts[] =  'CHANGE ' . $oldColumnName . ' '
-                    . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); */
-            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); //espo: fixed the problem
-        } //espo: END
-
+            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
+        }
 
         $sql = array();
         $tableSql = array();

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

@@ -79,7 +79,7 @@ class Converter
 
     protected $idParams = array(
         'dbType' => 'varchar',
-        'len' => '24',
+        'len' => 24,
     );
 
     /**
@@ -107,9 +107,9 @@ class Converter
         return $this->metadata;
     }
 
-    protected function getEntityDefs()
+    protected function getEntityDefs($reload = false)
     {
-        if (empty($this->entityDefs)) {
+        if (empty($this->entityDefs) || $reload) {
             $this->entityDefs = $this->getMetadata()->get('entityDefs');
         }
 
@@ -131,9 +131,14 @@ class Converter
         return $this->metadataHelper;
     }
 
+    /**
+     * Orm metadata convertation process
+     *
+     * @return array
+     */
     public function process()
     {
-        $entityDefs = $this->getEntityDefs();
+        $entityDefs = $this->getEntityDefs(true);
 
         $ormMeta = array();
         foreach($entityDefs as $entityName => $entityMeta) {
@@ -185,12 +190,12 @@ class Converter
                 switch ($fieldParams['type']) {
                     case 'id':
                         if ($fieldParams['dbType'] != 'int') {
-                            $fieldParams = array_merge($fieldParams, $this->idParams);
+                            $fieldParams = array_merge($this->idParams, $fieldParams);
                         }
                         break;
 
                     case 'foreignId':
-                        $fieldParams = array_merge($fieldParams, $this->idParams);
+                        $fieldParams = array_merge($this->idParams, $fieldParams);
                         $fieldParams['notNull'] = false;
                         break;
 
@@ -221,6 +226,11 @@ class Converter
      */
     protected function convertFields($entityName, &$entityMeta)
     {
+        //List of unmerged fields with default field defenitions in $outputMeta
+        $unmergedFields = array(
+            'name',
+        );
+
         $outputMeta = array(
             'id' => array(
                 'type' => Entity::ID,
@@ -230,6 +240,10 @@ class Converter
                 'type' => isset($entityMeta['fields']['name']['type']) ? $entityMeta['fields']['name']['type'] : Entity::VARCHAR,
                 'notStorable' => true,
             ),
+            'deleted' => array(
+                'type' => Entity::BOOL,
+                'default' => false,
+            ),
         );
 
         foreach($entityMeta['fields'] as $fieldName => $fieldParams) {
@@ -238,8 +252,14 @@ class Converter
             $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
 
             $fieldDefs = $this->convertField($entityName, $fieldName, $fieldParams, $fieldTypeMeta);
+
             if ($fieldDefs !== false) {
-                $outputMeta[$fieldName] = $fieldDefs; //push fieldDefs to the main array
+                //push fieldDefs to the ORM metadata array
+                if (isset($outputMeta[$fieldName]) && !in_array($fieldName, $unmergedFields)) {
+                    $outputMeta[$fieldName] = array_merge($outputMeta[$fieldName], $fieldDefs);
+                } else {
+                    $outputMeta[$fieldName] = $fieldDefs;
+                }
             }
 
             /** check and set the linkDefs from 'fields' metadata */
@@ -254,13 +274,6 @@ class Converter
             }
         }
 
-        if (!isset($outputMeta['deleted'])) {
-            $outputMeta['deleted'] = array(
-                'type' => Entity::BOOL,
-                'default' => false,
-            );
-        }
-
         return $outputMeta;
     }
 
@@ -308,6 +321,15 @@ class Converter
                     'type' => 'varchar',
                     'notStorable' => true,
                 );
+
+                $ormMeta[$entityName]['fields']['followersIds'] = array(
+                    'type' => 'jsonArray',
+                    'notStorable' => true,
+                );
+                $ormMeta[$entityName]['fields']['followersNames'] = array(
+                    'type' => 'jsonObject',
+                    'notStorable' => true,
+                );
             }
         } //END: add a field 'isFollowed' for stream => true
 
@@ -316,12 +338,6 @@ class Converter
 
     protected function convertField($entityName, $fieldName, array $fieldParams, $fieldTypeMeta = null)
     {
-        /** set default type if exists */
-        if (!isset($fieldParams['type']) || empty($fieldParams['type'])) {
-            $GLOBALS['log']->debug('Field type does not exist for '.$entityName.':'.$fieldName.'. Use default type ['.$this->defaultFieldType.']');
-            $fieldParams['type'] = $this->defaultFieldType;
-        } /** END: set default type if exists */
-
         /** merge fieldDefs option from field definition */
         if (!isset($fieldTypeMeta)) {
             $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
@@ -362,8 +378,6 @@ class Converter
             return array();
         }
 
-        $entityDefs = $this->getEntityDefs();
-
         $relationships = array();
         foreach($entityMeta['links'] as $linkName => $linkParams) {
 

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

@@ -28,8 +28,6 @@ class RelationManager
 {
     private $metadata;
 
-    private $entityDefs;
-
     public function __construct(\Espo\Core\Utils\Metadata $metadata)
     {
         $this->metadata = $metadata;
@@ -40,16 +38,6 @@ class RelationManager
         return $this->metadata;
     }
 
-    protected function getEntityDefs()
-    {
-        if (empty($this->entityDefs)) {
-            $this->entityDefs = $this->getMetadata()->get('entityDefs');
-        }
-
-        return $this->entityDefs;
-    }
-
-
     public function getLinkEntityName($entityName, $linkParams)
     {
         return isset($linkParams['entity']) ? $linkParams['entity'] : $entityName;
@@ -110,7 +98,7 @@ class RelationManager
 
     public function convert($linkName, $linkParams, $entityName, $ormMeta)
     {
-        $entityDefs = $this->getEntityDefs();
+        $entityDefs = $this->getMetadata()->get('entityDefs');
 
         $foreignEntityName = $this->getLinkEntityName($entityName, $linkParams);
         $foreignLink = $this->getForeignLink($linkName, $linkParams, $entityDefs[$foreignEntityName]);

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

@@ -47,11 +47,10 @@ class Converter
         'unique' => 'unique',
     );
 
-
     //todo: same array in Converters\Orm
     protected $idParams = array(
         'dbType' => 'varchar',
-        'len' => '24',
+        'len' => 24,
     );
 
     //todo: same array in Converters\Orm
@@ -68,8 +67,6 @@ class Converter
     {
         $this->fileManager = $fileManager;
 
-        $this->dbalSchema = new \Espo\Core\Utils\Database\DBAL\Schema\Schema();
-
         $this->typeList = array_keys(\Doctrine\DBAL\Types\Type::getTypesMap());
     }
 
@@ -78,13 +75,31 @@ class Converter
         return $this->fileManager;
     }
 
-    protected function getSchema()
+    /**
+     * Get schema
+     *
+     * @param  boolean $reload
+     *
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    protected function getSchema($reload = false)
     {
+        if (!isset($this->dbalSchema) || $reload) {
+            $this->dbalSchema = new \Espo\Core\Utils\Database\DBAL\Schema\Schema();
+        }
+
         return $this->dbalSchema;
     }
 
-
-    public function process(array $ormMeta, $entityDefs, $entityList = null)
+    /**
+     * Schema convertation process
+     *
+     * @param  array  $ormMeta
+     * @param  array|null $entityList
+     *
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    public function process(array $ormMeta, $entityList = null)
     {
         $GLOBALS['log']->debug('Schema\Converter - Start: building schema');
 
@@ -106,7 +121,7 @@ class Converter
             $ormMeta = array_intersect_key($ormMeta, array_flip($dependentEntities));
         }
 
-        $schema = $this->getSchema();
+        $schema = $this->getSchema(true);
 
         $tables = array();
         foreach ($ormMeta as $entityName => $entityParams) {

application/Espo/Core/Utils/EntityManager.php

@@ -126,20 +126,18 @@ class EntityManager
         }
         $labelCreate = $this->getLanguage()->translate('Create') . ' ' . $labelSingular;
 
-        $scopeData = array(
-            'entity' => true,
-            'layouts' => true,
-            'tab' => true,
-            'acl' => true,
-            'module' => 'Custom',
-            'isCustom' => true,
-            'customizable' => true,
-            'importable' => true,
-            'type' => $type,
-            'stream' => $stream,
-            'notifications' => true
-        );
-        $this->getMetadata()->set('scopes', $name, $scopeData);
+        $filePath = "application/Espo/Core/Templates/Metadata/{$type}/scopes.json";
+        $scopesDataContents = $this->getFileManager()->getContents($filePath);
+        $scopesDataContents = str_replace('{entityType}', $name, $scopesDataContents);
+        $scopesData = Json::decode($scopesDataContents, true);
+
+        $scopesData['stream'] = $stream;
+        $scopesData['type'] = $type;
+        $scopesData['module'] = 'Custom';
+        $scopesData['object'] = true;
+        $scopesData['isCustom'] = true;
+
+        $this->getMetadata()->set('scopes', $name, $scopesData);
 
         $filePath = "application/Espo/Core/Templates/Metadata/{$type}/entityDefs.json";
         $entityDefsDataContents = $this->getFileManager()->getContents($filePath);
@@ -280,6 +278,12 @@ class EntityManager
             throw new Conflict('Link ['.$entityForeign.'::'.$linkForeign.'] already exists.');
         }
 
+        if ($entity === $entityForeign) {
+            if ($link === ucfirst($entity) || $linkForeign === ucfirst($entity)) {
+                throw new Conflict();
+            }
+        }
+
         switch ($linkType) {
             case 'oneToMany':
                 if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.field.' . $linkForeign)) {

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

@@ -28,10 +28,12 @@ use Espo\Core\Utils\Json;
 class FileUnifier
 {
     private $fileManager;
+    private $metadata;
 
-    public function __construct(\Espo\Core\Utils\File\Manager $fileManager)
+    public function __construct(\Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Metadata $metadata = null)
     {
         $this->fileManager = $fileManager;
+        $this->metadata = $metadata;
     }
 
     protected function getFileManager()
@@ -39,6 +41,11 @@ class FileUnifier
         return $this->fileManager;
     }
 
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
     /**
      * Unite files content
      *
@@ -53,7 +60,7 @@ class FileUnifier
 
         if (!empty($paths['modulePath'])) {
             $moduleDir = strstr($paths['modulePath'], '{*}', true);
-            $moduleList = $this->getFileManager()->getFileList($moduleDir, false, '', false);
+            $moduleList = isset($this->metadata) ? $this->getMetadata()->getModuleList() : $this->getFileManager()->getFileList($moduleDir, false, '', false);
 
             foreach ($moduleList as $moduleName) {
                 $moduleFilePath = str_replace('{*}', $moduleName, $paths['modulePath']);

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

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

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

@@ -27,15 +27,17 @@ use Espo\Core\Utils;
 class Unifier
 {
     private $fileManager;
+    private $metadata;
 
     protected $params = array(
         'unsetFileName' => 'unset.json',
         'defaultsPath' => 'application/Espo/Core/defaults',
     );
 
-    public function __construct(\Espo\Core\Utils\File\Manager $fileManager)
+    public function __construct(\Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Metadata $metadata = null)
     {
         $this->fileManager = $fileManager;
+        $this->metadata = $metadata;
     }
 
     protected function getFileManager()
@@ -43,6 +45,11 @@ class Unifier
         return $this->fileManager;
     }
 
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
     /**
      * Unite file content to the file
      *
@@ -58,11 +65,12 @@ class Unifier
 
         if (!empty($paths['modulePath'])) {
             $customDir = strstr($paths['modulePath'], '{*}', true);
-            $dirList = $this->getFileManager()->getFileList($customDir, false, '', false);
 
-            foreach ($dirList as $dirName) {
-                $curPath = str_replace('{*}', $dirName, $paths['modulePath']);
-                $content = Utils\Util::merge($content, $this->unifySingle($curPath, $name, $recursively, $dirName));
+            $moduleList = isset($this->metadata) ? $this->getMetadata()->getModuleList() : $this->getFileManager()->getFileList($customDir, false, '', false);
+
+            foreach ($moduleList as $moduleName) {
+                $curPath = str_replace('{*}', $moduleName, $paths['modulePath']);
+                $content = Utils\Util::merge($content, $this->unifySingle($curPath, $name, $recursively, $moduleName));
             }
         }
 

application/Espo/Core/Utils/Language.php

@@ -30,6 +30,7 @@ class Language
 {
     private $fileManager;
     private $config;
+    private $metadata;
     private $preferences;
     private $unifier;
 
@@ -62,13 +63,14 @@ class Language
     );
 
 
-    public function __construct(\Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Config $config, \Espo\Entities\Preferences $preferences = null)
+    public function __construct(File\Manager $fileManager, Config $config, Metadata $metadata, \Espo\Entities\Preferences $preferences = null)
     {
         $this->fileManager = $fileManager;
         $this->config = $config;
+        $this->metadata = $metadata;
         $this->preferences = $preferences;
 
-        $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager);
+        $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager, $this->metadata);
     }
 
     protected function getFileManager()
@@ -81,6 +83,11 @@ class Language
         return $this->config;
     }
 
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
     protected function getPreferences()
     {
         return $this->preferences;

application/Espo/Core/Utils/Layout.php

@@ -136,7 +136,7 @@ class Layout
                     }
 
                     $layoutPath = $this->getLayoutPath($controllerName, true);
-                    $data = Json::encode($layoutData, \JSON_PRETTY_PRINT);
+                    $data = Json::encode($layoutData, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
 
                     $result &= $this->getFileManager()->putContents(array($layoutPath, $layoutName.'.json'), $data);
                 }

application/Espo/Core/Utils/Metadata.php

@@ -28,8 +28,6 @@ class Metadata
 {
     protected $meta = null;
 
-    protected $scopes = array();
-
     private $config;
     private $unifier;
     private $fileManager;
@@ -92,7 +90,7 @@ class Metadata
     protected function getUnifier()
     {
         if (!isset($this->unifier)) {
-            $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager);
+            $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager, $this);
         }
 
         return $this->unifier;
@@ -153,6 +151,7 @@ class Metadata
         if (file_exists($this->cacheFile) && !$reload) {
             $this->meta = $this->getFileManager()->getPhpContents($this->cacheFile);
         } else {
+            $this->clearVars();
             $this->meta = $this->getUnifier()->unify($this->name, $this->paths, true);
             $this->meta = $this->setLanguageFromConfig($this->meta);
             $this->meta = $this->addAdditionalFields($this->meta);
@@ -531,4 +530,16 @@ class Metadata
 
         return $path;
     }
+
+    /**
+     * Clear metadata variables when reload meta
+     *
+     * @return void
+     */
+    protected function clearVars()
+    {
+        $this->meta = null;
+        $this->moduleList = null;
+        $this->ormMeta = null;
+    }
 }

application/Espo/Core/Utils/Number.php

@@ -0,0 +1,60 @@
+<?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\Utils;
+
+class Number
+{
+    protected $decimalMark;
+
+    protected $thousandSeparator;
+
+    public function __construct($decimalMark = '.', $thousandSeparator = ',')
+    {
+        $this->decimalMark = $decimalMark;
+        $this->thousandSeparator = $thousandSeparator;
+    }
+
+    public function format($value, $decimals = null)
+    {
+        if (!is_null($decimals)) {
+             return number_format($value, $decimals, $this->decimalMark, $this->thousandSeparator);
+        } else {
+            $s = strval($value);
+            $arr = explode('.', $value);
+
+            $r = '0';
+            if (!empty($arr[0])) {
+                $r = number_format(intval($arr[0]), 0, '.', $this->thousandSeparator);
+            }
+
+            if (!empty($arr[1])) {
+                $r = $r . $this->decimalMark . $arr[1];
+            }
+
+            return $r;
+        }
+    }
+
+}
+
+

application/Espo/Core/Utils/Util.php

@@ -186,19 +186,25 @@ class Util
      */
     public static function unsetInArrayByValue($needle, array $haystack, $reIndex = true)
     {
+        $doReindex = false;
+
         foreach($haystack as $key => $value) {
             if (is_array($value)) {
                 $haystack[$key] = static::unsetInArrayByValue($needle, $value);
             } else if ($needle === $value) {
 
+                unset($haystack[$key]);
+
                 if ($reIndex) {
-                    array_splice($haystack, $key, 1);
-                } else {
-                    unset($haystack[$key]);
+                    $doReindex = true;
                 }
             }
         }
 
+        if ($doReindex) {
+            $haystack = array_values($haystack);
+        }
+
         return $haystack;
     }
 

application/Espo/Core/defaults/systemConfig.php

@@ -89,9 +89,6 @@ return array (
     'adminItems' =>
     array (
         'devMode',
-        'outboundEmailIsShared',
-        'outboundEmailFromName',
-        'outboundEmailFromAddress',
         'smtpServer',
         'smtpPort',
         'smtpAuth',

application/Espo/Entities/Template.php

@@ -0,0 +1,28 @@
+<?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\Entities;
+
+class Template extends \Espo\Core\ORM\Entity
+{
+
+}

application/Espo/EntryPoints/Download.php

@@ -43,10 +43,10 @@ class Download extends \Espo\Core\EntryPoints\Base
 
     public function run()
     {
-        $id = $_GET['id'];
-        if (empty($id)) {
+        if (empty($_GET['id'])) {
             throw new BadRequest();
         }
+        $id = $_GET['id'];
 
         $attachment = $this->getEntityManager()->getEntity('Attachment', $id);
 

application/Espo/EntryPoints/Image.php

@@ -30,13 +30,13 @@ use \Espo\Core\Exceptions\Error;
 class Image extends \Espo\Core\EntryPoints\Base
 {
     public static $authRequired = true;
-    
+
     protected $allowedFileTypes = array(
         'image/jpeg',
         'image/png',
         'image/gif',
     );
-    
+
     protected $imageSizes = array(
         'xxx-small' => array(18, 18),
         'xx-small' => array(32, 32),
@@ -47,59 +47,58 @@ class Image extends \Espo\Core\EntryPoints\Base
         'x-large' => array(864, 864),
         'xx-large' => array(1024, 1024),
     );
-    
-    
+
+
     public function run()
     {
         if (empty($_GET['id'])) {
             throw new BadRequest();
         }
-
         $id = $_GET['id'];
-            
+
         $size = null;
         if (!empty($_GET['size'])) {
             $size = $_GET['size'];
         }
-        
+
         $this->show($id, $size);
     }
-    
+
     protected function show($id, $size)
     {
         $attachment = $this->getEntityManager()->getEntity('Attachment', $id);
-        
+
         if (!$attachment) {
             throw new NotFound();
         }
-        
+
         if ($attachment->get('parentId') && $attachment->get('parentType')) {
             $parent = $this->getEntityManager()->getEntity($attachment->get('parentType'), $attachment->get('parentId'));
             if ($parent && !$this->getAcl()->check($parent)) {
                 throw new Forbidden();
             }
         }
-        
+
         $filePath = "data/upload/{$attachment->id}";
-        
+
         $fileType = $attachment->get('type');
-        
+
         if (!file_exists($filePath)) {
             throw new NotFound();
         }
-        
+
         if (!in_array($fileType, $this->allowedFileTypes)) {
             throw new Error();
         }
-        
+
         if (!empty($size)) {
             if (!empty($this->imageSizes[$size])) {
                 $thumbFilePath = "data/upload/thumbs/{$attachment->id}_{$size}";
-                
+
                 if (!file_exists($thumbFilePath)) {
                     $targetImage = $this->getThumbImage($filePath, $fileType, $size);
                     ob_start();
-                    
+
                     switch ($fileType) {
                         case 'image/jpeg':
                             imagejpeg($targetImage);
@@ -117,12 +116,12 @@ class Image extends \Espo\Core\EntryPoints\Base
                     $this->getContainer()->get('fileManager')->putContents($thumbFilePath, $contents);
                 }
                 $filePath = $thumbFilePath;
-        
+
             } else {
                 throw new Error();
             }
         }
-        
+
         if (!empty($size)) {
             $fileName = $attachment->id . '_' . $size . '.jpg';
         } else {
@@ -143,12 +142,12 @@ class Image extends \Espo\Core\EntryPoints\Base
         readfile($filePath);
         exit;
     }
-    
+
     protected function getThumbImage($filePath, $fileType, $size)
     {
         list($originalWidth, $originalHeight) = getimagesize($filePath);
         list($width, $height) = $this->imageSizes[$size];
-    
+
         if ($originalWidth <= $width && $originalHeight <= $height) {
             $targetWidth = $originalWidth;
             $targetHeight = $originalHeight;
@@ -169,7 +168,7 @@ class Image extends \Espo\Core\EntryPoints\Base
                 }
             }
         }
-                
+
         $targetImage = imagecreatetruecolor($targetWidth, $targetHeight);
         switch ($fileType) {
             case 'image/jpeg':
@@ -189,8 +188,8 @@ class Image extends \Espo\Core\EntryPoints\Base
                 imagecopyresampled($targetImage, $sourceImage, 0, 0, 0, 0, $targetWidth, $targetHeight, $originalWidth, $originalHeight);
                 break;
         }
-        
-        
+
+
         return $targetImage;
     }
 }

application/Espo/EntryPoints/Pdf.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\EntryPoints;
+
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Htmlizer\Htmlizer;
+
+
+class Pdf extends \Espo\Core\EntryPoints\Base
+{
+    public static $authRequired = true;
+
+    public function run()
+    {
+
+        if (empty($_GET['entityId']) || empty($_GET['entityType']) || empty($_GET['templateId'])) {
+            throw new BadRequest();
+        }
+        $entityId = $_GET['entityId'];
+        $entityType = $_GET['entityType'];
+        $templateId = $_GET['templateId'];
+
+        $entity = $this->getEntityManager()->getEntity($entityType, $entityId);
+        $template = $this->getEntityManager()->getEntity('Template', $templateId);
+
+        $this->getContainer()->get('serviceFactory')->create($entityType)->loadAdditionalFields($entity);
+
+        if (!$entity || !$template) {
+            throw new NotFound();
+        }
+
+        if ($template->get('entityType') !== $entityType) {
+            throw new Forbidden();
+        }
+
+        if (!$this->getAcl()->check($entity, 'read') || !$this->getAcl()->check($template, 'read')) {
+            throw new Forbidden();
+        }
+
+        $fileName = $entity->get('name') . '.pdf';
+
+        $htmlizer = new Htmlizer($this->getFileManager(), $this->getDateTime(), $this->getNumber());
+
+        $pdf = new \Espo\Core\Pdf\Tcpdf();
+        $pdf->setFont('freesans', '', 12, '', true);
+        $pdf->setPrintHeader(false);
+
+        $pdf->setAutoPageBreak(true, $template->get('bottomMargin'));
+        $pdf->setMargins($template->get('leftMargin'), $template->get('topMargin'), $template->get('rightMargin'));
+
+
+        if ($template->get('printFooter')) {
+            $htmlFooter = $htmlizer->render($entity, $template->get('footer'));
+            $pdf->setFooterPosition($template->get('footerPosition'));
+            $pdf->setFooterHtml($htmlFooter);
+        } else {
+            $pdf->setPrintFooter(false);
+        }
+
+        $pdf->addPage();
+
+        $htmlHeader = $htmlizer->render($entity, $template->get('header'));
+        $pdf->writeHTML($htmlHeader, true, false, true, false, '');
+
+        $htmlBody = $htmlizer->render($entity, $template->get('body'));
+        $pdf->writeHTML($htmlBody, true, false, true, false, '');
+
+        $pdf->output($fileName);
+
+        exit;
+    }
+}
+

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

@@ -1,4 +1,4 @@
-<?php
+<?php
 /************************************************************************
  * This file is part of EspoCRM.
  *
@@ -27,16 +27,16 @@ use \Espo\ORM\Entity;
 class EmailReminder
 {
     protected $entityManager;
-    
+
     protected $mailSender;
-    
+
     protected $config;
-    
+
     protected $dateTime;
-    
+
     protected $language;
-    
-    
+
+
     public function __construct($entityManager, $mailSender, $config, $dateTime, $language)
     {
         $this->entityManager = $entityManager;
@@ -45,17 +45,17 @@ class EmailReminder
         $this->dateTime = $dateTime;
         $this->language = $language;
     }
-    
+
     protected function getEntityManager()
     {
         return $this->entityManager;
     }
-    
+
     protected function parseInvitationTemplate($contents, $entity, $user = null)
     {
-        
+
         $contents = str_replace('{eventType}', strtolower($this->language->translate($entity->getEntityName(), 'scopeNames')), $contents);
-        
+
         $preferences = $this->getEntityManager()->getEntity('Preferences', $user->id);
         $timezone = $preferences->get('timeZone');
 
@@ -103,7 +103,7 @@ class EmailReminder
 
         return file_get_contents($fileName);
     }
-    
+
     public function send(Entity $reminder)
     {
         $user = $this->getEntityManager()->getEntity('User', $reminder->get('userId'));
@@ -123,7 +123,7 @@ class EmailReminder
 
         $subject = $this->parseInvitationTemplate($subjectTpl, $entity, $user);
         $subject = str_replace(array("\n", "\r"), '', $subject);
-        
+
         $body = $this->parseInvitationTemplate($bodyTpl, $entity, $user);
 
         $email->set('subject', $subject);
@@ -134,7 +134,7 @@ class EmailReminder
         $emailSender = $this->mailSender;
 
         $emailSender->send($email);
-       
+
         $this->getEntityManager()->removeEntity($email);
     }
 }

application/Espo/Modules/Crm/Controllers/Activities.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;
 
@@ -29,7 +29,7 @@ use \Espo\Core\Exceptions\Error,
 class Activities extends \Espo\Core\Controllers\Base
 {
     public static $defaultAction = 'index';
-    
+
     public function actionListCalendarEvents($params, $data, $request)
     {
         if (!$this->getAcl()->check('Calendar')) {
@@ -38,12 +38,12 @@ class Activities extends \Espo\Core\Controllers\Base
 
         $from = $request->get('from');
         $to = $request->get('to');
-        
+
         if (empty($from) || empty($to)) {
             throw new BadRequest();
         }
-        
-        
+
+
         $service = $this->getService('Activities');
         return $service->getEvents($this->getUser()->id, $from, $to);
     }
@@ -51,7 +51,7 @@ class Activities extends \Espo\Core\Controllers\Base
     public function actionPopupNotifications()
     {
         $userId = $this->getUser()->id;
-        
+
         return $this->getService('Activities')->getPopupNotifications($userId);
     }
 
@@ -72,30 +72,37 @@ class Activities extends \Espo\Core\Controllers\Base
     public function actionList($params, $data, $request)
     {
         $name = $params['name'];
-        
-        if (!in_array($name, array('activities', 'history'))) {
+
+        if (!in_array($name, ['activities', 'history'])) {
             throw new BadRequest();
         }
-        
-        $entityName = $params['scope'];
+
+        if (empty($params['scope'])) {
+            throw new BadRequest();
+        }
+        if (empty($params['id'])) {
+            throw new BadRequest();
+        }
+
+        $entityType = $params['scope'];
         $id = $params['id'];
-        
+
         $offset = intval($request->get('offset'));
         $maxSize = intval($request->get('maxSize'));
         $asc = $request->get('asc') === 'true';
         $sortBy = $request->get('sortBy');
         $where = $request->get('where');
-        
+
         $scope = null;
-        if (!empty($where) && !empty($where['scope']) && $where['scope'] !== 'false') {
-            $scope = $where['scope'];
+        if (is_array($where) && !empty($where[0]) && $where[0] !== 'false') {
+            $scope = $where[0];
         }
-        
+
         $service = $this->getService('Activities');
 
         $methodName = 'get' . ucfirst($name);
-        
-        return $service->$methodName($entityName, $id, array(
+
+        return $service->$methodName($entityType, $id, array(
             'scope' => $scope,
             'offset' => $offset,
             'maxSize' => $maxSize,

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

@@ -0,0 +1,28 @@
+<?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\Modules\Crm\Controllers;
+
+class DocumentFolder extends \Espo\Core\Templates\Controllers\CategoryTree
+{
+
+}

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

@@ -22,7 +22,27 @@
 
 namespace Espo\Modules\Crm\Controllers;
 
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+
 class TargetList extends \Espo\Core\Controllers\Record
 {
+	public function actionUnlinkAll($params, $data, $request)
+	{
+		if (!$request->isPost()) {
+			throw new BadRequest();
+		}
+
+		if (empty($data['id'])) {
+			throw new BadRequest();
+		}
+
+		if (empty($data['link'])) {
+			throw new BadRequest();
+		}
+
+		return $this->getRecordService()->unlinkAll($data['id'], $data['link']);
+	}
 
 }

application/Espo/Modules/Crm/Entities/Document.php

@@ -18,11 +18,11 @@
  *
  * 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;
 
-class Document extends \Espo\Core\Entities\Person
+class Document extends \Espo\Core\ORM\Entity
 {
 
 }

application/Espo/Modules/Crm/Entities/DocumentFolder.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\Modules\Crm\Entities;
+
+class DocumentFolder extends \Espo\Core\Templates\Entities\CategoryTree
+{
+
+}
+

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

@@ -92,6 +92,10 @@ class Contact extends \Espo\Core\ORM\Repositories\RDB
             }
         }
 
+        if ($entity->has('targetListId') && $entity->isNew()) {
+            $this->relate($entity, 'targetLists', $entity->get('targetListId'));
+        }
+
         return $result;
     }
 }

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

@@ -0,0 +1,27 @@
+<?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\Modules\Crm\Repositories;
+
+class DocumentFolder extends \Espo\Core\Repositories\CategoryTree
+{
+}

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

@@ -91,8 +91,6 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
         }
 
         return $reminders;
-
-        $entity->set('reminders', $reminders);
     }
 
     protected function afterSave(Entity $entity, array $options)

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

@@ -10,16 +10,21 @@
         "sicCode": "WKN Nummer",
         "industry": "Branche",
         "type": "Typ",
-        "contactRole": "Rolle"
+        "contactRole": "Funktion",
+        "campaign": "Kampagne"
     },
     "links": {
         "contacts": "Kontakte",
         "opportunities": "Verkaufschancen",
         "cases": "Fälle",
         "documents": "Dokumente",
-        "meetingsPrimary": "Meetings (intern)",
-        "callsPrimary": "Anrufe (intern)",
-        "tasksPrimary": "Aufgaben (intern)"
+        "meetingsPrimary": "Meetings (erweitert)",
+        "callsPrimary": "Anrufe (erweitert)",
+        "tasksPrimary": "Aufgaben (erweitert)",
+        "emailsPrimary": "E-Mails (erweitert)",
+        "targetLists": "Kontaktlisten",
+        "campaignLogRecords": "Kampagnen Log",
+        "campaign": "Kampagne"
     },
     "options": {
         "type": {
@@ -49,7 +54,7 @@
             "Real Estate": "Immobilien",
             "Service": "Dienstleistung",
             "Sports": "Sport",
-            "Sofware": "Software",
+            "Software": "Software",
             "Technology": "Technologie",
             "Telecommunications": "Telekommunikation",
             "Television": "Fernsehen",
@@ -60,5 +65,9 @@
     "labels": {
         "Create Account": "Firma erstellen",
         "Copy Billing": "Rechnungsadresse kopieren"
+    },
+    "presetFilters": {
+        "customers": "Kunden",
+        "partners": "Partner"
     }
 }

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

@@ -1,5 +1,6 @@
 {
     "layouts": {
-        "detailConvert": "Interessent umwandeln"
+        "detailConvert": "Interessent umwandeln",
+        "listForAccount": "Liste (für Firma)"
     }
 }

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

@@ -14,7 +14,8 @@
         "reminders": "Erinnerungen",
         "account": "Firma"
     },
-    "links": {},
+    "links": {
+    },
     "options": {
         "status": {
             "Planned": "Geplant",
@@ -32,6 +33,10 @@
             "Tentative": "Mit Vorbehalt"
         }
     },
+    "massActions": {
+        "setHeld": "Auf gehalten setzen",
+        "setNotHeld": "Auf nicht gehalten setzen"
+    },
     "labels": {
         "Create Call": "Anruf erstellen",
         "Set Held": "Auf gehalten setzen",

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

@@ -0,0 +1,55 @@
+{
+    "fields": {
+        "name": "Name",
+        "description": "Beschreibung",
+        "status": "Status",
+        "type": "Typ",
+        "startDate": "Startdatum",
+        "endDate": "Enddatum",
+        "targetLists": "Kontaktlisten",
+        "sentCount": "Gesendet",
+        "openedCount": "Geöffnet",
+        "clickedCount": "Geklickt",
+        "optedOutCount": "Keine E-Mails",
+        "bouncedCount": "Nicht zustellbar",
+        "hardBouncedCount": "Hard Bounced",
+        "softBouncedCount": "Soft Bounced",
+        "leadCreatedCount": "Erstellte Interessenten",
+        "revenue": "Umsatz",
+        "revenueConverted": "Umsatz (konvertiert)"
+    },
+    "links": {
+        "targetLists": "Kontaktlisten",
+        "accounts": "Firmen",
+        "contacts": "Kontakte",
+        "leads": "Interessenten",
+        "opportunities": "Verkaufschancen",
+        "campaignLogRecords": "Protokoll"
+    },
+    "options": {
+        "type": {
+            "Email": "E-Mail",
+            "Web": "Web",
+            "Television": "Fernsehen",
+            "Radio": "Radio Button",
+            "Newsletter": "Newsletter",
+            "Mail": "Mail"
+        },
+        "status": {
+            "Planning": "Planung",
+            "Active": "Aktiv",
+            "Inactive": "Inaktiv",
+            "Complete": "Fertig"
+        }
+    },
+    "labels": {
+        "Create Campaign": "Neue Kampagne",
+        "Target Lists": "Kontaktlisten",
+        "Statistics": "Statistik",
+        "hard": "hart",
+        "soft": "weich"
+    },
+    "presetFilters": {
+        "active": "Aktiv"
+    }
+}

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

@@ -0,0 +1,24 @@
+{
+    "fields": {
+        "action": "Aktion",
+        "actionDate": "Datum",
+        "data": "Daten",
+        "campaign": "Kampagne",
+        "parent": "Zielkontakt",
+        "object": "Objekt",
+        "application": "Applikation"
+    },
+    "options": {
+    	"action": {
+            "Sent": "Gesendet",
+            "Opened": "Geöffnet",
+            "Opted Out": "Keine E-Mails",
+            "Bounced": "Nicht zustellbar",
+            "Clicked": "Geklickt",
+            "Lead Created": "Interessent erstellt"
+    	}
+    },
+    "labels": {
+        "All": "Alle"
+    }
+}

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

@@ -9,7 +9,8 @@
         "type": "Typ",
         "description": "Beschreibung"
     },
-    "links": {},
+    "links": {
+    },
     "options": {
         "status": {
             "New": "Neu",
@@ -19,7 +20,7 @@
             "Rejected": "Abgelehnt",
             "Duplicate": "Duplizieren"
         },
-        "priority": {
+        "priority" : {
             "Low": "Niedrig",
             "Normal": "Normal",
             "High": "Hoch",

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

@@ -10,12 +10,18 @@
         "doNotCall": "Nicht anrufen",
         "address": "Adresse",
         "opportunityRole": "Verkaufschance Rolle",
-        "accountRole": "Rolle",
-        "description": "Beschreibung"
+        "accountRole": "Funktion",
+        "description": "Beschreibung",
+        "campaign": "Kampagne",
+        "targetLists": "Kontaktlisten",
+        "targetList": "Kontaktliste"
     },
     "links": {
         "opportunities": "Verkaufschancen",
-        "cases": "Fälle"
+        "cases": "Fälle",
+        "targetLists": "Kontaktlisten",
+        "campaignLogRecords": "Kampagnen Log",
+        "campaign": "Kampagne"
     },
     "labels": {
         "Create Contact": "Kontakt erstellen"

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

@@ -11,11 +11,14 @@
         "source": "Quelle",
         "publishDate": "Veröffentlichungsdatum",
         "expirationDate": "Ablaufdatum",
-        "description": "Beschreibung"
+        "description": "Beschreibung",
+        "accounts": "Firmen",
+        "folder": "Ordner"
     },
     "links": {
         "accounts": "Firmen",
-        "opportunities": "Verkaufschancen"
+        "opportunities": "Verkaufschancen",
+        "folder": "Ordner"
     },
     "options": {
         "status": {
@@ -23,6 +26,13 @@
             "Draft": "Entwurf",
             "Expired": "Abgelaufen",
             "Canceled": "Storniert"
+        },
+        "type": {
+            "": "Kein(e)",
+            "Contract": "Vertrag",
+            "NDA": "NDA",
+            "EULA": "EULA",
+            "License Agreement": "Lizenz Vereinbarung"
         }
     },
     "presetFilters": {

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

@@ -0,0 +1,9 @@
+{
+    "labels": {
+        "Create DocumentFolder": "Dokumente Ordner erstellen",
+        "Manage Categories": "Ordner verwalten"
+    },
+    "links": {
+        "documents": "Dokumente"
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "labels": {
+        "Create Lead": "Interessent erstellen",
+        "Create Contact": "Kontakt erstellen",
+        "Create Task": "Neue Aufgabe",
+        "Create Case": "Fall erstellen"
+    }
+}

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

@@ -10,8 +10,10 @@
         "Call": "Anruf",
         "Task": "Aufgabe",
         "Case": "Fall",
-        "InboundEmail": "Eingehende E-Mails",
-        "Document": "Dokument"
+        "Document": "Dokument",
+        "DocumentFolder": "Dokumente Ordner",
+        "Campaign": "Kampagne",
+        "TargetList": "Kontaktliste"
     },
     "scopeNamesPlural": {
         "Account": "Firmen",
@@ -24,8 +26,10 @@
         "Call": "Anrufe",
         "Task": "Aufgaben",
         "Case": "Fälle",
-        "InboundEmail": "Eingehende E-Mails",
-        "Document": "Dokumente"
+        "Document": "Dokumente",
+        "DocumentFolder": "Dokumente Ordner",
+        "Campaign": "Kampagnen",
+        "TargetList": "Kontaktlisten"
     },
     "dashlets": {
         "Leads": "Meine Interessenten",
@@ -38,7 +42,7 @@
         "OpportunitiesByStage": "Verkaufschancen nach Verkaufsphase",
         "OpportunitiesByLeadSource": "Verkaufschancen nach Quelle",
         "SalesByMonth": "Umsätze nach Monat",
-        "SalesPipeline": "Verkaufspipeline"    
+        "SalesPipeline": "Verkaufspipeline"
     },
     "labels": {
         "Create InboundEmail": "Eingehende E-Mail erstellen",
@@ -58,17 +62,17 @@
         "billingAddressCity": "Ort",
         "billingAddressCountry": "Land",
         "billingAddressPostalCode": "PLZ",
-        "billingAddressState": "Bundesland\/Kanton",
+        "billingAddressState": "Bundesland/Kanton",
         "billingAddressStreet": "Straße",
         "addressCity": "Ort",
         "addressStreet": "Straße",
         "addressCountry": "Land",
-        "addressState": "Bundesland\/Kanton",
+        "addressState": "Bundesland/Kanton",
         "addressPostalCode": "PLZ",        
         "shippingAddressCity": "Ort (Lieferadresse)",
         "shippingAddressStreet": "Straße (Lieferadresse)",
         "shippingAddressCountry": "Land (Lieferadresse)",
-        "shippingAddressState": "Bundesland\/Kanton (Lieferadresse)",
+        "shippingAddressState": "Bundesland/Kanton (Lieferadresse)",
         "shippingAddressPostalCode": "PLZ (Lieferadresse)"
     },
     "links": {

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

@@ -20,9 +20,16 @@
         "description": "Beschreibung",
         "createdAccount": "Firma",
         "createdContact": "Kontakt",
-        "createdOpportunity": "Verkaufschance"
+        "createdOpportunity": "Verkaufschance",
+        "campaign": "Kampagne",
+        "targetLists": "Kontaktlisten",
+        "targetList": "Kontaktliste"
+    },
+    "links": {
+        "targetLists": "Kontaktlisten",
+        "campaignLogRecords": "Kampagnen Log",
+        "campaign": "Kampagne"
     },
-    "links": {},
     "options": {
         "status": {
             "New": "Neu",
@@ -33,6 +40,7 @@
             "Dead": "'Gestorben'"
         },
         "source": {
+            "": "Kein(e)",
             "Call": "Anruf",
             "Email": "E-Mail",
             "Existing Customer": "Bestehender Kunde",
@@ -44,6 +52,7 @@
         }
     },
     "presetFilters": {
-        "active": "Aktiv"
+        "active": "Aktiv",
+        "converted": "Umgewandelt"
     }
 }

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

@@ -13,7 +13,8 @@
         "reminders": "Erinnerungen",
         "account": "Firma"
     },
-    "links": {},
+    "links": {
+    },
     "options": {
         "status": {
             "Planned": "Geplant",
@@ -27,13 +28,17 @@
             "Tentative": "Mit Vorbehalt"
         }
     },
+    "massActions": {
+        "setHeld": "Auf gehalten setzen",
+        "setNotHeld": "Auf nicht gehalten setzen"
+    },
     "labels": {
         "Create Meeting": "Meeting erstellen",
         "Set Held": "Auf gehalten setzen",
         "Set Not Held": "Auf nicht gehalten setzen",
         "Send Invitations": "Einladungen versenden",
         "on time": "Aktuelle Zeit",
-        "before": "Bevor"
+        "before": "bevor"
     },
     "presetFilters": {
         "planned": "Geplant",

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

@@ -11,11 +11,13 @@
         "contacts": "Kontakte",
         "description": "Beschreibung",
         "amountConverted": "Betrag (konvertiert)",
-        "amountWeightedConverted": "Betrag gewichtet"
+        "amountWeightedConverted": "Betrag gewichtet",
+        "campaign": "Kampagne"
     },
     "links": {
         "contacts": "Kontakte",
-        "documents": "Dokumente"
+        "documents": "Dokumente",
+        "campaign": "Kampagne"
     },
     "options": {
         "stage": {
@@ -26,9 +28,9 @@
             "Id. Decision Makers": "Entscheider ident.",
             "Perception Analysis": "Analyse Sichtweise",
             "Proposal/Price Quote": "Preisangebot",
-            "Negotiation/Review": "Verhandlung\/Überarbeitung",
+            "Negotiation/Review": "Verhandlung/Überarbeitung",
             "Closed Won": "Gewonnen",
-            "Closed Lost": "Verloren" 
+            "Closed Lost": "Verloren"
         }
     },
     "labels": {

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

@@ -10,7 +10,8 @@
         "address": "Adresse",
         "description": "Beschreibung"
     },
-    "links": {},
+    "links": {
+    },
     "labels": {
         "Create Target": "Zielkontakt erstellen",
         "Convert to Lead": "Zu Interessent umwandeln"

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

@@ -0,0 +1,29 @@
+{
+    "fields": {
+        "name": "Name",
+        "description": "Beschreibung",
+        "entryCount": "Eingabezähler",
+        "campaigns": "Kampagnen",
+        "endDate": "Enddatum",
+        "targetLists": "Kontaktlisten"
+    },
+    "links": {
+        "accounts": "Firmen",
+        "contacts": "Kontakte",
+        "leads": "Interessenten",
+        "campaigns": "Kampagnen"
+    },
+    "options": {
+        "type": {
+            "Email": "E-Mail",
+            "Web": "Web",
+            "Television": "Fernsehen",
+            "Radio": "Radio Button",
+            "Newsletter": "Newsletter"
+        }
+    },
+    "labels": {
+        "Create TargetList": "Kontaktliste erstellen",
+        "Opted Out": "Keine E-Mails"
+    }
+}

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

@@ -5,19 +5,27 @@
         "status": "Status",
         "dateStart": "Startdatum",
         "dateEnd": "Fällig am",
+        "dateStartDate": "Startdatum (ganztägig)",
+        "dateEndDate": "Enddatum (ganztägig)",
         "priority": "Priorität",
         "description": "Beschreibung",
-        "isOverdue": "Ist überfällig"
+        "isOverdue": "Ist überfällig",
+        "account": "Firma",
+        "dateCompleted": "Datum erledigt",
+        "attachments": "Anhänge"
+    },
+    "links": {
+        "attachments": "Anhänge"
     },
-    "links": {},
     "options": {
         "status": {
             "Not Started": "Nicht begonnen",
             "Started": "In Bearbeitung",
             "Completed": "Abgeschlossen",
-            "Canceled": "Storniert"
+            "Canceled": "Storniert",
+            "Deferred": "Zurückgestellt"
         },
-        "priority": {
+        "priority" : {
             "Low": "Niedrig",
             "Normal": "Normal",
             "High": "Hoch",

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

@@ -0,0 +1,5 @@
+{
+    "links": {
+        "targetLists": "Kontaktlisten"
+    }
+}

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

@@ -23,7 +23,8 @@
         "tasksPrimary": "Tasks (expanded)",
         "emailsPrimary": "Emails (expanded)",
         "targetLists": "Target Lists",
-        "campaignLogRecords": "Campaign Log"
+        "campaignLogRecords": "Campaign Log",
+        "campaign": "Campaign"
     },
     "options": {
         "type": {

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

@@ -15,7 +15,8 @@
         "hardBouncedCount": "Hard Bounced",
         "softBouncedCount": "Soft Bounced",
         "leadCreatedCount": "Leads Created",
-        "revenue": "Revenue"
+        "revenue": "Revenue",
+        "revenueConverted": "revenue (converted)"
     },
     "links": {
         "targetLists": "Target Lists",

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

@@ -20,7 +20,8 @@
         "opportunities": "Opportunities",
         "cases": "Cases",
         "targetLists": "Target Lists",
-        "campaignLogRecords": "Campaign Log"
+        "campaignLogRecords": "Campaign Log",
+        "campaign": "Campaign"
     },
     "labels": {
         "Create Contact": "Create Contact"

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

@@ -11,11 +11,14 @@
         "source": "Source",
         "publishDate": "Publish Date",
         "expirationDate": "Expiration Date",
-        "description": "Description"
+        "description": "Description",
+        "accounts": "Accounts",
+        "folder": "Folder"
     },
     "links": {
         "accounts": "Accounts",
-        "opportunities": "Opportunities"
+        "opportunities": "Opportunities",
+        "folder": "Folder"
     },
     "options": {
         "status": {
@@ -23,6 +26,13 @@
             "Draft": "Draft",
             "Expired": "Expired",
             "Canceled": "Canceled"
+        },
+        "type": {
+            "": "None",
+            "Contract": "Contract",
+            "NDA": "NDA",
+            "EULA": "EULA",
+            "License Agreement": "License Agreement"
         }
     },
     "presetFilters": {

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

@@ -0,0 +1,9 @@
+{
+    "labels": {
+        "Create DocumentFolder": "Create Document Folder",
+        "Manage Categories": "Manage Folders"
+    },
+    "links": {
+        "documents": "Documents"
+    }
+}

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

@@ -2,6 +2,7 @@
     "labels": {
         "Create Lead": "Create Lead",
         "Create Contact": "Create Contact",
-        "Create Task": "Create Task"
+        "Create Task": "Create Task",
+        "Create Case": "Create Case"
     }
 }

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

@@ -11,6 +11,7 @@
         "Task": "Task",
         "Case": "Case",
         "Document": "Document",
+        "DocumentFolder": "Document Folder",
         "Campaign": "Campaign",
         "TargetList": "Target List"
     },
@@ -26,6 +27,7 @@
         "Task": "Tasks",
         "Case": "Cases",
         "Document": "Documents",
+        "DocumentFolder": "Document Folders",
         "Campaign": "Campaigns",
         "TargetList": "Target Lists"
     },
@@ -40,7 +42,7 @@
         "OpportunitiesByStage": "Opportunities by Stage",
         "OpportunitiesByLeadSource": "Opportunities by Lead Source",
         "SalesByMonth": "Sales by Month",
-        "SalesPipeline": "Sales Pipeline"    
+        "SalesPipeline": "Sales Pipeline"
     },
     "labels": {
         "Create InboundEmail": "Create Inbound Email",

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

@@ -27,7 +27,8 @@
     },
     "links": {
         "targetLists": "Target Lists",
-        "campaignLogRecords": "Campaign Log"
+        "campaignLogRecords": "Campaign Log",
+        "campaign": "Campaign"
     },
     "options": {
         "status": {
@@ -39,6 +40,7 @@
             "Dead": "Dead"
         },
         "source": {
+            "": "None",
             "Call": "Call",
             "Email": "Email",
             "Existing Customer": "Existing Customer",

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

@@ -16,7 +16,8 @@
     },
     "links": {
         "contacts": "Contacts",
-        "documents": "Documents"
+        "documents": "Documents",
+        "campaign": "Campaign"
     },
     "options": {
         "stage": {

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

@@ -23,6 +23,7 @@
         }
     },
     "labels": {
-        "Create TargetList": "Create Target List"
+        "Create TargetList": "Create Target List",
+        "Opted Out": "Opted Out"
     }
 }

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

@@ -11,11 +11,14 @@
         "source": "Fuente",
         "publishDate": "Publicar Fecha",
         "expirationDate": "Fecha de Expiración",
-        "description": "Descripción"
+        "description": "Descripción",
+        "folder": "Carpeta"
     },
     "links": {
         "accounts": "Cuentas",
-        "opportunities": "Oportunidades"
+        "opportunities": "Oportunidades",
+        "accounts": "Cuentas",
+        "folder": "Carpeta"
     },
     "options": {
         "status": {

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

@@ -16,7 +16,7 @@
     "links": {
         "contacts": "Контакти",
         "opportunities": "Угоди",
-        "cases": "Кейси",
+        "cases": "Звернення",
         "documents": "Документи",
         "meetingsPrimary": "Meetings (expanded)",
         "callsPrimary": "Calls (expanded)",
@@ -37,7 +37,7 @@
             "Advertising": "Реклама",
             "Apparel & Accessories": "Одяг та аксесуари",
             "Automotive": "Автомобільні",
-            "Banking": "Банкінґ",
+            "Banking": "Банкінг",
             "Biotechnology": "Біотехнології",
             "Chemical": "Хемія",
             "Computer": "Комп'ютери",
@@ -53,8 +53,8 @@
             "Real Estate": "Нерухомість",
             "Service": "Сервіс",
             "Sports": "Спорт",
-            "Software": "Проґрамне забезпечення",
-            "Technology": "Технолоґія",
+            "Software": "Програмне забезпечення",
+            "Technology": "Технологія",
             "Telecommunications": "Телекомунікації",
             "Television": "Телебачення",
             "Transportation": "Транспорт",
@@ -62,7 +62,7 @@
         }
     },
     "labels": {
-        "Create Account": "Створити контраґента",
+        "Create Account": "Створити контрагента",
         "Copy Billing": "Копія рахунку"
     },
     "presetFilters": {

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

@@ -2,7 +2,7 @@
     "fields": {
         "name": "Ім'я",
         "parent": "Джерело",
-        "status": "статус",
+        "status": "Статус",
         "dateStart": "Дата початку",
         "dateEnd": "Дата закінчення",
         "direction": "Напрямок",
@@ -12,7 +12,7 @@
         "contacts": "Контакти",
         "leads": "Ліди",
         "reminders": "Нагадування",
-        "account": "Контраґент"
+        "account": "Контрагент"
     },
     "links": {
     },

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

@@ -2,7 +2,7 @@
     "fields": {
         "name": "Ім'я",
         "description": "Опис",
-        "status": "статус",
+        "status": "Статус",
         "type": "Тип",
         "startDate": "Дата Початку",
         "endDate": "Дата Закінчення",
@@ -19,7 +19,7 @@
     },
     "links": {
         "targetLists": "Цільові списки",
-        "accounts": "Контраґенти",
+        "accounts": "Контрагенти",
         "contacts": "Контакти",
         "leads": "Ліди",
         "opportunities": "Угоди",

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

@@ -1,9 +1,9 @@
 {
     "fields": {
         "name": "Ім'я",
-        "number": "Нумер",
-        "status": "статус",
-        "account": "Контраґент",
+        "number": "Номер",
+        "status": "Статус",
+        "account": "Контрагент",
         "contact": "Контакт",
         "priority": "Пріоритет",
         "type": "Тип",

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

@@ -3,10 +3,10 @@
         "name": "Ім'я",
         "emailAddress": "Емейл",
         "title": "Посада",
-        "account": "Контраґент",
-        "accounts": "Контраґенти",
+        "account": "Контрагент",
+        "accounts": "Контрагенти",
         "phoneNumber": "Телефон",
-        "accountType": "Тип контраґента",
+        "accountType": "Тип контрагента",
         "doNotCall": "Не дзвонити",
         "address": "Адреса",
         "opportunityRole": "Роль угоди",
@@ -18,7 +18,7 @@
     },
     "links": {
         "opportunities": "Угоди",
-        "cases": "Кейси",
+        "cases": "Звернення",
         "targetLists": "Цільові списки",
         "campaignLogRecords": "Журнал кампанія"
     },

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

@@ -5,7 +5,7 @@
     },
     "fields": {
         "name": "Ім'я",
-        "status": "статус",
+        "status": "Статус",
         "file": "Файл",
         "type": "Тип",
         "source": "Джерело",
@@ -14,7 +14,7 @@
         "description": "Опис"
     },
     "links": {
-        "accounts": "Контраґенти",
+        "accounts": "Контрагенти",
         "opportunities": "Угоди"
     },
     "options": {

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

@@ -1,6 +1,6 @@
 {
     "scopeNames": {
-        "Account": "Контраґент",
+        "Account": "Контрагент",
         "Contact": "Контакт",
         "Lead": "Лід",
         "Target": "Ціль",
@@ -15,7 +15,7 @@
         "TargetList": "Цільовий список"
     },
     "scopeNamesPlural": {
-        "Account": "Контраґенти",
+        "Account": "Контрагенти",
         "Contact": "Контакти",
         "Lead": "Ліди",
         "Target": "Цілі",
@@ -24,7 +24,7 @@
         "Calendar": "Календар",
         "Call": "Дзвінки",
         "Task": "Завдання",
-        "Case": "Кейси",
+        "Case": "Звернення",
         "Document": "Документи",
         "Campaign": "Кампанії",
         "TargetList": "Цільові списки"
@@ -33,40 +33,40 @@
         "Leads": "Мої ліди",
         "Opportunities": "Мої угоди",
         "Tasks": "Мої завдання",
-        "Cases": "Мої кейси",
+        "Cases": "Мої звернення",
         "Calendar": "Календар",
         "Calls": "Мої дзвінки",
         "Meetings": "Мої зустрічі",
         "OpportunitiesByStage": "Угоди на стадії",
         "OpportunitiesByLeadSource": "Угоди за джерелом лідів",
         "SalesByMonth": "Продажі по місяцях",
-        "SalesPipeline": "Джерела продажу"    
+        "SalesPipeline": "Джерела продажу"
     },
     "labels": {
         "Create InboundEmail": "Створити вхідну пошту",
         "Activities": "Заходи",
         "History": "Історія",
         "Attendees": "Учасники",
-        "Schedule Meeting": "Розклад зустрічей",
-        "Schedule Call": "Розклад дзвінків",
+        "Schedule Meeting": "Запланувати зустріч",
+        "Schedule Call": "Запланувати дзвінок",
         "Compose Email": "Написати емейл",
-        "Log Meeting": "Протокол зустрічей",
-        "Log Call": "Протокол дзвінків",
-        "Archive Email": "Архівувати листа",
+        "Log Meeting": "Записати зустріч",
+        "Log Call": "Записати дзвінок",
+        "Archive Email": "Записати емейл",
         "Create Task": "Створити завдання",
-        "Tasks": "Завдання"        
+        "Tasks": "Завдання"
     },
     "fields": {
         "billingAddressCity": "Місто",
         "billingAddressCountry": "Країна",
         "billingAddressPostalCode": "Поштовий індекс",
-        "billingAddressState": "Реґіон",
+        "billingAddressState": "Регіон",
         "billingAddressStreet": "Вулиця",
         "addressCity": "Місто",
         "addressStreet": "Вулиця",
         "addressCountry": "Країна",
-        "addressState": "Реґіон",
-        "addressPostalCode": "Поштовий індекс",        
+        "addressState": "Регіон",
+        "addressPostalCode": "Поштовий індекс",
         "shippingAddressCity": "Місто доставки",
         "shippingAddressStreet": "Вулиця доставки",
         "shippingAddressCountry": "Країна доставки",
@@ -76,16 +76,16 @@
     "links": {
         "contacts": "Контакти",
         "opportunities": "Угоди",
-        "leads": "Ліди",        
+        "leads": "Ліди",
         "meetings": "Зустрічі",
         "calls": "Дзвінки",
         "tasks": "Завдання",
         "emails": "Листи",
-        "accounts": "Контраґенти",
-        "cases": "Кейси",
+        "accounts": "Контрагенти",
+        "cases": "Звернення",
         "documents": "Документи",
-        "account": "Контраґент",
-        "opportunity": "Угода",        
+        "account": "Контрагент",
+        "opportunity": "Угода",
         "contact": "Контакт",
         "parent": "Джерело"
     },

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

@@ -2,7 +2,7 @@
     "fields": {
         "name": "Ім'я",
         "team": "Команда",
-        "status": "статус",
+        "status": "Статус",
         "assignToUser": "Зв'язатися з користувачем",
         "host": "Хост",
         "username": "Ім'я користувача",

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

@@ -10,15 +10,15 @@
         "title": "Посада",
         "website": "Вебсайт",
         "phoneNumber": "Телефон",
-        "accountName": "Ім'я контраґента",
+        "accountName": "Ім'я контрагента",
         "doNotCall": "Не дзвонити",
         "address": "Адреса",
-        "status": "статус",
+        "status": "Статус",
         "source": "Джерело",
         "opportunityAmount": "Сума угоди",
         "opportunityAmountConverted": "Сума угоди (конвертована)",
         "description": "Опис",
-        "createdAccount": "Контраґент",
+        "createdAccount": "Контрагент",
         "createdContact": "Контакт",
         "createdOpportunity": "Угода",
         "campaign": "Кампанія",

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

@@ -2,7 +2,7 @@
     "fields": {
         "name": "Ім'я",
         "parent": "Джерело",
-        "status": "статус",
+        "status": "Статус",
         "dateStart": "Дата початку",
         "dateEnd": "Дата закінчення",
         "duration": "Тривалість",

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

@@ -1,7 +1,7 @@
 {
     "fields": {
         "name": "Ім'я",
-        "account": "Контраґент",
+        "account": "Контрагент",
         "stage": "Стадія",
         "amount": "Сума",
         "probability": "Імовірність, %",
@@ -20,7 +20,7 @@
     },
     "options": {
         "stage": {
-            "Prospecting": "Проспектінґ",
+            "Prospecting": "Проспектінг",
             "Qualification": "Кваліфікація",
             "Needs Analysis": "Вимагає аналізу",
             "Value Proposition": "Цінова пропозиція",

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

@@ -4,7 +4,7 @@
         "emailAddress": "Емейл",
         "title": "Посада",
         "website": "Вебсайт",
-        "accountName": "Ім'я контраґента",
+        "accountName": "Ім'я контрагента",
         "phoneNumber": "Телефон",
         "doNotCall": "Не дзвонити",
         "address": "Адреса",

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

@@ -8,7 +8,7 @@
         "targetLists": "Цільові списки"
     },
     "links": {
-        "accounts": "Контраґенти",
+        "accounts": "Контрагенти",
         "contacts": "Контакти",
         "leads": "Ліди",
         "campaigns": "Кампанії"

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

@@ -2,7 +2,7 @@
     "fields": {
         "name": "Ім'я",
         "parent": "Джерело",
-        "status": "статус",
+        "status": "Статус",
         "dateStart": "Дата початку",
         "dateEnd": "Належна дата",
         "dateStartDate": "Date Start (all day)",
@@ -10,7 +10,7 @@
         "priority": "Пріоритет",
         "description": "Опис",
         "isOverdue": "Прострочено",
-        "account": "Контраґент",
+        "account": "Контрагент",
         "dateCompleted": "Date Completed",
         "attachments": "Вкладення"
     },

application/Espo/Modules/Crm/Resources/layouts/Account/detailSmall.json

@@ -1 +1,12 @@
-[{"label":"","rows":[[{"name":"name"}],[{"name":"website"}],[{"name":"emailAddress"}],[{"name":"phoneNumber"}]]}]
+[
+    {
+        "label":"",
+        "rows":[
+                [{"name":"name"}],
+                [{"name":"website"}],
+                [{"name":"emailAddress"}],
+                [{"name":"phoneNumber"}],
+                [{"name":"type"}, {"name":"industry"}]
+            ]
+        }
+]

application/Espo/Modules/Crm/Resources/layouts/Account/filters.json

@@ -4,5 +4,6 @@
 	"createdAt",
 	"emailAddress",
 	"industry",
+    "phoneNumber",
 	"type"
 ]