diff --git a/application/Espo/Core/Action/Actions/Merge/Merger.php b/application/Espo/Core/Action/Actions/Merge/Merger.php index e176e275fe..e09771df24 100644 --- a/application/Espo/Core/Action/Actions/Merge/Merger.php +++ b/application/Espo/Core/Action/Actions/Merge/Merger.php @@ -42,6 +42,7 @@ use Espo\Core\Record\ActionHistory\Action; use Espo\Core\Record\ServiceContainer; use Espo\Core\Utils\Metadata; use Espo\Core\Utils\ObjectUtil; +use Espo\Entities\Attachment; use Espo\Entities\Note; use Espo\ORM\Entity; use Espo\Entities\EmailAddress; @@ -307,6 +308,13 @@ class Merger continue; } + if ( + $relationDefs->tryGetForeignEntityType() === Attachment::ENTITY_TYPE && + $type === RelationType::HAS_CHILDREN + ) { + continue; + } + if ( $type !== Entity::HAS_MANY && $type !== Entity::HAS_CHILDREN &&