From e45a863e8d0020039e904d18bc8eda77dad2fa0a Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 24 Mar 2016 11:27:53 +0200 Subject: [PATCH 1/3] fix invitation --- application/Espo/Modules/Crm/Business/Event/Invitations.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/application/Espo/Modules/Crm/Business/Event/Invitations.php b/application/Espo/Modules/Crm/Business/Event/Invitations.php index f5e96b563f..9456544bfc 100644 --- a/application/Espo/Modules/Crm/Business/Event/Invitations.php +++ b/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() From 2a4b0dbcb44e542c63b6f955de99c663553af29b Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 25 Mar 2016 04:56:47 -0400 Subject: [PATCH 2/3] remove task dublicate index --- .../Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json index 0afa7b32fb..a1665ddce4 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json +++ b/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"] }, From c509eeae498b691715f8f2e2e5f2f281ac85de11 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 25 Mar 2016 05:01:05 -0400 Subject: [PATCH 3/3] fix notices --- application/Espo/Core/Controllers/Record.php | 1 - application/Espo/Notificators/Email.php | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/application/Espo/Core/Controllers/Record.php b/application/Espo/Core/Controllers/Record.php index 152adb4b12..134f98328a 100644 --- a/application/Espo/Core/Controllers/Record.php +++ b/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']; } diff --git a/application/Espo/Notificators/Email.php b/application/Espo/Notificators/Email.php index 86302437b0..8d60d9ec5f 100644 --- a/application/Espo/Notificators/Email.php +++ b/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']);