From a3836b0091deb17d02932d08a88a8b7839ae33ce Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Wed, 19 Oct 2016 16:38:00 +0300
Subject: [PATCH 1/2] email fix

---
 application/Espo/SelectManagers/Email.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/Espo/SelectManagers/Email.php b/application/Espo/SelectManagers/Email.php
index 21c99b32cf..280066c9c5 100644
--- a/application/Espo/SelectManagers/Email.php
+++ b/application/Espo/SelectManagers/Email.php
@@ -119,7 +119,10 @@ class Email extends \Espo\Core\SelectManagers\Base
         }
         $d = array(
             'usersMiddle.inTrash=' => false,
-            'usersMiddle.folderId' => null
+            'usersMiddle.folderId' => null,
+            array(
+                'status!=' => 'Draft'
+            )
         );
         if (!empty($idList)) {
             $d['fromEmailAddressId!='] = $idList;
@@ -151,6 +154,9 @@ class Email extends \Espo\Core\SelectManagers\Base
                     'createdById' => $this->getUser()->id
                 )
             ),
+            array(
+                'status!=' => 'Draft'
+            ),
             'usersMiddle.inTrash=' => false
         );
     }

From 730b5fb8a95232c38c40f6b38f8a57931470e914 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Fri, 28 Oct 2016 14:46:37 +0300
Subject: [PATCH 2/2] fix calendar dashlet

---
 client/modules/crm/src/views/dashlets/calendar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/modules/crm/src/views/dashlets/calendar.js b/client/modules/crm/src/views/dashlets/calendar.js
index 219fe59548..486f8d5680 100644
--- a/client/modules/crm/src/views/dashlets/calendar.js
+++ b/client/modules/crm/src/views/dashlets/calendar.js
@@ -38,7 +38,7 @@ Espo.define('crm:views/dashlets/calendar', 'views/dashlets/abstract/base', funct
 
         init: function () {
             Dep.prototype.init.call(this);
-            this.optionsFields['enabledScopeList'].options = this.getMetadata().get('clientDefs.Calendar.scopeList') || this.optionsFields['enabledScopeList'].options;
+            this.optionsFields['enabledScopeList'].options = this.getConfig().get('calendarEntityList') || [];
         },
 
         afterRender: function () {