Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-11 18:29:53 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix translation and cs-fixes

Browse Source
This commit is contained in:
Julie Lenaerts 2025-03-05 19:43:16 +01:00
parent 57dffc2038
commit 73cda4b2eb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
View File

@ -57,6 +57,7 @@ import {
THIRDPARTY_A_COMPANY, THIRDPARTY_A_COMPANY,
PERSON, PERSON,
THIRDPARTY, THIRDPARTY,
THIRDPARTY_CONTACT,
} from "translator"; } from "translator";
const props = defineProps({ const props = defineProps({
@ -64,3 +65,7 @@ const props = defineProps({
entity: Object, entity: Object,
}); });
</script> </script>
thirdparty_duplicate:
merge: Fussioner
find: 'Désigner un tiers doublon'

1
src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php
View File

@ -12,7 +12,6 @@ declare(strict_types=1);
namespace Chill\ThirdPartyBundle\Service; namespace Chill\ThirdPartyBundle\Service;
use Chill\ThirdPartyBundle\Entity\ThirdParty; use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Doctrine\DBAL\Exception;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadata;