Merge branch 'hotfix/4.0.4'

application/Espo/Core/Controllers/Record.php

@@ -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/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()

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

@@ -135,9 +135,6 @@
         "dateStart": {
             "columns": ["dateStart", "deleted"]
         },
-        "dateEnd": {
-            "columns": ["dateStart", "deleted"]
-        },
         "status": {
             "columns": ["status", "deleted"]
         },

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']);