css fix

Gruntfile.js

@@ -190,6 +190,7 @@ module.exports = function (grunt) {
                     'extension.php',
                     'websocket.php',
                     'command.php',
+                    'oauth-callback.php',
                     'index.php',
                     'LICENSE.txt',
                     '.htaccess',

application/Espo/Acl/Note.php

@@ -46,6 +46,21 @@ class Note extends \Espo\Core\Acl\Base
         return false;
     }
 
+    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('parentId') && $entity->get('parentType')) {
+            $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
+            if ($parent) {
+                if ($this->getAclManager()->checkEntity($user, $parent, 'stream')) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        return true;
+    }
+
     public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
     {
         if ($user->isAdmin()) {

application/Espo/AclPortal/Note.php

@@ -41,5 +41,26 @@ class Note extends \Espo\Core\AclPortal\Base
         }
         return false;
     }
-}
 
+    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('type') !== 'Post') return false;
+
+        if ($entity->get('type') === 'Post' && $entity->get('targetType')) {
+            return false;
+        }
+
+        if (!$entity->get('parentId') || !$entity->get('parentType')) {
+            return false;
+        }
+
+        $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        if ($parent) {
+            if ($this->getAclManager()->checkEntity($user, $parent, 'stream')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

application/Espo/Controllers/ExternalAccount.php

@@ -47,17 +47,27 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
     public function actionList($params, $data, $request)
     {
         $integrations = $this->getEntityManager()->getRepository('Integration')->find();
-        $arr = array();
+
+        $list = [];
         foreach ($integrations as $entity) {
             if ($entity->get('enabled') && $this->getMetadata()->get('integrations.' . $entity->id .'.allowUserAccounts')) {
-                $arr[] = array(
+
+                $userAccountAclScope = $this->getMetadata()->get(['integrations', $entity->id, 'userAccountAclScope']);
+
+                if ($userAccountAclScope) {
+                    if (!$this->getAcl()->checkScope($userAccountAclScope)) {
+                        continue;
+                    }
+                }
+
+                $list[] = [
                     'id' => $entity->id
-                );
+                ];
             }
         }
-        return array(
-            'list' => $arr
-        );
+        return [
+            'list' => $list
+        ];
     }
 
     public function actionGetOAuth2Info($params, $data, $request)

application/Espo/Controllers/FieldManager.php

@@ -121,6 +121,8 @@ class FieldManager extends \Espo\Core\Controllers\Base
 
         $this->getContainer()->get('fieldManager')->resetToDefault($data->scope, $data->name);
 
+        $this->getContainer()->get('dataManager')->clearCache();
+
         $this->getContainer()->get('dataManager')->rebuildMetadata();
 
         return true;

application/Espo/Controllers/LeadCapture.php

@@ -69,4 +69,11 @@ class LeadCapture extends \Espo\Core\Controllers\Record
 
         return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
     }
+
+    public function getActionSmtpAccountDataList()
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return $this->getServiceFactory()->create('LeadCapture')->getSmtpAccountDataList();
+    }
 }

application/Espo/Controllers/ScheduledJob.php

@@ -25,10 +25,12 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Controllers;
 
+use Espo\Core\Exceptions\Forbidden;
+
 class ScheduledJob extends \Espo\Core\Controllers\Record
 {
     protected function checkControllerAccess()

application/Espo/Controllers/ScheduledJobLogRecord.php

@@ -25,10 +25,12 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Controllers;
 
+use Espo\Core\Exceptions\Forbidden;
+
 class ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
 {
     protected function checkControllerAccess()
@@ -38,4 +40,3 @@ class ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
         }
     }
 }
-

application/Espo/Controllers/Settings.php

@@ -29,18 +29,22 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
 class Settings extends \Espo\Core\Controllers\Base
 {
-
     protected function getConfigData()
     {
         $data = $this->getServiceFactory()->create('Settings')->getConfigData();
 
-        $data->jsLibs = $this->getMetadata()->get('app.jsLibs');
+        $data->jsLibs = $this->getMetadata()->get(['app', 'jsLibs']);
+
+        unset($data->loginView);
+        $loginView = $this->getMetadata()->get(['clientDefs', 'App', 'loginView']);
+        if ($loginView) {
+            $data->loginView = $loginView;
+        }
 
         return $data;
     }

application/Espo/Core/Acl/GlobalRestricton.php

@@ -60,21 +60,45 @@ class GlobalRestricton
     public function __construct(
         \Espo\Core\Utils\Metadata $metadata,
         \Espo\Core\Utils\File\Manager $fileManager,
-        \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil
+        \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil,
+        bool $useCache = true
     )
     {
         $this->metadata = $metadata;
         $this->fileManager = $fileManager;
         $this->fieldManagerUtil = $fieldManagerUtil;
 
-        if (!file_exists($this->cacheFilePath)) {
-            $this->buildCacheFile();
+        $isFromCache = false;
+
+        if ($useCache) {
+            if (file_exists($this->cacheFilePath)) {
+                $this->data = include($this->cacheFilePath);
+                $isFromCache = true;
+
+                if (!($this->data instanceof \StdClass)) {
+                    $GLOBALS['log']->error("ACL GlobalRestricton: Bad data fetched from cache.");
+                    $this->data = null;
+                }
+            }
         }
 
-        $this->data = include($this->cacheFilePath);
+        if (!$this->data) {
+            $this->buildData();
+        }
+
+        if ($useCache) {
+            if (!$isFromCache) {
+                $this->storeCacheFile();
+            }
+        }
     }
 
-    protected function buildCacheFile()
+    protected function storeCacheFile()
+    {
+        $this->getFileManager()->putPhpContents($this->cacheFilePath, $this->data, true);
+    }
+
+    protected function buildData()
     {
         $scopeList = array_keys($this->getMetadata()->get(['entityDefs'], []));
 
@@ -127,8 +151,6 @@ class GlobalRestricton
         }
 
         $this->data = $data;
-
-        $this->getFileManager()->putPhpContents($this->cacheFilePath, $data, true);
     }
 
     protected function getMetadata()

application/Espo/Core/AclManager.php

@@ -59,7 +59,8 @@ class AclManager
         $this->globalRestricton = new \Espo\Core\Acl\GlobalRestricton(
             $container->get('metadata'),
             $container->get('fileManager'),
-            $container->get('fieldManagerUtil')
+            $container->get('fieldManagerUtil'),
+            $container->get('config')->get('useCache')
         );
     }
 

application/Espo/Core/Application.php

@@ -133,7 +133,9 @@ class Application
 
             $slim->run();
         } catch (\Exception $e) {
-            $container->get('output')->processError($e->getMessage(), $e->getCode(), true, $e);
+            try {
+                $container->get('output')->processError($e->getMessage(), $e->getCode(), true, $e);
+            } catch (\Slim\Exception\Stop $e) {}
         }
     }
 

application/Espo/Core/Console/Commands/Upgrade.php

@@ -48,7 +48,7 @@ class Upgrade extends Base
             return;
         }
 
-        fwrite(\STDOUT, "EspoCRM will be upgaded to version {$nextVersion} now. Type 'Y' to continue.\n");
+        fwrite(\STDOUT, "EspoCRM will be upgraded to version {$nextVersion} now. Enter [Y] to continue.\n");
 
         if (!$this->confirm()) {
             echo "Upgrade canceled.\n";

application/Espo/Core/Container.php

@@ -291,7 +291,7 @@ class Container
             'en_US',
             $this->get('fileManager'),
             $this->get('metadata'),
-            $this->get('useCache')
+            $this->get('config')->get('useCache')
         );
     }
 
@@ -301,7 +301,7 @@ class Container
             \Espo\Core\Utils\Language::detectLanguage($this->get('config')),
             $this->get('fileManager'),
             $this->get('metadata'),
-            $this->get('useCache')
+            $this->get('config')->get('useCache')
         );
     }
 

application/Espo/Core/Exceptions/ConflictSilent.php

@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Exceptions;
+
+class ConflictSilent extends Conflict
+{
+    public $logLevel = 'notice';
+}

application/Espo/Core/Export/Xlsx.php

@@ -491,7 +491,14 @@ class Xlsx extends \Espo\Core\Injectable
 
                         $sheet->setCellValue("$col$rowNumber", $value);
                     }
-
+                } else if ($type == 'multiEnum' || $type == 'array') {
+                    if (!empty($row[$name])) {
+                        $array = json_decode($row[$name]);
+                        if (is_array($array)) {
+                            $value = implode(', ', $array);
+                            $sheet->setCellValue("$col$rowNumber", $value, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
+                        }
+                    }
                 } else {
                     if (array_key_exists($name, $row)) {
                         $sheet->setCellValueExplicit("$col$rowNumber", $row[$name], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);

application/Espo/Core/ExternalAccount/ClientManager.php

@@ -69,7 +69,7 @@ class ClientManager
             $externalAccountEntity = $this->clientMap[$hash]['externalAccountEntity'];
             $externalAccountEntity->set('accessToken', $data['accessToken']);
             $externalAccountEntity->set('tokenType', $data['tokenType']);
-            $this->getEntityManager()->saveEntity($externalAccountEntity);
+            $this->getEntityManager()->saveEntity($externalAccountEntity, ['isTokenRenewal' => true]);
         }
     }
 
@@ -87,7 +87,12 @@ class ClientManager
 
         $className = $this->getMetadata()->get("integrations.{$integration}.clientClassName");
 
-        $redirectUri = $this->getConfig()->get('siteUrl') . '?entryPoint=oauthCallback'; // TODO move to client class
+        $redirectUri = $this->getConfig()->get('siteUrl') . '?entryPoint=oauthCallback';
+
+        $redirectUriPath = $this->getMetadata()->get(['integrations', $integration, 'params', 'redirectUriPath']);
+        if ($redirectUriPath) {
+            $redirectUri = rtrim($this->getConfig()->get('siteUrl'), '/') . '/' . $redirectUriPath;
+        }
 
         if (!$externalAccountEntity) {
             throw new Error("External Account {$integration} not found for {$userId}");

application/Espo/Core/ExternalAccount/OAuth2/Client.php

@@ -187,7 +187,11 @@ class Client
 
         $curlOptHttpHeader = array();
         foreach ($httpHeaders as $key => $value) {
-             $curlOptHttpHeader[] = "{$key}: {$value}";
+            if (is_int($key) && !is_string($key)) {
+                $curlOptHttpHeader[] = $value;
+                continue;
+            }
+            $curlOptHttpHeader[] = "{$key}: {$value}";
         }
         $curlOptions[CURLOPT_HTTPHEADER] = $curlOptHttpHeader;
 

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

@@ -65,7 +65,7 @@ class AddLinkMultipleIdType extends \Espo\Core\Formula\Functions\Base
             }
         } else {
             if (!is_string($id)) {
-                throw new Error();
+                return;
             }
             $this->getEntity()->addLinkMultipleId($link, $id);
         }

application/Espo/Core/Hooks/Base.php

@@ -44,6 +44,7 @@ abstract class Base implements Injectable
         'metadata',
         'aclManager',
         'user',
+        'serviceFactory',
     ];
 
     protected $dependencies = []; // for backward compatibility
@@ -118,4 +119,9 @@ abstract class Base implements Injectable
     {
         return $this->getInjection('metadata');
     }
+
+    protected function getServiceFactory()
+    {
+        return $this->getInjection('serviceFactory');
+    }
 }

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -147,6 +147,7 @@ class Htmlizer
             }
 
             $type = $entity->getAttributeType($attribute);
+            $fieldType = $entity->getAttributeParam($attribute, 'fieldType');
 
             if ($type == Entity::DATETIME) {
                 if (!empty($data[$attribute])) {
@@ -194,6 +195,14 @@ class Htmlizer
                 unset($data[$attribute]);
             }
 
+            if ($fieldType === 'currency' && $this->metadata) {
+                if ($entity->getAttributeParam($attribute, 'attributeRole') === 'currency') {
+                    if ($currencyValue = $data[$attribute]) {
+                        $data[$attribute . 'Symbol'] = $this->metadata->get(['app', 'currency', 'symbolMap', $currencyValue]);
+                    }
+                }
+            }
+
             if (array_key_exists($attribute, $data)) {
                 $keyRaw = $attribute . '_RAW';
                 $data[$keyRaw] = $data[$attribute];

application/Espo/Core/Mail/Sender.php

@@ -172,7 +172,7 @@ class Sender
         return $this;
     }
 
-    public function send(Email $email, $params = [], &$message = null, $attachmentList = [])
+    public function send(Email $email, $params = [], $message = null, $attachmentList = [])
     {
         if (!$message) {
             $message = new Message();
@@ -284,6 +284,7 @@ class Sender
                     $contents = $a->get('contents');
                 } else {
                     $fileName = $this->getEntityManager()->getRepository('Attachment')->getFilePath($a);
+                    if (!is_file($fileName)) continue;
                     $contents = file_get_contents($fileName);
                 }
                 $attachment = new MimePart($contents);
@@ -303,6 +304,7 @@ class Sender
                     $contents = $a->get('contents');
                 } else {
                     $fileName = $this->getEntityManager()->getRepository('Attachment')->getFilePath($a);
+                    if (!is_file($fileName)) continue;
                     $contents = file_get_contents($fileName);
                 }
                 $attachment = new MimePart($contents);
@@ -399,6 +401,7 @@ class Sender
             $email->set('status', 'Sent');
             $email->set('dateSent', date("Y-m-d H:i:s"));
         } catch (\Exception $e) {
+            $this->useGlobal();
             throw new Error($e->getMessage(), 500);
         }
 

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

@@ -197,10 +197,10 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
     protected function afterMassRelate(Entity $entity, $relationName, array $params = [], array $options = [])
     {
         if (!$this->hooksDisabled && empty($options['skipHooks'])) {
-            $hookData = array(
+            $hookData = [
                 'relationName' => $relationName,
-                'relationParams' => $params
-            );
+                'relationParams' => $params,
+            ];
             $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterMassRelate', $entity, $options, $hookData);
         }
     }
@@ -215,14 +215,24 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
     {
         parent::afterRelate($entity, $relationName, $foreign, $data, $options);
 
-        if ($foreign instanceof Entity) {
-            $foreignEntity = $foreign;
-            if (!$this->hooksDisabled && empty($options['skipHooks'])) {
-                $hookData = array(
+        if (!$this->hooksDisabled && empty($options['skipHooks'])) {
+            if (is_string($foreign)) {
+                $foreignId = $foreign;
+                $foreignEntityType = $entity->getRelationParam($relationName, 'entity');
+                if ($foreignEntityType) {
+                    $foreign = $this->getEntityManager()->getEntity($foreignEntityType);
+                    $foreign->id = $foreignId;
+                    $foreign->setAsFetched();
+                }
+            }
+
+            if ($foreign instanceof Entity) {
+                $hookData = [
                     'relationName' => $relationName,
                     'relationData' => $data,
-                    'foreignEntity' => $foreignEntity
-                );
+                    'foreignEntity' => $foreign,
+                    'foreignId' => $foreign->id,
+                ];
                 $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRelate', $entity, $options, $hookData);
             }
         }
@@ -232,13 +242,23 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
     {
         parent::afterUnrelate($entity, $relationName, $foreign, $options);
 
-        if ($foreign instanceof Entity) {
-            $foreignEntity = $foreign;
-            if (!$this->hooksDisabled && empty($options['skipHooks'])) {
-                $hookData = array(
+        if (!$this->hooksDisabled && empty($options['skipHooks'])) {
+            if (is_string($foreign)) {
+                $foreignId = $foreign;
+                $foreignEntityType = $entity->getRelationParam($relationName, 'entity');
+                if ($foreignEntityType) {
+                    $foreign = $this->getEntityManager()->getEntity($foreignEntityType);
+                    $foreign->id = $foreignId;
+                    $foreign->setAsFetched();
+                }
+            }
+
+            if ($foreign instanceof Entity) {
+                $hookData = [
                     'relationName' => $relationName,
-                    'foreignEntity' => $foreignEntity
-                );
+                    'foreignEntity' => $foreign,
+                    'foreignId' => $foreign->id,
+                ];
                 $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterUnrelate', $entity, $options, $hookData);
             }
         }

application/Espo/Core/Portal/Application.php

@@ -50,9 +50,9 @@ class Application extends \Espo\Core\Application
         $portal = $this->getContainer()->get('entityManager')->getEntity('Portal', $portalId);
 
         if (!$portal) {
-            $portal = $this->getContainer()->get('entityManager')->getRepository('Portal')->where(array(
+            $portal = $this->getContainer()->get('entityManager')->getRepository('Portal')->where([
                 'customId' => $portalId
-            ))->findOne();
+            ])->findOne();
         }
 
         if (!$portal) {

application/Espo/Core/Portal/Container.php

@@ -94,7 +94,7 @@ class Container extends \Espo\Core\Container
             \Espo\Core\Utils\Language::detectLanguage($this->get('config'), $this->get('preferences')),
             $this->get('fileManager'),
             $this->get('metadata'),
-            $this->get('useCache')
+            $this->get('config')->get('useCache')
         );
         $language->setPortal($this->get('portal'));
         return $language;

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

@@ -1,8 +1,8 @@
 {
   "links": {
-    "meetings": "vergaderingen",
-    "calls": "gesprekken",
-    "tasks": "taken"
+    "meetings": "Vergaderingen",
+    "calls": "Gesprekken",
+    "tasks": "Taken"
   },
   "labels": {
     "Create {entityType}": "Klant {entityTypeTranslated}"

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

@@ -1,7 +1,7 @@
 {
   "fields": {
     "billingAddress": "Facturatie adres",
-    "shippingAddress": "Verzendingsadres"
+    "shippingAddress": "Verzending adres"
   },
   "links": {
     "meetings": "vergaderingen",

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

@@ -31,6 +31,7 @@
     "setNotHeld": "Set not Held"
   },
   "presetFilters": {
-    "planned": "Gepland"
+    "planned": "Gepland",
+    "todays": "Vandaag"
   }
 }

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

@@ -3,9 +3,9 @@
     "address": "Adres"
   },
   "links": {
-    "meetings": "vergaderingen",
-    "calls": "gesprekken",
-    "tasks": "taken"
+    "meetings": "Vergaderingen",
+    "calls": "Gesprekken",
+    "tasks": "Taken"
   },
   "labels": {
     "Create {entityType}": "Klant {entityTypeTranslated}"

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

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

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

@@ -1,5 +1,9 @@
 {
-    "labels": {
-        "Create {entityType}": "Criar {entityTypeTranslated}"
-    }
-}
+  "links": {
+    "meetings": "Reuniões",
+    "tasks": "Tarefas"
+  },
+  "labels": {
+    "Create {entityType}": "Criar {entityTypeTranslated}"
+  }
+}

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

@@ -1,5 +1,13 @@
 {
-    "labels": {
-        "Create {entityType}": "Criar {entityTypeTranslated}"
-    }
-}
+  "fields": {
+    "billingAddress": "Endereço de Cobrança",
+    "shippingAddress": "Endereço de Entrega"
+  },
+  "links": {
+    "meetings": "Reuniões",
+    "tasks": "Tarefas"
+  },
+  "labels": {
+    "Create {entityType}": "Criar {entityTypeTranslated}"
+  }
+}

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

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

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

@@ -1,5 +1,12 @@
 {
-    "labels": {
-        "Create {entityType}": "Criar {entityTypeTranslated}"
-    }
-}
+  "fields": {
+    "address": "Endereço"
+  },
+  "links": {
+    "meetings": "Reuniões",
+    "tasks": "Tarefas"
+  },
+  "labels": {
+    "Create {entityType}": "Criar {entityTypeTranslated}"
+  }
+}

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

@@ -102,14 +102,28 @@ class Output
     public function displayError(string $text, int $statusCode = 500, bool $toPrint = false, $exception = null)
     {
         $logLevel = 'error';
+        $messageLineFile = null;
+
+        if ($exception) {
+            $messageLineFile = 'line: ' . $exception->getLine() . ', file: ' . $exception->getFile();
+        }
+
         if ($exception && !empty($exception->logLevel)) {
             $logLevel = $exception->logLevel;
         }
+
         $logMessageItemList = [];
+
         if ($text) $logMessageItemList[] = "{$text}";
+
         if (!empty($this->slim)) {
             $logMessageItemList[] = $this->getSlim()->request()->getMethod() . ' ' .$_SERVER['REQUEST_URI'];
         }
+
+        if ($messageLineFile) {
+            $logMessageItemList[] = $messageLineFile;
+        }
+
         $logMessage = "($statusCode) " . implode("; ", $logMessageItemList);
 
         $GLOBALS['log']->log($logLevel, $logMessage);
@@ -134,6 +148,8 @@ class Output
             if ($toPrint) {
                 $status = $this->getCodeDescription($statusCode);
                 $status = isset($status) ? $statusCode.' '.$status : 'HTTP '.$statusCode;
+                if ($text)
+                    $text = htmlspecialchars($text);
                 $this->getSlim()->printError($text, $status);
             }
 

application/Espo/Core/Utils/Auth.php

@@ -142,6 +142,14 @@ class Auth
             }
         }
 
+        $createTokenSecret = $this->request->headers->get('Espo-Authorization-Create-Token-Secret') === 'true';
+
+        if ($createTokenSecret) {
+            if ($this->getConfig()->get('authTokenSecretDisabled')) {
+                $createTokenSecret = false;
+            }
+        }
+
         if (!$isByTokenOnly) {
             $this->checkFailedAttemptsLimit($username);
         }
@@ -153,6 +161,15 @@ class Auth
             $authToken = $this->getEntityManager()->getRepository('AuthToken')->where([
                 'token' => $password
             ])->findOne();
+
+            if ($authToken) {
+                if ($authToken->get('secret')) {
+                    $sentSecret = $_COOKIE['auth-token-secret'] ?? null;
+                    if ($sentSecret !== $authToken->get('secret')) {
+                        $authToken = null;
+                    }
+                }
+            }
         }
 
         if ($authToken) {
@@ -255,6 +272,13 @@ class Auth
                 $authToken->set('hash', $user->get('password'));
                 $authToken->set('ipAddress', $_SERVER['REMOTE_ADDR']);
                 $authToken->set('userId', $user->id);
+
+                if ($createTokenSecret) {
+                    $secret = $this->generateToken();
+                    $authToken->set('secret', $secret);
+                    $this->setSecretInCookie($secret);
+                }
+
                 if ($this->isPortal()) {
                     $authToken->set('portalId', $this->getPortal()->id);
                 }
@@ -334,10 +358,16 @@ class Auth
 
     public function destroyAuthToken($token)
     {
-        $authToken = $this->getEntityManager()->getRepository('AuthToken')->select(['id', 'isActive'])->where(['token' => $token])->findOne();
+        $authToken = $this->getEntityManager()->getRepository('AuthToken')->select(['id', 'isActive', 'secret'])->where(['token' => $token])->findOne();
         if ($authToken) {
             $authToken->set('isActive', false);
             $this->getEntityManager()->saveEntity($authToken);
+            if ($authToken->get('secret')) {
+                $sentSecret = $_COOKIE['auth-token-secret'] ?? null;
+                if ($sentSecret === $authToken->get('secret')) {
+                    setcookie('auth-token-secret', null, -1, '/');
+                }
+            }
             return true;
         }
     }
@@ -379,4 +409,19 @@ class Auth
         $authLogRecord->set('denialReason', $denialReason);
         $this->getEntityManager()->saveEntity($authLogRecord);
     }
+
+    protected function setSecretInCookie(string $secret)
+    {
+        if (version_compare(\PHP_VERSION, '7.3.0') < 0) {
+            setcookie('auth-token-secret', $secret, strtotime('+1000 days'), '/', '', false, true);
+            return;
+        }
+
+        setcookie('auth-token-secret', $secret, [
+            'expires' => strtotime('+1000 days'),
+            'path' => '/',
+            'httponly' => true,
+            'samesite' => 'Lax',
+        ]);
+    }
 }

application/Espo/Core/Utils/ClientManager.php

@@ -99,15 +99,17 @@ class ClientManager
         if ($isDeveloperMode) {
             $useCache = $this->getConfig()->get('useCacheInDeveloperMode');
             $jsFileList = $this->getMetadata()->get(['app', 'client', 'developerModeScriptList'], []);
-            $cssFileList = $this->getMetadata()->get(['app', 'client', 'developerModeCssList'], []);
             $loaderCacheTimestamp = 'null';
         } else {
             $useCache = $this->getConfig()->get('useCache');
             $jsFileList = $this->getMetadata()->get(['app', 'client', 'scriptList'], []);
-            $cssFileList = $this->getMetadata()->get(['app', 'client', 'cssList'], []);
             $loaderCacheTimestamp = $cacheTimestamp;
         }
 
+        $cssFileList = $this->getMetadata()->get(['app', 'client', 'cssList'], []);
+
+        $linkList = $this->getMetadata()->get(['app', 'client', 'linkList'], []);
+
         $scriptsHtml = '';
         foreach ($jsFileList as $jsFile) {
             $src = $this->basePath . $jsFile . '?r=' . $cacheTimestamp;
@@ -121,6 +123,22 @@ class ClientManager
             $additionalStyleSheetsHtml .= "\n        <link rel=\"stylesheet\" href=\"{$src}\">";
         }
 
+        $linksHtml = '';
+        foreach ($linkList as $item) {
+            $href = $this->basePath . $item['href'];
+            if (empty($item['noTimestamp'])) {
+                $href .= '?r=' . $cacheTimestamp;
+            }
+            $as = $item['as'] ?? '';
+            $rel = $item['rel'] ?? '';
+            $type = $item['type'] ?? '';
+            $additinalPlaceholder = '';
+            if (!empty($item['crossorigin'])) {
+                $additinalPlaceholder .= ' crossorigin';
+            }
+            $linksHtml .= "\n        <link rel=\"{$rel}\" href=\"{$href}\" as=\"{$as}\" as=\"{$type}\"{$additinalPlaceholder}>";
+        }
+
         $data = [
             'applicationId' => 'espocrm-application-id',
             'apiUrl' => 'api/v1',
@@ -134,6 +152,7 @@ class ClientManager
             'appClientClassName' => 'app',
             'scriptsHtml' => $scriptsHtml,
             'additionalStyleSheetsHtml' => $additionalStyleSheetsHtml,
+            'linksHtml' => $linksHtml,
         ];
 
         $html = file_get_contents($htmlFilePath);

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

@@ -31,7 +31,6 @@ namespace Espo\Core\Utils\Database\DBAL\Schema;
 
 class Column extends \Doctrine\DBAL\Schema\Column
 {
-
     /**
      * @var boolean
      */
@@ -42,6 +41,7 @@ class Column extends \Doctrine\DBAL\Schema\Column
      */
     protected $_unique = false;
 
+    protected $_quoted = true;
 
     /**
      * @param boolean $unique
@@ -85,4 +85,4 @@ class Column extends \Doctrine\DBAL\Schema\Column
         ), $this->_platformOptions, $this->_customSchemaOptions);
     }
 
-}
+}

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

@@ -30,6 +30,7 @@
 namespace Espo\Core\Utils\Database\DBAL\Schema;
 
 use Doctrine\DBAL\Schema\Index as DBALIndex;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 
 class Index extends \Doctrine\DBAL\Schema\Index
 {
@@ -79,4 +80,16 @@ class Index extends \Doctrine\DBAL\Schema\Index
 
         return false;
     }
-}
+
+    public function getQuotedColumns(AbstractPlatform $platform)
+    {
+        $columns = array();
+
+        foreach ($this->_columns as $column) {
+            $column->_quoted = true;
+            $columns[] = $column->getQuotedName($platform);
+        }
+
+        return $columns;
+    }
+}

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

@@ -34,6 +34,8 @@ use Doctrine\DBAL\Schema\SchemaException;
 
 class Table extends \Doctrine\DBAL\Schema\Table
 {
+    protected $_quoted = true;
+
     /**
      * @param string $columnName
      * @param string $typeName
@@ -81,4 +83,4 @@ class Table extends \Doctrine\DBAL\Schema\Table
 
         return $this;
     }
-}
+}

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

@@ -91,7 +91,8 @@ class Converter
         'select' => 'select',
         'orderBy' => 'orderBy',
         'where' => 'where',
-        'storeArrayValues' => 'storeArrayValues'
+        'storeArrayValues' => 'storeArrayValues',
+        'binary' => 'binary',
     );
 
     protected $idParams = array(
@@ -506,6 +507,10 @@ class Converter
             }
         }
 
+        if (isset($fieldParams['type'])) {
+            $values['fieldType'] = $fieldParams['type'];
+        }
+
         return $values;
     }
 

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

@@ -100,6 +100,8 @@ class Currency extends Base
                     'sql' => $converedFieldName . " {direction}",
                     'leftJoins' => $leftJoins,
                 ],
+                'attributeRole' => 'valueConverted',
+                'fieldType' => 'currency',
             ];
 
             $defs[$entityType]['fields'][$fieldName]['orderBy'] = [
@@ -108,6 +110,12 @@ class Currency extends Base
             ];
         }
 
+        $defs[$entityType]['fields'][$fieldName]['attributeRole'] = 'value';
+        $defs[$entityType]['fields'][$fieldName]['fieldType'] = 'currency';
+
+        $defs[$entityType]['fields'][$fieldName . 'Currency']['attributeRole'] = 'currency';
+        $defs[$entityType]['fields'][$fieldName . 'Currency']['fieldType'] = 'currency';
+
         return $defs;
     }
 }

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

@@ -121,10 +121,12 @@ class Email extends Base
                         'select' => 'emailAddresses.opt_out',
                         'where' => [
                             '= TRUE' => [
-                                'sql' => 'emailAddresses.opt_out = true AND emailAddresses.opt_out IS NOT NULL'
+                                'sql' => 'emailAddresses.opt_out = true AND emailAddresses.opt_out IS NOT NULL',
+                                'leftJoins' => [['emailAddresses', 'emailAddresses', ['primary' => 1]]],
                             ],
                             '= FALSE' => [
-                                'sql' => 'emailAddresses.opt_out = false OR emailAddresses.opt_out IS NULL'
+                                'sql' => 'emailAddresses.opt_out = false OR emailAddresses.opt_out IS NULL',
+                                'leftJoins' => [['emailAddresses', 'emailAddresses', ['primary' => 1]]],
                             ]
                         ],
                         'orderBy' => 'emailAddresses.opt_out {direction}'

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

@@ -35,25 +35,30 @@ class Link extends Base
     {
         $fieldParams = $this->getFieldParams();
 
-        $data = array(
-            $entityName => array (
-                'fields' => array(
-                    $fieldName.'Id' => array(
+        $data = [
+            $entityName => [
+                'fields' => [
+                    $fieldName.'Id' => [
                         'type' => 'foreignId',
-                        'index' => $fieldName
-                    ),
-                    $fieldName.'Name' => array(
+                        'index' => $fieldName,
+                        'attributeRole' => 'id',
+                        'fieldType' => 'link',
+                    ],
+                    $fieldName.'Name' => [
                         'type' => 'varchar',
-                        'notStorable' => true
-                    )
-                )
-            ),
-            'unset' => array(
-                $entityName => array(
-                    'fields.'.$fieldName
-                )
-            )
-        );
+                        'notStorable' => true,
+                        'attributeRole' => 'name',
+                        'fieldType' => 'link',
+                    ]
+                ]
+            ],
+            'unset' => [
+                $entityName => [
+                    'fields.' . $fieldName
+                ]
+            ]
+        ];
+
         if (!empty($fieldParams['notStorable'])) {
             $data[$entityName]['fields'][$fieldName.'Id']['notStorable'] = true;
         }
@@ -64,4 +69,4 @@ class Link extends Base
 
         return $data;
     }
-}
+}

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

@@ -41,12 +41,16 @@ class LinkMultiple extends Base
                         'notStorable' => true,
                         'isLinkMultipleIdList' => true,
                         'relation' => $fieldName,
-                        'isUnordered' => true
+                        'isUnordered' => true,
+                        'attributeRole' => 'idList',
+                        'fieldType' => 'linkMultiple',
                     ],
                     $fieldName.'Names' => [
                         'type' => 'jsonObject',
                         'notStorable' => true,
-                        'isLinkMultipleNameMap' => true
+                        'isLinkMultipleNameMap' => true,
+                        'attributeRole' => 'nameMap',
+                        'fieldType' => 'linkMultiple',
                     ]
                 ]
             ],
@@ -71,7 +75,8 @@ class LinkMultiple extends Base
             $data[$entityName]['fields'][$fieldName . 'Columns'] = [
                 'type' => 'jsonObject',
                 'notStorable' => true,
-                'columns' => $columns
+                'columns' => $columns,
+                'attributeRole' => 'columnsMap',
             ];
         }
 

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

@@ -33,33 +33,39 @@ class LinkParent extends Base
 {
     protected function load($fieldName, $entityName)
     {
-        $data = array(
-            $entityName => array (
-                'fields' => array(
-                    $fieldName.'Id' => array(
+        $data = [
+            $entityName => [
+                'fields' => [
+                    $fieldName.'Id' => [
                         'type' => 'foreignId',
-                        'index' => $fieldName
-                    ),
-                    $fieldName.'Type' => array(
+                        'index' => $fieldName,
+                        'attributeRole' => 'id',
+                        'fieldType' => 'linkParent',
+                    ],
+                    $fieldName.'Type' => [
                         'type' => 'foreignType',
                         'notNull' => false,
                         'index' => $fieldName,
-                        'len' => 100
-                    ),
-                    $fieldName.'Name' => array(
+                        'len' => 100,
+                        'attributeRole' => 'type',
+                        'fieldType' => 'linkParent',
+                    ],
+                    $fieldName.'Name' => [
                         'type' => 'varchar',
                         'notStorable' => true,
                         'relation' => $fieldName,
-                        'isParentName' => true
-                    )
-                )
-            ),
-            'unset' => array(
-                $entityName => array(
+                        'isParentName' => true,
+                        'attributeRole' => 'name',
+                        'fieldType' => 'linkParent',
+                    ]
+                ]
+            ],
+            'unset' => [
+                $entityName => [
                     'fields.'.$fieldName
-                )
-            )
-        );
+                ]
+            ]
+        ];
 
         $fieldParams = $this->getFieldParams();
 
@@ -72,4 +78,4 @@ class LinkParent extends Base
 
         return $data;
     }
-}
+}

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

@@ -122,10 +122,12 @@ class Phone extends Base
                         'select' => 'phoneNumbers.opt_out',
                         'where' => [
                             '= TRUE' => [
-                                'sql' => 'phoneNumbers.opt_out = true AND phoneNumbers.opt_out IS NOT NULL'
+                                'sql' => 'phoneNumbers.opt_out = true AND phoneNumbers.opt_out IS NOT NULL',
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbers', ['primary' => 1]]],
                             ],
                             '= FALSE' => [
-                                'sql' => 'phoneNumbers.opt_out = false OR phoneNumbers.opt_out IS NULL'
+                                'sql' => 'phoneNumbers.opt_out = false OR phoneNumbers.opt_out IS NULL',
+                                'leftJoins' => [['phoneNumbers', 'phoneNumbers', ['primary' => 1]]],
                             ]
                         ],
                         'orderBy' => 'phoneNumbers.opt_out {direction}'

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

@@ -35,20 +35,29 @@ class Attachments extends HasChildren
     {
         $parentRelation = parent::load($linkName, $entityName);
 
-        $relation = array(
-            $entityName => array (
-                'fields' => array(
-                    $linkName.'Types' => array(
+        $relation = [
+            $entityName => [
+                'fields' => [
+                    $linkName.'Types' => [
                         'type' => 'jsonObject',
                         'notStorable' => true,
-                    ),
-                ),
-            ),
-        );
+                    ],
+                ],
+                'relations' => [
+                    $linkName => [
+                        'conditions' => [
+                            'OR' => [
+                                ['field' => null],
+                                ['field' => $linkName],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
 
         $relation = \Espo\Core\Utils\Util::merge($parentRelation, $relation);
 
         return $relation;
     }
 }
-

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

@@ -408,9 +408,15 @@ class Converter
             $dbFieldParams['unsigned'] = true;
         }
 
+        if (isset($fieldParams['binary']) && $fieldParams['binary']) {
+            $dbFieldParams['platformOptions'] = array(
+                'collation' => 'utf8mb4_bin',
+            );
+        }
+
         if (isset($fieldParams['utf8mb3']) && $fieldParams['utf8mb3']) {
             $dbFieldParams['platformOptions'] = array(
-                'collation' => 'utf8_unicode_ci',
+                'collation' => (isset($fieldParams['binary']) && $fieldParams['binary']) ? 'utf8_bin' : 'utf8_unicode_ci',
             );
         }
 

application/Espo/Core/Utils/DateTime.php

@@ -251,4 +251,9 @@ class DateTime
 
         return false;
     }
+
+    public static function getSystemNowString()
+    {
+        return date(self::$systemDateTimeFormat);
+    }
 }

application/Espo/Core/Utils/EntityManager.php

@@ -54,7 +54,7 @@ class EntityManager
 
     private $linkForbiddenNameList = ['posts', 'stream', 'subscription', 'followers', 'action', 'null', 'false', 'true'];
 
-    private $forbiddenEntityTypeNameList = ['PortalUser', 'ApiUser', 'Timeline', 'About', 'Admin', 'Null', 'False', 'True'];
+    private $forbiddenEntityTypeNameList = ['Common', 'PortalUser', 'ApiUser', 'Timeline', 'About', 'Admin', 'Null', 'False', 'True'];
 
     public function __construct(Metadata $metadata, Language $language, File\Manager $fileManager, Config $config, Container $container = null)
     {

application/Espo/Core/Utils/FieldManager.php

@@ -271,7 +271,7 @@ class FieldManager
 
         $entityDefs = $this->normalizeDefs($scope, $name, $fieldDefs);
 
-        if (!empty($entityDefs)) {
+        if (!empty((array) $entityDefs)) {
             $result &= $this->saveCustomEntityDefs($scope, $entityDefs);
             $this->isChanged = true;
         }
@@ -430,13 +430,15 @@ class FieldManager
         return $this->getMetadata()->get('entityDefs'.'.'.$scope.'.fields.'.$name, $default);
     }
 
-    protected function getCustomFieldDefs($scope, $name)
+    protected function getCustomFieldDefs($scope, $name, $default = null)
     {
         $customDefs = $this->getMetadata()->getCustom('entityDefs', $scope, (object) []);
 
         if (isset($customDefs->fields->$name)) {
             return (array) $customDefs->fields->$name;
         }
+
+        return $default;
     }
 
     protected function saveCustomEntityDefs($scope, $newDefs)
@@ -529,43 +531,32 @@ class FieldManager
             }
         }
 
-        $actualCustomFieldDefs = $this->getCustomFieldDefs($scope, $name);
+        $actualCustomFieldDefs = $this->getCustomFieldDefs($scope, $name, []);
         $actualFieldDefs = $this->getFieldDefs($scope, $name, []);
         $permittedParamList = array_keys($params);
 
-        $filteredFieldDefs = $actualCustomFieldDefs ? $actualCustomFieldDefs : [];
+        $filteredFieldDefs = !empty($actualCustomFieldDefs) ? $actualCustomFieldDefs : [];
 
         foreach ($fieldDefs as $paramName => $paramValue) {
             if (in_array($paramName, $permittedParamList)) {
+
+                $defaultParamValue = null;
+
                 switch ($params[$paramName]['type']) {
                     case 'bool':
-                        $fieldDefsDefaultValue = array_key_exists('default', $params[$paramName]) ? $params[$paramName]['default'] : false;
-
-                        $actualValue = array_key_exists($paramName, $actualFieldDefs) ? $actualFieldDefs[$paramName] : $fieldDefsDefaultValue;
-
-                        if (!Util::areValuesEqual($actualValue, $paramValue)) {
-                            $filteredFieldDefs[$paramName] = $paramValue;
-                        }
+                        $defaultParamValue = false;
                         break;
+                }
 
-                    default:
-                        if (!array_key_exists('default', $params[$paramName]) && !array_key_exists($paramName, $actualFieldDefs)) {
-                            $filteredFieldDefs[$paramName] = $paramValue;
-                            break;
-                        }
+                $actualValue = array_key_exists($paramName, $actualFieldDefs) ? $actualFieldDefs[$paramName] : $defaultParamValue;
 
-                        if (array_key_exists('default', $params[$paramName])) {
-                            $actualValue = $params[$paramName]['default'];
-                        }
+                if (!array_key_exists($paramName, $actualCustomFieldDefs) && !Util::areValuesEqual($actualValue, $paramValue)) {
+                    $filteredFieldDefs[$paramName] = $paramValue;
+                    continue;
+                }
 
-                        if (array_key_exists($paramName, $actualFieldDefs)) {
-                            $actualValue = $actualFieldDefs[$paramName];
-                        }
-
-                        if (!Util::areValuesEqual($actualValue, $paramValue)) {
-                            $filteredFieldDefs[$paramName] = $paramValue;
-                        }
-                        break;
+                if (array_key_exists($paramName, $actualCustomFieldDefs)) {
+                    $filteredFieldDefs[$paramName] = $paramValue;
                 }
             }
         }
@@ -593,7 +584,7 @@ class FieldManager
      * @param string $scope
      * @param string $fieldName
      * @param array $fieldDefs
-     * @return array
+     * @return object
      */
     protected function normalizeDefs($scope, $fieldName, array $fieldDefs)
     {

application/Espo/Core/Utils/Language.php

@@ -28,9 +28,10 @@
  ************************************************************************/
 
 namespace Espo\Core\Utils;
-use \Espo\Core\Utils\Util,
-    \Espo\Core\Exceptions\NotFound,
-    \Espo\Core\Exceptions\Error;
+
+use Espo\Core\Utils\Util,
+    Espo\Core\Exceptions\NotFound,
+    Espo\Core\Exceptions\Error;
 
 class Language
 {
@@ -40,22 +41,15 @@ class Language
 
     private $unifier;
 
-    /**
-     * Data of all languages
-     *
-     * @var array
-     */
-    private $data = array();
+    private $data = [];
 
-    private $deletedData = array();
+    private $deletedData = [];
 
-    private $changedData = array();
-
-    private $name = 'i18n';
+    private $changedData = [];
 
     private $currentLanguage = null;
 
-    protected $cacheFile = 'data/cache/application/languages/{*}.php';
+    protected $cacheFile = 'data/cache/application/languages/{language}.php';
 
     protected $defaultLanguage = 'en_US';
 
@@ -63,11 +57,11 @@ class Language
 
     protected $noCustom = false;
 
-    private $paths = array(
-        'corePath' => 'application/Espo/Resources/i18n',
-        'modulePath' => 'application/Espo/Modules/{*}/Resources/i18n',
-        'customPath' => 'custom/Espo/Custom/Resources/i18n',
-    );
+    protected $paths = [
+        'corePath' => 'application/Espo/Resources/i18n/{language}',
+        'modulePath' => 'application/Espo/Modules/{*}/Resources/i18n/{language}',
+        'customPath' => 'custom/Espo/Custom/Resources/i18n/{language}',
+    ];
 
     public function __construct($language = null, File\Manager $fileManager, Metadata $metadata, $useCache = false, $noCustom = false)
     {
@@ -106,7 +100,8 @@ class Language
         return $this->defaultLanguage;
     }
 
-    public static function detectLanguage($config, $preferences = null) {
+    public static function detectLanguage(\Espo\Core\Utils\Config $config, $preferences = null)
+    {
         $language = null;
         if ($preferences) {
             $language = $preferences->get('language');
@@ -127,9 +122,11 @@ class Language
         $this->currentLanguage = $language;
     }
 
-    protected function getLangCacheFile()
+    protected function getCacheFile(string $language = null) : string
     {
-        $langCacheFile = str_replace('{*}', $this->getLanguage(), $this->cacheFile);
+        $language = $language ?? $this->getLanguage();
+
+        $langCacheFile = str_replace('{language}', $language, $this->cacheFile);
 
         return $langCacheFile;
     }
@@ -149,7 +146,7 @@ class Language
     public function translate($label, $category = 'labels', $scope = 'Global', $requiredOptions = null)
     {
         if (is_array($label)) {
-            $translated = array();
+            $translated = [];
 
             foreach ($label as $subLabel) {
                 $translated[$subLabel] = $this->translate($subLabel, $category, $scope, $requiredOptions);
@@ -200,7 +197,7 @@ class Language
         $data = $this->getData();
 
         if (!isset($data) || $data === false) {
-            throw new Error('Language: current language ['.$this->getLanguage().'] does not found');
+            throw new Error('Language: current language '.$this->getLanguage().' not found');
         }
 
         return Util::getValueByKey($data, $key, $returns);
@@ -213,19 +210,19 @@ class Language
 
     /**
      * Save changes
-     *
-     * @return bool
      */
-    public function save()
+    public function save() : bool
     {
+        $language = $this->getLanguage();
+
         $path = $this->paths['customPath'];
-        $currentLanguage = $this->getLanguage();
+        $path = str_replace('{language}', $language, $path);
 
         $result = true;
         if (!empty($this->changedData)) {
             foreach ($this->changedData as $scope => $data) {
                 if (!empty($data)) {
-                    $result &= $this->getFileManager()->mergeContents(array($path, $currentLanguage, $scope.'.json'), $data, true);
+                    $result &= $this->getFileManager()->mergeContents([$path, $scope.'.json'], $data, true);
                 }
             }
         }
@@ -233,7 +230,7 @@ class Language
         if (!empty($this->deletedData)) {
             foreach ($this->deletedData as $scope => $unsetData) {
                 if (!empty($unsetData)) {
-                    $result &= $this->getFileManager()->unsetContents(array($path, $currentLanguage, $scope.'.json'), $unsetData, true);
+                    $result &= $this->getFileManager()->unsetContents([$path, $scope.'.json'], $unsetData, true);
                 }
             }
         }
@@ -250,19 +247,15 @@ class Language
      */
     public function clearChanges()
     {
-        $this->changedData = array();
-        $this->deletedData = array();
+        $this->changedData = [];
+        $this->deletedData = [];
         $this->init(true);
     }
 
-    /**
-     * Get data of Unifier language files
-     *
-     * @return array
-     */
     protected function getData()
     {
         $currentLanguage = $this->getLanguage();
+
         if (!isset($this->data[$currentLanguage])) {
             $this->init();
         }
@@ -345,40 +338,73 @@ class Language
         }
     }
 
-    protected function init($reload = false)
+    protected function init(bool $reload = false)
     {
-        if ($reload || !file_exists($this->getLangCacheFile()) || !$this->useCache) {
+        $this->data[$this->currentLanguage] = $this->getLanguageData($this->currentLanguage, $reload);
+    }
 
-            $paths = $this->paths;
-            if ($this->noCustom) {
-                unset($paths['customPath']);
-            }
+    protected function getDefaultLanguageData(bool $reload = false)
+    {
+        return $this->getLanguageData($this->defaultLanguage, $reload);
+    }
 
-            $fullData = $this->getUnifier()->unify($this->name, $paths, true);
+    protected function getLanguageData(string $language, bool $reload = false)
+    {
+        if ($reload || !isset($this->data[$language])) {
 
-            $result = true;
-            foreach ($fullData as $i18nName => $i18nData) {
+            $cacheFile = $this->getCacheFile($language);
 
-                if ($i18nName != $this->defaultLanguage) {
-                    $i18nData = Util::merge($fullData[$this->defaultLanguage], $i18nData);
+            if (!$this->useCache || !file_exists($cacheFile) || $reload) {
+
+                $paths = $this->paths;
+
+                foreach ($paths as $k => &$path) {
+                    $path = str_replace('{language}', $language, $path);
                 }
 
-                $this->data[$i18nName] = $i18nData;
+                if ($this->noCustom) {
+                    unset($paths['customPath']);
+                }
+
+                $data = $this->getUnifier()->unify('i18n', $paths, true);
+
+                if (is_array($data)) {
+                    $this->sanitizeData($data);
+                }
+
+                if ($language != $this->defaultLanguage) {
+                    $data = Util::merge($this->getDefaultLanguageData($reload), $data);
+                }
+
+                $this->data[$language] = $data;
 
                 if ($this->useCache) {
-                    $i18nCacheFile = str_replace('{*}', $i18nName, $this->cacheFile);
-                    $result &= $this->getFileManager()->putPhpContents($i18nCacheFile, $i18nData);
+                    $putResult = $this->getFileManager()->putPhpContents($cacheFile, $data);
+                    if (!$putResult) {
+                        $GLOBALS['log']->error("Language: Could not store cache file for {$language}");
+                    }
                 }
             }
 
-            if ($result == false) {
-                throw new Error('Language::init() - Cannot save data to a cache');
+            if ($this->useCache) {
+                $this->data[$language] = $this->getFileManager()->getPhpContents($cacheFile);
             }
         }
 
-        $currentLanguage = $this->getLanguage();
-        if (empty($this->data[$currentLanguage])) {
-            $this->data[$currentLanguage] = $this->getFileManager()->getPhpContents($this->getLangCacheFile());
+        return $this->data[$language] ?? [];
+    }
+
+    protected function sanitizeData(array &$data)
+    {
+        foreach ($data as $key => &$subData) {
+            if (is_array($subData)) {
+                $this->sanitizeData($subData);
+            } else {
+                if (is_string($subData)) {
+                    $subData = str_replace('<', '&lt;', $subData);
+                    $subData = str_replace('>', '&gt;', $subData);
+                }
+            }
         }
     }
 }

application/Espo/Core/Utils/ThemeManager.php

@@ -52,8 +52,6 @@ class ThemeManager
 
     public function getStylesheet()
     {
-        return $this->metadata->get('themes.' . $this->getName() . '.stylesheet', 'client/css/espo.css');
+        return $this->metadata->get(['themes', $this->getName(), 'stylesheet'], 'client/css/espo/espo.css');
     }
 }
-
-

application/Espo/Core/Utils/Util.php

@@ -711,4 +711,102 @@ class Util
 
         return $v1 === $v2;
     }
+
+    public static function mbUpperCaseFirst(string $string)
+    {
+        if (!$string) return $string;
+
+        $length = mb_strlen($string);
+        $firstChar = mb_substr($string, 0, 1);
+        $then = mb_substr($string, 1, $length - 1);
+
+        return mb_strtoupper($firstChar) . $then;
+    }
+
+    public static function mbLowerCaseFirst(string $string)
+    {
+        if (!$string) return $string;
+
+        $length = mb_strlen($string);
+        $firstChar = mb_substr($string, 0, 1);
+        $then = mb_substr($string, 1, $length - 1);
+
+        return mb_strtolower($firstChar) . $then;
+    }
+
+    /**
+     * Sanitize Html code
+     * @param  string $text
+     * @param  array  $permittedHtmlTags - Allows only html tags without parameters like <p></p>, <br>, etc.
+     * @return string
+     */
+    public static function sanitizeHtml($text, $permittedHtmlTags = ['p', 'br', 'b', 'strong', 'pre'])
+    {
+        if (is_array($text)) {
+            foreach ($text as $key => &$value) {
+                $value = self::sanitizeHtml($value, $permittedHtmlTags);
+            }
+            return $text;
+        }
+
+        $sanitized = htmlspecialchars($text, \ENT_QUOTES | \ENT_HTML5, 'UTF-8');
+
+        foreach ($permittedHtmlTags as $htmlTag) {
+            $sanitized = preg_replace('/&lt;(\/)?(' . $htmlTag . ')&gt;/i', '<$1$2>', $sanitized);
+        }
+
+        return $sanitized;
+    }
+
+    public static function urlAddParam($url, $paramName, $paramValue)
+    {
+        $urlQuery = parse_url($url, \PHP_URL_QUERY);
+
+        if (!$urlQuery) {
+            $params = [
+                $paramName => $paramValue
+            ];
+
+            $url = trim($url);
+            $url = preg_replace('/\/\?$/', '', $url);
+            $url = preg_replace('/\/$/', '', $url);
+
+            return $url . '/?' . http_build_query($params);
+        }
+
+        parse_str($urlQuery, $params);
+
+        if (!isset($params[$paramName]) || $params[$paramName] != $paramValue) {
+            $params[$paramName] = $paramValue;
+
+            return str_replace($urlQuery, http_build_query($params), $url);
+        }
+
+        return $url;
+    }
+
+    public static function urlRemoveParam($url, $paramName, $suffix = '')
+    {
+        $urlQuery = parse_url($url, \PHP_URL_QUERY);
+
+        if ($urlQuery) {
+            parse_str($urlQuery, $params);
+
+            if (isset($params[$paramName])) {
+                unset($params[$paramName]);
+
+                $newUrl = str_replace($urlQuery, http_build_query($params), $url);
+
+                if (empty($params)) {
+                    $newUrl = preg_replace('/\/\?$/', '', $newUrl);
+                    $newUrl = preg_replace('/\/$/', '', $newUrl);
+                    $newUrl .= $suffix;
+                }
+
+                return $newUrl;
+            }
+        }
+
+        return $url;
+    }
 }

application/Espo/Core/WebSocket/Pusher.php

@@ -80,9 +80,10 @@ class Pusher implements WampServerInterface
         if ($checkCommand) {
             $checkResult = shell_exec($checkCommand);
             if ($checkResult !== 'true') {
-                if ($this->isDebugMode) $this->log("check access failed for topic {$topicId} for user {$userId}");
+                if ($this->isDebugMode) $this->log("{$connectionId}: check access failed for topic {$topicId} for user {$userId}");
                 return;
             }
+            if ($this->isDebugMode) $this->log("{$connectionId}: check access succeed for topic {$topicId} for user {$userId}");
         }
 
         if (!in_array($topicId, $this->connectionIdTopicIdListMap[$connectionId])) {
@@ -110,20 +111,37 @@ class Pusher implements WampServerInterface
             if ($index !== false) {
                 if ($this->isDebugMode) $this->log("{$connectionId}: remove topic {$topicId} for user {$userId}");
                 unset($this->connectionIdTopicIdListMap[$connectionId][$index]);
-                $this->connectionIdTopicIdListMap[$connectionId][$index] = array_values($this->connectionIdTopicIdListMap[$connectionId][$index]);
+                $this->connectionIdTopicIdListMap[$connectionId] = array_values($this->connectionIdTopicIdListMap[$connectionId]);
             }
         }
     }
 
+    protected function getCategoryData(string $topicId) : array
+    {
+        $arr = explode('.', $topicId);
+        $category = $arr[0];
+
+        if (array_key_exists($category, $this->categoriesData)) {
+            $data = $this->categoriesData[$category];
+        } else if (array_key_exists($topicId, $this->categoriesData)) {
+            $data = $this->categoriesData[$topicId];
+        } else {
+            $data = [];
+        }
+
+        return $data;
+    }
+
     protected function getParamsFromTopicId(string $topicId) : array
     {
         $arr = explode('.', $topicId);
-        $category = $arr[0];
+
+        $data = $this->getCategoryData($topicId);
 
         $params = [];
 
-        if (array_key_exists('paramList', $this->categoriesData[$category])) {
-            foreach ($this->categoriesData[$category]['paramList'] as $i => $item) {
+        if (array_key_exists('paramList', $data)) {
+            foreach ($data['paramList'] as $i => $item) {
                 if (isset($arr[$i + 1])) {
                     $params[$item] = $arr[$i + 1];
                 } else {
@@ -146,10 +164,12 @@ class Pusher implements WampServerInterface
             return null;
         }
 
-        $category = $this->getTopicCategory($topic);
-        if (!array_key_exists('accessCheckCommand', $this->categoriesData[$category])) return null;
+        $data = $this->getCategoryData($topic->getId());
+
+        if (!array_key_exists('accessCheckCommand', $data)) return null;
+
+        $command = $this->phpExecutablePath . " command.php " . $data['accessCheckCommand'];
 
-        $command = $this->phpExecutablePath . " command.php " . $this->categoriesData[$category]['accessCheckCommand'];
         foreach ($params as $key => $value) {
             $command = str_replace(':' . $key, $value, $command);
         }

application/Espo/Core/defaults/config.php

@@ -166,7 +166,7 @@ return [
     'cleanupAuthTokenPeriod' => '1 month',
     'currencyFormat' => 2,
     'currencyDecimalPlaces' => 2,
-    'aclStrictMode' => false,
+    'aclStrictMode' => true,
     'aclAllowDeleteCreated' => false,
     'aclAllowDeleteCreatedThresholdPeriod' => '24 hours',
     'inlineAttachmentUploadMaxSize' => 20,

application/Espo/Core/defaults/systemConfig.php

@@ -101,6 +101,7 @@ return [
         'portalUserLimit',
         'stylesheet',
         'userItems',
+        'globalItems',
         'internalSmtpServer',
         'internalSmtpPort',
         'internalSmtpAuth',
@@ -193,6 +194,11 @@ return [
         'adminNotificationsNewExtensionVersion',
         'leadCaptureAllowOrigin',
         'cronDisabled',
+        'defaultPortalId',
+        'cleanupDeletedRecords',
+        'authTokenPreventConcurrent',
+        'emailParser',
+        'latestVersion',
     ],
     'superAdminItems' => [
         'jobMaxPortion',
@@ -215,10 +221,30 @@ return [
     'superAdminSystemItems' => [
     ],
     'userItems' => [
-        'outboundEmailFromAddress',
-        'outboundEmailFromName',
-        'outboundEmailBccAddress',
-        'integrations',
+
+    ],
+    'globalItems' => [
+        'cacheTimestamp',
+        'language',
+        'isDeveloperMode',
+        'dateFormat',
+        'timeFormat',
+        'timeZone',
+        'decimalMark',
+        'weekStart',
+        'thousandSeparator',
+        'companyLogoId',
+        'applicationName',
+        'jsLibs',
+        'maintenanceMode',
+        'siteUrl',
+        'useCache',
+        'useCacheInDeveloperMode',
+        'isDeveloperMode',
+        'version',
+        'useWebSocket',
+        'webSocketUrl',
+        'aclAllowDeleteCreated',
     ],
     'isInstalled' => false,
     'ldapUserNameAttribute' => 'sAMAccountName',
@@ -256,4 +282,5 @@ return [
     'requiredMariadbVersion' => '5.5.3',
     'recommendedMariadbParams' => [],
     'ldapPortalUserLdapAuth' => false,
+    'aclStrictMode' => true,
 ];

application/Espo/EntryPoints/Attachment.php

@@ -37,6 +37,13 @@ class Attachment extends \Espo\Core\EntryPoints\Base
 {
     public static $authRequired = true;
 
+    protected $allowedFileTypes = [
+        'image/jpeg',
+        'image/png',
+        'image/gif',
+        'image/webp',
+    ];
+
     public function run()
     {
         $id = $_GET['id'];
@@ -60,8 +67,14 @@ class Attachment extends \Espo\Core\EntryPoints\Base
             throw new NotFound();
         }
 
+        $fileType = $attachment->get('type');
+
+        if (!in_array($fileType, $this->allowedFileTypes)) {
+            throw new Forbidden("EntryPoint Attachment: Not allowed type {$fileType}.");
+        }
+
         if ($attachment->get('type')) {
-            header('Content-Type: ' . $attachment->get('type'));
+            header('Content-Type: ' . $fileType);
         }
 
         header('Pragma: public');
@@ -70,4 +83,3 @@ class Attachment extends \Espo\Core\EntryPoints\Base
         exit;
     }
 }
-

application/Espo/EntryPoints/Image.php

@@ -30,6 +30,7 @@
 namespace Espo\EntryPoints;
 
 use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\NotFoundSilent;
 use \Espo\Core\Exceptions\Forbidden;
 use \Espo\Core\Exceptions\BadRequest;
 use \Espo\Core\Exceptions\Error;
@@ -84,7 +85,7 @@ class Image extends \Espo\Core\EntryPoints\Base
         $attachment = $this->getEntityManager()->getEntity('Attachment', $id);
 
         if (!$attachment) {
-            throw new NotFound();
+            throw new NotFoundSilent();
         }
 
         if (!$disableAccessCheck && !$this->getAcl()->checkEntity($attachment)) {
@@ -98,7 +99,7 @@ class Image extends \Espo\Core\EntryPoints\Base
         $fileType = $attachment->get('type');
 
         if (!file_exists($filePath)) {
-            throw new NotFound();
+            throw new NotFoundSilent();
         }
 
         if (!in_array($fileType, $this->allowedFileTypes)) {

application/Espo/Jobs/Cleanup.php

@@ -428,7 +428,9 @@ class Cleanup extends \Espo\Core\Jobs\Base
     {
         if (!$this->getConfig()->get('cleanupDeletedRecords')) return;
         $period = '-' . $this->getConfig()->get('cleanupDeletedRecordsPeriod', $this->cleanupDeletedRecordsPeriod);
-        $datetime = new \DateTime('-' . $period);
+        $datetime = new \DateTime($period);
+
+        $serviceFactory = $this->getServiceFactory();
 
         $scopeList = array_keys($this->getMetadata()->get(['scopes']));
         foreach ($scopeList as $scope) {
@@ -443,6 +445,15 @@ class Cleanup extends \Espo\Core\Jobs\Base
             if (!method_exists($repository, 'select')) continue;
             if (!method_exists($repository, 'deleteFromDb')) continue;
 
+            $hasCleanupMethod = false;
+            $service = null;
+            if ($serviceFactory->checkExists($scope)) {
+                $service = $serviceFactory->create($scope);
+                if (method_exists($service, 'cleanup')) {
+                    $hasCleanupMethod = true;
+                }
+            }
+
             $whereClause = [
                 'deleted' => 1,
             ];
@@ -455,6 +466,13 @@ class Cleanup extends \Espo\Core\Jobs\Base
 
             $deletedEntityList = $repository->select(['id', 'deleted'])->where($whereClause)->find(['withDeleted' => true]);
             foreach ($deletedEntityList as $e) {
+                if ($hasCleanupMethod) {
+                    try {
+                        $service->cleanup($e->id);
+                    } catch (\Throwable $e) {
+                        $GLOBALS['log']->error("Cleanup job: Cleanup scope {$scope}: " . $e->getMessage());
+                    }
+                }
                 $this->cleanupDeletedEntity($e);
             }
         }

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

@@ -31,6 +31,8 @@ namespace Espo\Modules\Crm\Business\Event;
 
 use \Espo\ORM\Entity;
 
+use Espo\Core\Utils\Util;
+
 class Invitations
 {
     protected $entityManager;
@@ -140,7 +142,7 @@ class Invitations
         }
 
         $data['entityType'] = $this->language->translate($entity->getEntityType(), 'scopeNames');
-        $data['entityTypeLowerFirst'] = lcfirst($data['entityType']);
+        $data['entityTypeLowerFirst'] = Util::mbLowerCaseFirst($data['entityType']);
 
         $htmlizer = new \Espo\Core\Htmlizer\Htmlizer($this->fileManager, $dateTime, $this->number, null);
 

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

@@ -31,6 +31,8 @@ namespace Espo\Modules\Crm\Business\Reminder;
 
 use \Espo\ORM\Entity;
 
+use Espo\Core\Utils\Util;
+
 class EmailReminder
 {
     protected $entityManager;
@@ -79,7 +81,7 @@ class EmailReminder
 
     protected function parseInvitationTemplate($contents, $entity, $user = null)
     {
-        $contents = str_replace('{eventType}', strtolower($this->language->translate($entity->getEntityName(), 'scopeNames')), $contents);
+        $contents = str_replace('{eventType}', mb_strtolower($this->language->translate($entity->getEntityName(), 'scopeNames')), $contents);
 
         $preferences = $this->getEntityManager()->getEntity('Preferences', $user->id);
         $timezone = $preferences->get('timeZone');
@@ -141,7 +143,7 @@ class EmailReminder
         $data['recordUrl'] = $recordUrl;
 
         $data['entityType'] = $this->getLanguage()->translate($entity->getEntityType(), 'scopeNames');
-        $data['entityTypeLowerFirst'] = lcfirst($data['entityType']);
+        $data['entityTypeLowerFirst'] = Util::mbLowerCaseFirst($data['entityType']);
 
         if ($user) {
             $data['userName'] = $user->get('name');

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

@@ -88,12 +88,12 @@ class SubscribeAgain extends \Espo\Core\EntryPoints\Base
                     }
 
                     $link = null;
-                    $m = array(
+                    $m = [
                         'Account' => 'accounts',
                         'Contact' => 'contacts',
                         'Lead' => 'leads',
                         'User' => 'users'
-                    );
+                    ];
                     if (!empty($m[$target->getEntityType()])) {
                         $link = $m[$target->getEntityType()];
                     }
@@ -115,7 +115,11 @@ class SubscribeAgain extends \Espo\Core\EntryPoints\Base
                         }
 
                         $data = [
-                            'queueItemId' => $queueItemId
+                            'actionData' => [
+                                'queueItemId' => $queueItemId,
+                            ],
+                            'view' => $this->getMetadata()->get(['clientDefs', 'Campaign', 'subscribeView']),
+                            'template' => $this->getMetadata()->get(['clientDefs', 'Campaign', 'subscribeTemplate']),
                         ];
 
                         $runScript = "

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

@@ -88,12 +88,12 @@ class Unsubscribe extends \Espo\Core\EntryPoints\Base
                     }
 
                     $link = null;
-                    $m = array(
+                    $m = [
                         'Account' => 'accounts',
                         'Contact' => 'contacts',
                         'Lead' => 'leads',
                         'User' => 'users'
-                    );
+                    ];
                     if (!empty($m[$target->getEntityType()])) {
                         $link = $m[$target->getEntityType()];
                     }
@@ -115,7 +115,11 @@ class Unsubscribe extends \Espo\Core\EntryPoints\Base
                         }
 
                         $data = [
-                            'queueItemId' => $queueItemId
+                            'actionData' => [
+                                'queueItemId' => $queueItemId,
+                            ],
+                            'view' => $this->getMetadata()->get(['clientDefs', 'Campaign', 'unsubscribeView']),
+                            'template' => $this->getMetadata()->get(['clientDefs', 'Campaign', 'unsubscribeTemplate']),
                         ];
 
                         $runScript = "
@@ -137,4 +141,3 @@ class Unsubscribe extends \Espo\Core\EntryPoints\Base
         }
     }
 }
-

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

@@ -33,7 +33,17 @@ use Espo\ORM\Entity;
 
 class Lead extends \Espo\Core\ORM\Repositories\RDB
 {
-    public function afterSave(Entity $entity, array $options = array())
+    public function beforeSave(Entity $entity, array $options = [])
+    {
+        if (!$entity->get('convertedAt') && $entity->get('status') === 'Converted' && $entity->isAttributeChanged('status')) {
+            $convertedAt = date('Y-m-d H:i:s');
+            $entity->set('convertedAt', $convertedAt);
+        }
+
+        parent::beforeSave($entity, $options);
+    }
+
+    public function afterSave(Entity $entity, array $options = [])
     {
         parent::afterSave($entity, $options);
 

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

@@ -22,6 +22,7 @@
         "createdAccount": "Account",
         "createdContact": "Contact",
         "createdOpportunity": "Opportunity",
+        "convertedAt": "Converted At",
         "campaign": "Campaign",
         "targetLists": "Target Lists",
         "targetList": "Target List",

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

@@ -1,6 +1,6 @@
 {
   "fields": {
-    "name": "Record Naam",
+    "name": "Naam",
     "emailAddress": "E-mail",
     "phoneNumber": "Telefoon",
     "billingAddress": "Factuur Adres",
@@ -8,6 +8,7 @@
     "description": "Beschrijving",
     "industry": "Industrie",
     "contactRole": "Titel",
+    "campaign": "Campagne",
     "targetLists": "Doellijsten",
     "targetList": "Doellijst",
     "originalLead": "Oorspronkelijke lead",
@@ -16,10 +17,13 @@
   "links": {
     "contacts": "Contacten",
     "opportunities": "Kansen",
-    "cases": "Casus",
+    "cases": "Tickets",
     "documents": "Documenten",
+    "emailsPrimary": "E-mails (expanded)",
     "targetLists": "Doellijsten",
-    "portalUsers": "Portal-gebruikers",
+    "campaignLogRecords": "Campagne log",
+    "campaign": "Campagne",
+    "portalUsers": "Portaal-gebruikers",
     "originalLead": "Oorspronkelijke lead"
   },
   "options": {
@@ -33,20 +37,19 @@
       "Education": "Onderwijs",
       "Electronics": "Electronica",
       "Insurance": "Verzekeringen",
-      "Aerospace": "ruimte",
+      "Aerospace": "Ruimtevaart",
       "Architecture": "Architectuur",
       "Construction": "Bouw",
-      "Defense": "Verdediging",
+      "Defense": "Defensie",
       "Creative": "Creatief",
       "Culture": "Cultuur",
-      "Consulting": "Overleg plegen",
+      "Consulting": "Consultancy",
       "Electric Power": "Elektrische energie",
       "Hospitality": "Gastvrijheid",
-      "Mass Media": "Massa media",
+      "Mass Media": "Media",
       "Mining": "Mijnbouw",
       "Music": "Muziek",
-      "Petroleum": "petroleum",
-      "Retail": "Kleinhandel",
+      "Retail": "Retailhandel",
       "Shipping": "Verzenden",
       "Support": "Ondersteuning",
       "Testing, Inspection & Certification": "Testen, inspectie en certificering",
@@ -55,8 +58,8 @@
     }
   },
   "labels": {
-    "Create Account": "Klant Aanmaken",
-    "Copy Billing": "Kopieer van Factuur",
+    "Create Account": "Relatie Aanmaken",
+    "Copy Billing": "Kopie factuur",
     "Set Primary": "Primair instellen"
   },
   "presetFilters": {

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

@@ -10,6 +10,7 @@
     "users": "Gebruikers",
     "contacts": "Contacten",
     "reminders": "Herineringen",
+    "account": "Relatie",
     "acceptanceStatus": "Acceptatiestatus"
   },
   "options": {

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

@@ -8,19 +8,20 @@
     "budgetConverted": "Budget (omgezet)",
     "contactsTemplate": "Contacten-sjabloon",
     "leadsTemplate": "Leads sjabloon",
-    "accountsTemplate": "Accounts-sjabloon",
+    "accountsTemplate": "Relaties-sjabloon",
     "usersTemplate": "Gebruikers sjabloon",
     "mailMergeOnlyWithAddress": "Records overslaan zonder ingevuld adres",
     "budgetCurrency": "Budgetvaluta"
   },
   "links": {
     "targetLists": "Doellijsten",
-    "accounts": "Klanten",
+    "accounts": "Relaties",
     "contacts": "Contacten",
     "opportunities": "Kansen",
+    "massEmails": "Mass E-mails",
     "contactsTemplate": "Contacten-sjabloon",
     "leadsTemplate": "Leads sjabloon",
-    "accountsTemplate": "Accounts-sjabloon",
+    "accountsTemplate": "Relaties-sjabloon",
     "usersTemplate": "Gebruikers sjabloon"
   },
   "options": {
@@ -35,7 +36,7 @@
   },
   "labels": {
     "Target Lists": "Doellijsten",
-    "Mass Emails": "Massale e-mails",
+    "Mass Emails": "Massale E-mails",
     "Email Templates": "E-mailsjablonen",
     "Unsubscribe again": "Afmelden opnieuw",
     "Subscribe again": "Abonneer opnieuw",

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

@@ -1,6 +1,8 @@
 {
   "fields": {
-    "name": "Record Naam",
+    "name": "Naam",
+    "number": "Nummer",
+    "account": "Relatie",
     "contacts": "Contacten",
     "priority": "Prioriteit",
     "description": "Beschrijving",
@@ -8,9 +10,10 @@
     "inboundEmail": "Groeps e-mailaccount"
   },
   "links": {
+    "account": "Relatie",
     "Contacts": "Contacten",
     "emails": "E-mails",
-    "articles": "Knowledge Base-artikelen",
+    "articles": "Kennisbank-artikelen",
     "attachments": "Bijlagen",
     "inboundEmail": "Groeps e-mailaccount"
   },
@@ -21,7 +24,7 @@
       "Pending": "In afwachting",
       "Closed": "Gesloten",
       "Rejected": "Afgewezen",
-      "Duplicate": "Duplicaat"
+      "Duplicate": "Dubbel"
     },
     "priority": {
       "Low": "Laag",
@@ -34,7 +37,8 @@
     }
   },
   "labels": {
-    "Close": "Sluit",
+    "Close": "Afsluiten",
+    "Reject": "Afwijzen",
     "Closed": "Gesloten",
     "Rejected": "Afgewezen"
   },

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

@@ -3,28 +3,31 @@
     "name": "Record Naam",
     "emailAddress": "E-mail",
     "accountRole": "Titel",
-    "accounts": "Klanten",
+    "account": "Relatie",
+    "accounts": "Relaties",
     "phoneNumber": "Telefoon",
-    "accountType": "Klant Type",
+    "accountType": "Relatie Type",
     "doNotCall": "Niet Bellen",
     "address": "Adres",
     "opportunityRole": "Functie Kansen",
     "description": "Beschrijving",
     "targetLists": "Doellijsten",
-    "portalUser": "Portalgebruiker",
+    "portalUser": "Portaalgebruiker",
     "originalLead": "Oorspronkelijke lead",
     "acceptanceStatus": "Acceptatiestatus",
-    "accountIsInactive": "account inactief",
+    "accountIsInactive": "Relatie inactief",
     "acceptanceStatusMeetings": "Acceptatiestatus (vergaderingen)",
     "acceptanceStatusCalls": "Acceptatiestatus (oproepen)",
-    "title": "Primair Account titel"
+    "title": "Primair relatie titel"
   },
   "links": {
     "opportunities": "Kansen",
-    "cases": "Casus",
+    "cases": "Tickets",
     "targetLists": "Doellijsten",
-    "accounts": "Klanten",
-    "portalUser": "Portalgebruiker",
+    "account": "Relatie (Primary)",
+    "accounts": "Relatie",
+    "casesPrimary": "Tickets (Primary)",
+    "portalUser": "Portaalgebruiker",
     "originalLead": "Oorspronkelijke lead",
     "documents": "documenten",
     "tasksPrimary": "Taken (uitgebreid)"
@@ -39,8 +42,8 @@
     }
   },
   "presetFilters": {
-    "portalUsers": "Portal-gebruikers",
-    "notPortalUsers": "Geen portalgebruikers",
+    "portalUsers": "Portaal-gebruikers",
+    "notPortalUsers": "Geen portaalgebruikers",
     "accountActive": "Actief"
   }
 }

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

@@ -8,10 +8,10 @@
     "publishDate": "Publicatiedatum",
     "expirationDate": "Vervaldatum",
     "description": "Beschrijving",
-    "accounts": "Klanten"
+    "accounts": "Relatie"
   },
   "links": {
-    "accounts": "Klanten",
+    "accounts": "Relatie",
     "opportunities": "Kansen",
     "leads": "leads",
     "contacts": "Contacten"

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

@@ -4,29 +4,33 @@
     "contacts": "Contacten",
     "opportunities": "Kansen",
     "emails": "E-mails",
-    "accounts": "Klanten",
-    "cases": "Casus",
+    "accounts": "Relaties",
+    "cases": "Tickets",
     "documents": "Documenten",
+    "account": "Relatie",
     "opportunity": "Kans"
   },
   "scopeNames": {
+    "Account": "Relatie",
     "Opportunity": "Kans",
     "Meeting": "Vergadering",
     "Calendar": "Kalender",
     "Call": "Tel. Gesprek",
     "Task": "Taak",
+    "Case": "Ticket",
     "Activities": "Activiteiten",
     "KnowledgeBaseArticle": "Kennisbank-artikel",
     "KnowledgeBaseCategory": "Kennisbank-categorie"
   },
   "scopeNamesPlural": {
-    "Account": "Klanten",
+    "Account": "Relaties",
     "Contact": "Contacten",
     "Opportunity": "Kansen",
     "Calendar": "Kalender",
-    "Case": "Casus",
+    "Case": "Tickets",
     "Document": "Documenten",
     "TargetList": "Doellijsten",
+    "MassEmail": "Mass E-mails",
     "Activities": "Activiteiten",
     "KnowledgeBaseArticle": "Kennisbank",
     "KnowledgeBaseCategory": "Kennisbank-categorieën"
@@ -35,7 +39,7 @@
     "Leads": "Mijn Leads",
     "Opportunities": "Mijn Kansen",
     "Tasks": "Mijn Taken",
-    "Cases": "Mijn Casus",
+    "Cases": "Mijn Tickets",
     "Calendar": "Kalender",
     "Calls": "Mijn Tel.gesprekken",
     "Meetings": "Mijn Afspraken",

application/Espo/Modules/Crm/Resources/i18n/nl_NL/KnowledgeBaseArticle.json

@@ -15,16 +15,16 @@
     "publishDate": "Publiceer datum",
     "expirationDate": "vervaldatum",
     "description": "Beschrijving",
-    "body": "Lichaam",
+    "body": "Inhoud",
     "categories": "Categorieën",
     "language": "Taal",
-    "portals": "portals"
+    "portals": "portalen"
   },
   "links": {
-    "cases": "Casus",
+    "cases": "Tickets",
     "opportunities": "Kansen",
     "categories": "Categorieën",
-    "portals": "portals"
+    "portals": "portalen"
   },
   "options": {
     "status": {
@@ -41,6 +41,6 @@
     "published": "Gepubliceerd"
   },
   "tooltips": {
-    "portals": "Artikel is alleen beschikbaar in bepaalde portals."
+    "portals": "Artikel is alleen beschikbaar in bepaalde portalen."
   }
 }

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

@@ -10,13 +10,14 @@
     "emailAddress": "E-mail",
     "title": "Titel",
     "phoneNumber": "Telefoon",
-    "accountName": "Naam Klant",
+    "accountName": "Relatie naam",
     "doNotCall": "Niet Bellen",
     "address": "Adres",
     "source": "Bron",
     "opportunityAmount": "Bedrag Kansen",
     "opportunityAmountConverted": "Bedrag Kans (geconverteerd)",
     "description": "Beschrijving",
+    "createdAccount": "Relatie",
     "createdOpportunity": "Kans",
     "targetLists": "Doellijsten",
     "industry": "Industrie",
@@ -27,8 +28,9 @@
   },
   "links": {
     "targetLists": "Doellijsten",
+    "createdAccount": "Relatie",
     "createdOpportunity": "Kans",
-    "cases": "Casus",
+    "cases": "Tickets",
     "documents": "documenten"
   },
   "options": {

application/Espo/Modules/Crm/Resources/i18n/nl_NL/MassEmail.json

@@ -1,6 +1,7 @@
 {
   "fields": {
     "name": "Record Naam",
+    "storeSentEmails": "Opslaan verzonden E-mails",
     "startAt": "Start Datum",
     "fromAddress": "Van Adres",
     "fromName": "Van Naam",
@@ -28,7 +29,7 @@
     "storeSentEmails": "E-mails worden opgeslagen in CRM."
   },
   "presetFilters": {
-    "actual": "werkelijk",
+    "actual": "Werkelijk",
     "complete": "Compleet"
   },
   "labels": {

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

@@ -9,6 +9,7 @@
     "users": "Gebruikers",
     "contacts": "Contacten",
     "reminders": "Herineringen",
+    "account": "Relatie",
     "acceptanceStatus": "Acceptatiestatus",
     "dateStartDate": "Startdatum (de hele dag)",
     "dateEndDate": "Datum einde (hele dag)",

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

@@ -1,6 +1,7 @@
 {
   "fields": {
     "name": "Record Naam",
+    "account": "Relatie",
     "stage": "Stadium",
     "amount": "Aantal",
     "probability": "Waarschijnlijkheid, %",

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

@@ -9,8 +9,9 @@
     "isOptedOut": "Is afgemeld"
   },
   "links": {
-    "accounts": "Klanten",
-    "contacts": "Contacten"
+    "accounts": "Relaties",
+    "contacts": "Contacten",
+    "massEmails": "Mass E-mails"
   },
   "options": {
     "type": {

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

@@ -6,11 +6,13 @@
     "priority": "Prioriteit",
     "description": "Beschrijving",
     "isOverdue": "Te Laat",
+    "account": "Relatie",
     "attachments": "Bijlagen",
-    "reminders": "herinneringen"
+    "reminders": "Herinneringen"
   },
   "links": {
-    "attachments": "Bijlagen"
+    "attachments": "Bijlagen",
+    "account": "Relatie"
   },
   "options": {
     "status": {
@@ -34,6 +36,6 @@
     "completed": "Voltooid",
     "todays": "Huidig",
     "overdue": "Laat",
-    "deferred": "uitgestelde"
+    "deferred": "Uitgestelde"
   }
 }

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

@@ -2,7 +2,6 @@
   "fields": {
     "name": "Nazwa",
     "emailAddress": "E-mail",
-    "title": "Tytuł",
     "accountRole": "Tytuł",
     "account": "Klient",
     "accounts": "Klienci",
@@ -31,7 +30,6 @@
   },
   "options": {
     "opportunityRole": {
-      "": "--NIC--",
       "Decision Maker": "Osoba Decyzyjna",
       "Evaluator": "Oceniający",
       "Influencer": "Wpływający"

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

@@ -1,67 +1,65 @@
 {
-	"fields": {
-		"name": "Nome",
-		"emailAddress": "E-mail",
-		"website": "Website",
-		"phoneNumber": "Telefone",
-		"billingAddress": "Endereço de Cobrança",
-		"shippingAddress": "Endereço de Entrega",
-		"description": "Descrição",
-		"sicCode": "CNPJ",
-		"industry": "Indústria",
-		"type": "Tipo",
-		"contactRole": "Regra",
-        "campaign": "Campanha"
-	},
-	"links": {
-		"contacts": "Contatos",
-		"opportunities": "Oportunidades",
-		"cases": "Atendimentos",
-		"documents": "Documentos",
-        "meetingsPrimary": "Reuniões (Interno)",
-        "callsPrimary": "Ligações (Interno)",
-        "tasksPrimary": "Tarefas (Interno)",
-        "targetLists": "Lista de alvos",
-        "campaignLogRecords": "Log da Campanha"
-	},
-	"options": {
-		"type": {
-			"Customer": "Cliente",
-			"Investor": "Investidor",
-			"Partner": "Parceiro",
-			"Reseller": "Revendedor"
-		},
-		"industry": {
-			"Agriculture": "Agricultura",
-            "Advertising": "Publicidade",
-            "Apparel & Accessories": "Apparel & Accessories",
-            "Automotive": "Automotiva",
-            "Banking": "Banco",
-            "Biotechnology": "Biotecnologia",
-            "Chemical": "Química",
-            "Computer": "Computadores",
-            "Education": "Educação",
-            "Electronics": "Electrônicos",
-            "Entertainment & Leisure": "Entertainment & Leisure",
-            "Finance": "Finanças",
-            "Food & Beverage": "Alimentação",
-            "Grocery": "Grocery",
-            "Insurance": "Insurance",
-            "Legal": "Legal",
-            "Publishing": "Publishing",
-            "Real Estate": "Real Estate",
-            "Service": "Service",
-            "Sports": "Sports",
-            "Software": "Software",
-            "Technology": "Technology",
-            "Telecommunications": "Telecommunications",
-            "Television": "Television",
-            "Transportation": "Transportation",
-            "Venture Capital": "Venture Capital"
-		}
-	},
-	"labels": {
-		"Create Account": "Criar Conta",
-		"Copy Billing": "Copiar Cobrança"
-	}
-}
+  "fields": {
+    "name": "Nome",
+    "emailAddress": "E-mail",
+    "phoneNumber": "Telefone",
+    "billingAddress": "Endereço de Cobrança",
+    "shippingAddress": "Endereço de Entrega",
+    "description": "Descrição",
+    "sicCode": "CNPJ",
+    "industry": "Indústria",
+    "type": "Tipo",
+    "contactRole": "Regra",
+    "campaign": "Campanha",
+    "targetLists": "Listas de Alvo",
+    "targetList": "Lista de Alvo",
+    "contactIsInactive": "Inativo"
+  },
+  "links": {
+    "contacts": "Contatos",
+    "opportunities": "Oportunidades",
+    "cases": "Atendimentos",
+    "documents": "Documentos",
+    "meetingsPrimary": "Reuniões (Interno)",
+    "callsPrimary": "Ligações (Interno)",
+    "tasksPrimary": "Tarefas (Interno)",
+    "targetLists": "Lista de alvos",
+    "campaignLogRecords": "Log da Campanha",
+    "campaign": "Campanha",
+    "portalUsers": "Usuários de Portal"
+  },
+  "options": {
+    "type": {
+      "Customer": "Cliente",
+      "Investor": "Investidor",
+      "Partner": "Parceiro",
+      "Reseller": "Revendedor"
+    },
+    "industry": {
+      "Agriculture": "Agricultura",
+      "Advertising": "Publicidade",
+      "Automotive": "Automotiva",
+      "Banking": "Banco",
+      "Biotechnology": "Biotecnologia",
+      "Building Materials & Equipment": "Materiais de Construção e Equipamento",
+      "Chemical": "Química",
+      "Computer": "Computadores",
+      "Education": "Educação",
+      "Electronics": "Electrônicos",
+      "Energy": "Energia",
+      "Finance": "Finanças",
+      "Food & Beverage": "Alimentação",
+      "Healthcare": "Plano de Saúde",
+      "Travel": "Viagem"
+    }
+  },
+  "labels": {
+    "Create Account": "Criar Conta",
+    "Copy Billing": "Copiar Cobrança",
+    "Set Primary": "Definir Primário"
+  },
+  "presetFilters": {
+    "customers": "Clientes",
+    "partners": "Parceiros"
+  }
+}

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

@@ -1,5 +1,5 @@
 {
-    "layouts": {
-        "detailConvert": "Converter Lead"
-    }
-}
+  "layouts": {
+    "detailConvert": "Converter Lead"
+  }
+}

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

@@ -1,13 +1,20 @@
 {
-	"modes": {
-		"month": "Mês",
-		"week": "Semana",
-		"day": "Dia",
-		"agendaWeek": "Semana",
-		"agendaDay": "Dia"
-	},
-	"labels": {
-		"Today": "Hoje",
-		"Create": "Criar"
-	}
-}
+  "modes": {
+    "month": "Mês",
+    "week": "Semana",
+    "agendaWeek": "Semana",
+    "day": "Dia",
+    "agendaDay": "Dia",
+    "timeline": "Linha do Tempo"
+  },
+  "labels": {
+    "Today": "Hoje",
+    "Create": "Criar",
+    "Shared": "Compartilhado",
+    "Add User": "Adicionar Usuário",
+    "current": "atual",
+    "time": "tempo",
+    "User List": "Lista de Usuário",
+    "Manage Users": "Gerenciar Usuários"
+  }
+}

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

@@ -1,47 +1,43 @@
 {
-    "fields": {
-        "name": "Nome",
-        "parent": "Relação",
-        "status": "Status",
-        "dateStart": "Data de Início",
-        "dateEnd": "Data Final",
-        "direction": "Direção",
-        "duration": "Duração",
-        "description": "Descrição",
-        "users": "Usuários",
-        "contacts": "Contatos",
-        "leads": "Leads",
-        "reminders": "Lembretes",
-        "account": "Conta"
+  "fields": {
+    "name": "Nome",
+    "parent": "Relação",
+    "dateStart": "Data de Início",
+    "dateEnd": "Data Final",
+    "direction": "Direção",
+    "duration": "Duração",
+    "description": "Descrição",
+    "users": "Usuários",
+    "contacts": "Contatos",
+    "reminders": "Lembretes",
+    "account": "Conta"
+  },
+  "options": {
+    "status": {
+      "Planned": "Planejado",
+      "Held": "Realizada",
+      "Not Held": "Não Realizada"
     },
-    "links": {
+    "direction": {
+      "Outbound": "Saída",
+      "Inbound": "Entrada"
     },
-    "options": {
-        "status": {
-            "Planned": "Planejado",
-            "Held": "Realizada",
-            "Not Held": "Não Realizada"
-        },
-        "direction": {
-            "Outbound": "Saída",
-            "Inbound": "Entrada"
-        },
-		"acceptanceStatus": {
-			"None": "Nenhum",
-			"Accepted": "Aceita",
-			"Declined": "Rejeitada",
-            "Tentative": "Tentativa"
-		}
-    },
-    "labels": {
-        "Create Call": "Criar Ligação",
-        "Set Held": "Marcar como realizada",
-        "Set Not Held": "Marcar como não realizada",
-        "Send Invitations": "Enviar Convites"
-    },
-	"presetFilters": {
-		"planned": "Planejado",
-		"held": "Realizado",
-		"todays": "Hoje"
-	}
-}
+    "acceptanceStatus": {
+      "None": "Nenhum",
+      "Accepted": "Aceita",
+      "Declined": "Rejeitada",
+      "Tentative": "Tentativa"
+    }
+  },
+  "labels": {
+    "Create Call": "Criar Ligação",
+    "Set Held": "Marcar como realizada",
+    "Set Not Held": "Marcar como não realizada",
+    "Send Invitations": "Enviar Convites"
+  },
+  "presetFilters": {
+    "planned": "Planejado",
+    "held": "Realizado",
+    "todays": "Hoje"
+  }
+}

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

@@ -1,54 +1,49 @@
 {
-    "fields": {
-        "name": "Nome",
-        "description": "Descrição",
-        "status": "Status",
-        "type": "Tipo",
-        "startDate": "Data de início",
-        "endDate": "Data de fim",
-        "targetLists": "Lista de alvos",
-        "sentCount": "Enviar",
-        "openedCount": "Abertos",
-        "clickedCount": "Clicados",
-        "optedOutCount": "Cancelamentos",
-        "bouncedCount": "Bounces",
-        "hardBouncedCount": "Hard Bounce",
-        "softBouncedCount": "Soft Bounce",
-        "leadCreatedCount": "Leads Criados",
-        "revenue": "Receita"
+  "fields": {
+    "name": "Nome",
+    "description": "Descrição",
+    "type": "Tipo",
+    "startDate": "Data de início",
+    "endDate": "Data de fim",
+    "targetLists": "Lista de alvos",
+    "sentCount": "Enviar",
+    "openedCount": "Abertos",
+    "clickedCount": "Clicados",
+    "optedOutCount": "Cancelamentos",
+    "bouncedCount": "Bounces",
+    "hardBouncedCount": "Hard Bounce",
+    "softBouncedCount": "Soft Bounce",
+    "leadCreatedCount": "Leads Criados",
+    "revenue": "Receita",
+    "budget": "Orçamento"
+  },
+  "links": {
+    "targetLists": "Lista de alvos",
+    "accounts": "Contas",
+    "contacts": "Contatos",
+    "opportunities": "Oportunidades"
+  },
+  "options": {
+    "type": {
+      "Email": "E-mail",
+      "Television": "Televisão",
+      "Radio": "Rádio",
+      "Mail": "Correio"
     },
-    "links": {
-        "targetLists": "Lista de alvos",
-        "accounts": "Contas",
-        "contacts": "Contatos",
-        "leads": "Leads",
-        "opportunities": "Oportunidades",
-        "campaignLogRecords": "Log"
-    },
-    "options": {
-        "type": {
-            "Email": "E-mail",
-            "Web": "Web",
-            "Television": "Televisão",
-            "Radio": "Rádio",
-            "Newsletter": "Newsletter",
-            "Mail": "Correio"
-        },
-        "status": {
-            "Planning": "Planejamento",
-            "Active": "Ativa",
-            "Inactive": "Inativa",
-            "Complete": "Completa"
-        }
-    },
-    "labels": {
-        "Create Campaign": "Criar Campanha",
-        "Target Lists": "Lista de alvos",
-        "Statistics": "Estatísticas",
-        "hard": "hard",
-        "soft": "soft"
-    },
-    "presetFilters": {
-        "active": "Ativa"
+    "status": {
+      "Planning": "Planejamento",
+      "Active": "Ativa",
+      "Inactive": "Inativa",
+      "Complete": "Completa"
     }
-}
+  },
+  "labels": {
+    "Create Campaign": "Criar Campanha",
+    "Target Lists": "Lista de alvos",
+    "Statistics": "Estatísticas",
+    "Email Templates": "Templates de email"
+  },
+  "presetFilters": {
+    "active": "Ativa"
+  }
+}

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

@@ -1,24 +1,33 @@
 {
-    "fields": {
-        "action": "Ação",
-        "actionDate": "Data",
-        "data": "Dados",
-        "campaign": "Campanha",
-        "parent": "Alvo",
-        "object": "Objeto",
-        "application": "Aplicação"
-    },
-    "options": {
-    	"action": {
-            "Sent": "Enviado",
-            "Opened": "Aberto",
-            "Opted Out": "Cancelado",
-            "Bounced": "Bounced",
-            "Clicked": "Clicado",
-            "Lead Created": "Lead Criado"
-    	}
-    },
-    "labels": {
-        "All": "Tudo"
+  "fields": {
+    "action": "Ação",
+    "actionDate": "Data",
+    "data": "Dados",
+    "campaign": "Campanha",
+    "parent": "Alvo",
+    "object": "Objeto",
+    "application": "Aplicação"
+  },
+  "links": {
+    "object": "Assunto",
+    "campaign": "Campanha"
+  },
+  "options": {
+    "action": {
+      "Sent": "Enviado",
+      "Opened": "Aberto",
+      "Opted Out": "Cancelado",
+      "Clicked": "Clicado",
+      "Lead Created": "Lead Criado"
     }
-}
+  },
+  "labels": {
+    "All": "Tudo"
+  },
+  "presetFilters": {
+    "sent": "Enviado",
+    "opened": "Aberto",
+    "clicked": "Clicado",
+    "leadCreated": "Lead criado"
+  }
+}

application/Espo/Modules/Crm/Resources/i18n/pt_BR/CampaignTrackingUrl.json

@@ -0,0 +1,8 @@
+{
+  "fields": {
+    "campaign": "Campanha"
+  },
+  "links": {
+    "campaign": "Campanha"
+  }
+}

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

@@ -1,42 +1,53 @@
 {
-    "fields": {
-        "name": "Nome",
-        "number": "Número",
-        "status": "Status",
-        "account": "Conta",
-        "contact": "Contato",
-        "priority": "Prioridade",
-        "type": "Tipo",
-        "description": "Descrição"
+  "fields": {
+    "name": "Nome",
+    "number": "Número",
+    "account": "Conta",
+    "contact": "Contato",
+    "contacts": "Contatos",
+    "priority": "Prioridade",
+    "type": "Tipo",
+    "description": "Descrição",
+    "attachments": "Anexos"
+  },
+  "links": {
+    "account": "Conta",
+    "contact": "Contato (Primário)",
+    "Contacts": "Contatos",
+    "meetings": "Reuniões",
+    "calls": "Ligações",
+    "tasks": "Tarefas",
+    "attachments": "Anexos"
+  },
+  "options": {
+    "status": {
+      "New": "Novo",
+      "Assigned": "Designado",
+      "Pending": "Pendente",
+      "Closed": "Fechado",
+      "Rejected": "Rejeitado",
+      "Duplicate": "Duplicado"
     },
-    "links": {
+    "priority": {
+      "Low": "Baixa",
+      "High": "Alta",
+      "Urgent": "Urgente"
     },
-    "options": {
-        "status": {
-            "New": "Novo",
-            "Assigned": "Designado",
-            "Pending": "Pendente",
-            "Closed": "Fechado",
-            "Rejected": "Rejeitado",
-            "Duplicate": "Duplicado"
-        },
-        "priority": {
-            "Low": "Baixa",
-            "Normal": "Normal",
-            "High": "Alta",
-            "Urgent": "Urgente"
-        },
-        "type": {
-            "Question": "Questão",
-            "Incident": "Incidente",
-            "Problem": "Problema"
-        }
-    },
-    "labels": {
-        "Create Case": "Criar Atendimento"
-    },
-	"presetFilters": {
-		"open": "Aberto",
-		"closed": "Fechado"
-	}
-}
+    "type": {
+      "Question": "Questão",
+      "Incident": "Incidente",
+      "Problem": "Problema"
+    }
+  },
+  "labels": {
+    "Create Case": "Criar Atendimento",
+    "Close": "Fechar",
+    "Reject": "Rejeitar",
+    "Closed": "Fechado",
+    "Rejected": "Rejeitado"
+  },
+  "presetFilters": {
+    "open": "Aberto",
+    "closed": "Fechado"
+  }
+}

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

@@ -1,34 +1,36 @@
 {
-    "fields": {
-        "name": "Nome",
-        "emailAddress": "E-mail",
-        "title": "Cargo",
-        "account": "Conta",
-		"accounts": "Contas",
-        "phoneNumber": "Telefone",
-		"accountType": "Tipo de Conta",
-        "doNotCall": "Não Ligar",
-        "address": "Endereço",
-        "opportunityRole": "Regra de Oportunidade",
-		"accountRole": "Regra",
-        "description": "Descrição",
-        "campaign": "Campanha"
-    },
-    "links": {
-        "opportunities": "Oportunidades",
-        "cases": "Atendimento",
-        "targetLists": "Lista de Alvos",
-        "campaignLogRecords": "Log das Campanhas"
-    },
-    "labels": {
-        "Create Contact": "Criar Contato"
-    },
-	"options": {
-		"opportunityRole": {
-			"": "--Nenhum--",
-			"Decision Maker": "Tomador de Decisão",
-			"Evaluator": "Avaliador",
-			"Influencer": "Influenciador"
-		}
-	}
-}
+  "fields": {
+    "name": "Nome",
+    "emailAddress": "E-mail",
+    "accountRole": "Regra",
+    "account": "Conta",
+    "accounts": "Contas",
+    "phoneNumber": "Telefone",
+    "accountType": "Tipo de Conta",
+    "doNotCall": "Não Ligar",
+    "address": "Endereço",
+    "opportunityRole": "Regra de Oportunidade",
+    "description": "Descrição",
+    "campaign": "Campanha",
+    "accountIsInactive": "Conta Inativa"
+  },
+  "links": {
+    "opportunities": "Oportunidades",
+    "cases": "Atendimento",
+    "targetLists": "Lista de Alvos",
+    "campaignLogRecords": "Log das Campanhas"
+  },
+  "labels": {
+    "Create Contact": "Criar Contato"
+  },
+  "options": {
+    "opportunityRole": {
+      "Decision Maker": "Tomador de Decisão",
+      "Evaluator": "Avaliador",
+      "Influencer": "Influenciador"
+    }
+  },
+  "presetFilters": {
+    "accountActive": "Ativo"
+  }
+}

application/Espo/Modules/Crm/Resources/i18n/pt_BR/DashletOptions.json

@@ -0,0 +1 @@
+{}

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

@@ -1,32 +1,30 @@
 {
-	"labels": {
-		"Create Document": "Criar Documento",
-		"Details": "Detalhes"
-	},
-	"fields": {
-		"name": "Nome",
-		"status": "Status",
-		"file": "Arquivo",
-		"type": "Tipo",
-		"source": "Fonte",
-		"publishDate": "Data de Publicação",
-		"expirationDate": "Data de expiração",
-		"description": "Descrição"
-	},
-	"links": {
-		"accounts": "Contas",
-		"opportunities": "Oportunidades"
-	},
-	"options": {
-		"status": {
-			"Active": "Ativo",
-			"Draft": "Rascunho",
-			"Expired": "Expirado",
-			"Canceled": "Cancelado"
-		}
-	},
-	"presetFilters": {
-		"active": "Ativo",
-		"draft": "Rascunho"
-	}
-}
+  "labels": {
+    "Create Document": "Criar Documento",
+    "Details": "Detalhes"
+  },
+  "fields": {
+    "name": "Nome",
+    "file": "Arquivo",
+    "type": "Tipo",
+    "publishDate": "Data de Publicação",
+    "expirationDate": "Data de expiração",
+    "description": "Descrição"
+  },
+  "links": {
+    "accounts": "Contas",
+    "opportunities": "Oportunidades"
+  },
+  "options": {
+    "status": {
+      "Active": "Ativo",
+      "Draft": "Rascunho",
+      "Expired": "Expirado",
+      "Canceled": "Cancelado"
+    }
+  },
+  "presetFilters": {
+    "active": "Ativo",
+    "draft": "Rascunho"
+  }
+}

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

@@ -0,0 +1 @@
+{}

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

@@ -0,0 +1,8 @@
+{
+  "labels": {
+    "Create Lead": "Criar lead",
+    "Create Contact": "Criar contato",
+    "Create Task": "Criar Tarefa",
+    "Create Case": "Criar caso"
+  }
+}

application/Espo/Modules/Crm/Resources/i18n/pt_BR/EmailQueueItem.json

@@ -0,0 +1,18 @@
+{
+  "fields": {
+    "name": "Nome",
+    "emailAddress": "Endereço de E-mail"
+  },
+  "options": {
+    "status": {
+      "Pending": "Pendente",
+      "Sent": "Enviado",
+      "Failed": "Falhou"
+    }
+  },
+  "presetFilters": {
+    "pending": "Pendente",
+    "sent": "Enviado",
+    "failed": "Falhou"
+  }
+}

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

@@ -1,100 +1,92 @@
 {
-    "scopeNames": {
-        "Account": "Conta",
-        "Contact": "Contato",
-        "Lead": "Lead",
-        "Target": "Alvo",
-        "Opportunity": "Oportunidade",
-        "Meeting": "Reunião",
-        "Calendar": "Calendário",
-        "Call": "Ligação",
-        "Task": "Tarefa",
-        "Case": "Atendimento",
-        "InboundEmail": "E-mail de Entrada",
-		"Document": "Documento",
-        "Campaign": "Campanha",
-        "TargetList": "Lista de Alvos"
-    },
-    "scopeNamesPlural": {
-        "Account": "Contas",
-        "Contact": "Contatos",
-        "Lead": "Leads",
-        "Target": "Alvos",
-        "Opportunity": "Oportunidades",
-        "Meeting": "Reuniões",
-        "Calendar": "Calendário",
-        "Call": "Ligações",
-        "Task": "Tarefas",
-        "Case": "Atendimentos",
-        "InboundEmail": "E-mails de Entrada",
-		"Document": "Documentos",
-        "Campaign": "Campaign",
-        "TargetList": "Target List"
-    },
-    "dashlets": {
-        "Leads": "Meus Leads",
-        "Opportunities": "Minhas Oportunidades",
-        "Tasks": "Minhas Tarefas",
-        "Cases": "Meus Atendimentos",
-        "Calendar": "Calendário",
-		"Calls": "Minhas Ligações",
-		"Meetings": "Minhas Reuniões",
-        "OpportunitiesByStage": "Oportunidades por Estágio",
-        "OpportunitiesByLeadSource": "Oportunities por Origem do Lead",
-        "SalesByMonth": "Vendas Por Mês",
-        "SalesPipeline": "Funil de Vendas"
-    },
-    "labels": {
-        "Create InboundEmail": "Criar E-mail de Entrada",
-        "Activities": "Atividades",
-        "History": "Histórico",
-        "Attendees": "participantes",
-        "Schedule Meeting": "Agendar Reunião",
-        "Schedule Call": "Agendar Ligação",
-        "Compose Email": "Compor E-mail",
-        "Log Meeting": "Logar Reunião",
-        "Log Call": "Logar Ligação",
-        "Archive Email": "Arquivar E-mail",
-        "Create Task": "Criar Tarefa",
-        "Tasks": "Tarefas"
-    },
-    "fields": {
-        "billingAddressCity": "Cidade",
-        "billingAddressCountry": "País",
-        "billingAddressPostalCode": "CEP",
-        "billingAddressState": "Estado",
-        "billingAddressStreet": "Endereço",
-        "addressCity": "Cidade",
-        "addressStreet": "Logradouro",
-        "addressCountry": "País",
-        "addressState": "Estado",
-        "addressPostalCode": "CEP",
-        "shippingAddressCity": "Cidade (Envio)",
-        "shippingAddressStreet": "Logradouro (Envio)",
-        "shippingAddressCountry": "País (Envio)",
-        "shippingAddressState": "Estado (Envio)",
-        "shippingAddressPostalCode": "CEP (Envio)"
-    },
-    "links": {
-        "contacts": "Contatos",
-        "opportunities": "Oportunidades",
-        "leads": "Leads",
-        "meetings": "Reuniões",
-        "calls": "Ligações",
-        "tasks": "Tarefas",
-        "emails": "E-mails",
-        "accounts": "Contas",
-        "cases": "Atendimentos",
-        "documents": "Documentos",
-        "account": "Conta",
-        "opportunity": "Oportunidade",        
-        "contact": "Contato",
-        "parent": "Pai"
-    },
-    "options": {
-        "reminderTypes": {
-            "Popup": "Popup",
-            "Email": "Email"
-        }
-    }
-}
+  "links": {
+    "parent": "Pai",
+    "contacts": "Contatos",
+    "opportunities": "Oportunidades",
+    "meetings": "Reuniões",
+    "calls": "Ligações",
+    "tasks": "Tarefas",
+    "emails": "E-mails",
+    "accounts": "Contas",
+    "cases": "Atendimentos",
+    "documents": "Documentos",
+    "account": "Conta",
+    "opportunity": "Oportunidade",
+    "contact": "Contato"
+  },
+  "scopeNames": {
+    "Account": "Conta",
+    "Contact": "Contato",
+    "Target": "Alvo",
+    "Opportunity": "Oportunidade",
+    "Meeting": "Reunião",
+    "Calendar": "Calendário",
+    "Call": "Ligação",
+    "Task": "Tarefa",
+    "Case": "Atendimento",
+    "Document": "Documento",
+    "Campaign": "Campanha",
+    "TargetList": "Lista de Alvos",
+    "Activities": "Atividades"
+  },
+  "scopeNamesPlural": {
+    "Account": "Contas",
+    "Contact": "Contatos",
+    "Target": "Alvos",
+    "Opportunity": "Oportunidades",
+    "Meeting": "Reuniões",
+    "Calendar": "Calendário",
+    "Call": "Ligações",
+    "Task": "Tarefas",
+    "Case": "Atendimentos",
+    "Document": "Documentos",
+    "Campaign": "Campaign",
+    "TargetList": "Target List",
+    "Activities": "Atividades"
+  },
+  "dashlets": {
+    "Leads": "Meus Leads",
+    "Opportunities": "Minhas Oportunidades",
+    "Tasks": "Minhas Tarefas",
+    "Cases": "Meus Atendimentos",
+    "Calendar": "Calendário",
+    "Calls": "Minhas Ligações",
+    "Meetings": "Minhas Reuniões",
+    "OpportunitiesByStage": "Oportunidades por Estágio",
+    "OpportunitiesByLeadSource": "Oportunities por Origem do Lead",
+    "SalesByMonth": "Vendas Por Mês",
+    "SalesPipeline": "Funil de Vendas",
+    "Activities": "Minhas Atividades"
+  },
+  "labels": {
+    "Create InboundEmail": "Criar E-mail de Entrada",
+    "Activities": "Atividades",
+    "History": "Histórico",
+    "Attendees": "participantes",
+    "Schedule Meeting": "Agendar Reunião",
+    "Schedule Call": "Agendar Ligação",
+    "Compose Email": "Compor E-mail",
+    "Log Meeting": "Logar Reunião",
+    "Log Call": "Logar Ligação",
+    "Archive Email": "Arquivar E-mail",
+    "Create Task": "Criar Tarefa",
+    "Tasks": "Tarefas"
+  },
+  "fields": {
+    "billingAddressCity": "Cidade",
+    "addressCity": "Cidade",
+    "billingAddressCountry": "País",
+    "addressCountry": "País",
+    "billingAddressPostalCode": "CEP",
+    "addressPostalCode": "CEP",
+    "billingAddressState": "Estado",
+    "addressState": "Estado",
+    "billingAddressStreet": "Logradouro",
+    "addressStreet": "Logradouro",
+    "shippingAddressCity": "Cidade (Envio)",
+    "shippingAddressStreet": "Logradouro (Envio)",
+    "shippingAddressCountry": "País (Envio)",
+    "shippingAddressState": "Estado (Envio)",
+    "shippingAddressPostalCode": "CEP (Envio)"
+  }
+}

application/Espo/Modules/Crm/Resources/i18n/pt_BR/KnowledgeBaseArticle.json

@@ -0,0 +1,27 @@
+{
+  "labels": {
+    "Create KnowledgeBaseArticle": "Criar artigo"
+  },
+  "fields": {
+    "name": "Nome",
+    "attachments": "Anexos",
+    "description": "Descrição",
+    "categories": "Categorias"
+  },
+  "links": {
+    "opportunities": "Oportunidades"
+  },
+  "options": {
+    "status": {
+      "Draft": "Rascunho",
+      "Archived": "Arquivado",
+      "Published": "Publicado"
+    },
+    "type": {
+      "Article": "Artigo"
+    }
+  },
+  "presetFilters": {
+    "published": "Publicado"
+  }
+}

application/Espo/Modules/Crm/Resources/i18n/pt_BR/KnowledgeBaseCategory.json

@@ -0,0 +1,9 @@
+{
+  "labels": {
+    "Create KnowledgeBaseCategory": "Criar categoria",
+    "Articles": "Artigos"
+  },
+  "links": {
+    "articles": "Artigos"
+  }
+}

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

@@ -1,55 +1,56 @@
 {
-    "labels": {
-        "Converted To": "Convertido Para",
-        "Create Lead": "Criar Lead",
-        "Convert": "Converter",
-        "convert": "converter"
+  "labels": {
+    "Converted To": "Convertido Para",
+    "Create Lead": "Criar Lead",
+    "Convert": "Converter",
+    "convert": "converter"
+  },
+  "fields": {
+    "name": "Nome",
+    "emailAddress": "E-mail",
+    "title": "Cargo",
+    "phoneNumber": "Telefone",
+    "accountName": "Conta",
+    "doNotCall": "Não Ligar",
+    "address": "Endereço",
+    "source": "Origem",
+    "opportunityAmount": "Valor da Oportunidade",
+    "opportunityAmountConverted": "Valor da Oportunidade (convertido)",
+    "description": "Descrição",
+    "createdAccount": "Conta",
+    "createdContact": "Contato",
+    "createdOpportunity": "Oportunidade",
+    "campaign": "Campanha"
+  },
+  "links": {
+    "targetLists": "Lista de Alvos",
+    "campaignLogRecords": "Logs das Camapnhas",
+    "campaign": "Campanha",
+    "createdContact": "Contato",
+    "createdOpportunity": "Oportunidade"
+  },
+  "options": {
+    "status": {
+      "New": "Novo",
+      "Assigned": "Atribuído",
+      "In Process": "Em Processo",
+      "Converted": "Convertido",
+      "Recycled": "Reciclado",
+      "Dead": "Morto"
     },
-    "fields": {
-        "name": "Nome",
-        "emailAddress": "E-mail",
-        "title": "Cargo",
-        "website": "Website",
-        "phoneNumber": "Telefone",
-        "accountName": "Conta",
-        "doNotCall": "Não Ligar",
-        "address": "Endereço",
-        "status": "Status",
-        "source": "Origem",
-        "opportunityAmount": "Valor da Oportunidade",
-		"opportunityAmountConverted": "Valor da Oportunidade (convertido)",
-        "description": "Descrição",
-        "createdAccount": "Conta",
-        "createdContact": "Contato",
-        "createdOpportunity": "Oportunidade",
-        "campaign": "Campanha"
-    },
-    "links": {
-        "targetLists": "Lista de Alvos",
-        "campaignLogRecords": "Logs das Camapnhas"
-    },
-    "options": {
-        "status": {
-            "New": "Novo",
-            "Assigned": "Atribuído",
-            "In Process": "Em Processo",
-            "Converted": "Convertido",
-            "Recycled": "Reciclado",
-            "Dead": "Morto"
-        },
-        "source": {
-            "Call": "Ligação",
-            "Email": "E-mail",
-            "Existing Customer": "Cliente Existente",
-            "Partner": "Parceiro",
-            "Public Relations": "Relacionamento",
-            "Web Site": "Website",
-            "Campaign": "Campanha",
-            "Other": "Outro"
-        }
-    },
-	"presetFilters": {
-        "actual": "Atual",
-		"active": "Ativo"
-	}
-}
+    "source": {
+      "Call": "Ligação",
+      "Email": "E-mail",
+      "Existing Customer": "Cliente Existente",
+      "Partner": "Parceiro",
+      "Public Relations": "Relacionamento",
+      "Web Site": "Website",
+      "Campaign": "Campanha",
+      "Other": "Outro"
+    }
+  },
+  "presetFilters": {
+    "active": "Ativo",
+    "actual": "Atual"
+  }
+}