Merge branch 'master' into version/7.4

application/Espo/Modules/Crm/Hooks/Task/DateCompleted.php

@@ -0,0 +1,69 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Modules\Crm\Hooks\Task;
+
+use Espo\Core\Field\DateTime;
+use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Modules\Crm\Entities\Task;
+use Espo\ORM\Entity;
+
+class DateCompleted
+{
+    private const FIELD_DATE_COMPLETED = 'dateCompleted';
+    private const FIELD_STATUS = 'status';
+
+    public function __construct() {}
+
+    /**
+     * @param Task $entity
+     * @param array<string, mixed> $options
+     */
+    public function beforeSave(Entity $entity, array $options): void
+    {
+        if (!$entity->isAttributeChanged(self::FIELD_STATUS)) {
+            return;
+        }
+
+        if (
+            ($options[SaveOption::IMPORT] ?? false) &&
+            $entity->get(self::FIELD_DATE_COMPLETED)
+        ) {
+            return;
+        }
+
+        if ($entity->getStatus() !== Task::STATUS_COMPLETED) {
+            $entity->set(self::FIELD_DATE_COMPLETED, null);
+
+            return;
+        }
+
+        $entity->setValueObject(self::FIELD_DATE_COMPLETED, DateTime::createNow());
+    }
+}

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

@@ -29,7 +29,6 @@
 
 namespace Espo\Modules\Crm\Repositories;
 
-use Espo\Core\Utils\DateTime;
 use Espo\Modules\Crm\Entities\Account as AccountEntity;
 use Espo\Modules\Crm\Entities\Contact as ContactEntity;
 use Espo\Modules\Crm\Entities\Lead as LeadEntity;
@@ -50,14 +49,6 @@ class Task extends EventRepository
      */
     protected function beforeSave(Entity $entity, array $options = [])
     {
-        if ($entity->isAttributeChanged('status')) {
-            if ($entity->get('status') == TaskEntity::STATUS_COMPLETED) {
-                $entity->set('dateCompleted', date(DateTime::SYSTEM_DATE_TIME_FORMAT));
-            } else {
-                $entity->set('dateCompleted', null);
-            }
-        }
-
         if (!$entity->isNew() && $entity->isAttributeChanged('parentId')) {
             $entity->set('accountId', null);
             $entity->set('contactId', null);

application/Espo/Services/LeadCapture.php

@@ -73,6 +73,8 @@ class LeadCapture extends Record
         $attributeIgnoreList = [
             'emailAddressIsOptedOut',
             'phoneNumberIsOptedOut',
+            'emailAddressIsInvalid',
+            'phoneNumberIsInvalid',
             'emailAddressData',
             'phoneNumberData',
         ];

application/Espo/Tools/App/LanguageService.php

@@ -177,15 +177,15 @@ class LanguageService
      */
     private function unsetEmpty(array &$data, string $scope): void
     {
-        if ($data[$scope]['options'] === []) {
+        if (($data[$scope]['options'] ?? null) === []) {
             unset($data[$scope]['options']);
         }
 
-        if ($data[$scope]['fields'] === []) {
+        if (($data[$scope]['fields'] ?? null) === []) {
             unset($data[$scope]['fields']);
         }
 
-        if ($data[$scope]['links'] === []) {
+        if (($data[$scope]['links'] ?? null) === []) {
             unset($data[$scope]['links']);
         }
     }

application/Espo/Tools/Import/Import.php

@@ -630,6 +630,12 @@ class Import
 
     private function processForeignName(CoreEntity $entity, string $attribute): void
     {
+        $nameValue = $entity->get($attribute);
+
+        if ($nameValue === null) {
+            return;
+        }
+
         $relation = $entity->getAttributeParam($attribute, 'relation');
 
         if (!$relation) {
@@ -671,8 +677,6 @@ class Import
             return;
         }
 
-        $nameValue = $entity->get($attribute);
-
         if ($isPerson) {
             $where = $this->parsePersonName($nameValue, $this->params->getPersonNameFormat() ?? '');
         }

client/src/views/main.js

@@ -410,14 +410,18 @@ define('views/main', ['view'], function (Dep) {
             this.menu[type][method](item);
 
             if (!doNotReRender && this.isRendered()) {
-                this.getHeaderView().reRender();
+                this.getHeaderView()
+                    .reRender()
+                    .then(() => this.adjustButtons());
 
                 return;
             }
 
             if (!doNotReRender && this.isBeingRendered()) {
                 this.once('after:render', () => {
-                    this.getHeaderView().reRender();
+                    this.getHeaderView()
+                        .reRender()
+                        .then(() => this.adjustButtons());
                 });
             }
         },
@@ -448,14 +452,20 @@ define('views/main', ['view'], function (Dep) {
             }
 
             if (!doNotReRender && this.isRendered()) {
-                this.getHeaderView().reRender();
+                this.getHeaderView()
+                    .reRender()
+                    .reRender()
+                    .then(() => this.adjustButtons());
 
                 return;
             }
 
             if (!doNotReRender && this.isBeingRendered()) {
                 this.once('after:render', () => {
-                    this.getHeaderView().reRender();
+                    this.getHeaderView()
+                        .reRender()
+                        .then(() => this.adjustButtons());
+
                 });
 
                 return;