v 4.0.5

Gruntfile.js

@@ -214,8 +214,11 @@ module.exports = function (grunt) {
                 },
                 src: [
                     'build/EspoCRM-<%= pkg.version %>/install',
+                    'build/EspoCRM-<%= pkg.version %>/portal',
                     'build/EspoCRM-<%= pkg.version %>/api',
                     'build/EspoCRM-<%= pkg.version %>/api/v1',
+                    'build/EspoCRM-<%= pkg.version %>/api/v1/portal-access',
+                    'build/EspoCRM-<%= pkg.version %>',
                 ]
             }
         },

api/v1/portal-access/web.config

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

application/Espo/Controllers/Job.php

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

application/Espo/Controllers/Notification.php

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

application/Espo/Core/Acl/Table.php

@@ -175,7 +175,7 @@ class Table
     public function getLevel($scope, $action)
     {
         if (isset($this->data->table->$scope)) {
-            if (isset($this->table->$scope->$action)) {
+            if (isset($this->data->table->$scope->$action)) {
                 return $this->data->table->$scope->$action;
             }
         }

application/Espo/Core/Controllers/Record.php

@@ -128,7 +128,7 @@ class Record extends Base
         $where = $request->get('where');
         $offset = $request->get('offset');
         $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc') === 'true';
+        $asc = $request->get('asc', 'true') === 'true';
         $sortBy = $request->get('sortBy');
         $q = $request->get('q');
         $primaryFilter = $request->get('primaryFilter');
@@ -174,7 +174,7 @@ class Record extends Base
         $where = $request->get('where');
         $offset = $request->get('offset');
         $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc') === 'true';
+        $asc = $request->get('asc', 'true') === 'true';
         $sortBy = $request->get('sortBy');
         $q = $request->get('q');
         $textFilter = $request->get('textFilter');
@@ -292,7 +292,6 @@ class Record extends Base
             $params['where'] = $where;
         }
         if (array_key_exists('ids', $data)) {
-            $where = json_decode(json_encode($data['where']), true);
             $params['ids'] = $data['ids'];
         }
 

application/Espo/Core/Mail/Importer.php

@@ -456,22 +456,37 @@ class Importer
 
     protected function fetchFileNameFromContentDisposition($contentDisposition)
     {
+        $contentDisposition = preg_replace('/\\\\"/', "{{_!Q!U!O!T!E!_}}", $contentDisposition);
+
+        $fileName = false;
         $m = array();
-        if (preg_match('/filename="?([^"]+)"?/i', $contentDisposition, $m)) {
+        $asterisk = false;
+
+        if (preg_match('/filename="([^"]+)";?/i', $contentDisposition, $m)) {
             $fileName = $m[1];
-            return $fileName;
-        } else if (preg_match('/filename\*="?([^"]+)"?/i', $contentDisposition, $m)) {
+        } else if (preg_match('/filename=([^";]+);?/i', $contentDisposition, $m)) {
             $fileName = $m[1];
+        } else if (preg_match('/filename\*[01]?="([^"]+)";?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $asterisk = true;
+        } else if (preg_match('/filename\*[01]?=([^";]+);?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $asterisk = true;
+        }
+
+        if ($asterisk) {
             if ($fileName && stripos($fileName, "''") !== false) {
                 list($encoding, $fileName) = explode("''", $fileName);
                 $fileName = rawurldecode($fileName);
                 if (strtoupper($encoding) !== 'UTF-8') {
                     $fileName = mb_convert_encoding($fileName, 'UTF-8', $encoding);
                 }
-                return $fileName;
             }
         }
-        return false;
+
+        $fileName = str_replace('{{_!Q!U!O!T!E!_}}', '"', $fileName);
+
+        return $fileName;
     }
 
     protected function getContentFromPart($part)

application/Espo/Core/Repositories/CategoryTree.php

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

application/Espo/Core/SelectManagers/Base.php

@@ -1069,7 +1069,7 @@ class Base
 
     public function hasLeftJoin($leftJoin, &$result)
     {
-        return in_array($leftJoin, $result['leftJoin']);
+        return in_array($leftJoin, $result['leftJoins']);
     }
 
     public function addJoin($join, &$result)

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

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

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

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

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

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

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

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

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

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

application/Espo/Core/Utils/EntityManager.php

@@ -320,9 +320,15 @@ class EntityManager
 
         switch ($linkType) {
             case 'oneToMany':
-                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.field.' . $linkForeign)) {
+                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign)) {
                     throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'] already exists.');
                 }
+                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign . 'Id')) {
+                    throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'Id] already exists.');
+                }
+                if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign . 'Name')) {
+                    throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'Name] already exists.');
+                }
                 $dataLeft = array(
                     'fields' => array(
                         $link => array(
@@ -361,9 +367,15 @@ class EntityManager
                 );
                 break;
             case 'manyToOne':
-                if ($this->getMetadata()->get('entityDefs.' . $entity . '.field.' . $link)) {
+                if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link)) {
                     throw new Conflict('Field ['.$entity.'::'.$link.'] already exists.');
                 }
+                if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link . 'Id')) {
+                    throw new Conflict('Field ['.$entity.'::'.$link.'Id] already exists.');
+                }
+                if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link . 'Name')) {
+                    throw new Conflict('Field ['.$entity.'::'.$link.'Name] already exists.');
+                }
                 $dataLeft = array(
                     'fields' => array(
                         $link => array(

application/Espo/Core/defaults/config.php

@@ -93,7 +93,7 @@ return array (
         'Opportunity',
     ),
     "tabList" => ["Account", "Contact", "Lead", "Opportunity", "Calendar", "Meeting", "Call", "Task", "Case", "Email", "Document", "Campaign", "KnowledgeBaseArticle"],
-    "quickCreateList" => ["Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case"],
+    "quickCreateList" => ["Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case", "Email"],
     'calendarDefaultEntity' => 'Meeting',
     'exportDisabled' => false,
     'assignmentEmailNotifications' => false,

application/Espo/EntryPoints/Download.php

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

application/Espo/Hooks/Common/Notifications.php

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

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

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

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

@@ -25,7 +25,7 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Modules\Crm\Controllers;
 
@@ -37,52 +37,52 @@ class Opportunity extends \Espo\Core\Controllers\Record
     public function actionReportByLeadSource($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-                
+
         return $this->getService('Opportunity')->reportByLeadSource($dateFrom, $dateTo);
     }
-    
+
     public function actionReportByStage($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-        
+
         return $this->getService('Opportunity')->reportByStage($dateFrom, $dateTo);
     }
-    
+
     public function actionReportSalesByMonth($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-                
-        return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);        
+
+        return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);
     }
-    
+
     public function actionReportSalesPipeline($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
-        if (!$level || $level == 'own') {
+        if (!$level || $level == 'own' || $level == 'no') {
             throw new Forbidden();
         }
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-        
+
         return $this->getService('Opportunity')->reportSalesPipeline($dateFrom, $dateTo);
     }
 }

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

@@ -93,6 +93,25 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
                 }
             }
         }
+
+        if (!$entity->isNew()) {
+            if ($entity->isFieldChanged('dateStart') && $entity->isFieldChanged('dateStart') && !$entity->isFieldChanged('dateEnd')) {
+                $dateEndPrevious = $entity->getFetched('dateEnd');
+                $dateStartPrevious = $entity->getFetched('dateStart');
+                if ($dateStartPrevious && $dateEndPrevious) {
+                    $dtStart = new \DateTime($dateStartPrevious);
+                    $dtEnd = new \DateTime($dateEndPrevious);
+                    $dt = new \DateTime($entity->get('dateStart'));
+
+                    if ($dtStart && $dtEnd && $dt) {
+                        $duration = ($dtEnd->getTimestamp() - $dtStart->getTimestamp());
+                        $dt->modify('+' . $duration . ' seconds');
+                        $dateEnd = $dt->format('Y-m-d H:i:s');
+                        $entity->set('dateEnd', $dateEnd);
+                    }
+                }
+            }
+        }
     }
 
     public function getEntityReminders(Entity $entity)
@@ -124,7 +143,7 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
         return $reminders;
     }
 
-    protected function afterSave(Entity $entity, array $options)
+    protected function afterSave(Entity $entity, array $options = array())
     {
         parent::afterSave($entity, $options);
 

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

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

application/Espo/Modules/Crm/Resources/metadata/app/aclPortal.json

@@ -11,6 +11,12 @@
         "scopeFieldLevel": {
             "KnowledgeBaseArticle": {
                 "portals": false
+            },
+            "Case": {
+                "status": {
+                    "read": "yes",
+                    "edit": "no"
+                }
             }
         }
     }

application/Espo/Modules/Crm/Resources/metadata/clientDefs/CampaignTrackingUrl.json

@@ -1,4 +1,8 @@
 {
     "controller": "controllers/record",
-    "acl": "crm:acl/campaign-tracking-url"
+    "acl": "crm:acl/campaign-tracking-url",
+    "recordViews": {
+        "edit": "crm:views/campaign-tracking-url/record/edit",
+        "editQuick": "crm:views/campaign-tracking-url/record/edit-small"
+    }
 }

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

@@ -12,7 +12,7 @@
              {
                 "name":"activities",
                 "label":"Activities",
-                "view":"crm:views/record/panels/activities",
+                "view":"crm:views/case/record/panels/activities",
                 "aclScope": "Activities"
              },
              {

application/Espo/Modules/Crm/Resources/metadata/clientDefs/MassEmail.json

@@ -2,7 +2,9 @@
   "controller": "controllers/record",
   "acl": "crm:acl/mass-email",
   "recordViews": {
-    "detail": "crm:views/mass-email/record/detail"
+    "detail": "crm:views/mass-email/record/detail",
+    "edit": "crm:views/mass-email/record/edit",
+    "editQuick": "crm:views/mass-email/record/edit-small"
   },
   "views": {
     "detail": "crm:views/mass-email/detail"

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

@@ -140,7 +140,8 @@
             "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "targetLists": {
             "type": "linkMultiple",
@@ -271,7 +272,8 @@
     },
     "collection": {
         "sortBy": "name",
-        "asc": true
+        "asc": true,
+        "textFilterFields": ["name", "emailAddress"]
     },
     "indexes": {
         "name": {

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

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

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

@@ -44,10 +44,11 @@
         },
         "assignedUser": {
             "type": "link",
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "targetLists": {
             "type": "linkMultiple",

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

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

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

@@ -21,8 +21,11 @@
         "accountId": {
             "where": {
                 "=": "contact.id IN (SELECT contact_id FROM account_contact WHERE deleted = 0 AND account_id = {value})",
+                "<>": "contact.id IN (SELECT contact_id FROM account_contact WHERE deleted = 0 AND account_id <> {value})",
                 "IN": "contact.id IN (SELECT contact_id FROM account_contact WHERE deleted = 0 AND account_id IN {value})",
-                "NOT IN": "contact.id IN (SELECT contact_id FROM account_contact WHERE deleted = 0 AND account_id NOT IN {value})"
+                "NOT IN": "contact.id NOT IN (SELECT contact_id FROM account_contact WHERE deleted = 0 AND account_id IN {value})",
+                "IS NULL": "contact.account_id IS NULL",
+                "IS NOT NULL": "contact.account_id IS NOT NULL"
             },
             "disabled": true
         },
@@ -33,8 +36,31 @@
             "select": "accountContact.role",
             "orderBy": "accountContact.role {direction}",
             "where": {
-                "LIKE": "contact.id IN (SELECT contact_id FROM account_contact WHERE deleted = 0 AND role LIKE {value})",
-                "=": "contact.id IN (SELECT contact_id FROM account_contact WHERE deleted = 0 AND role = {value})"
+                "LIKE": {
+                    "leftJoins": ["accounts"],
+                    "sql": "accountsMiddle.role LIKE {value}",
+                    "distinct": true
+                },
+                "=": {
+                    "leftJoins": ["accounts"],
+                    "sql": "accountsMiddle.role = {value}",
+                    "distinct": true
+                },
+                "<>": {
+                    "leftJoins": ["accounts"],
+                    "sql": "accountsMiddle.role <> {value}",
+                    "distinct": true
+                },
+                "IS NULL": {
+                    "leftJoins": ["accounts"],
+                    "sql": "accountsMiddle.role IS NULL",
+                    "distinct": true
+                },
+                "IS NOT NULL": {
+                    "leftJoins": ["accounts"],
+                    "sql": "accountsMiddle.role IS NOT NULL",
+                    "distinct": true
+                }
             },
             "trim": true
         },
@@ -130,7 +156,8 @@
             "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "targetLists": {
             "type": "linkMultiple",

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

@@ -61,10 +61,11 @@
         },
         "assignedUser": {
             "type": "link",
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "accounts": {
             "type": "linkMultiple",

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

@@ -25,7 +25,8 @@
             "readOnly": true
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "parent": {
             "type": "link"

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

@@ -51,10 +51,12 @@
             "readOnly": true
         },
         "assignedUser": {
-            "type": "link"
+            "type": "link",
+            "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "categories": {
             "type": "linkMultiple",

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

@@ -29,7 +29,8 @@
             "required": true
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "parent": {
             "type": "link"

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

@@ -107,7 +107,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "acceptanceStatus": {
             "type": "varchar",
@@ -115,7 +115,8 @@
             "disabled": true
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "campaign": {
             "type": "link",

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

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

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

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

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

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

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

@@ -33,10 +33,11 @@
         },
         "assignedUser": {
             "type": "link",
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "campaigns": {
             "type": "link"

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

@@ -82,10 +82,11 @@
         "assignedUser": {
             "type": "link",
             "required": true,
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "attachments": {
             "type": "attachmentMultiple",
@@ -135,9 +136,6 @@
         "dateStart": {
             "columns": ["dateStart", "deleted"]
         },
-        "dateEnd": {
-            "columns": ["dateStart", "deleted"]
-        },
         "status": {
             "columns": ["status", "deleted"]
         },

application/Espo/Modules/Crm/Resources/metadata/scopes/Account.json

@@ -3,7 +3,7 @@
     "layouts": true,
     "tab": true,
     "acl": true,
-    "aclPortal": "recordAllAccountOwnNo",
+    "aclPortal": "recordAllAccountNo",
     "module": "Crm",
     "customizable": true,
     "stream": true,

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

@@ -3,7 +3,7 @@
 	"layouts":true,
 	"tab":true,
 	"acl":true,
-    "aclPortal": "recordAllAccountContactOwnNo",
+    "aclPortal": "recordAllAccountContactNo",
 	"module":"Crm",
     "customizable": true,
     "stream": true,

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

@@ -52,5 +52,22 @@ class Account extends \Espo\Core\SelectManagers\Base
         );
     }
 
+    protected function accessPortalOnlyAccount(&$result)
+    {
+        $d = array();
+
+        $accountIdList = $this->getUser()->getLinkMultipleIdList('accounts');
+
+        if (count($accountIdList)) {
+            $result['whereClause'][] = array(
+                'id' => $accountIdList
+            );
+        } else {
+            $result['whereClause'][] = array(
+                'id' => null
+            );
+        }
+    }
+
  }
 

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

@@ -44,5 +44,22 @@ class Contact extends \Espo\Core\SelectManagers\Base
         ), $result);
     }
 
+    protected function accessPortalOnlyContact(&$result)
+    {
+        $d = array();
+
+        $contactId = $this->getUser()->get('contactId');
+
+        if ($contactId) {
+            $result['whereClause'][] = array(
+                'id' => $contactId
+            );
+        } else {
+            $result['whereClause'][] = array(
+                'id' => null
+            );
+        }
+    }
+
  }
 

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

@@ -103,7 +103,8 @@ class Activities extends \Espo\Core\Services\Base
             'leftJoins' => [['users', 'usersLeft']],
             'whereClause' => array(
                 'usersLeftMiddle.userId' => $entity->id
-            )
+            ),
+            'customJoin' => ''
         );
 
         if (!empty($statusList)) {
@@ -142,7 +143,8 @@ class Activities extends \Espo\Core\Services\Base
             'leftJoins' => [['users', 'usersLeft']],
             'whereClause' => array(
                 'usersLeftMiddle.userId' => $entity->id
-            )
+            ),
+            'customJoin' => ''
         );
 
         if (!empty($statusList)) {
@@ -181,7 +183,8 @@ class Activities extends \Espo\Core\Services\Base
             'leftJoins' => [['users', 'usersLeft']],
             'whereClause' => array(
                 'usersLeftMiddle.userId' => $entity->id
-            )
+            ),
+            'customJoin' => ''
         );
 
         if (!empty($statusList)) {
@@ -225,7 +228,8 @@ class Activities extends \Espo\Core\Services\Base
                 'status',
                 'createdAt'
             ],
-            'whereClause' => array()
+            'whereClause' => array(),
+            'customJoin' => ''
         );
 
         if (!empty($statusList)) {
@@ -439,7 +443,8 @@ class Activities extends \Espo\Core\Services\Base
                 'status',
                 'createdAt'
             ],
-            'whereClause' => array()
+            'whereClause' => array(),
+            'customJoin' => ''
         );
 
         if (!empty($statusList)) {
@@ -686,7 +691,8 @@ class Activities extends \Espo\Core\Services\Base
                 'dateStart>=' => $from,
                 'dateStart<' => $to,
                 'usersMiddle.status!=' => 'Declined'
-            )
+            ),
+            'customJoin' => ''
         );
 
         return $this->getEntityManager()->getQuery()->createSelectQuery('Meeting', $selectParams);
@@ -716,7 +722,8 @@ class Activities extends \Espo\Core\Services\Base
                 'dateStart>=' => $from,
                 'dateStart<' => $to,
                 'usersMiddle.status!=' => 'Declined'
-            )
+            ),
+            'customJoin' => ''
         );
 
         return $this->getEntityManager()->getQuery()->createSelectQuery('Call', $selectParams);
@@ -943,8 +950,11 @@ class Activities extends \Espo\Core\Services\Base
 
         $sth = $pdo->prepare($unionSql);
 
-        $sth->bindParam(':offset', intval($params['offset']), \PDO::PARAM_INT);
-        $sth->bindParam(':maxSize', intval($params['maxSize']), \PDO::PARAM_INT);
+        $offset = intval($params['offset']);
+        $maxSize = intval($params['maxSize']);
+
+        $sth->bindParam(':offset', $offset, \PDO::PARAM_INT);
+        $sth->bindParam(':maxSize', $maxSize, \PDO::PARAM_INT);
         $sth->execute();
         $rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
 

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

@@ -44,7 +44,7 @@ class CaseObj extends \Espo\Services\Record
         'inboundEmailId'
     ];
 
-    public function afterCreate($entity, array $data = array())
+    public function afterCreate(Entity $entity, array $data = array())
     {
         parent::afterCreate($entity, $data);
         if (!empty($data['emailId'])) {

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

@@ -61,7 +61,7 @@ class Contact extends \Espo\Services\Record
         return $data;
     }
 
-    public function afterCreate($entity, array $data = array())
+    public function afterCreate(Entity $entity, array $data = array())
     {
         parent::afterCreate($entity, $data);
         if (!empty($data['emailId'])) {

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

@@ -63,7 +63,7 @@ class Lead extends \Espo\Services\Record
         return $data;
     }
 
-    public function afterCreate($entity, array $data, $data = array())
+    public function afterCreate(Entity $entity, array $data = array())
     {
         parent::afterCreate($entity, $data);
         if (!empty($data['emailId'])) {

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

@@ -105,8 +105,6 @@ class TargetList extends \Espo\Services\Record
 
     protected function findLinkedEntitiesOptedOut($id, $params)
     {
-        $collection = new \Espo\ORM\EntityCollection;
-
         $pdo = $this->getEntityManager()->getPDO();
         $query = $this->getEntityManager()->getQuery();
 

application/Espo/Notificators/Email.php

@@ -91,6 +91,8 @@ class Email extends \Espo\Core\Notificators\Base
             $this->getEntityManager()->getRepository('Email')->loadFromField($entity);
         }
 
+        $person = null;
+
         $from = $entity->get('from');
         if ($from) {
             $person = $this->getEntityManager()->getRepository('EmailAddress')->getEntityByAddress($from, null, ['User', 'Contact', 'Lead']);

application/Espo/ORM/DB/Mapper.php

@@ -798,7 +798,7 @@ abstract class Mapper implements IMapper
         foreach ($entity->fields as $field => $fieldDefs) {
             if ($entity->has($field)) {
                 if ($onlyStorable) {
-                    if (!empty($fieldDefs['notStorable']) || isset($fieldDefs['source']) && $fieldDefs['source'] != 'db')
+                    if (!empty($fieldDefs['notStorable']) || !empty($fieldDefs['autoincrement']) || isset($fieldDefs['source']) && $fieldDefs['source'] != 'db')
                         continue;
                     if ($fieldDefs['type'] == IEntity::FOREIGN)
                         continue;

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

@@ -110,6 +110,18 @@ abstract class Base
             $whereClause = $whereClause + array('deleted' => 0);
         }
 
+        if (empty($params['joins'])) {
+            $params['joins'] = array();
+        }
+        if (empty($params['leftJoins'])) {
+            $params['leftJoins'] = array();
+        }
+        if (empty($params['customJoin'])) {
+            $params['customJoin'] = '';
+        }
+
+        $wherePart = $this->getWhere($entity, $whereClause, 'AND', $params);
+
         if (empty($params['aggregation'])) {
             $selectPart = $this->getSelect($entity, $params['select'], $params['distinct']);
             $orderPart = $this->getOrder($entity, $params['orderBy'], $params['order']);
@@ -134,16 +146,8 @@ abstract class Base
             $selectPart = $this->getAggregationSelect($entity, $params['aggregation'], $params['aggregationBy'], $aggDist);
         }
 
-        if (empty($params['joins'])) {
-            $params['joins'] = array();
-        }
-        if (empty($params['leftJoins'])) {
-            $params['leftJoins'] = array();
-        }
-
         $joinsPart = $this->getBelongsToJoins($entity, $params['select'], array_merge($params['joins'], $params['leftJoins']));
 
-        $wherePart = $this->getWhere($entity, $whereClause);
 
         if (!empty($params['customWhere'])) {
             $wherePart .= ' ' . $params['customWhere'];
@@ -581,7 +585,7 @@ abstract class Base
         return false;
     }
 
-    public function getWhere(IEntity $entity, $whereClause, $sqlOp = 'AND')
+    public function getWhere(IEntity $entity, $whereClause, $sqlOp = 'AND', &$params = array())
     {
         $whereParts = array();
 
@@ -630,10 +634,54 @@ abstract class Base
                         } else if ($operator == '<>') {
                             $operatorModified = 'NOT IN';
                         }
+                    } else if (is_null($value)) {
+                        if ($operator == '=') {
+                            $operatorModified = 'IS NULL';
+                        } else if ($operator == '<>') {
+                            $operatorModified = 'IS NOT NULL';
+                        }
                     }
 
                     if (!empty($fieldDefs['where']) && !empty($fieldDefs['where'][$operatorModified])) {
-                        $whereParts[] = str_replace('{value}', $this->stringifyValue($value), $fieldDefs['where'][$operatorModified]);
+                        $whereSqlPart = '';
+                        if (is_string($fieldDefs['where'][$operatorModified])) {
+                            $whereSqlPart = $fieldDefs['where'][$operatorModified];
+                        } else {
+                            if (!empty($fieldDefs['where'][$operatorModified]['sql'])) {
+                                $whereSqlPart = $fieldDefs['where'][$operatorModified]['sql'];
+                            }
+                        }
+                        if (!empty($fieldDefs['where'][$operatorModified]['leftJoins'])) {
+                            foreach ($fieldDefs['where'][$operatorModified]['leftJoins'] as $j) {
+                                $jAlias = $this->obtainJoinAlias($j);
+                                foreach ($params['leftJoins'] as $jE) {
+                                    $jEAlias = $this->obtainJoinAlias($jE);
+                                    if ($jEAlias === $jAlias) {
+                                        continue 2;
+                                    }
+                                }
+                                $params['leftJoins'][] = $j;
+                            }
+                        }
+                        if (!empty($fieldDefs['where'][$operatorModified]['joins'])) {
+                            foreach ($fieldDefs['where'][$operatorModified]['joins'] as $j) {
+                                $jAlias = $this->obtainJoinAlias($j);
+                                foreach ($params['joins'] as $jE) {
+                                    $jEAlias = $this->obtainJoinAlias($jE);
+                                    if ($jEAlias === $jAlias) {
+                                        continue 2;
+                                    }
+                                }
+                                $params['joins'][] = $j;
+                            }
+                        }
+                        if (!empty($fieldDefs['where'][$operatorModified]['customJoin'])) {
+                            $params['customJoin'] .= ' ' . $fieldDefs['where'][$operatorModified]['customJoin'];
+                        }
+                        if (!empty($fieldDefs['where'][$operatorModified]['distinct'])) {
+                            $params['distinct'] = true;
+                        }
+                        $whereParts[] = str_replace('{value}', $this->stringifyValue($value), $whereSqlPart);
                     } else {
                         if ($fieldDefs['type'] == IEntity::FOREIGN) {
                             $leftPart = '';
@@ -682,7 +730,7 @@ abstract class Base
                     }
                 }
             } else {
-                $internalPart = $this->getWhere($entity, $value, $field);
+                $internalPart = $this->getWhere($entity, $value, $field, $params);
                 if ($internalPart) {
                     $whereParts[] = "(" . $internalPart . ")";
                 }
@@ -691,6 +739,20 @@ abstract class Base
         return implode(" " . $sqlOp . " ", $whereParts);
     }
 
+    public function obtainJoinAlias($j)
+    {
+        if (is_array($j)) {
+            if (count($j)) {
+                $joinAlias = $j[1];
+            } else {
+                $joinAlias = $j[0];
+            }
+        } else {
+            $joinAlias = $j;
+        }
+        return $joinAlias;
+    }
+
     public function stringifyValue($value)
     {
         if (is_array($value)) {

application/Espo/Repositories/Email.php

@@ -116,7 +116,7 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
         $entity->set('idHash', $idHash);
     }
 
-    protected function beforeSave(Entity $entity, array $options)
+    protected function beforeSave(Entity $entity, array $options = array())
     {
         $eaRepositoty = $this->getEntityManager()->getRepository('EmailAddress');
 
@@ -187,7 +187,7 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
         }
     }
 
-    protected function afterSave(Entity $entity, array $options)
+    protected function afterSave(Entity $entity, array $options = array())
     {
         parent::afterSave($entity, $options);
         if (!$entity->isNew()) {

application/Espo/Repositories/EmailAddress.php

@@ -320,6 +320,7 @@ class EmailAddress extends \Espo\Core\ORM\Repositories\RDB
                                 ".$pdo->quote($emailAddress->id).",
                                 ".$pdo->quote((int)($address === $primary))."
                             )
+                        ON DUPLICATE KEY UPDATE deleted = 0, `primary` = ".$pdo->quote((int)($address === $primary))."
                     ";
                     $sth = $pdo->prepare($query);
                     $sth->execute();

application/Espo/Repositories/Job.php

@@ -43,7 +43,7 @@ class Job extends \Espo\Core\ORM\Repositories\RDB
         return $this->getInjection('config');
     }
 
-    public function beforeSave(Entity $entity)
+    public function beforeSave(Entity $entity, array $options = array())
     {
         if (!$entity->has('executeTime')) {
             $entity->set('executeTime', date('Y-m-d H:i:s'));

application/Espo/Repositories/PhoneNumber.php

@@ -233,6 +233,7 @@ class PhoneNumber extends \Espo\Core\ORM\Repositories\RDB
                                 ".$pdo->quote($phoneNumber->id).",
                                 ".$pdo->quote((int)($number === $primary))."
                             )
+                        ON DUPLICATE KEY UPDATE deleted = 0, `primary` = ".$pdo->quote((int)($number === $primary))."
                     ";
                     $sth = $pdo->prepare($query);
                     $sth->execute();

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

@@ -331,8 +331,8 @@
 	},
     "options": {
         "salutationName": {
-            "Mr.": "Hr.",
-            "Ms.": "Fr.",
+            "Mr.": "Herr",
+            "Ms.": "Frau",
             "Mrs.": "Frl.",
             "Dr.": "Dr."
         },

application/Espo/Resources/i18n/en_US/EntityManager.json

@@ -44,6 +44,6 @@
     "messages": {
         "entityCreated": "Entity has been created",
         "linkAlreadyExists": "Link name conflict.",
-        "linkConflict": "Link with the same name already exists."
+        "linkConflict": "Name conflict: link or field with the same name already exists."
     }
 }

application/Espo/Resources/i18n/en_US/User.json

@@ -72,7 +72,8 @@
         "userNameEmailAddressNotFound": "Username/Email Address not found",
         "forbidden": "Forbidden, please try later",
         "uniqueLinkHasBeenSent": "The unique URL has been sent to the specified email address.",
-        "passwordChangedByRequest": "Password has been changed."
+        "passwordChangedByRequest": "Password has been changed.",
+        "setupSmtpBefore": "You need to setup <a href=\"{url}\">SMTP settings</a> to make the system be able to send password in email."
     },
     "boolFilters": {
         "onlyMyTeam": "Only My Team"

application/Espo/Resources/layouts/User/filters.json

@@ -1,9 +1,11 @@
 [
     "teams",
+    "createdAt",
     "emailAddress",
     "title",
     "isAdmin",
     "isActive",
     "portals",
-    "accounts"
+    "accounts",
+    "contact"
 ]

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

@@ -17,6 +17,7 @@
       "detail": "views/email/modals/detail",
       "compose": "views/modals/compose-email"
    },
+   "quickCreateModalType": "compose",
    "menu": {
       "list": {
          "buttons": [

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

@@ -14,5 +14,8 @@
       "active",
       "activePortal"
    ],
-   "boolFilterList": ["onlyMyTeam"]
+   "boolFilterList": ["onlyMyTeam"],
+    "selectDefaultFilters": {
+        "filter": "active"
+    }
 }

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

@@ -183,7 +183,7 @@
         "assignedUser": {
             "type": "link",
             "required": false,
-            "view": "views/fields/user"
+            "view": "views/fields/assigned-user"
         },
         "replied": {
             "type": "link",
@@ -206,7 +206,8 @@
             "notStorable": true
         },
         "teams": {
-            "type": "linkMultiple"
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
         },
         "users": {
             "type": "linkMultiple",

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

@@ -30,6 +30,10 @@
         "related": {
             "type": "linkParent",
             "readOnly": true
+        },
+        "relatedParent": {
+            "type": "linkParent",
+            "readOnly": true
         }
     },
     "links": {
@@ -39,6 +43,9 @@
         },
         "related": {
             "type": "belongsToParent"
+        },
+        "relatedParent": {
+            "type": "belongsToParent"
         }
     },
     "collection": {

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

@@ -91,8 +91,7 @@
             "trim": true
         },
         "smtpServer": {
-            "type": "varchar",
-            "required": true
+            "type": "varchar"
         },
         "smtpPort": {
             "type": "int",

application/Espo/SelectManagers/Email.php

@@ -31,9 +31,9 @@ namespace Espo\SelectManagers;
 
 class Email extends \Espo\Core\SelectManagers\Base
 {
-    public function getSelectParams(array $params, $withAcl = false)
+    public function getSelectParams(array $params, $withAcl = false, $checkWherePermission = false)
     {
-        $result = parent::getSelectParams($params, $withAcl);
+        $result = parent::getSelectParams($params, $withAcl, $checkWherePermission);
 
         if (!$this->hasJoin('users', $result) && !$this->hasLeftJoin('users', $result)) {
             $this->addLeftJoin('users', $result);

application/Espo/Services/EmailAddress.php

@@ -129,7 +129,7 @@ class EmailAddress extends Record
 
         foreach ($result as $r) {
             foreach ($final as $f) {
-                if ($f['emailAddress'] == $r['emailAddress'] && $f['name'] == $r['name']) {
+                if ($f['emailAddress'] == $r['emailAddress']) {
                     continue 2;
                 }
             }

application/Espo/Services/EmailTemplate.php

@@ -192,7 +192,9 @@ class EmailTemplate extends Record
                     $value = $this->getDateTime()->convertSystemDateTime($value);
                 }
             }
-            $text = str_replace('{' . $type . '.' . $field . '}', $value, $text);
+            if (is_string($value) || $value === null || is_scalar($value) || is_callable([$value, '__toString'])) {
+                $text = str_replace('{' . $type . '.' . $field . '}', $value, $text);
+            }
         }
         return $text;
     }

application/Espo/Services/InboundEmail.php

@@ -421,6 +421,7 @@ class InboundEmail extends \Espo\Services\Record
 
         if ($user) {
             $case->set('assignedUserId', $user->id);
+            $case->set('status', 'Assigned');
         }
     }
 
@@ -437,6 +438,7 @@ class InboundEmail extends \Espo\Services\Record
 
         if ($user) {
             $case->set('assignedUserId', $user->id);
+            $case->set('status', 'Assigned');
         }
     }
 
@@ -468,19 +470,17 @@ class InboundEmail extends \Espo\Services\Record
             $caseDistribution = $params['caseDistribution'];
         }
 
-
-
         $targetUserPosition = null;
         if (!empty($params['targetUserPosition'])) {
             $targetUserPosition = $params['targetUserPosition'];
         }
 
-        $case->set('status', 'Assigned');
 
         switch ($caseDistribution) {
             case 'Direct-Assignment':
                 if ($userId) {
                     $case->set('assignedUserId', $userId);
+                    $case->set('status', 'Assigned');
                 }
                 break;
             case 'Round-Robin':

application/Espo/Services/Notification.php

@@ -79,19 +79,20 @@ class Notification extends \Espo\Services\Record
         $now = date('Y-m-d H:i:s');
         $pdo = $this->getEntityManager()->getPDO();
 
-        $sql = "INSERT INTO `notification` (`id`, `data`, `type`, `user_id`, `created_at`, `related_id`, `related_type`) VALUES ";
+        $sql = "INSERT INTO `notification` (`id`, `data`, `type`, `user_id`, `created_at`, `related_id`, `related_type`, `related_parent_id`, `related_parent_type`) VALUES ";
         $arr = [];
         foreach ($userIdList as $userId) {
             if (empty($userId)) continue;
 
             $user = $this->getEntityManager()->getEntity('User');
             $user->id = $userId;
+            $user->setIsNew(false);
             $user->setAsFetched();
             if (!$this->checkUserNoteAccess($user, $note)) {
                 continue;
             }
             $id = uniqid();
-            $arr[] = "(".$pdo->quote($id).", ".$pdo->quote($encodedData).", ".$pdo->quote('Note').", ".$pdo->quote($userId).", ".$pdo->quote($now).", ".$pdo->quote($note->id).", ".$pdo->quote('Note').")";
+            $arr[] = "(".$pdo->quote($id).", ".$pdo->quote($encodedData).", ".$pdo->quote('Note').", ".$pdo->quote($userId).", ".$pdo->quote($now).", ".$pdo->quote($note->id).", ".$pdo->quote('Note').", ".$pdo->quote($note->get('parentId')).", ".$pdo->quote($note->get('parentType')).")";
         }
 
         if (empty($arr)) {

application/Espo/Services/Record.php

@@ -361,13 +361,16 @@ class Record extends \Espo\Core\Services\Base
 
         $assignedUserId = $entity->get('assignedUserId');
 
+        $assignmentPermission = $this->getAcl()->get('assignmentPermission');
+
         if (empty($assignedUserId)) {
+            if ($assignmentPermission === 'no') {
+                return false;
+            }
             return true;
         }
 
-        $assignmentPermission = $this->getAcl()->get('assignmentPermission');
-
-        if (empty($assignmentPermission) || $assignmentPermission === true || !in_array($assignmentPermission, ['team', 'no'])) {
+        if ($assignmentPermission === true || !in_array($assignmentPermission, ['team', 'no'])) {
             return true;
         }
 

application/Espo/Services/Stream.php

@@ -1017,8 +1017,8 @@ class Stream extends \Espo\Core\Services\Base
         $ignoreScopeList = [];
         $scopes = $this->getMetadata()->get('scopes', array());
         foreach ($scopes as $scope => $d) {
-            if (!$d['entity']) continue;
-            if (!$d['object']) continue;
+            if (empty($d['entity']) || !$d['entity']) continue;
+            if (empty($d['object']) || !$d['object']) continue;
             if (!$this->getAcl()->checkScope($scope)) {
                 $ignoreScopeList[] = $scope;
             }

application/Espo/Services/Team.php

@@ -29,6 +29,8 @@
 
 namespace Espo\Services;
 
+use \Espo\ORM\Entity;
+
 class Team extends Record
 {
     protected function init()
@@ -49,7 +51,7 @@ class Team extends Record
         return $this->getInjection('fileManager');
     }
 
-    public function afterUpdate(Entity $entity, array $data)
+    public function afterUpdate(Entity $entity, array $data = array())
     {
         parent::afterUpdate($entity, $data);
         if (array_key_exists('rolesIds', $data)) {

application/Espo/Services/User.php

@@ -224,7 +224,9 @@ class User extends Record
 
         if (!is_null($newPassword) && !empty($data['sendAccessInfo'])) {
             if ($user->isActive()) {
-                $this->sendPassword($user, $newPassword);
+                try {
+                    $this->sendPassword($user, $newPassword);
+                } catch (\Exception $e) {}
             }
         }
 
@@ -388,7 +390,7 @@ class User extends Record
         $email = $this->getEntityManager()->getEntity('Email');
 
         if (!$this->getConfig()->get('smtpServer')) {
-            return;
+            throw new Error("SMTP settings is not setup.");
         }
 
         $subject = $this->getLanguage()->translate('passwordChangeLinkEmailSubject', 'messages', 'User');

client/modules/crm/src/views/account/detail.js

@@ -24,12 +24,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.
- ************************************************************************/ 
+ ************************************************************************/
 
-Espo.define('Crm:Views.Account.Detail', 'Views.Detail', function (Dep) {
+Espo.define('crm:views/account/detail', 'views/detail', function (Dep) {
 
     return Dep.extend({
-    
+
         relatedAttributeMap: {
             'contacts': {
                 'billingAddressCity': 'addressCity',
@@ -39,9 +39,8 @@ Espo.define('Crm:Views.Account.Detail', 'Views.Detail', function (Dep) {
                 'billingAddressCountry': 'addressCountry',
                 'id': 'accountId',
                 'name': 'accountName'
-            },
-        },
-        
+            }
+        }
     });
 });
 

client/modules/crm/src/views/calendar/calendar.js

@@ -237,7 +237,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi
                 if (!o.dateStartDate) {
                     event.start = this.getDateTime().toMoment(o.dateStart);
                 } else {
-                    event.start = this.getDateTime().toMoment(o.dateStartDate);
+                    event.start = this.getDateTime().toMomentDate(o.dateStartDate);
                 }
             }
             if (o.dateEnd) {
@@ -383,7 +383,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi
                 selectable: true,
                 selectHelper: true,
                 height: this.options.height || null,
-                firstDay: this.getPreferences().get('weekStart'),
+                firstDay: this.getDateTime().weekStart,
                 slotEventOverlap: true,
                 slotDuration: slotDuration,
                 snapDuration: this.slotDuration * 60 * 1000,

client/modules/crm/src/views/campaign-tracking-url/record/edit-small.js

@@ -0,0 +1,37 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+Espo.define('crm:views/campaign-tracking-url/record/edit-small', 'views/record/edit-small', function (Dep) {
+
+    return Dep.extend({
+
+        sideView: false
+
+    });
+});
+

client/modules/crm/src/views/campaign-tracking-url/record/edit.js

@@ -0,0 +1,37 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+Espo.define('crm:views/campaign-tracking-url/record/edit', 'views/record/edit', function (Dep) {
+
+    return Dep.extend({
+
+        sideView: false
+
+    });
+});
+

client/modules/crm/src/views/case/record/panels/activities.js

@@ -24,31 +24,33 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/
 
-Espo.define('Crm:Views.Case.Record.Panels.Activities', 'Crm:Views.Record.Panels.Activities', function (Dep) {
+Espo.define('crm:views/case/record/panels/activities', 'crm:views/record/panels/activities', function (Dep) {
 
     return Dep.extend({
-        
+
         getComposeEmailAttributes: function (data, callback) {
             data = data || {};
             var attributes = {
                 status: 'Draft',
                 name: '[#' + this.model.get('number') + '] ' + this.model.get('name')
             };
-            
+
             if (this.model.get('contactId')) {
                 this.getModelFactory().create('Contact', function (contact) {
                     contact.id = this.model.get('contactId');
-                    
+
                     this.listenToOnce(contact, 'sync', function () {
-                        var emailAddress = contact.get('emailAddress');                        
+                        var emailAddress = contact.get('emailAddress');
                         if (emailAddress) {
                             attributes.to = emailAddress;
+                            attributes.nameHash = {};
+                            attributes.nameHash[emailAddress] = contact.get('name');
                         }
-                        
+
                         callback.call(this, attributes);
-                    });                    
+                    });
                     contact.fetch({
                         error: function () {
                             callback.call(this, attributes);
@@ -58,8 +60,7 @@ Espo.define('Crm:Views.Case.Record.Panels.Activities', 'Crm:Views.Record.Panels.
             } else {
                 callback.call(this, attributes);
             }
-        },
-        
+        }
     });
 });
 

client/modules/crm/src/views/mass-email/record/edit-small.js

@@ -0,0 +1,37 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+Espo.define('crm:views/mass-email/record/edit-small', 'views/record/edit-small', function (Dep) {
+
+    return Dep.extend({
+
+        sideView: false
+
+    });
+});
+

client/modules/crm/src/views/mass-email/record/edit.js

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

client/modules/crm/src/views/record/panels/activities.js

@@ -77,7 +77,7 @@ Espo.define('crm:views/record/panels/activities', ['views/record/panels/relation
             'Meeting': {
                 rows: [
                     [
-                        {name: 'ico', view: 'Crm:Fields.Ico'},
+                        {name: 'ico', view: 'crm:views/fields/ico'},
                         {
                             name: 'name',
                             link: true,
@@ -92,7 +92,7 @@ Espo.define('crm:views/record/panels/activities', ['views/record/panels/relation
             'Call': {
                 rows: [
                     [
-                        {name: 'ico', view: 'Crm:Fields.Ico'},
+                        {name: 'ico', view: 'crm:views/fields/ico'},
                         {
                             name: 'name',
                             link: true,
@@ -119,7 +119,7 @@ Espo.define('crm:views/record/panels/activities', ['views/record/panels/relation
 
                 this.listenToOnce(this.collection, 'sync', function () {
                     this.notify(false);
-                }.bind(this));
+                }, this);
                 this.notify('Loading...');
                 this.collection.fetch();
 
@@ -185,7 +185,6 @@ Espo.define('crm:views/record/panels/activities', ['views/record/panels/relation
             this.collection.asc = this.asc;
             this.collection.maxSize = this.getConfig().get('recordsPerPageSmall') || 5;
 
-
             this.listenToOnce(this.collection, 'sync', function () {
                 this.createView('list', 'views/record/list-expanded', {
                     el: this.$el.selector + ' > .list-container',
@@ -194,7 +193,7 @@ Espo.define('crm:views/record/panels/activities', ['views/record/panels/relation
                     rowActionsView: this.rowActionsView,
                     checkboxes: false,
                     collection: this.collection,
-                    listLayout: this.listLayout,
+                    listLayout: this.listLayout
                 }, function (view) {
                     view.render();
                 });

client/modules/crm/src/views/record/panels/history.js

@@ -73,7 +73,7 @@ Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activiti
             'Meeting': {
                 rows: [
                     [
-                        {name: 'ico', view: 'Crm:Fields.Ico'},
+                        {name: 'ico', view: 'crm:views/fields/ico'},
                         {
                             name: 'name',
                             link: true,
@@ -89,7 +89,7 @@ Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activiti
             'Call': {
                 rows: [
                     [
-                        {name: 'ico', view: 'Crm:Fields.Ico'},
+                        {name: 'ico', view: 'crm:views/fields/ico'},
                         {
                             name: 'name',
                             link: true,
@@ -105,7 +105,7 @@ Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activiti
             'Email': {
                 rows: [
                     [
-                        {name: 'ico', view: 'Crm:Fields.Ico'},
+                        {name: 'ico', view: 'crm:views/fields/ico'},
                         {
                             name: 'name',
                             link: true,

client/res/templates/about.tpl

@@ -7,7 +7,7 @@
         <section>
             <h5>Version {{version}}</h5>
             <p>
-                Copyright &copy; 2014-2015 EspoCRM: Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko.
+                Copyright &copy; 2014-2016 EspoCRM: Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko.
                 <br>
                 Website: <a href="http://www.espocrm.com">http://www.espocrm.com</a>.
             </p>

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

@@ -1 +1 @@
-<a href="javascript:" data-email-address="{{value}}" data-action="mailTo">{{value}}</a>
+<a href="javascript:" data-email-address="{{value}}" data-action="mailTo" title="{{value}}">{{value}}</a>

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

@@ -1,4 +1,4 @@
 {{#if idValue}}
-	<a href="#{{foreignScope}}/view/{{idValue}}">{{nameValue}}</a>
+	<a href="#{{foreignScope}}/view/{{idValue}}" title="{{nameValue}}">{{nameValue}}</a>
 {{/if}}
 

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

@@ -1 +1 @@
-<a href="tel:{{value}}" data-phone-number="{{value}}" data-action="dial">{{value}}</a>
+<a href="tel:{{value}}" data-phone-number="{{value}}" data-action="dial" title="{{value}}">{{value}}</a>

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

@@ -1,3 +1,3 @@
 {{#if value}}
-	<a href="{{url}}" target="_blank">{{value}}</a>
+	<a href="{{url}}" target="_blank" title="{{value}}">{{value}}</a>
 {{/if}}

client/res/templates/record/list-tree-item.tpl

@@ -1,4 +1,4 @@
-<li data-id="{{model.id}}" class="list-group-item">
+
     <div class="cell">
         <a href="javascript:" class="action{{#unless showFold}} hidden{{/unless}} small" data-action="fold" data-id="{{model.id}}"><span class="glyphicon glyphicon-chevron-down"></span></a>
         <a href="javascript:" class="action{{#unless showUnfold}} hidden{{/unless}} small" data-action="unfold" data-id="{{model.id}}"><span class="glyphicon glyphicon-chevron-right"></span></a>
@@ -6,5 +6,4 @@
 
         <a href="#{{model.name}}/view/{{model.id}}" class="link{{#if isSelected}} text-bold{{/if}}" data-id="{{model.id}}">{{name}}</a>
     </div>
-    <div class="children{{#unless isUnfolded}} hidden{{/unless}}">{{{children}}}</div>
-</li>
+    <div class="children{{#unless isUnfolded}} hidden{{/unless}}">{{{children}}}</div>

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

@@ -25,7 +25,9 @@
 
     <ul class="list-group list-group-tree list-group-no-border">
     {{#each rowList}}
+        <li data-id="{{./this}}" class="list-group-item">
         {{{var this ../this}}}
+        </li>
     {{/each}}
     {{#unless createDisabled}}
     <li class="list-group-item">

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

@@ -14,7 +14,7 @@
     <div class="cell form-group col-sm-6 col-md-12">
         <label class="control-label">{{translate 'Created'}}</label>
         <div class="field">
-            <span data-name="createdAt">{{{createdAt}}}</span> <span class="text-muted">&raquo;</span> <span data-name="createdBy">{{{createdBy}}}</span>
+            <span data-name="createdAt" class="field">{{{createdAt}}}</span> <span class="text-muted">&raquo;</span> <span data-name="createdBy" class="field">{{{createdBy}}}</span>
         </div>
     </div>
     {{/ifAttrNotEmpty}}
@@ -23,7 +23,7 @@
     <div class="cell form-group col-sm-6 col-md-12">
         <label class="control-label">{{translate 'Modified'}}</label>
         <div class="field">
-            <span data-name="modifiedAt">{{{modifiedAt}}}</span> <span class="text-muted">&raquo;</span> <span data-name="modifiedBy">{{{modifiedBy}}}</span>
+            <span data-name="modifiedAt" class="field">{{{modifiedAt}}}</span> <span class="text-muted">&raquo;</span> <span data-name="modifiedBy" >{{{modifiedBy}}}</span>
         </div>
     </div>
     {{/ifAttrNotEmpty}}

client/src/controller.js

@@ -260,8 +260,7 @@ Espo.define('controller', [], function () {
                     if (master.currentViewKey) {
                         this.set('storedScrollTop-' + master.currentViewKey, $(window).scrollTop());
                         if (this.hasStoredMainView(master.currentViewKey)) {
-                            master.nestedViews['main'].undelegateEvents();
-                            delete master.nestedViews['main'];
+                            master.unchainView('main');
                         }
                     }
                     master.currentViewKey = storedKey;

client/src/ui.js

@@ -40,11 +40,11 @@ Espo.define('ui', [], function () {
         this.height = false;
         this.buttons = [];
         this.removeOnClose = true;
-        this.graggable = false;
+        this.draggable = false;
         this.container = 'body'
         this.onRemove = function () {};
 
-        var params = ['className', 'backdrop', 'keyboard', 'closeButton', 'header', 'body', 'width', 'height', 'fitHeight', 'buttons', 'removeOnClose', 'graggable', 'container', 'onRemove'];
+        var params = ['className', 'backdrop', 'keyboard', 'closeButton', 'header', 'body', 'width', 'height', 'fitHeight', 'buttons', 'removeOnClose', 'draggable', 'container', 'onRemove'];
         params.forEach(function (param) {
             if (param in options) {
                 this[param] = options[param];
@@ -99,7 +99,7 @@ Espo.define('ui', [], function () {
             }
         }.bind(this));
 
-        if (this.graggable) {
+        if (this.draggable) {
             this.$el.find('header').css('cursor', 'pointer');
             this.$el.draggable({
                 handle: 'header',

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

@@ -338,7 +338,7 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
             if (view) {
                 view.disabled = true;
             }
-            this.$el.find('.cell-' + name).css('visibility', 'hidden');
+            this.$el.find('.cell[data-name=' + name+']').css('visibility', 'hidden');
         },
 
         showField: function (name) {
@@ -346,7 +346,7 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
             if (view) {
                 view.disabled = false;
             }
-            this.$el.find('.cell-' + name).css('visibility', 'visible');
+            this.$el.find('.cell[data-name=' + name+']').css('visibility', 'visible');
         },
 
         handleLinkTypeChange: function () {

client/src/views/fields/user-with-avatar.js

@@ -36,7 +36,7 @@ Espo.define('views/fields/user-with-avatar', 'views/fields/user', function (Dep)
 
         data: function () {
             var o = _.extend({}, Dep.prototype.data.call(this));
-            if (this.mode == 'detail' || this.mode == 'list') {
+            if (this.mode == 'detail') {
                 o.avatar = this.getAvatarHtml();
             }
             return o;

client/src/views/global-search/global-search.js

@@ -62,7 +62,7 @@ Espo.define('views/global-search/global-search', 'view', function (Dep) {
         },
 
         runSearch: function (text) {
-            var text = this.$input.val();
+            var text = this.$input.val().trim();
             if (text != '' && text.length > 2) {
                 text = text;
                 this.search(text);