From d83f02010ad1b5b8783b0b1bd12bee994f166806 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 18 Sep 2019 10:21:51 +0300
Subject: [PATCH 1/4] fix inbound email from address

---
 application/Espo/Services/InboundEmail.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/Espo/Services/InboundEmail.php b/application/Espo/Services/InboundEmail.php
index a0ee91b994..7bcb580e67 100644
--- a/application/Espo/Services/InboundEmail.php
+++ b/application/Espo/Services/InboundEmail.php
@@ -922,7 +922,7 @@ class InboundEmail extends \Espo\Services\Record
 
     public function getSmtpParamsFromAccount(\Espo\Entities\InboundEmail $emailAccount)
     {
-        $smtpParams = array();
+        $smtpParams = [];
         $smtpParams['server'] = $emailAccount->get('smtpHost');
         if ($smtpParams['server']) {
             $smtpParams['port'] = $emailAccount->get('smtpPort');
@@ -933,7 +933,10 @@ class InboundEmail extends \Espo\Services\Record
             if ($emailAccount->get('fromName')) {
                 $smtpParams['fromName'] = $emailAccount->get('fromName');
             }
-            if (array_key_exists('password', $smtpParams)) {
+            if ($emailAccount->get('emailAddress')) {
+                $smtpParams['fromAddress'] = $emailAccount->get('emailAddress');
+            }
+            if (array_key_exists('password', $smtpParams) && is_string($smtpParams['password'])) {
                 $smtpParams['password'] = $this->getCrypt()->decrypt($smtpParams['password']);
             }
             return $smtpParams;

From b08f7de0cbeb73cc80f4d724c0cae7fcd163e18d Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 18 Sep 2019 10:48:12 +0300
Subject: [PATCH 2/4] email address fix double escaping

---
 client/src/views/email/fields/email-address-varchar.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/views/email/fields/email-address-varchar.js b/client/src/views/email/fields/email-address-varchar.js
index 5ade27fbd8..ca7b753908 100644
--- a/client/src/views/email/fields/email-address-varchar.js
+++ b/client/src/views/email/fields/email-address-varchar.js
@@ -203,10 +203,6 @@ Espo.define('views/email/fields/email-address-varchar', ['views/fields/varchar',
         },
 
         addAddress: function (address, name, type, id) {
-            if (name) {
-                name = this.getHelper().escapeString(name);
-            }
-
             if (this.justAddedAddress) {
                 this.deleteAddress(this.justAddedAddress);
             }

From e1d77338485581fdc8b4e5d62ff2771284c12371 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 18 Sep 2019 11:07:10 +0300
Subject: [PATCH 3/4] meeting/call do not show send invitees if only own user
 and accepted

---
 client/modules/crm/src/views/meeting/detail.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/modules/crm/src/views/meeting/detail.js b/client/modules/crm/src/views/meeting/detail.js
index 1475204242..901133e562 100644
--- a/client/modules/crm/src/views/meeting/detail.js
+++ b/client/modules/crm/src/views/meeting/detail.js
@@ -98,6 +98,12 @@ Espo.define('crm:views/meeting/detail', 'views/detail', function (Dep) {
 
                 if (!contactIdList.length && !leadIdList.length && !userIdList.length) {
                     show = false;
+                } else if (
+                    userIdList.length === 1 && userIdList[0] === this.getUser().id
+                    &&
+                    this.model.getLinkMultipleColumn('users', 'status', this.getUser().id) === 'Accepted'
+                ) {
+                    show = false;
                 }
             }
 

From e9208602f63050fec0d8e44e9ceb2d8cebeacc32 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Thu, 19 Sep 2019 12:00:03 +0300
Subject: [PATCH 4/4] css fix

---
 frontend/less/espo/custom.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index bb9610b1e3..2ec9957767 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -1179,6 +1179,10 @@ select[multiple].input-sm {
     height: 90px !important;
 }
 
+optgroup {
+    font-weight: 600;
+}
+
 .input-group-btn > select.form-control {
     position: relative;
     display: inline-block;