fix email filter

* fix variable name

* init $number variable

* another fix

application/Espo/Controllers/Extension.php

@@ -94,17 +94,17 @@ class Extension extends \Espo\Core\Controllers\Record
         return true;
     }
 
-    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();
     }
@@ -139,12 +139,12 @@ class Extension 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/Core/Container.php

@@ -181,7 +181,7 @@ class Container
 
     protected function loadNumber()
     {
-        return new \Espo\Core\Utils\Number(
+        return new \Espo\Core\Utils\NumberUtil(
             $this->get('config')->get('decimalMark'),
             $this->get('config')->get('thousandSeparator')
         );

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -34,7 +34,7 @@ use Espo\Core\Exceptions\Error;
 
 use Espo\Core\Utils\File\Manager as FileManager;
 use Espo\Core\Utils\DateTime;
-use Espo\Core\Utils\Number;
+use Espo\Core\Utils\NumberUtil;
 
 require('vendor/zordius/lightncandy/src/lightncandy.php');
 
@@ -48,7 +48,7 @@ class Htmlizer
 
     protected $acl;
 
-    public function __construct(FileManager $fileManager, DateTime $dateTime, Number $number, $acl = null)
+    public function __construct(FileManager $fileManager, DateTime $dateTime, NumberUtil $number, $acl = null)
     {
         $this->fileManager = $fileManager;
         $this->dateTime = $dateTime;

application/Espo/Core/Mail/FiltersMatcher.php

@@ -39,6 +39,18 @@ class FiltersMatcher
 
     }
 
+    protected function matchTo(Email $email, $filter)
+    {
+        if ($email->get('to')) {
+            $toArr = explode(';', $email->get('to'));
+            foreach ($toArr as $to) {
+                if ($this->matchString(strtolower($filter->get('to')), strtolower($to))) {
+                    return true;
+                }
+            }
+        }
+    }
+
     public function match(Email $email, $subject, $skipBody = false)
     {
         if (is_array($subject) || $subject instanceof \Traversable) {
@@ -48,30 +60,42 @@ class FiltersMatcher
         }
 
         foreach ($filterList as $filter) {
-            if ($filter->get('from')) {
-                if ($this->matchString(strtolower($filter->get('from')), strtolower($email->get('from')))) {
-                    return true;
-                }
-            }
-            if ($filter->get('to')) {
-                if ($email->get('to')) {
-                    $toArr = explode(';', $email->get('to'));
-                    foreach ($toArr as $to) {
-                        if ($this->matchString(strtolower($filter->get('to')), strtolower($to))) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            if ($filter->get('subject')) {
-                if ($this->matchString($filter->get('subject'), $email->get('name'))) {
-                    return true;
-                }
-            }
-        }
+            $filterCount = 0;
 
-        if (!$skipBody) {
-            if ($this->matchBody($email, $filterList)) {
+            if ($filter->get('from')) {
+                $filterCount++;
+                if (!$this->matchString(strtolower($filter->get('from')), strtolower($email->get('from')))) {
+                    continue;
+                }
+            }
+
+            if ($filter->get('to')) {
+                $filterCount++;
+                if (!$this->matchTo($email, $filter)) {
+                    continue;
+                }
+            }
+
+            if ($filter->get('subject')) {
+                $filterCount++;
+                if (!$this->matchString($filter->get('subject'), $email->get('name'))) {
+                    continue;
+                }
+            }
+
+            $wordList = $filter->get('bodyContains');
+            if (!empty($wordList)) {
+                $filterCount++;
+                if ($skipBody) {
+                    continue;
+                }
+                if (!$this->matchBody($email, $filter)) {
+                    continue;
+                }
+
+            }
+
+            if ($filterCount) {
                 return true;
             }
         }
@@ -79,30 +103,19 @@ class FiltersMatcher
         return false;
     }
 
-    public function matchBody(Email $email, $subject)
+    protected function matchBody(Email $email, $filter)
     {
-        if (is_array($subject) || $subject instanceof \Traversable) {
-            $filterList = $subject;
-        } else {
-            $filterList = [$subject];
-        }
-
-        foreach ($filterList as $filter) {
-            if ($filter->get('bodyContains')) {
-                $phraseList = $filter->get('bodyContains');
-                $body = $email->get('body');
-                $bodyPlain = $email->get('bodyPlain');
-                foreach ($phraseList as $phrase) {
-                    if (stripos($bodyPlain, $phrase) !== false) {
-                        return true;
-                    }
-                    if (stripos($body, $phrase) !== false) {
-                        return true;
-                    }
-                }
+        $phraseList = $filter->get('bodyContains');
+        $body = $email->get('body');
+        $bodyPlain = $email->get('bodyPlain');
+        foreach ($phraseList as $phrase) {
+            if (stripos($bodyPlain, $phrase) !== false) {
+                return true;
+            }
+            if (stripos($body, $phrase) !== false) {
+                return true;
             }
         }
-        return false;
     }
 
     protected function matchString($pattern, $value)

application/Espo/Core/Mail/Importer.php

@@ -71,7 +71,10 @@ class Importer
 
             $email->set('isBeingImported', true);
 
-            $subject = $message->subject;
+            $subject = '';
+            if (isset($message->subject)) {
+                $subject = $message->subject;
+            }
             if (!empty($subject) && is_string($subject)) {
                 $subject = trim($subject);
             }
@@ -151,7 +154,7 @@ class Importer
 
                 $duplicate->set('isBeingImported', true);
 
-            	$this->getEntityManager()->saveEntity($duplicate);
+                $this->getEntityManager()->saveEntity($duplicate);
 
                 if (!empty($teamsIdList)) {
                     foreach ($teamsIdList as $teamId) {
@@ -168,8 +171,8 @@ class Importer
                     $email->set('dateSent', $dateSent);
                 }
             } else {
-				$email->set('dateSent', date('Y-m-d H:i:s'));
-			}
+                $email->set('dateSent', date('Y-m-d H:i:s'));
+            }
             if (isset($message->deliveryDate)) {
                 $dt = new \DateTime($message->deliveryDate);
                 if ($dt) {
@@ -205,7 +208,7 @@ class Importer
                     $email->set('body', $body);
                 }
 
-                if ($this->getFiltersMatcher()->matchBody($email, $filterList)) {
+                if ($this->getFiltersMatcher()->match($email, $filterList)) {
                     return false;
                 }
             } else {
@@ -233,6 +236,7 @@ class Importer
                 $reference = str_replace(array('/', '@'), " ", trim($reference, '<>'));
                 $parentType = $parentId = null;
                 $emailSent = PHP_INT_MAX;
+                $number = null;
                 $n = sscanf($reference, '%s %s %d %d espo', $parentType, $parentId, $emailSent, $number);
                 if ($n == 4 && $emailSent < time()) {
                     if (!empty($parentType) && !empty($parentId)) {
@@ -324,15 +328,15 @@ class Importer
                 $email->set('parentId', $account->id);
                 return true;
             } else {
-	            $lead = $this->getEntityManager()->getRepository('Lead')->where(array(
-	                'emailAddress' => $emailAddress
-	            ))->findOne();
-	            if ($lead) {
-	                $email->set('parentType', 'Lead');
-	                $email->set('parentId', $lead->id);
-	                return true;
-	            }
-	       	}
+                $lead = $this->getEntityManager()->getRepository('Lead')->where(array(
+                    'emailAddress' => $emailAddress
+                ))->findOne();
+                if ($lead) {
+                    $email->set('parentType', 'Lead');
+                    $email->set('parentId', $lead->id);
+                    return true;
+                }
+            }
         }
     }
 

application/Espo/Core/Portal/AclManager.php

@@ -169,20 +169,22 @@ class AclManager extends \Espo\Core\AclManager
         return parent::get($user, $permission);
     }
 
-    public function checkReadOnlyTeam(User $user, $permission)
+    public function checkReadOnlyTeam(User $user, $scope)
     {
         if ($this->checkUserIsNotPortal($user)) {
-            return $this->getMainManager()->checkReadOnlyTeam($user, $permission);
+            $data = $this->getTable($user)->getScopeData($scope);
+            return $this->getMainManager()->checkReadOnlyTeam($user, $data);
         }
-        return false;
+        return parent::checkReadOnlyTeam($user, $scope);
     }
 
-    public function checkReadOnlyOwn(User $user, $permission)
+    public function checkReadOnlyOwn(User $user, $scope)
     {
         if ($this->checkUserIsNotPortal($user)) {
-            return $this->getMainManager()->checkReadOnlyOwn($user, $permission);
+            $data = $this->getTable($user)->getScopeData($scope);
+            return $this->getMainManager()->checkReadOnlyOwn($user, $data);
         }
-        return false;
+        return parent::checkReadOnlyOwn($user, $scope);
     }
 
     public function check(User $user, $subject, $action = null)

application/Espo/Core/SelectManagers/Base.php

@@ -919,7 +919,7 @@ class Base
                     $part[$item['field'] . '*'] = $item['value'] . '%';
                     break;
                 case 'endsWith':
-                    $part[$item['field'] . '*'] = $item['value'] . '%';
+                    $part[$item['field'] . '*'] = '%' . $item['value'];
                     break;
                 case 'contains':
                     $part[$item['field'] . '*'] = '%' . $item['value'] . '%';

application/Espo/Core/Utils/Language.php

@@ -185,6 +185,11 @@ class Language
         $options = $this->get($scope. '.options.' . $field);
         if (is_array($options) && array_key_exists($value, $options)) {
             return $options[$value];
+        } else if ($scope !== 'Global') {
+            $options = $this->get('Global.options.' . $field);
+            if (is_array($options) && array_key_exists($value, $options)) {
+                return $options[$value];
+            }
         }
         return $value;
     }

application/Espo/Core/Utils/NumberUtil.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Utils;
 
-class Number
+class NumberUtil
 {
     protected $decimalMark;
 

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

@@ -81,7 +81,7 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
             }
             if ($entity->isNew()) {
                 $currentUserId = $this->getEntityManager()->getUser()->id;
-                if (in_array($currentUserId, $usersIds)) {
+                if (isset($usersIds) && in_array($currentUserId, $usersIds)) {
                     $usersColumns = $entity->get('usersColumns');
                     if (empty($usersColumns)) {
                         $usersColumns = new \StdClass();

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

@@ -3,7 +3,9 @@
         "label": "",
         "rows": [
             [
-                {"name": "name"},
+                {"name": "name"}
+            ],
+            [
                 {"name": "status"}
             ],
             [

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

@@ -13,7 +13,7 @@
         },
         "phoneNumber": {
             "type": "phone",
-            "typeList": ["Office", "Fax", "Other"],
+            "typeList": ["Office", "Mobile", "Fax", "Other"],
             "defaultType": "Office"
         },
         "type": {

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

@@ -9,5 +9,6 @@
     "importable": true,
     "notifications": true,
     "calendar": true,
+    "activity": true,
     "object": true
 }

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

@@ -9,5 +9,6 @@
     "importable": true,
     "notifications": true,
     "calendar": true,
+    "activity": true,
     "object": true
 }

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

@@ -668,6 +668,12 @@ class Activities extends \Espo\Core\Services\Base
 
         $fetchAll = empty($params['scope']);
 
+        if (!$fetchAll) {
+            if (!$this->getMetadata()->get(['scopes', $params['scope'], 'activity'])) {
+                throw new Error('Entity \'' . $params['scope'] . '\' is not an activity');
+            }
+        }
+
         $parts = array();
         if ($this->getAcl()->checkScope('Meeting')) {
             $parts['Meeting'] = ($fetchAll || $params['scope'] == 'Meeting') ? $this->getMeetingQuery($entity, 'NOT IN', ['Held', 'Not Held']) : [];
@@ -675,6 +681,7 @@ class Activities extends \Espo\Core\Services\Base
         if ($this->getAcl()->checkScope('Call')) {
             $parts['Call'] = ($fetchAll || $params['scope'] == 'Call') ? $this->getCallQuery($entity, 'NOT IN', ['Held', 'Not Held']) : [];
         }
+
         return $this->getResultFromQueryParts($parts, $scope, $id, $params);
     }
 
@@ -689,6 +696,12 @@ class Activities extends \Espo\Core\Services\Base
 
         $fetchAll = empty($params['scope']);
 
+        if (!$fetchAll) {
+            if (!$this->getMetadata()->get(['scopes', $params['scope'], 'activity'])) {
+                throw new Error('Entity \'' . $params['scope'] . '\' is not an activity');
+            }
+        }
+
         $parts = array();
         if ($this->getAcl()->checkScope('Meeting')) {
             $parts['Meeting'] = ($fetchAll || $params['scope'] == 'Meeting') ? $this->getMeetingQuery($entity, 'IN', ['Held', 'Not Held']) : [];

application/Espo/Notificators/Email.php

@@ -104,6 +104,9 @@ class Email extends \Espo\Core\Notificators\Base
             $this->getEntityManager()->getRepository('Email')->loadFromField($entity);
         }
 
+        if (!$entity->has('to')) {
+            $this->getEntityManager()->getRepository('Email')->loadToField($entity);
+        }
         $person = null;
 
         $from = $entity->get('from');

application/Espo/Repositories/Email.php

@@ -45,7 +45,7 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
             return;
         }
 
-        $eaRepositoty = $this->getEntityManager()->getRepository('EmailAddress');
+        $eaRepository = $this->getEntityManager()->getRepository('EmailAddress');
 
         $address = $entity->get($type);
         $idList = [];
@@ -54,7 +54,7 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
                 return trim($e);
             }, explode(';', $address));
 
-            $idList = $eaRepositoty->getIdListFormAddressList($arr);
+            $idList = $eaRepository->getIdListFormAddressList($arr);
             foreach ($idList as $id) {
                 $this->addUserByEmailAddressId($entity, $id, $addAssignedUser);
             }
@@ -80,6 +80,45 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
         }
     }
 
+    public function loadToField(Entity $entity)
+    {
+        $entity->loadLinkMultipleField('toEmailAddresses');
+        $names = $entity->get('toEmailAddressesNames');
+        if (!empty($names)) {
+            $arr = array();
+            foreach ($names as $id => $address) {
+                $arr[] = $address;
+            }
+            $entity->set('to', implode(';', $arr));
+        }
+    }
+
+    public function loadCcField(Entity $entity)
+    {
+        $entity->loadLinkMultipleField('ccEmailAddresses');
+        $names = $entity->get('ccEmailAddressesNames');
+        if (!empty($names)) {
+            $arr = array();
+            foreach ($names as $id => $address) {
+                $arr[] = $address;
+            }
+            $entity->set('cc', implode(';', $arr));
+        }
+    }
+
+    public function loadBccField(Entity $entity)
+    {
+        $entity->loadLinkMultipleField('bccEmailAddresses');
+        $names = $entity->get('bccEmailAddressesNames');
+        if (!empty($names)) {
+            $arr = array();
+            foreach ($names as $id => $address) {
+                $arr[] = $address;
+            }
+            $entity->set('bcc', implode(';', $arr));
+        }
+    }
+
     public function loadNameHash(Entity $entity, array $fieldList = ['from', 'to', 'cc'])
     {
         $addressList = array();
@@ -124,7 +163,7 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
 
     protected function beforeSave(Entity $entity, array $options = array())
     {
-        $eaRepositoty = $this->getEntityManager()->getRepository('EmailAddress');
+        $eaRepository = $this->getEntityManager()->getRepository('EmailAddress');
 
         if ($entity->has('attachmentsIds')) {
             $attachmentsIds = $entity->get('attachmentsIds');
@@ -141,7 +180,7 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
             if ($entity->has('from')) {
                 $from = trim($entity->get('from'));
                 if (!empty($from)) {
-                    $ids = $eaRepositoty->getIds(array($from));
+                    $ids = $eaRepository->getIds(array($from));
                     if (!empty($ids)) {
                         $entity->set('fromEmailAddressId', $ids[0]);
                         $this->addUserByEmailAddressId($entity, $ids[0], true);
@@ -201,6 +240,12 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
         }
 
         if ($entity->get('isBeingImported')) {
+            if (!$entity->has('from')) {
+                $this->loadFromField($entity);
+            }
+            if (!$entity->has('to')) {
+                $this->loadToField($entity);
+            }
             foreach ($entity->getLinkMultipleIdList('users') as $userId) {
                 $filter = $this->getEmailFilterManager()->getMatchingFilter($entity, $userId);
                 if ($filter) {

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

@@ -51,7 +51,6 @@
         "ldapUserFirstNameAttribute": "User First Name Attribute",
         "ldapUserLastNameAttribute": "User Last Name Attribute",
         "ldapUserEmailAddressAttribute": "User Email Address Attribute",
-        "ldapUserPhoneNumberAttribute": "User Phone Number Attribute",
         "ldapUserTeams": "User Teams",
         "ldapUserDefaultTeam": "User Default Team",
         "ldapUserPhoneNumberAttribute": "User Phone Number Attribute",

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

@@ -140,7 +140,7 @@
         },
         "fromEmailAddress": {
             "type": "link",
-            "view": "views/fields/from-email-address"
+            "view": "views/email/fields/from-email-address"
         },
         "toEmailAddresses": {
             "type": "linkMultiple"

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

@@ -6,5 +6,6 @@
     "aclPortal": "recordAllAccountContactOwnNo",
     "notifications": true,
     "object": true,
-    "customizable": true
+    "customizable": true,
+    "activity": true
 }

application/Espo/Resources/metadata/scopes/Template.json

@@ -1,8 +1,8 @@
 {
-    "entity": false,
+    "entity": true,
     "layouts": false,
     "tab": false,
     "acl": "recordAllTeamNo",
-    "customizable": false,
+    "customizable": true,
     "disabled": true
 }

application/Espo/Services/Email.php

@@ -250,41 +250,17 @@ class Email extends Record
 
     public function loadToField(Entity $entity)
     {
-        $entity->loadLinkMultipleField('toEmailAddresses');
-        $names = $entity->get('toEmailAddressesNames');
-        if (!empty($names)) {
-            $arr = array();
-            foreach ($names as $id => $address) {
-                $arr[] = $address;
-            }
-            $entity->set('to', implode(';', $arr));
-        }
+        $this->getEntityManager()->getRepository('Email')->loadToField($entity);
     }
 
     public function loadCcField(Entity $entity)
     {
-        $entity->loadLinkMultipleField('ccEmailAddresses');
-        $names = $entity->get('ccEmailAddressesNames');
-        if (!empty($names)) {
-            $arr = array();
-            foreach ($names as $id => $address) {
-                $arr[] = $address;
-            }
-            $entity->set('cc', implode(';', $arr));
-        }
+        $this->getEntityManager()->getRepository('Email')->loadCcField($entity);
     }
 
     public function loadBccField(Entity $entity)
     {
-        $entity->loadLinkMultipleField('bccEmailAddresses');
-        $names = $entity->get('bccEmailAddressesNames');
-        if (!empty($names)) {
-            $arr = array();
-            foreach ($names as $id => $address) {
-                $arr[] = $address;
-            }
-            $entity->set('bcc', implode(';', $arr));
-        }
+        $this->getEntityManager()->getRepository('Email')->loadBccField($entity);
     }
 
     public function getEntity($id = null)

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

@@ -36,10 +36,18 @@ Espo.define('crm:views/campaign/detail', 'views/detail', function (Dep) {
                 'targetListsIds': 'targetListsIds',
                 'targetListsNames': 'targetListsNames',
                 'excludingTargetListsIds': 'excludingTargetListsIds',
-                'excludingTargetListsNames': 'excludingTargetListsNames'
+                'excludingTargetListsNames': 'excludingTargetListsNames',
             },
         },
 
+        relatedAttributeFunctions: {
+            'massEmails':  function () {
+                return {
+                    name: this.model.get('name') + ' ' + this.getDateTime().getToday()
+                };
+            }
+        }
+
     });
 });
 

client/src/views/admin/layouts/base.js

@@ -101,12 +101,6 @@ Espo.define('views/admin/layouts/base', 'view', function (Dep) {
             }.bind(this));
         },
 
-        cancel: function () {
-            this.loadLayout(function () {
-                this.render();
-            }.bind(this));
-        },
-
         reset: function () {
             this.render();
         },

client/src/views/admin/layouts/filters.js

@@ -40,7 +40,12 @@ Espo.define('views/admin/layouts/filters', 'views/admin/layouts/rows', function
             Dep.prototype.setup.call(this);
 
             this.wait(true);
+            this.loadLayout(function () {
+                this.wait(false);
+            }.bind(this));
+        },
 
+        loadLayout: function (callback) {
             this.getModelFactory().create(this.scope, function (model) {
                 this.getHelper().layoutManager.get(this.scope, this.type, function (layout) {
 
@@ -80,7 +85,7 @@ Espo.define('views/admin/layouts/filters', 'views/admin/layouts/rows', function
                         this.rowLayout[i].label = this.getLanguage().translate(this.rowLayout[i].name, 'fields', this.scope);
                     }
 
-                    this.wait(false);
+                    callback();
                 }.bind(this), false);
             }.bind(this));
         },

client/src/views/admin/layouts/mass-update.js

@@ -42,7 +42,12 @@ Espo.define('views/admin/layouts/mass-update', 'views/admin/layouts/rows', funct
             Dep.prototype.setup.call(this);
 
             this.wait(true);
+            this.loadLayout(function () {
+                this.wait(false);
+            }.bind(this));
+        },
 
+        loadLayout: function (callback) {
             this.getModelFactory().create(this.scope, function (model) {
                 this.getHelper().layoutManager.get(this.scope, this.type, function (layout) {
 
@@ -83,7 +88,7 @@ Espo.define('views/admin/layouts/mass-update', 'views/admin/layouts/rows', funct
                         this.rowLayout[i].label = this.getLanguage().translate(this.rowLayout[i].name, 'fields', this.scope);
                     }
 
-                    this.wait(false);
+                    callback();
                 }.bind(this), false);
             }.bind(this));
         },

client/src/views/admin/layouts/relationships.js

@@ -38,7 +38,12 @@ Espo.define('views/admin/layouts/relationships', 'views/admin/layouts/rows', fun
             Dep.prototype.setup.call(this);
 
             this.wait(true);
+            this.loadLayout(function () {
+                this.wait(false);
+            }.bind(this));
+        },
 
+        loadLayout: function (callback) {
             this.getModelFactory().create(this.scope, function (model) {
                 this.getHelper().layoutManager.get(this.scope, this.type, function (layout) {
 
@@ -80,7 +85,7 @@ Espo.define('views/admin/layouts/relationships', 'views/admin/layouts/rows', fun
                         this.rowLayout[i].label = this.getLanguage().translate(this.rowLayout[i].name, 'links', this.scope);
                     }
 
-                    this.wait(false);
+                    callback();
                 }.bind(this), false);
             }.bind(this));
         },

client/src/views/email/record/compose.js

@@ -49,7 +49,10 @@ Espo.define('views/email/record/compose', ['views/record/edit', 'views/email/rec
 	        }
 
             this.listenTo(this.model, 'insert-template', function (data) {
-                var body = this.appendSignature(data.body || '', data.isHtml);
+                var body = data.body;
+                if (this.hasSignature()) {
+                    body = this.appendSignature(body || '', data.isHtml);
+                }
                 this.model.set('isHtml', data.isHtml);
                 this.model.set('name', data.subject);
                 this.model.set('body', '');
@@ -98,7 +101,7 @@ Espo.define('views/email/record/compose', ['views/record/edit', 'views/email/rec
         },
 
         getSignature: function () {
-            return this.getPreferences().get('signature');
+            return this.getPreferences().get('signature') || '';
         },
 
         getPlainTextSignature: function () {

client/src/views/fields/link-multiple-with-role.js

@@ -117,7 +117,7 @@ Espo.define('views/fields/link-multiple-with-role', 'views/fields/link-multiple'
         },
 
         getJQSelect: function (id, roleValue) {
-            $role = $('<select class="role form-control input-sm pull-right" data-id="'+id+'">');
+            var $role = $('<select class="role form-control input-sm pull-right" data-id="'+id+'">');
             this.roleList.forEach(function (role) {
                 var selectedHtml = (role == roleValue) ? 'selected': '';
                 option = '<option value="'+role+'" '+selectedHtml+'>' + this.getLanguage().translateOption(role, this.roleField, this.roleFieldScope) + '</option>';
@@ -155,7 +155,9 @@ Espo.define('views/fields/link-multiple-with-role', 'views/fields/link-multiple'
                 'width': '92%',
                 'display': 'inline-block'
             });
-            $left.append($role);
+            if ($role) {
+                $left.append($role);
+            }
             $left.append(nameHtml);
             $el.append($left);
 
@@ -171,19 +173,22 @@ Espo.define('views/fields/link-multiple-with-role', 'views/fields/link-multiple'
             $container.append($el);
 
             if (this.mode == 'edit') {
-                var fetch = function ($target) {
-                    var value = $target.val().toString().trim();
-                    var id = $target.data('id');
-                    this.columns[id] = this.columns[id] || {};
-                    this.columns[id][this.columnName] = value;
-                }.bind(this);
-                $role.on('change', function (e) {
-                    var $target = $(e.currentTarget);
-                    fetch($target);
-                    this.trigger('change');
-                }.bind(this));
-                fetch($role);
+                if ($role) {
+                    var fetch = function ($target) {
+                        if (!$target || !$target.size()) return;
 
+                        var value = $target.val().toString().trim();
+                        var id = $target.data('id');
+                        this.columns[id] = this.columns[id] || {};
+                        this.columns[id][this.columnName] = value;
+                    }.bind(this);
+                    $role.on('change', function (e) {
+                        var $target = $(e.currentTarget);
+                        fetch($target);
+                        this.trigger('change');
+                    }.bind(this));
+                    fetch($role);
+                }
             }
             return $el;
         },

client/src/views/notification/badge.js

@@ -129,7 +129,18 @@ Espo.define('views/notification/badge', 'view', function (Dep) {
             this.$badge.attr('title', '');
         },
 
+        checkBypass: function () {
+            var last = this.getRouter().getLast() || {};
+            if (last.controller == 'Admin' && last.action == 'upgrade') {
+                return true;
+            }
+        },
+
         checkUpdates: function (isFirstCheck) {
+            if (this.checkBypass()) {
+                return;
+            }
+
             $.ajax('Notification/action/notReadCount').done(function (count) {
                 if (!isFirstCheck && count > this.unreadCount) {
 
@@ -172,13 +183,21 @@ Espo.define('views/notification/badge', 'view', function (Dep) {
                 isFirstCheck = true;
             }
 
-            var jqxhr = $.ajax(url).done(function (list) {
-                list.forEach(function (d) {
-                    this.showPopupNotification(name, d, isFirstCheck);
-                }, this);
-            }.bind(this));
+            (new Promise(function (resolve) {
+                if (this.checkBypass()) {
+                    resolve();
+                    return;
+                }
+                var jqxhr = $.ajax(url).done(function (list) {
+                    list.forEach(function (d) {
+                        this.showPopupNotification(name, d, isFirstCheck);
+                    }, this);
+                }.bind(this));
 
-            jqxhr.always(function() {
+                jqxhr.always(function() {
+                    resolve();
+                });
+            }.bind(this))).then(function () {
                 this.popoupTimeouts[name] = setTimeout(function () {
                     this.popupCheckIteration++;
                     this.checkPopupNotifications(name);

client/src/views/stream/notes/status.js

@@ -26,11 +26,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('Views.Stream.Notes.Status', 'Views.Stream.Note', function (Dep) {
+Espo.define('views/stream/notes/status', 'views/stream/note', function (Dep) {
 
     return Dep.extend({
 
-        template: 'stream.notes.status',
+        template: 'stream/notes/status',
 
         messageName: 'status',
 
@@ -58,7 +58,7 @@ Espo.define('Views.Stream.Notes.Status', 'Views.Stream.Note', function (Dep) {
 
             this.statusText = this.getLanguage().translateOption(value, field, this.model.get('parentType'));
 
-            this.messageData['field'] = this.translate(field, 'fields', this.model.name).toLowerCase();
+            this.messageData['field'] = this.translate(field, 'fields', this.model.get('parentType')).toLowerCase();
 
             this.createMessage();
         },

client/src/views/template/fields/variables.js

@@ -55,17 +55,17 @@ Espo.define('views/template/fields/variables', 'views/fields/base', function (De
         },
 
         setup: function () {
-            this.setupFieldList();
+            this.setupAttributeList();
+            this.setupTranslatedOptions();
 
             this.listenTo(this.model, 'change:entityType', function () {
-                this.setupFieldList();
-                if (this.isRendered()) {
-                    this.reRender();
-                }
+                this.setupAttributeList();
+                this.setupTranslatedOptions();
+                this.reRender();
             }, this);
         },
 
-        setupFieldList: function () {
+        setupAttributeList: function () {
             var entityType = this.model.get('entityType');
 
             var attributeList = this.getFieldManager().getEntityAttributes(entityType) || [];
@@ -85,6 +85,57 @@ Espo.define('views/template/fields/variables', 'views/fields/base', function (De
             attributeList.forEach(function (item) {
                 this.translatedOptions[item] = this.translate(item, 'fields', entityType);
             }, this);
+
+            var links = this.getMetadata().get('entityDefs.' + entityType + '.links') || {};
+
+            var linkList = Object.keys(links).sort(function (v1, v2) {
+                return this.translate(v1, 'links', entityType).localeCompare(this.translate(v2, 'links', entityType));
+            }.bind(this));
+
+            linkList.forEach(function (link) {
+                var type = links[link].type
+                if (type != 'belongsTo') return;
+                var scope = links[link].entity;
+                if (!scope) return;
+
+                var attributeList = this.getFieldManager().getEntityAttributes(scope) || [];
+
+                attributeList.push('id');
+                if (this.getMetadata().get('entityDefs.' + scope + '.fields.name.type') == 'personName') {
+                    attributeList.unshift('name');
+                };
+
+                attributeList.sort(function (v1, v2) {
+                    return this.translate(v1, 'fields', scope).localeCompare(this.translate(v2, 'fields', scope));
+                }.bind(this));
+
+                attributeList.forEach(function (item) {
+                    this.attributeList.push(link + '.' + item);
+                }, this);
+            }, this);
+
+            return this.attributeList;
+        },
+
+        setupTranslatedOptions: function () {
+            this.translatedOptions = {};
+
+            var entityType = this.model.get('entityType');
+            this.attributeList.forEach(function (item) {
+                var field = item;
+                var scope = entityType;
+                var isForeign = false;
+                if (~item.indexOf('.')) {
+                    isForeign = true;
+                    field = item.split('.')[1];
+                    var link = item.split('.')[0];
+                    scope = this.getMetadata().get('entityDefs.' + entityType + '.links.' + link + '.entity');
+                }
+                this.translatedOptions[item] = this.translate(field, 'fields', scope);
+                if (isForeign) {
+                    this.translatedOptions[item] =  this.translate(link, 'links', entityType) + '.' + this.translatedOptions[item];
+                }
+            }, this);
         },
 
         afterRender: function () {

client/src/views/user/fields/teams.js

@@ -37,8 +37,8 @@ Espo.define('views/user/fields/teams', 'views/fields/link-multiple-with-role', f
 
             this.loadRoleList(function () {
                 if (this.mode == 'edit') {
-                    if (this.isRendered()) {
-                        this.render();
+                    if (this.isRendered() || this.isBeingRendered()) {
+                        this.reRender();
                     }
                 }
             }, this);
@@ -53,7 +53,7 @@ Espo.define('views/user/fields/teams', 'views/fields/link-multiple-with-role', f
                 }, this);
                 if (toLoad) {
                     this.loadRoleList(function () {
-                        this.render();
+                        this.reRender();
                     }, this);
                 }
             }, this);
@@ -99,7 +99,15 @@ Espo.define('views/user/fields/teams', 'views/fields/link-multiple-with-role', f
         },
 
         getJQSelect: function (id, roleValue) {
+
+
             var roleList = Espo.Utils.clone((this.roleListMap[id] || []));
+
+            if (!roleList.length) {
+                return;
+            };
+
+
             if (roleList.length || roleValue) {
                 $role = $('<select class="role form-control input-sm pull-right" data-id="'+id+'">');
 

frontend/less/espo/custom.less

@@ -323,7 +323,24 @@ ul.dropdown-menu > li.checkbox:last-child {
     margin-bottom: 1px;
 }
 
-.field .link-container .list-group-item .form-control {
+.filter > .form-group .field {
+    .link-container {
+        font-size: @font-size-small;
+    }
+    .input-group {
+        input {
+            font-size: @font-size-small;
+            height: @input-height-small;
+        }
+        button.btn {
+            font-size: @font-size-small;
+            height: @input-height-small;
+        }
+    }
+}
+
+.field .link
+-container .list-group-item .form-control {
     width: 140px !important;
 }
 

frontend/less/espo/misc/selectize/selectize.less

@@ -293,3 +293,12 @@
 	opacity: @selectize-opacity-disabled;
 	background-color: @selectize-color-disabled;
 }
+
+.filter > .form-group .field {
+    .selectize-control {
+        .selectize-input {
+            font-size: @font-size-small;
+            padding: 4px 5px 0px;
+        }
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "4.2.4",
+  "version": "4.2.6",
   "description": "",
   "main": "index.php",
   "repository": {