diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue index 1c5d2b6da..5afcb3c43 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue @@ -57,6 +57,7 @@ import { THIRDPARTY_A_COMPANY, PERSON, THIRDPARTY, + THIRDPARTY_CONTACT, } from "translator"; const props = defineProps({ @@ -64,3 +65,7 @@ const props = defineProps({ entity: Object, }); + +thirdparty_duplicate: + merge: Fussioner + find: 'Désigner un tiers doublon' diff --git a/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php b/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php index c9d126f14..22956c8d0 100644 --- a/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php +++ b/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\ThirdPartyBundle\Service; use Chill\ThirdPartyBundle\Entity\ThirdParty; -use Doctrine\DBAL\Exception; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadata;