diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3939bf09e542787d44736a72198c89fa25fa55df..37fc895a4805816d412f3e45df285796478ddad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
 CHANGELOG
 =========
-## [2.4.9] - 202X-XX-XX
+## [2.4.9] - 2025-XX-XX
 ### Ajout
+- [Global] Ajout des champs absents dans les documents Word générés depuis la liste des différents modules.
+- [Formulaire] Ajout d'un label aux champs type et liste des structures dans la gestion des droits des modèles d'AIPD et dans les référentiels, ainsi que dans la duplication.
 - [Accessibilité] Ajout du plan d'actions 2025.
+- [Preuves] Ajout de la possibilité de déposer des documents ayant comme extension .txt, .log, .csv et .md.
+- [Bilan] Ajout du score moyen de l'indice de maturité dans le bilan et dans le document Word de synthèse.
+- [Référentiels] Ajout du nom de l'élément modifié dans la gestion des droits des référentiels.
+- [AIPD] Ajout du nom de l'élément modifié dans la gestion des droits des modèles d'AIPD.
 - [AIPD] Ajout du modèle XML sur la vidéoprotection mis en oeuvre par les autorités publiques.
 ### Changement
 - [Global] Divers renommages et traductions.
@@ -10,10 +16,17 @@ CHANGELOG
 - [Documentation] Mise à jour de la documentation utilisateur.
 - [Accessibilité] Mise à jour du schéma pluriannuel et du plan d'actions 2024.
 - [Plan du site] Mise à jour des pages liées à l'accessibilité.
+- [Traitements] Déplacement du consentement demandé et du format du bloc détails au bloc informations générales.
+- [Traitements] Repositionnement des mesures de sécurité et confidentialité par ordre alphabétique.
 - [Indice de maturité] Modification du bouton de modification pour s'afficher que s'il y a des préconisations dans la synthèse d'un indice de maturité.
+- [Bilan] Modification de l'affichage des données du dernier indice de maturité dans le bilan.
 - [AIPD] Modification des dates des avis des acteurs pour ne rien afficher par défaut dans le PDF d'une AIPD.
 ### Fix
+- [Traitements] Fix de certains champs manquants dans le document Word généré depuis la liste des traitements.
 - [Indice de maturité] Fix de l'affichage du graphique dans le bilan et la synthèse d'un indice de maturité.
+- [Bilan] Fix de l'affichage de la date dans le tableau des actions de protection mises en place.
+- [Bilan] Fix de certaines données présentes dans le tableau annexe du registre des traitements.
+- [Registre public] Fix affichage des durées de conservation.
 - [Migration] Fix d'une migration qui cause une erreur lors du déploiement.
 
 ## [2.4.8] - 2024-12-10
@@ -223,7 +236,6 @@ APP_NOTIFICATION_EMAIL_FIRST_LINE="Des modifications ont été apportées dans <
 ### Changement
 - Ajout du parametre APP_URL dans le .env pour afficher les liens corrects dans les emails de notifications
 
-
 ## [2.0] - 2022-12-13
 ### Changement
 - Mise à jour vers Symfony 5.4 et PHP 8.1
@@ -247,7 +259,6 @@ APP_NOTIFICATION_EMAIL_FIRST_LINE="Des modifications ont été apportées dans <
 - Correction d'un bug déconnectant l'utilisateur lors d'une tentative de modification de son propre profil
 - Correction d'un bug empêchant de se connecter en tant que user avec des services supprimés
 
-
 ## [1.8.10] - 2022-03-14
 ### Changement
 - Modification des services pour afficher tous les services aux utilisateurs n'appartenant à aucun
diff --git a/LICENSE.md b/LICENSE.md
index be3f7b28e564e7dd05eaf59d64adba1a4065ac0e..b7d9527e8e443a5fcf7513a73fc1d12bfae052e5 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,661 +1,227 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# GNU AFFERO GENERAL PUBLIC LICENSE
+
+**Version 3, 19 November 2007**
+
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+## Preamble
+
+The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.
+
+The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.
+
+An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based on the Program.
+
+To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work.
+
+A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+- a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+- b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices".
+- c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+- d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+- a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+- b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+- c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+- d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+- e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+- a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+- b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+- c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+- d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+- e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+- f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+
+### 13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph.
+
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+**END OF TERMS AND CONDITIONS**
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+> <one line to give the program's name and a brief idea of what it does.>
+>
+> Copyright (C) <year> <name of author>
+>
+> This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+>
+> This program 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 Affero General Public License for more details.
+>
+> You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements.
+
+You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>.
diff --git a/config/api_platform/serialization/treatment.yaml b/config/api_platform/serialization/treatment.yaml
index 424d1e8ab9fe45189e5c2b2ed19ba0f47e31ad40..dd26b6bf45773efc713bfe2c7a1957a0758dbe0a 100644
--- a/config/api_platform/serialization/treatment.yaml
+++ b/config/api_platform/serialization/treatment.yaml
@@ -30,10 +30,10 @@ App\Domain\Registry\Model\Treatment:
             groups: ['treatment_read']
         securityAccessControl:
             groups: ['treatment_read']
-        securitySaving:
-            groups: ['treatment_read']
         securityUpdate:
             groups: ['treatment_read']
+        securitySaving:
+            groups: ['treatment_read']
         securityOther:
             groups: ['treatment_read']
         securityEntitledPersons:
diff --git a/config/domain/page/translations/messages.fr.yaml b/config/domain/page/translations/messages.fr.yaml
index f024ec13d8af6997f99da883d6b073a11fb448b0..b978566fabf604dbda942f9ae659064f2c4b23e7 100644
--- a/config/domain/page/translations/messages.fr.yaml
+++ b/config/domain/page/translations/messages.fr.yaml
@@ -11,7 +11,7 @@ page:
     schema_pluriannuel:
         title: Schéma pluriannuel de mise en accessibilité 2025 – 2027
         title_sitemap: Schéma pluriannuel de mise en accessibilité
-        breadcrumb: Schéma pluriannuel 2025 – 2027
+        breadcrumb: Schéma pluriannuel
         created_at: 31 août 2023
         updated_at: 08 janvier 2025
     plan_annuel_2022:
@@ -34,9 +34,13 @@ page:
         breadcrumb: Plan annuel 2025
         created_at: 08 janvier 2025
         updated_at: 08 janvier 2025
+    plan_annuel_2026:
+        title: Plan annuel 2026
+    plan_annuel_2027:
+        title: Plan annuel 2027
     credit:
-        title: Crédit
-        breadcrumb: Crédit
+        title: Crédits
+        breadcrumb: Crédits
     sitemap:
         title: Plan du site
         breadcrumb: Plan du site
diff --git a/config/domain/registry/translations/messages.fr.yaml b/config/domain/registry/translations/messages.fr.yaml
index 910a0d3215ec17c6582c1c99344378e94691608c..97aa564286a4b2ebbab0057e8863c3e4b9d55975 100644
--- a/config/domain/registry/translations/messages.fr.yaml
+++ b/config/domain/registry/translations/messages.fr.yaml
@@ -60,11 +60,11 @@ registry:
             concerned_people: Personnes concernées
             concerned_people_particular: Particuliers
             concerned_people_user: Internautes
-            concerned_people_agent: Salariés
+            concerned_people_agent: Agents / Salariés
             concerned_people_elected: Élus
             concerned_people_company: Professionnels
             concerned_people_partner: Partenaires
-            concerned_people_usager: Usagers
+            concerned_people_usager: Usagers / Résidents
             concerned_people_other: Autres
             estimated_concerned_people: Nombre de personnes concernées
             tools_if_inactif: Logiciels et supports
@@ -111,7 +111,7 @@ registry:
                 checked: Contrôlé
         tab:
             conformite: Conformité du traitement
-            data_category: Catégorie des données
+            data_category: Catégorie de données
             details: Détails
             last_aipd: Analyse d'impact
             recipients: Destinataires
@@ -303,7 +303,7 @@ registry:
             show: Visualiser "%name%"
         label:
             date: Date de la violation
-            in_progress: La violation est toujours en cours
+            in_progress: Violation en cours
             violation_natures: Natures de la violation
             origins: Origine de la perte de données
             cause: Cause de la violation
@@ -364,7 +364,7 @@ registry:
             comment: Commentaire
             file: Fichier
             help:
-                file: "Un seul fichier. Taille maximale autorisée : max_size. Types de fichiers autorisés : Image, Documents"
+                file: "Un seul fichier. Taille maximale autorisée : max_size. Types de fichiers autorisés : Image, Documents, Texte"
             delete_confirm: Souhaitez-vous vraiment supprimer la preuve "%object%" ?
             archive_confirm: Souhaitez-vous vraiment archiver la preuve "%object%" ?
             unarchive_confirm: Souhaitez-vous vraiment désarchiver la preuve "%object%" ?
diff --git a/config/domain/registry/translations/validators.fr.yaml b/config/domain/registry/translations/validators.fr.yaml
index 277d2ff5ae8584939f2915426a01f45758755590..bcee076260c5ef7075d3958768e2048e18864e86 100644
--- a/config/domain/registry/translations/validators.fr.yaml
+++ b/config/domain/registry/translations/validators.fr.yaml
@@ -28,7 +28,7 @@ registry_contractor:
 registry_proof:
     document_file:
         not_null: Vous devez ajouter un document
-        file: "Le type du fichier est invalide. Les fichiers autorisés sont : .jpg, .jpeg, .png, .pdf, .doc, .docx, .odt, .ppt, .pptx, .xls, .xlsx, .xlsm, .ods."
+        file: "Le type du fichier est invalide. Les fichiers autorisés sont : .jpg, .jpeg, .png, .pdf, .doc, .docx, .odt, .ppt, .pptx, .xls, .xlsx, .xlsm, .ods, .txt, .log, .csv, .md."
     name:
         not_blank: Vous devez saisir un nom
 
diff --git a/config/domain/registry/validation/mesurement.yaml b/config/domain/registry/validation/mesurement.yaml
index e4ec4ce9b4ef4eff1cb52bf9b3f51f80312ab0c0..870f89b4b018c0d51273353aa9c100633efa5808 100644
--- a/config/domain/registry/validation/mesurement.yaml
+++ b/config/domain/registry/validation/mesurement.yaml
@@ -15,10 +15,6 @@ App\Domain\Registry\Model\Mesurement:
             - Length:
                 max: 255
                 groups: ['default']
-        comment:
-            - Length:
-                max: 255
-                groups: ['default']
         priority:
             - Knp\DictionaryBundle\Validator\Constraints\Dictionary:
                 name: 'registry_mesurement_priority'
diff --git a/config/domain/registry/validation/treatment.yaml b/config/domain/registry/validation/treatment.yaml
index 4dcd5f8dcfacf96925f3f5020736b913463f6817..35ded7a70cfa11baa12741838dac1b073312a84a 100644
--- a/config/domain/registry/validation/treatment.yaml
+++ b/config/domain/registry/validation/treatment.yaml
@@ -46,11 +46,11 @@ App\Domain\Registry\Model\Treatment:
                 groups: ['default']
         securityAccessControl:
             - Valid: ~
-        securityTracability:
+        securityUpdate:
             - Valid: ~
         securitySaving:
             - Valid: ~
-        securityUpdate:
+        securityTracability:
             - Valid: ~
         securityOther:
             - Valid: ~
diff --git a/doc/developpement/1-lancer-stack-developpement.md b/doc/developpement/1-lancer-stack-developpement.md
index 28839d65f97c17edd0bf9413bd2a44731b034d80..0cebb412534510681027fd7f2d2efc419371504f 100644
--- a/doc/developpement/1-lancer-stack-developpement.md
+++ b/doc/developpement/1-lancer-stack-developpement.md
@@ -58,11 +58,11 @@ Pour aller plus loin, vous pouvez étudier le fichier `docker-service` pour voir
 * URL du projet : `http://127.0.0.1:8888` ou `https://127.0.0.1`
 
 Quelques identifiants clés :
-- **Administrateur :** `admin@awkan.fr` / `111111` ;
-- **Gestionnaire 1:** `collectivite@awkan.fr` / `111111` ;
-- **Gestionnaire 2:** `collectivite2@awkan.fr` / `111111` ;
-- **Lecteur :** `lecteur@awkan.fr` / `111111` ;
-- **Utilisateur inactif :** `inactif@awkan.fr` / `111111`.
+- **Administrateur :** `admin@nomail.soluris.fr` / `111111` ;
+- **Gestionnaire 1 :** `collectivite@nomail.soluris.fr` / `111111` ;
+- **Gestionnaire 2 :** `collectivite2@nomail.soluris.fr` / `111111` ;
+- **Lecteur :** `lecteur@nomail.soluris.fr` / `111111` ;
+- **Utilisateur inactif :** `inactif@nomail.soluris.fr` / `111111`.
 
 ## 4. Lancer les tests
 
diff --git a/docs/docutilisateur.md b/docs/docutilisateur.md
index a1c2a1ae6fab936dab31e0ed19e6821b35d4c4f1..c817466b820e2cb3faec3e2a1a9cdabc5287d9b0 100644
--- a/docs/docutilisateur.md
+++ b/docs/docutilisateur.md
@@ -435,7 +435,7 @@ Il est possible d'effectuer plusieurs actions :
 Dans les informations générales, il est possible de renseigner les éléments suivants :
 
 * **Date de la violation** : Date de la constatation de la violation. Par défaut, elle se mettra sur la date à laquelle la violation est ajoutée ;
-* **La violation est toujours en cours** : Précise si la violation est toujours en cours. Lorsque la violation sera terminée, cette case devra être décochée ;
+* **Violation en cours** : Précise si la violation est toujours en cours. Lorsque la violation sera terminée, cette case devra être décochée ;
 * **Nature de la violation** : Type de violation de DIC (Disponibilité ; Intégrité ; Confidentialité) ;
 * **Origine de la perte de données** ;
 * **Cause de la violation** ;
diff --git a/fixtures/0-user-0-address.yaml b/fixtures/0-user-0-address.yaml
index 3b71f941d531e5a05d6f81332fc082c553766b89..b6dbac29f0d298bc3a8adadda270d689308eb11e 100644
--- a/fixtures/0-user-0-address.yaml
+++ b/fixtures/0-user-0-address.yaml
@@ -1,5 +1,5 @@
 App\Domain\User\Model\Embeddable\Address:
-    user_address_collectivity_awkan:
+    user_address_collectivity_demoville:
         lineOne: <words(3, true)>
         lineTwo: <words(3, true)>
         city: <word()>
@@ -10,9 +10,8 @@ App\Domain\User\Model\Embeddable\Address:
         city: <word()>
         zipCode: <randomNumber(5)>
         insee: '17415'
-    user_address_collectivity_foobar:
+    user_address_collectivity_demovillage:
         lineOne: <words(3, true)>
         city: <word()>
         zipCode: <randomNumber(5)>
         insee: '17300'
-
diff --git a/fixtures/0-user-0-contact.yaml b/fixtures/0-user-0-contact.yaml
index 535a9290747026a8554483cdc0e6c49bb69d6443..c42e4fab506edcb5e613b74ce2feae941c3a9b7a 100644
--- a/fixtures/0-user-0-contact.yaml
+++ b/fixtures/0-user-0-contact.yaml
@@ -8,14 +8,14 @@ App\Domain\User\Model\Embeddable\Contact:
         phoneNumber: 0<randomNumber(9)>
 
     # ------------------
-    # COLLECTIVITY AWKAN
+    # COLLECTIVITY DEMOVILLE
     # ------------------
-    user_contact_collectivity_awkan_manager_legal (extends contact_template): ~
-    user_contact_collectivity_awkan_referent (extends contact_template): ~
-    user_contact_collectivity_awkan_dpo (extends contact_template): ~
-    user_contact_collectivity_awkan_manager_it (extends contact_template): ~
+    user_contact_collectivity_demoville_manager_legal (extends contact_template): ~
+    user_contact_collectivity_demoville_referent (extends contact_template): ~
+    user_contact_collectivity_demoville_dpo (extends contact_template): ~
+    user_contact_collectivity_demoville_manager_it (extends contact_template): ~
 
-    comite_il_contact_collectivity_awkan_{1..4} (extends contact_template): ~
+    comite_il_contact_collectivity_demoville_{1..4} (extends contact_template): ~
 
     # --------------------
     # COLLECTIVITY SOLURIS
diff --git a/fixtures/0-user-1-collectivity.yaml b/fixtures/0-user-1-collectivity.yaml
index b761b702582497644932fb6e58416e7dc591f430..35d9c94a3e22f398d8999220d3c057bf41b38cb3 100644
--- a/fixtures/0-user-1-collectivity.yaml
+++ b/fixtures/0-user-1-collectivity.yaml
@@ -1,16 +1,16 @@
 App\Domain\User\Model\Collectivity:
-    user_collectivity_awkan:
-        name: Structure Awkan
-        shortName: Awkan
-        type: '<(App\Domain\User\Dictionary\CollectivityTypeDictionary::TYPE_OTHER)>'
+    user_collectivity_demoville:
+        name: Commune de Démoville
+        shortName: Démoville
+        type: '<(App\Domain\User\Dictionary\CollectivityTypeDictionary::TYPE_COMMUNE)>'
         siren: <randomNumber(9)>
-        address: '@user_address_collectivity_awkan'
-        legalManager: '@user_contact_collectivity_awkan_manager_legal'
-        referent: '@user_contact_collectivity_awkan_referent'
+        address: '@user_address_collectivity_demoville'
+        legalManager: '@user_contact_collectivity_demoville_manager_legal'
+        referent: '@user_contact_collectivity_demoville_referent'
         differentDpo: true
-        dpo: '@user_contact_collectivity_awkan_dpo'
+        dpo: '@user_contact_collectivity_demoville_dpo'
         differentItManager: true
-        itManager: '@user_contact_collectivity_awkan_manager_it'
+        itManager: '@user_contact_collectivity_demoville_manager_it'
         finessGeo: 'test geo1'
         hasModuleConformiteTraitement: true
         hasModuleConformiteOrganisation: true
@@ -36,8 +36,8 @@ App\Domain\User\Model\Collectivity:
 
     user_collectivity_soluris:
         name: Soluris
-        shortName: SI17
-        type: '<(App\Domain\User\Dictionary\CollectivityTypeDictionary::TYPE_CCAS)>'
+        shortName: Soluris
+        type: '<(App\Domain\User\Dictionary\CollectivityTypeDictionary::TYPE_SYNDICAT)>'
         siren: <randomNumber(9)>
         address: '@user_address_collectivity_soluris'
         legalManager: '@user_contact_collectivity_soluris_manager_legal'
@@ -65,10 +65,10 @@ App\Domain\User\Model\Collectivity:
 
             \<p\>Conclusion\</p\>
 
-    user_collectivity_foobar:
-        name: Structure Foobar
-        shortName: Foobar
+    user_collectivity_demovillage:
+        name: Commune de Démovillage
+        shortName: Démovillage
         type: '<(App\Domain\User\Dictionary\CollectivityTypeDictionary::TYPE_CIAS)>'
         siren: <randomNumber(9)>
-        address: '@user_address_collectivity_foobar'
+        address: '@user_address_collectivity_demovillage'
         finessGeo: 'test geo3'
diff --git a/fixtures/0-user-1-reviewdata.yaml b/fixtures/0-user-1-reviewdata.yaml
index adc677938ac114420a6a5d78cc00ee63466e2a11..030f1e5e121b782fa9a31c1e0be9cc1209649656 100644
--- a/fixtures/0-user-1-reviewdata.yaml
+++ b/fixtures/0-user-1-reviewdata.yaml
@@ -1,9 +1,9 @@
 App\Domain\User\Model\ReviewData:
-    user_collectivity_awkan_reviewdata:
-        documentName: awkanbilan
+    user_collectivity_demoville_reviewdata:
+        documentName: demovillebilan
         showCollectivityLogoFooter: false
         showDPDLogoFooter: false
-        collectivity: '@user_collectivity_awkan'
+        collectivity: '@user_collectivity_demoville'
         sections:
             - treatment_registry
             - contractor_registry
@@ -39,11 +39,11 @@ App\Domain\User\Model\ReviewData:
             - proof_list
             - user_list
             - suivi
-    user_collectivity_foobar_reviewdata:
-        documentName: foobilan
+    user_collectivity_demovillage_reviewdata:
+        documentName: demovillagebilan
         showCollectivityLogoFooter: false
         showDPDLogoFooter: false
-        collectivity: '@user_collectivity_foobar'
+        collectivity: '@user_collectivity_demovillage'
         sections:
             - treatment_registry
             - contractor_registry
diff --git a/fixtures/0-user-2-comite_il.yaml b/fixtures/0-user-2-comite_il.yaml
index d1d08eb6b9a58a5ea160df43bc63761f092ff9e6..b9dad90d1271d111d9873cad4744c90600be733a 100644
--- a/fixtures/0-user-2-comite_il.yaml
+++ b/fixtures/0-user-2-comite_il.yaml
@@ -1,7 +1,7 @@
 App\Domain\User\Model\ComiteIlContact:
-    comite_il_contact_awkan{1..4}:
-        collectivity: '@user_collectivity_awkan'
-        contact: '@comite_il_contact_collectivity_awkan_<current()>'
+    comite_il_contact_demoville{1..4}:
+        collectivity: '@user_collectivity_demoville'
+        contact: '@comite_il_contact_collectivity_demoville_<current()>'
 
     comite_il_contact_soluris{1..4}:
         collectivity: '@user_collectivity_soluris'
diff --git a/fixtures/0-user-2-user.yaml b/fixtures/0-user-2-user.yaml
index 9f5ced1402b3df7a07d0739a9d3c75afd87c6f17..b9bb9c1c20ee3b679782b22bca608641a5c0cf94 100644
--- a/fixtures/0-user-2-user.yaml
+++ b/fixtures/0-user-2-user.yaml
@@ -1,15 +1,15 @@
 App\Domain\User\Model\User:
     user_user_admin:
-        collectivity: '@user_collectivity_awkan'
-        email: admin@awkan.fr
+        collectivity: '@user_collectivity_demoville'
+        email: admin@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
         roles: ['ROLE_ADMIN']
 
     user_user_manager_1:
-        collectivity: '@user_collectivity_awkan'
-        email: collectivite@awkan.fr
+        collectivity: '@user_collectivity_demoville'
+        email: collectivite@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
@@ -17,7 +17,7 @@ App\Domain\User\Model\User:
 
     user_user_manager_2:
         collectivity: '@user_collectivity_soluris'
-        email: collectivite2@awkan.fr
+        email: collectivite2@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
@@ -25,7 +25,7 @@ App\Domain\User\Model\User:
 
     user_user_preview:
         collectivity: '@user_collectivity_soluris'
-        email: lecteur@awkan.fr
+        email: lecteur@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
@@ -33,7 +33,7 @@ App\Domain\User\Model\User:
 
     user_user_blocked:
         collectivity: '@user_collectivity_soluris'
-        email: inactif@awkan.fr
+        email: inactif@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
@@ -41,8 +41,8 @@ App\Domain\User\Model\User:
         roles: ['ROLE_PREVIEW']
 
     user_user_reader:
-        collectivity: '@user_collectivity_awkan'
-        email: reader-awkan@awkan.fr
+        collectivity: '@user_collectivity_demoville'
+        email: reader-soluris@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
@@ -50,19 +50,19 @@ App\Domain\User\Model\User:
         roles: [ 'ROLE_PREVIEW' ]
 
     user_user_referent:
-        collectivity: '@user_collectivity_awkan'
-        email: referent@awkan.fr
+        collectivity: '@user_collectivity_demoville'
+        email: referent@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
         roles: ['ROLE_REFERENT']
         collectivitesReferees:
-            - '@user_collectivity_awkan'
-            - '@user_collectivity_foobar'
+            - '@user_collectivity_demoville'
+            - '@user_collectivity_demovillage'
 
-    user_user_manager_foobar:
-        collectivity: '@user_collectivity_foobar'
-        email: foobar@foobar.fr
+    user_user_manager_demovillage:
+        collectivity: '@user_collectivity_demovillage'
+        email: demovillage@nomail.soluris.fr
         firstName: <firstName()>
         lastName: <lastName()>
         plainPassword: 111111
diff --git a/fixtures/1-maturity-2-answer.yaml b/fixtures/1-maturity-2-answer.yaml
index 2738a99190042a7321fbb3cf8de2d05dddce4ef0..aa056e296222178981822254291a1a0c3ff648e6 100644
--- a/fixtures/1-maturity-2-answer.yaml
+++ b/fixtures/1-maturity-2-answer.yaml
@@ -1,361 +1,361 @@
 App\Domain\Maturity\Model\Answer:
 
     # ------------------
-    # COLLECTIVITY AWKAN
+    # COLLECTIVITY DEMOVILLE
     # ------------------
 
     # Survey 1
-    maturity_survey_awkan_1_answer_1_1:
+    maturity_survey_demoville_1_answer_1_1:
         question: '@maturity_domain_1_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_1_answer_1_2:
+    maturity_survey_demoville_1_answer_1_2:
         question: '@maturity_domain_1_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_1_answer_1_3:
+    maturity_survey_demoville_1_answer_1_3:
         question: '@maturity_domain_1_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_1_answer_1_4:
+    maturity_survey_demoville_1_answer_1_4:
         question: '@maturity_domain_1_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_1_answer_1_5:
+    maturity_survey_demoville_1_answer_1_5:
         question: '@maturity_domain_1_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_1_answer_1_6:
+    maturity_survey_demoville_1_answer_1_6:
         question: '@maturity_domain_1_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_1_answer_1_7:
+    maturity_survey_demoville_1_answer_1_7:
         question: '@maturity_domain_1_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_1_answer_2_1:
+    maturity_survey_demoville_1_answer_2_1:
         question: '@maturity_domain_2_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_1_answer_2_2:
+    maturity_survey_demoville_1_answer_2_2:
         question: '@maturity_domain_2_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_1_answer_2_3:
+    maturity_survey_demoville_1_answer_2_3:
         question: '@maturity_domain_2_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_1_answer_2_4:
+    maturity_survey_demoville_1_answer_2_4:
         question: '@maturity_domain_2_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_1_answer_2_5:
+    maturity_survey_demoville_1_answer_2_5:
         question: '@maturity_domain_2_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_1_answer_2_6:
+    maturity_survey_demoville_1_answer_2_6:
         question: '@maturity_domain_2_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_1_answer_2_7:
+    maturity_survey_demoville_1_answer_2_7:
         question: '@maturity_domain_2_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_1_answer_3_1:
+    maturity_survey_demoville_1_answer_3_1:
         question: '@maturity_domain_3_question_1'
         response: 2
         position: 1
-    maturity_survey_awkan_1_answer_3_2:
+    maturity_survey_demoville_1_answer_3_2:
         question: '@maturity_domain_3_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_1_answer_3_3:
+    maturity_survey_demoville_1_answer_3_3:
         question: '@maturity_domain_3_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_1_answer_3_4:
+    maturity_survey_demoville_1_answer_3_4:
         question: '@maturity_domain_3_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_1_answer_3_5:
+    maturity_survey_demoville_1_answer_3_5:
         question: '@maturity_domain_3_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_1_answer_3_6:
+    maturity_survey_demoville_1_answer_3_6:
         question: '@maturity_domain_3_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_1_answer_3_7:
+    maturity_survey_demoville_1_answer_3_7:
         question: '@maturity_domain_3_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_1_answer_4_1:
+    maturity_survey_demoville_1_answer_4_1:
         question: '@maturity_domain_4_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_1_answer_4_2:
+    maturity_survey_demoville_1_answer_4_2:
         question: '@maturity_domain_4_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_1_answer_4_3:
+    maturity_survey_demoville_1_answer_4_3:
         question: '@maturity_domain_4_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_1_answer_4_4:
+    maturity_survey_demoville_1_answer_4_4:
         question: '@maturity_domain_4_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_1_answer_4_5:
+    maturity_survey_demoville_1_answer_4_5:
         question: '@maturity_domain_4_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_1_answer_4_6:
+    maturity_survey_demoville_1_answer_4_6:
         question: '@maturity_domain_4_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_1_answer_4_7:
+    maturity_survey_demoville_1_answer_4_7:
         question: '@maturity_domain_4_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_1_answer_5_1:
+    maturity_survey_demoville_1_answer_5_1:
         question: '@maturity_domain_5_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_1_answer_5_2:
+    maturity_survey_demoville_1_answer_5_2:
         question: '@maturity_domain_5_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_1_answer_5_3:
+    maturity_survey_demoville_1_answer_5_3:
         question: '@maturity_domain_5_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_1_answer_5_4:
+    maturity_survey_demoville_1_answer_5_4:
         question: '@maturity_domain_5_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_1_answer_5_5:
+    maturity_survey_demoville_1_answer_5_5:
         question: '@maturity_domain_5_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_1_answer_5_6:
+    maturity_survey_demoville_1_answer_5_6:
         question: '@maturity_domain_5_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_1_answer_5_7:
+    maturity_survey_demoville_1_answer_5_7:
         question: '@maturity_domain_5_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_1_answer_6_1:
+    maturity_survey_demoville_1_answer_6_1:
         question: '@maturity_domain_6_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_1_answer_6_2:
+    maturity_survey_demoville_1_answer_6_2:
         question: '@maturity_domain_6_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_1_answer_6_3:
+    maturity_survey_demoville_1_answer_6_3:
         question: '@maturity_domain_6_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_1_answer_6_4:
+    maturity_survey_demoville_1_answer_6_4:
         question: '@maturity_domain_6_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_1_answer_6_5:
+    maturity_survey_demoville_1_answer_6_5:
         question: '@maturity_domain_6_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_1_answer_6_6:
+    maturity_survey_demoville_1_answer_6_6:
         question: '@maturity_domain_6_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_1_answer_6_7:
+    maturity_survey_demoville_1_answer_6_7:
         question: '@maturity_domain_6_question_7'
         response: 1
         position: 7
 
     # Survey 2
-    maturity_survey_awkan_2_answer_1_1:
+    maturity_survey_demoville_2_answer_1_1:
         question: '@maturity_domain_1_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_2_answer_1_2:
+    maturity_survey_demoville_2_answer_1_2:
         question: '@maturity_domain_1_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_2_answer_1_3:
+    maturity_survey_demoville_2_answer_1_3:
         question: '@maturity_domain_1_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_2_answer_1_4:
+    maturity_survey_demoville_2_answer_1_4:
         question: '@maturity_domain_1_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_2_answer_1_5:
+    maturity_survey_demoville_2_answer_1_5:
         question: '@maturity_domain_1_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_2_answer_1_6:
+    maturity_survey_demoville_2_answer_1_6:
         question: '@maturity_domain_1_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_2_answer_1_7:
+    maturity_survey_demoville_2_answer_1_7:
         question: '@maturity_domain_1_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_2_answer_2_1:
+    maturity_survey_demoville_2_answer_2_1:
         question: '@maturity_domain_2_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_2_answer_2_2:
+    maturity_survey_demoville_2_answer_2_2:
         question: '@maturity_domain_2_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_2_answer_2_3:
+    maturity_survey_demoville_2_answer_2_3:
         question: '@maturity_domain_2_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_2_answer_2_4:
+    maturity_survey_demoville_2_answer_2_4:
         question: '@maturity_domain_2_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_2_answer_2_5:
+    maturity_survey_demoville_2_answer_2_5:
         question: '@maturity_domain_2_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_2_answer_2_6:
+    maturity_survey_demoville_2_answer_2_6:
         question: '@maturity_domain_2_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_2_answer_2_7:
+    maturity_survey_demoville_2_answer_2_7:
         question: '@maturity_domain_2_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_2_answer_3_1:
+    maturity_survey_demoville_2_answer_3_1:
         question: '@maturity_domain_3_question_1'
         response: 2
         position: 1
-    maturity_survey_awkan_2_answer_3_2:
+    maturity_survey_demoville_2_answer_3_2:
         question: '@maturity_domain_3_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_2_answer_3_3:
+    maturity_survey_demoville_2_answer_3_3:
         question: '@maturity_domain_3_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_2_answer_3_4:
+    maturity_survey_demoville_2_answer_3_4:
         question: '@maturity_domain_3_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_2_answer_3_5:
+    maturity_survey_demoville_2_answer_3_5:
         question: '@maturity_domain_3_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_2_answer_3_6:
+    maturity_survey_demoville_2_answer_3_6:
         question: '@maturity_domain_3_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_2_answer_3_7:
+    maturity_survey_demoville_2_answer_3_7:
         question: '@maturity_domain_3_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_2_answer_4_1:
+    maturity_survey_demoville_2_answer_4_1:
         question: '@maturity_domain_4_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_2_answer_4_2:
+    maturity_survey_demoville_2_answer_4_2:
         question: '@maturity_domain_4_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_2_answer_4_3:
+    maturity_survey_demoville_2_answer_4_3:
         question: '@maturity_domain_4_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_2_answer_4_4:
+    maturity_survey_demoville_2_answer_4_4:
         question: '@maturity_domain_4_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_2_answer_4_5:
+    maturity_survey_demoville_2_answer_4_5:
         question: '@maturity_domain_4_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_2_answer_4_6:
+    maturity_survey_demoville_2_answer_4_6:
         question: '@maturity_domain_4_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_2_answer_4_7:
+    maturity_survey_demoville_2_answer_4_7:
         question: '@maturity_domain_4_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_2_answer_5_1:
+    maturity_survey_demoville_2_answer_5_1:
         question: '@maturity_domain_5_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_2_answer_5_2:
+    maturity_survey_demoville_2_answer_5_2:
         question: '@maturity_domain_5_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_2_answer_5_3:
+    maturity_survey_demoville_2_answer_5_3:
         question: '@maturity_domain_5_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_2_answer_5_4:
+    maturity_survey_demoville_2_answer_5_4:
         question: '@maturity_domain_5_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_2_answer_5_5:
+    maturity_survey_demoville_2_answer_5_5:
         question: '@maturity_domain_5_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_2_answer_5_6:
+    maturity_survey_demoville_2_answer_5_6:
         question: '@maturity_domain_5_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_2_answer_5_7:
+    maturity_survey_demoville_2_answer_5_7:
         question: '@maturity_domain_5_question_7'
         response: 1
         position: 7
 
-    maturity_survey_awkan_2_answer_6_1:
+    maturity_survey_demoville_2_answer_6_1:
         question: '@maturity_domain_6_question_1'
         response: 1
         position: 1
-    maturity_survey_awkan_2_answer_6_2:
+    maturity_survey_demoville_2_answer_6_2:
         question: '@maturity_domain_6_question_2'
         response: 2
         position: 2
-    maturity_survey_awkan_2_answer_6_3:
+    maturity_survey_demoville_2_answer_6_3:
         question: '@maturity_domain_6_question_3'
         response: 1
         position: 3
-    maturity_survey_awkan_2_answer_6_4:
+    maturity_survey_demoville_2_answer_6_4:
         question: '@maturity_domain_6_question_4'
         response: 1
         position: 4
-    maturity_survey_awkan_2_answer_6_5:
+    maturity_survey_demoville_2_answer_6_5:
         question: '@maturity_domain_6_question_5'
         response: 2
         position: 5
-    maturity_survey_awkan_2_answer_6_6:
+    maturity_survey_demoville_2_answer_6_6:
         question: '@maturity_domain_6_question_6'
         response: 1
         position: 6
-    maturity_survey_awkan_2_answer_6_7:
+    maturity_survey_demoville_2_answer_6_7:
         question: '@maturity_domain_6_question_7'
         response: 1
         position: 7
 
     # --------------------
-    # COLLECTIVITY_SOLURIS
+    # COLLECTIVITY SOLURIS
     # --------------------
 
     # Survey 1
diff --git a/fixtures/2-registry-0-address.yaml b/fixtures/2-registry-0-address.yaml
index c2b665ca5e4a62d46485235bf2cf1a10ab7b9000..6b17415b53ab4db42f440bca763325ae139ae88b 100644
--- a/fixtures/2-registry-0-address.yaml
+++ b/fixtures/2-registry-0-address.yaml
@@ -1,5 +1,5 @@
 App\Domain\Registry\Model\Embeddable\Address:
-    registry_address_contractor_awkan_{1..5}:
+    registry_address_contractor_demoville_{1..5}:
         city: <word()>
         lineOne: <words(3, true)>
         lineTwo: <words(3, true)>
@@ -15,7 +15,7 @@ App\Domain\Registry\Model\Embeddable\Address:
         phoneNumber: 0<randomNumber(9)>
         zipCode: <randomNumber(5)>
 
-    registry_address_contractor_foobar_{1..3}:
+    registry_address_contractor_demovillage_{1..3}:
         city: <word()>
         lineOne: <words(3, true)>
         lineTwo: <words(3, true)>
diff --git a/fixtures/2-registry-0-mesurement.yaml b/fixtures/2-registry-0-mesurement.yaml
index 4727296aeebeb1c633e7e0c6a2cdaf40b12b3f1a..a9aeb42bb989a65948ce14793d41682a85f49d40 100644
--- a/fixtures/2-registry-0-mesurement.yaml
+++ b/fixtures/2-registry-0-mesurement.yaml
@@ -1,22 +1,22 @@
 App\Domain\Registry\Model\Mesurement:
-    registry_mesurement_awkan_{1..5}:
+    registry_mesurement_demoville_{1..5}:
         name: Action de protection <current()>
         description: <text()>
         cost: <words(3, true)>
         charge: <words(3, true)>
         status: '<(App\Domain\Registry\Dictionary\MesurementStatusDictionary::STATUS_NOT_APPLICABLE)>'
         comment: <words(10, true)>
-        collectivity: '@user_collectivity_awkan'
+        collectivity: '@user_collectivity_demoville'
         priority: '70%? <dictionary("registry_mesurement_priority")>'
 
-    registry_mesurement_awkan_{6..8}:
+    registry_mesurement_demoville_{6..8}:
         name: Action de protection <current()>
         description: <text()>
         cost: <words(3, true)>
         charge: <words(3, true)>
         status: '<(App\Domain\Registry\Dictionary\MesurementStatusDictionary::STATUS_NOT_APPLIED)>'
         comment: <words(10, true)>
-        collectivity: '@user_collectivity_awkan'
+        collectivity: '@user_collectivity_demoville'
         priority: '70%? <dictionary("registry_mesurement_priority")>'
 
     registry_mesurement_soluris_{1..3}:
@@ -30,7 +30,7 @@ App\Domain\Registry\Model\Mesurement:
         collectivity: '@user_collectivity_soluris'
         priority: '70%? <dictionary("registry_mesurement_priority")>'
 
-    registry_mesurement_foobar_{1..3}:
+    registry_mesurement_demovillage_{1..3}:
         name: Action de protection <current()>
         description: <text()>
         cost: <words(3, true)>
@@ -38,5 +38,5 @@ App\Domain\Registry\Model\Mesurement:
         status: '<(App\Domain\Registry\Dictionary\MesurementStatusDictionary::STATUS_NOT_APPLIED)>'
         comment: <words(10, true)>
         planificationDate: <(new \DateTime('+15 days'))>
-        collectivity: '@user_collectivity_foobar'
+        collectivity: '@user_collectivity_demovillage'
         priority: '70%? <dictionary("registry_mesurement_priority")>'
diff --git a/fixtures/2-registry-1-contractor.yaml b/fixtures/2-registry-1-contractor.yaml
index 8b6287a9e56e80156f584d3dbfaae848eb583a22..2a3276e90605402e5a0da1911a79b3468174108f 100644
--- a/fixtures/2-registry-1-contractor.yaml
+++ b/fixtures/2-registry-1-contractor.yaml
@@ -1,5 +1,5 @@
 App\Domain\Registry\Model\Contractor:
-    registry_contractor_awkan_{1..5}:
+    registry_contractor_demoville_{1..5}:
         name: Sous-traitant <current()>
         referent: <firstName()> <lastName()>
         contractualClausesVerified: <boolean()>
@@ -7,8 +7,8 @@ App\Domain\Registry\Model\Contractor:
         maintainsTreatmentRegister: <boolean()>
         sendingDataOutsideEu: <boolean()>
         otherInformations: '50%? <text()>'
-        address: '@registry_address_contractor_awkan_<current()>'
-        collectivity: '@user_collectivity_awkan'
+        address: '@registry_address_contractor_demoville_<current()>'
+        collectivity: '@user_collectivity_demoville'
         creator: '@user_user_manager_1'
 
     registry_contractor_soluris_{1..3}:
@@ -23,7 +23,7 @@ App\Domain\Registry\Model\Contractor:
         collectivity: '@user_collectivity_soluris'
         creator: '@user_user_manager_2'
 
-    registry_contractor_foobar_{1..3}:
+    registry_contractor_demovillage_{1..3}:
         name: Sous-traitant <current()>
         referent: <firstName()> <lastName()>
         contractualClausesVerified: <boolean()>
@@ -31,8 +31,6 @@ App\Domain\Registry\Model\Contractor:
         maintainsTreatmentRegister: <boolean()>
         sendingDataOutsideEu: <boolean()>
         otherInformations: '50%? <text()>'
-        address: '@registry_address_contractor_foobar_<current()>'
-        collectivity: '@user_collectivity_foobar'
-        creator: '@user_user_manager_foobar'
-
-
+        address: '@registry_address_contractor_demovillage_<current()>'
+        collectivity: '@user_collectivity_demovillage'
+        creator: '@user_user_manager_demovillage'
diff --git a/fixtures/2-registry-2-treatment.yaml b/fixtures/2-registry-2-treatment.yaml
index f03f181cbf20ae64e5280a996773b12a464252aa..e98f30256b69ed046c1074093b423f3aff8b3c64 100644
--- a/fixtures/2-registry-2-treatment.yaml
+++ b/fixtures/2-registry-2-treatment.yaml
@@ -4,7 +4,7 @@ App\Domain\Registry\Model\Embeddable\ComplexChoice:
         comment: <word()>
 
 App\Domain\Registry\Model\Treatment:
-    registry_treatment_awkan_{1..20}:
+    registry_treatment_demoville_{1..20}:
         name: Traitement <current()>
         goal: <text()>
         statut: 'draft'
@@ -17,9 +17,9 @@ App\Domain\Registry\Model\Treatment:
         recipientCategory: <text()>
         concernedPeopleParticular: '@registry_treatment'
         concernedPeopleAgent: '@registry_treatment'
-        contractors: ['@registry_contractor_awkan_1', '@registry_contractor_awkan_3']
+        contractors: ['@registry_contractor_demoville_1', '@registry_contractor_demoville_3']
         active: '80%? 1 : 0'
-        collectivity: '@user_collectivity_awkan'
+        collectivity: '@user_collectivity_demoville'
         legal_mentions: true
         consent_request: false
 
@@ -42,7 +42,7 @@ App\Domain\Registry\Model\Treatment:
         legal_mentions: true
         consent_request: false
 
-    registry_treatment_foobar_{1..10}:
+    registry_treatment_demovillage_{1..10}:
         name: Traitement <current()>
         goal: <text()>
         statut: 'checked'
@@ -55,8 +55,8 @@ App\Domain\Registry\Model\Treatment:
         recipientCategory: <text()>
         concernedPeopleParticular: '@registry_treatment'
         concernedPeopleAgent: '@registry_treatment'
-        contractors: [ '@registry_contractor_foobar_3' ]
+        contractors: [ '@registry_contractor_demovillage_3' ]
         active: '80%? 1 : 0'
-        collectivity: '@user_collectivity_foobar'
+        collectivity: '@user_collectivity_demovillage'
         legal_mentions: false
         consent_request: false
diff --git a/fixtures/2-registry-3-request.yaml b/fixtures/2-registry-3-request.yaml
index 6f65da2ae8e972b474db4c5c05d4051ac724bf42..82edd7fd7bba2aa0c529c0daad232cc21dca627a 100644
--- a/fixtures/2-registry-3-request.yaml
+++ b/fixtures/2-registry-3-request.yaml
@@ -13,11 +13,11 @@ App\Domain\Registry\Model\Embeddable\RequestConcernedPeople:
         mail: <fr_FR:email()>
 
 App\Domain\Registry\Model\Request:
-    registry_request_awkan_{1..20}:
+    registry_request_demoville_{1..20}:
         object: <dictionary('registry_request_object')>
         otherObject: <dictionary('registry_request_object')>
         reason: <fr_FR:word()>
         applicant: '@request_applicant_<current()>'
         concernedPeople: '@request_concerned_people_<current()>'
         state: <dictionary('registry_request_state')>
-        collectivity: '@user_collectivity_awkan'
+        collectivity: '@user_collectivity_demoville'
diff --git a/fixtures/2-registry-5-shelfLife.yaml b/fixtures/2-registry-5-shelfLife.yaml
index e284b28d80819f7c3cea206c3cebce5deadfcc25..1910e3fab6fc8c037cf016ef4e17432bc6c1ecdf 100644
--- a/fixtures/2-registry-5-shelfLife.yaml
+++ b/fixtures/2-registry-5-shelfLife.yaml
@@ -1,18 +1,18 @@
 App\Domain\Registry\Model\ShelfLife:
     registry_treatment_shelf_life_1:
-        treatment: '@registry_treatment_awkan_1'
+        treatment: '@registry_treatment_demoville_1'
         name: shelflife 1
         duration: 5 jours
         ultimate_fate: deposit
 
     registry_treatment_shelf_life_2:
-        treatment: '@registry_treatment_awkan_1'
+        treatment: '@registry_treatment_demoville_1'
         name: shelflife 2
         duration: 4 jours
         ultimate_fate: conservation
 
     registry_treatment_shelf_life_3:
-        treatment: '@registry_treatment_awkan_2'
+        treatment: '@registry_treatment_demoville_2'
         name: shelflife 3
         duration: 3 jours
         ultimate_fate: conservation
diff --git a/fixtures/3-conformite-organisation-3-evaluation.yaml b/fixtures/3-conformite-organisation-3-evaluation.yaml
index 7ee42a1139f6bb9d6e9e603b49e611b5c8acd48b..0de24b4595b0c54d470be293f9e76244f7f25be5 100644
--- a/fixtures/3-conformite-organisation-3-evaluation.yaml
+++ b/fixtures/3-conformite-organisation-3-evaluation.yaml
@@ -1,5 +1,4 @@
 App\Domain\Registry\Model\ConformiteOrganisation\Evaluation:
   evaluation_1:
     date: <(new \DateTime('-3 days'))>
-    collectivity: '@user_collectivity_awkan'
-
+    collectivity: '@user_collectivity_demoville'
diff --git a/fixtures/3-conformite-organisation-4-conformite.yaml b/fixtures/3-conformite-organisation-4-conformite.yaml
index cf99672b26cf128739bc623c2af1236b7619ce68..2cd9a552a2f8136958feacb3dc8fe59b06691c94 100644
--- a/fixtures/3-conformite-organisation-4-conformite.yaml
+++ b/fixtures/3-conformite-organisation-4-conformite.yaml
@@ -4,7 +4,7 @@ App\Domain\Registry\Model\ConformiteOrganisation\Conformite :
     evaluation: '@evaluation_1'
     pilote: <firstName()> <lastName()>
     conformite: 2.3
-    actionProtections: ['@registry_mesurement_awkan_1', '@registry_mesurement_awkan_6']
+    actionProtections: ['@registry_mesurement_demoville_1', '@registry_mesurement_demoville_6']
 
   evaluation_1_processus_2_conformite:
     processus: '@processus_2'
@@ -26,7 +26,7 @@ App\Domain\Registry\Model\ConformiteOrganisation\Conformite :
     processus: '@processus_5'
     evaluation: '@evaluation_1'
     pilote: <firstName()> <lastName()>
-    actionProtections: ['@registry_mesurement_awkan_7','@registry_mesurement_awkan_8']
+    actionProtections: ['@registry_mesurement_demoville_7','@registry_mesurement_demoville_8']
 
   evaluation_1_processus_6_conformite:
     processus: '@processus_6'
@@ -61,4 +61,4 @@ App\Domain\Registry\Model\ConformiteOrganisation\Conformite :
   evaluation_1_processus_12_conformite:
     processus: '@processus_12'
     evaluation: '@evaluation_1'
-    pilote: <firstName()> <lastName()>
\ No newline at end of file
+    pilote: <firstName()> <lastName()>
diff --git a/fixtures/3-conformite_traitement_t.yaml b/fixtures/3-conformite_traitement_t.yaml
index 37c2b93a0f87e9aaf388cf4dba2516cb5d5716ce..d3e8753828e4d29b91694f574dab880a7fa5fa73 100644
--- a/fixtures/3-conformite_traitement_t.yaml
+++ b/fixtures/3-conformite_traitement_t.yaml
@@ -1,3 +1,3 @@
 App\Domain\Registry\Model\ConformiteTraitement\ConformiteTraitement:
     conformite_traitement_1:
-        traitement: '@registry_treatment_awkan_1'
+        traitement: '@registry_treatment_demoville_1'
diff --git a/migrations/Version20180619192219.php b/migrations/Version20180619192219.php
index e70ffdf254b3fc26e1d446a264bb14ff505cd05f..ddc15a46f33630e0a4c2a133e3e1d427dd92ab02 100644
--- a/migrations/Version20180619192219.php
+++ b/migrations/Version20180619192219.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180620211117.php b/migrations/Version20180620211117.php
index b5152dc71e92593793132d628b159350a0e33ea9..55a238f1402b78d093e75eafd43395f1f34a683c 100644
--- a/migrations/Version20180620211117.php
+++ b/migrations/Version20180620211117.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180625203119.php b/migrations/Version20180625203119.php
index af703b343a6a5f8303fd9188c45b89fb8b1ff2cc..8bb354e85bf19d1b20add5c471d784dc87971e34 100644
--- a/migrations/Version20180625203119.php
+++ b/migrations/Version20180625203119.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180625210010.php b/migrations/Version20180625210010.php
index 090eaf964ec27e0bad4c4f1d67ffe790791038ed..aa382a44a9dbbf4dcbfc24b42ccbe0ca80481dc0 100644
--- a/migrations/Version20180625210010.php
+++ b/migrations/Version20180625210010.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180629090158.php b/migrations/Version20180629090158.php
index a53a8107807d9b73cdd55a1381dd2b123d8766a6..217f2bc7ad686a06005229291188a81757b534d0 100644
--- a/migrations/Version20180629090158.php
+++ b/migrations/Version20180629090158.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180702142837.php b/migrations/Version20180702142837.php
index d55c0747de1b102b3ac28316fcf13c7731394fb9..018f6faabc934d31f80a9600f7d38415d83f286c 100644
--- a/migrations/Version20180702142837.php
+++ b/migrations/Version20180702142837.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180705202242.php b/migrations/Version20180705202242.php
index f4b6ac55f3efce0136a40318af472ae331a4c52d..2de805f8e5e2b3f1e69d1711a5d465330652195c 100644
--- a/migrations/Version20180705202242.php
+++ b/migrations/Version20180705202242.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180708183305.php b/migrations/Version20180708183305.php
index 99b2e391895de952d2e71e9579744ccf1c0dd843..473c242727633e29d6106e52dc926068c7e851e4 100644
--- a/migrations/Version20180708183305.php
+++ b/migrations/Version20180708183305.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180714115042.php b/migrations/Version20180714115042.php
index 432b0ae2a25d6031058db3e4b86912e9101086fb..a6a46d62976de42ad2578fca01409b41acd12804 100644
--- a/migrations/Version20180714115042.php
+++ b/migrations/Version20180714115042.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180715120618.php b/migrations/Version20180715120618.php
index e8fd101683c45d94f300ed37b66a983f04a5a5b7..f0268b3644c630021c447880e05690aca4964631 100644
--- a/migrations/Version20180715120618.php
+++ b/migrations/Version20180715120618.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180716193440.php b/migrations/Version20180716193440.php
index 34e319c4334ee48f7d980ff79efbeb515eacacc0..b7ee0c34f14501ce75e58459f859121621548ff0 100644
--- a/migrations/Version20180716193440.php
+++ b/migrations/Version20180716193440.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180722161251.php b/migrations/Version20180722161251.php
index d39449f9daa86a4f11b69e498e9e08f7aa919aa1..6175f644ffed461454f50a514bed1ccc69ca9ba7 100644
--- a/migrations/Version20180722161251.php
+++ b/migrations/Version20180722161251.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180729162508.php b/migrations/Version20180729162508.php
index d67e442ac66169840a4663e84cb44d5fbc8d9b4a..ae822e0e0d0494a2061d3bf7603a1cba43e9e186 100644
--- a/migrations/Version20180729162508.php
+++ b/migrations/Version20180729162508.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180730162628.php b/migrations/Version20180730162628.php
index 518d7f66f9fb1b3583d314c59964336810d539c2..565339ee44581854d3ba1204291931fd6c660149 100644
--- a/migrations/Version20180730162628.php
+++ b/migrations/Version20180730162628.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180730223326.php b/migrations/Version20180730223326.php
index a385389373967d3f585d28a8de181329e9f5e74a..ce22bc139d5af368cf674f14890e04b27bb7b2a0 100644
--- a/migrations/Version20180730223326.php
+++ b/migrations/Version20180730223326.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180731194927.php b/migrations/Version20180731194927.php
index ef5aef1e27eb748db78d4d8587ae2162881ad830..c6f4073caf2730307f99bc31e3b2681395751634 100644
--- a/migrations/Version20180731194927.php
+++ b/migrations/Version20180731194927.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180807154935.php b/migrations/Version20180807154935.php
index 26711cdb4dde4930c93c4afa4d2c24563bb7daac..a8b5557de877db7f74b45c0cfef688d473374699 100644
--- a/migrations/Version20180807154935.php
+++ b/migrations/Version20180807154935.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180808105626.php b/migrations/Version20180808105626.php
index 6065610f2ea32c2b332ab18180f013fdb0e7de46..993f70ed0f73203f2dec45ea98a057f9ddf4dfb8 100644
--- a/migrations/Version20180808105626.php
+++ b/migrations/Version20180808105626.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180809124632.php b/migrations/Version20180809124632.php
index 9184a38af342265b7a5a613800ddc46f42d6c65d..4bf0165586703b1fdc47bd09fcadee6f5059066a 100644
--- a/migrations/Version20180809124632.php
+++ b/migrations/Version20180809124632.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180810101618.php b/migrations/Version20180810101618.php
index 19a728caba66c1a4069bd3276a32f2919db38fcb..4c6fdecf848c7fddf1be036af2d292106b6eadaa 100644
--- a/migrations/Version20180810101618.php
+++ b/migrations/Version20180810101618.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180814100311.php b/migrations/Version20180814100311.php
index 38f2c65abd8f7f88fbd4ba7810780ec8e27fa6b7..1a6922bf11885009e2780d552aa14f3b4795c7dd 100644
--- a/migrations/Version20180814100311.php
+++ b/migrations/Version20180814100311.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180826154629.php b/migrations/Version20180826154629.php
index ac0492de06ee58aef53ae8aefc3b5c0c2b79f9cc..0bd491b03124b6cbeea608c6a5bc1922c1356bdc 100644
--- a/migrations/Version20180826154629.php
+++ b/migrations/Version20180826154629.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180827210313.php b/migrations/Version20180827210313.php
index e08eb34b78dc68d3c7eba43f9a0b72dd9cfec6eb..05ce6acc2d3b078b0b31225ec0d9af95c348aa1b 100644
--- a/migrations/Version20180827210313.php
+++ b/migrations/Version20180827210313.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180903180743.php b/migrations/Version20180903180743.php
index b09d9d96185f56fe330720e3b7084970cf16db2d..a263f73bcc24da1acd1458d43547e71d25d87ee1 100644
--- a/migrations/Version20180903180743.php
+++ b/migrations/Version20180903180743.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20180904201829.php b/migrations/Version20180904201829.php
index ea228af4720bff692f5797decb05a7b620d18575..125f67055bdcbccac3da137c393f2401808e3cb0 100644
--- a/migrations/Version20180904201829.php
+++ b/migrations/Version20180904201829.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20181001194107.php b/migrations/Version20181001194107.php
index 6954cacefdd4af43ddaa96d37e37ed03a510ffb5..f102d6b282f9177bcfdbe41fc356022a69437b2a 100644
--- a/migrations/Version20181001194107.php
+++ b/migrations/Version20181001194107.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20181107184006.php b/migrations/Version20181107184006.php
index 5dddc9f131ec4c6868587084a4a6d09f7a0482ad..2ffaab2cf8c517928e1e652d1623039f8852184b 100644
--- a/migrations/Version20181107184006.php
+++ b/migrations/Version20181107184006.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20181108184203.php b/migrations/Version20181108184203.php
index 5dd0d2e16c66d0bc84723310ebcf2a33eb640107..50c69007cd8e1ca7f02ce23a80427171532c60f5 100644
--- a/migrations/Version20181108184203.php
+++ b/migrations/Version20181108184203.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20181115193356.php b/migrations/Version20181115193356.php
index b14ec3d2e6a472349f29cd6eca2fafcbad100506..4ceeb8183c00f3a82c563aa0b00d5046a342f2bc 100644
--- a/migrations/Version20181115193356.php
+++ b/migrations/Version20181115193356.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20190303165343.php b/migrations/Version20190303165343.php
index e3223d6d76ff849059e242708f05f8df4e2dce94..183cdcfcb834176aca2027bf310dcfb28d6e8234 100644
--- a/migrations/Version20190303165343.php
+++ b/migrations/Version20190303165343.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20190303175529.php b/migrations/Version20190303175529.php
index e4a3be107e6ca0d01f96f0a09943835c2392f534..7e2091ecf1ee5af52f57d4ae6fdccede39377137 100644
--- a/migrations/Version20190303175529.php
+++ b/migrations/Version20190303175529.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20190308115517.php b/migrations/Version20190308115517.php
index b97954d274eb79dac10d2ed25a582b824098a06d..19f21827335d736e081e9cc282f296cfaa9ea7ef 100644
--- a/migrations/Version20190308115517.php
+++ b/migrations/Version20190308115517.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20190308151033.php b/migrations/Version20190308151033.php
index 7587dca9b4ff66b609f3158c56d7d818ce881801..9ac1b2c7f26be4320b20676fd3bc234480e28b1c 100644
--- a/migrations/Version20190308151033.php
+++ b/migrations/Version20190308151033.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20190620182459.php b/migrations/Version20190620182459.php
index e4e971f1e6dfa9c72ef7d5c8a5efbe78ea00e061..005f0315c7b17aeecd0a1b3c4885ffa3b4ab75e3 100644
--- a/migrations/Version20190620182459.php
+++ b/migrations/Version20190620182459.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20190622175009.php b/migrations/Version20190622175009.php
index 1546270e4101aa0ab6779df49b272895531e3e88..86c772bec38fa883af859abaa01cf594aae43724 100644
--- a/migrations/Version20190622175009.php
+++ b/migrations/Version20190622175009.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/migrations/Version20250211143000.php b/migrations/Version20250211143000.php
new file mode 100644
index 0000000000000000000000000000000000000000..10b52487318bcd7613809247cc108915c2124d25
--- /dev/null
+++ b/migrations/Version20250211143000.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250211143000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE registry_mesurement CHANGE comment comment LONGTEXT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE registry_mesurement CHANGE comment comment VARCHAR(255) DEFAULT NULL');
+    }
+}
diff --git a/src/Application/Controller/CRUDController.php b/src/Application/Controller/CRUDController.php
index c0de861f6c9a61c627c03a8788f42c3cde225514..5bee8293f239fba77f80f69c942685410913903f 100644
--- a/src/Application/Controller/CRUDController.php
+++ b/src/Application/Controller/CRUDController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Controller/ControllerHelper.php b/src/Application/Controller/ControllerHelper.php
index 087d310dffa5c6f4fbac6f824cb634916f2a3b88..59af151ccb639e6e00a32bfff3dadd4b1ad7511c 100644
--- a/src/Application/Controller/ControllerHelper.php
+++ b/src/Application/Controller/ControllerHelper.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/DDD/Repository/CRUDRepositoryInterface.php b/src/Application/DDD/Repository/CRUDRepositoryInterface.php
index 575336ec30f5cb4154ebb0495d6ecab6f493b01e..fb718a67997161c428069e8964e522b3f7f213fe 100644
--- a/src/Application/DDD/Repository/CRUDRepositoryInterface.php
+++ b/src/Application/DDD/Repository/CRUDRepositoryInterface.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/DDD/Repository/RepositoryInterface.php b/src/Application/DDD/Repository/RepositoryInterface.php
index 3a9cc2e1d58467f1041cd3e54c3e930a58943dd4..3611dd1b48058213a556db08eb56753bde008cbe 100644
--- a/src/Application/DDD/Repository/RepositoryInterface.php
+++ b/src/Application/DDD/Repository/RepositoryInterface.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Dictionary/SimpleDictionary.php b/src/Application/Dictionary/SimpleDictionary.php
index 63d69c9c8e676d675cfceb904f50c97e1cc1542a..edd818fd0a1a096c2d765f7110f5476d87caf650 100644
--- a/src/Application/Dictionary/SimpleDictionary.php
+++ b/src/Application/Dictionary/SimpleDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Doctrine/Repository/CRUDRepository.php b/src/Application/Doctrine/Repository/CRUDRepository.php
index ac39f08b88abc40e980d6dec550b1a49fa973e15..6c86a7a4606af43fd1b4b7d528533120859f31fc 100644
--- a/src/Application/Doctrine/Repository/CRUDRepository.php
+++ b/src/Application/Doctrine/Repository/CRUDRepository.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Doctrine/ApiRoleSubscriber.php b/src/Application/Symfony/EventSubscriber/Doctrine/ApiRoleSubscriber.php
index 447313ccdb125a4a38246f110b3398cc79da03a2..23bd59c56bfa15f1df4b4657e8194bfaed9c7c90 100644
--- a/src/Application/Symfony/EventSubscriber/Doctrine/ApiRoleSubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Doctrine/ApiRoleSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriber.php b/src/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriber.php
index 0bd19448584cb076de176b3154151cefedf8982e..7bab9fdfa68336baffb66bf457dda4e70d62041f 100644
--- a/src/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriber.php b/src/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriber.php
index 7b9d49000e453d9e8d40a71b0bd43cc6c0aece4c..ac6dd4310c01f10a14f64782b54357bcd13eb351 100644
--- a/src/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php b/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php
index eebac11200fc3a66785e6c72dece45a1badc7912..05f8a1b6808522e5dbbfab5f9ce0261a297382d3 100644
--- a/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Doctrine/LinkUpdatedBySubscriber.php b/src/Application/Symfony/EventSubscriber/Doctrine/LinkUpdatedBySubscriber.php
index 91c7ee9db45922044c025a1748aad43b083be53a..6e5c316f517492737e74af9bf16cd0ef6d4e12db 100644
--- a/src/Application/Symfony/EventSubscriber/Doctrine/LinkUpdatedBySubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Doctrine/LinkUpdatedBySubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriber.php b/src/Application/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriber.php
index bb802de8366b89efa7f3bee9f9c7a863cef36520..4a014ebc55da1e05631d5b0eec8b0911ec331231 100644
--- a/src/Application/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Kernel/IdleSubscriber.php b/src/Application/Symfony/EventSubscriber/Kernel/IdleSubscriber.php
index a714ce0f961bc473fcb7320455dbf30da37e9d57..2d7932b35c554b1c8796cee56bc6d364adf1071e 100644
--- a/src/Application/Symfony/EventSubscriber/Kernel/IdleSubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Kernel/IdleSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/EventSubscriber/Kernel/LoginSubscriber.php b/src/Application/Symfony/EventSubscriber/Kernel/LoginSubscriber.php
index 6042a27072e57a4ac947d4f691014d9d8474e916..d8871ff516d654479fa22beeded45eb6008c219e 100644
--- a/src/Application/Symfony/EventSubscriber/Kernel/LoginSubscriber.php
+++ b/src/Application/Symfony/EventSubscriber/Kernel/LoginSubscriber.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/Security/UserProvider.php b/src/Application/Symfony/Security/UserProvider.php
index e262c43384e626c8dcefaae7cae6e15bd6e4884d..d12b05bf02821afa457e2d6924598ddf4beff405 100644
--- a/src/Application/Symfony/Security/UserProvider.php
+++ b/src/Application/Symfony/Security/UserProvider.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValue.php b/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValue.php
index b1b50ee97a05ef58f275516059c3b3cf5352cfc7..48c44f5f85dae69c1a2c6dfbbbc90949066c21db 100644
--- a/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValue.php
+++ b/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValue.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidator.php b/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidator.php
index f47b46f14138cf6873d5f6da7fd4b50f031cb78a..38c9a398763cd61a6b6353d70f98335875d3e680 100644
--- a/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidator.php
+++ b/src/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Traits/Model/CollectivityTrait.php b/src/Application/Traits/Model/CollectivityTrait.php
index c17a3f2b438f87fcdad7d92b62f741188d972fe8..951181e666965ca5feb88791ffefc8a8678ebf9e 100644
--- a/src/Application/Traits/Model/CollectivityTrait.php
+++ b/src/Application/Traits/Model/CollectivityTrait.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Traits/Model/CreatorTrait.php b/src/Application/Traits/Model/CreatorTrait.php
index 0890fbb40747d29115c74477a3ab2b8eca55aff4..3be13bfd083dcd911e2e866585b590fab40ae671 100644
--- a/src/Application/Traits/Model/CreatorTrait.php
+++ b/src/Application/Traits/Model/CreatorTrait.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Traits/Model/HistoryTrait.php b/src/Application/Traits/Model/HistoryTrait.php
index 9fb886c2f01a14302a5924a0d2291a9e3502fe0a..a4d7c67af5c33a3edecbc77c6f421b6a1f6f8fc1 100644
--- a/src/Application/Traits/Model/HistoryTrait.php
+++ b/src/Application/Traits/Model/HistoryTrait.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Traits/Model/ServiceTrait.php b/src/Application/Traits/Model/ServiceTrait.php
index 32679a7feb6d6de5828f05de139f3ea8876ec01e..cb773e3030173c2ff04a8bb82a778c1a7ec7f0a3 100644
--- a/src/Application/Traits/Model/ServiceTrait.php
+++ b/src/Application/Traits/Model/ServiceTrait.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Application/Traits/Model/SoftDeletableTrait.php b/src/Application/Traits/Model/SoftDeletableTrait.php
index 5578bf50a9e9c753d1ac7e3513fee103e987391a..196c541203f1b72496d9b9222a89c021c14a2f1a 100644
--- a/src/Application/Traits/Model/SoftDeletableTrait.php
+++ b/src/Application/Traits/Model/SoftDeletableTrait.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/AIPD/Form/Type/ModeleAnalyseRightsType.php b/src/Domain/AIPD/Form/Type/ModeleAnalyseRightsType.php
index e05f031c9ec0189846f942a1e05adff385d1ea88..7708561415ec8e6d9827bf30cad34c946526731a 100644
--- a/src/Domain/AIPD/Form/Type/ModeleAnalyseRightsType.php
+++ b/src/Domain/AIPD/Form/Type/ModeleAnalyseRightsType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2021 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -55,7 +54,7 @@ class ModeleAnalyseRightsType extends AbstractType
             ])
             ->add('authorizedCollectivityTypes', DictionaryType::class, [
                 'name'     => 'user_collectivity_type',
-                'label'    => false,
+                'label'    => 'global.label.organization_type',
                 'required' => false,
                 'multiple' => true,
                 'expanded' => false,
@@ -65,7 +64,7 @@ class ModeleAnalyseRightsType extends AbstractType
             ])
             ->add('authorizedCollectivities', EntityType::class, [
                 'class'         => Collectivity::class,
-                'label'         => false,
+                'label'         => 'global.label.organization_list',
                 'query_builder' => function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->orderBy('c.name', 'ASC');
diff --git a/src/Domain/Admin/Cloner/AbstractCloner.php b/src/Domain/Admin/Cloner/AbstractCloner.php
index deddd0d19134133b20cc702c56b17cb2cf7df503..f2c1532a2138e8e0fc610b35f609dfa2cd921625 100644
--- a/src/Domain/Admin/Cloner/AbstractCloner.php
+++ b/src/Domain/Admin/Cloner/AbstractCloner.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Cloner/ClonerInterface.php b/src/Domain/Admin/Cloner/ClonerInterface.php
index 8c914b5bf39f766296e364cacc2e62f82e4645e1..f2cf35d51322e1c9416fb9316422f9cfe129aa3a 100644
--- a/src/Domain/Admin/Cloner/ClonerInterface.php
+++ b/src/Domain/Admin/Cloner/ClonerInterface.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Cloner/ClonerProvider.php b/src/Domain/Admin/Cloner/ClonerProvider.php
index eb57ce1a5b8ab426c8d2cae1bea0bed4de10224e..dcdcd204a2640558c512f4e4f2a2c9b730ff6844 100644
--- a/src/Domain/Admin/Cloner/ClonerProvider.php
+++ b/src/Domain/Admin/Cloner/ClonerProvider.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Cloner/ContractorCloner.php b/src/Domain/Admin/Cloner/ContractorCloner.php
index 56d82a2b06cf6101445d93360567755432277305..4a788e80c2a9908ea0e457083b0690d5c7d9bc27 100644
--- a/src/Domain/Admin/Cloner/ContractorCloner.php
+++ b/src/Domain/Admin/Cloner/ContractorCloner.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Cloner/MesurementCloner.php b/src/Domain/Admin/Cloner/MesurementCloner.php
index cf9f933e8e6634c863701c06cffd238b9194af5f..fb7867e4f160aecbaedd188bc68064f5e562b011 100644
--- a/src/Domain/Admin/Cloner/MesurementCloner.php
+++ b/src/Domain/Admin/Cloner/MesurementCloner.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Cloner/ToolCloner.php b/src/Domain/Admin/Cloner/ToolCloner.php
index 5e76ed52ca9959149f2f8fd192496166296051da..77d18c451c53f9df217bd33edc7b049639ced20d 100644
--- a/src/Domain/Admin/Cloner/ToolCloner.php
+++ b/src/Domain/Admin/Cloner/ToolCloner.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Cloner/TreatmentCloner.php b/src/Domain/Admin/Cloner/TreatmentCloner.php
index 971d7cdc283f534c056dce3cc204cb47d1e95584..2f1ba108b03bdf9626f0ebf88086c65ad46688a2 100644
--- a/src/Domain/Admin/Cloner/TreatmentCloner.php
+++ b/src/Domain/Admin/Cloner/TreatmentCloner.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -90,14 +89,14 @@ class TreatmentCloner extends AbstractCloner
         if (null !== $referent->getSecurityAccessControl()) {
             $treatment->setSecurityAccessControl($referent->getSecurityAccessControl());
         }
-        if (null !== $referent->getSecurityTracability()) {
-            $treatment->setSecurityTracability($referent->getSecurityTracability());
+        if (null !== $referent->getSecurityUpdate()) {
+            $treatment->setSecurityUpdate($referent->getSecurityUpdate());
         }
         if (null !== $referent->getSecuritySaving()) {
             $treatment->setSecuritySaving($referent->getSecuritySaving());
         }
-        if (null !== $referent->getSecurityUpdate()) {
-            $treatment->setSecurityUpdate($referent->getSecurityUpdate());
+        if (null !== $referent->getSecurityTracability()) {
+            $treatment->setSecurityTracability($referent->getSecurityTracability());
         }
         if (null !== $referent->getSecurityOther()) {
             $treatment->setSecurityOther($referent->getSecurityOther());
diff --git a/src/Domain/Admin/Controller/DuplicationController.php b/src/Domain/Admin/Controller/DuplicationController.php
index 8a8540015b44f26cd3268727c3d59246cf64f52c..c2a70bb251d91ab843dd14b6c6850d187e2b1e93 100644
--- a/src/Domain/Admin/Controller/DuplicationController.php
+++ b/src/Domain/Admin/Controller/DuplicationController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/DTO/DuplicationFormDTO.php b/src/Domain/Admin/DTO/DuplicationFormDTO.php
index 1e3452ab2499a7fa4097ed3dc55e7f5202928cf8..4e15253da26a06bca06cbb1c7883e9bd25053a02 100644
--- a/src/Domain/Admin/DTO/DuplicationFormDTO.php
+++ b/src/Domain/Admin/DTO/DuplicationFormDTO.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Dictionary/DuplicationTargetOptionDictionary.php b/src/Domain/Admin/Dictionary/DuplicationTargetOptionDictionary.php
index e918b918ed7ed01b212aa0bea22855bed67b90e8..35ed929f30ed885cced8fff5860dbef132654300 100644
--- a/src/Domain/Admin/Dictionary/DuplicationTargetOptionDictionary.php
+++ b/src/Domain/Admin/Dictionary/DuplicationTargetOptionDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Dictionary/DuplicationTypeDictionary.php b/src/Domain/Admin/Dictionary/DuplicationTypeDictionary.php
index 09adf458e9e381a66579374a75da380e9795d2d8..2542a045f09f89481b93fb1e9307e15b0047bf7e 100644
--- a/src/Domain/Admin/Dictionary/DuplicationTypeDictionary.php
+++ b/src/Domain/Admin/Dictionary/DuplicationTypeDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Admin/Form/Type/DuplicationType.php b/src/Domain/Admin/Form/Type/DuplicationType.php
index fabde311e3e4c31df73ccfb3ac140c64f39b754b..928abee0d59ca5bcb8e31e16a7ebe681a03931af 100644
--- a/src/Domain/Admin/Form/Type/DuplicationType.php
+++ b/src/Domain/Admin/Form/Type/DuplicationType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -107,7 +106,7 @@ class DuplicationType extends AbstractType
             ])
             ->add('targetCollectivityTypes', DictionaryType::class, [
                 'name'     => 'user_collectivity_type',
-                'label'    => false,
+                'label'    => 'global.label.organization_type',
                 'required' => false,
                 'multiple' => true,
                 'expanded' => false,
@@ -117,7 +116,7 @@ class DuplicationType extends AbstractType
             ])
             ->add('targetCollectivities', EntityType::class, [
                 'class'         => UserModel\Collectivity::class,
-                'label'         => false,
+                'label'         => 'global.label.organization_list',
                 'query_builder' => function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->orderBy('c.name', 'ASC');
diff --git a/src/Domain/Admin/Repository/Duplication.php b/src/Domain/Admin/Repository/Duplication.php
index 6b0e2198ad7ea9ea93c5bf816b1ce91391cf3bb2..896f50fa6deb07a05bdb1fa49f3cfa32d15dcfa1 100644
--- a/src/Domain/Admin/Repository/Duplication.php
+++ b/src/Domain/Admin/Repository/Duplication.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Controller/CategoryController.php b/src/Domain/Documentation/Controller/CategoryController.php
index 85efa14b1cdebb7dec36029763789d2e6f776cf8..200765b8add670b7f08c05678fe3de2f140a5544 100644
--- a/src/Domain/Documentation/Controller/CategoryController.php
+++ b/src/Domain/Documentation/Controller/CategoryController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Controller/DocumentController.php b/src/Domain/Documentation/Controller/DocumentController.php
index 22755c0508cf4fb870e427801bfc26630994754e..ff4930b0266728e6c8cce0debed2ce297e142892 100644
--- a/src/Domain/Documentation/Controller/DocumentController.php
+++ b/src/Domain/Documentation/Controller/DocumentController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Dictionary/DocumentTypeDictionary.php b/src/Domain/Documentation/Dictionary/DocumentTypeDictionary.php
index 3e300ebf37f95c9d249add90678c6863ea8c850f..904fd97adb47e333037e4e38286f696aeff86df4 100644
--- a/src/Domain/Documentation/Dictionary/DocumentTypeDictionary.php
+++ b/src/Domain/Documentation/Dictionary/DocumentTypeDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author <chayrouse@datakode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Form/Type/CategoryType.php b/src/Domain/Documentation/Form/Type/CategoryType.php
index 514c0a069eebcacdba91e2a10611e2e33847cff0..a1916f193604f32956b3617b255f456cddb732a6 100644
--- a/src/Domain/Documentation/Form/Type/CategoryType.php
+++ b/src/Domain/Documentation/Form/Type/CategoryType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Form/Type/DocumentType.php b/src/Domain/Documentation/Form/Type/DocumentType.php
index c2a59d514d1fbc14bfef3dd812dab86f0af3e837..512189dd1314dc7157d518698c7509867d796bb3 100644
--- a/src/Domain/Documentation/Form/Type/DocumentType.php
+++ b/src/Domain/Documentation/Form/Type/DocumentType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Model/Category.php b/src/Domain/Documentation/Model/Category.php
index 108dbbc903c8d979c84a2ed944848934ead39eee..4125437abc9a7b75aba4299913cf8d0fa7beaec6 100644
--- a/src/Domain/Documentation/Model/Category.php
+++ b/src/Domain/Documentation/Model/Category.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Model/Document.php b/src/Domain/Documentation/Model/Document.php
index f21e087a17d1b09149f2ac0b50678913e7afcaf2..14b3d017cab2696c39b48b7f7c9ea0f803781b78 100644
--- a/src/Domain/Documentation/Model/Document.php
+++ b/src/Domain/Documentation/Model/Document.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Repository/Category.php b/src/Domain/Documentation/Repository/Category.php
index 1ef1721b0c20576b394cb39339086e29e84e0ce1..b34ea2f5aee1d6077673c4811f57067c9078daff 100644
--- a/src/Domain/Documentation/Repository/Category.php
+++ b/src/Domain/Documentation/Repository/Category.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Documentation/Repository/Document.php b/src/Domain/Documentation/Repository/Document.php
index 91603bd3fcfee9d72db092a77ff43d0a9a3d874b..5c8969e4c7574aec6ec6af76bd63ae7c0ab4c230 100644
--- a/src/Domain/Documentation/Repository/Document.php
+++ b/src/Domain/Documentation/Repository/Document.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Calculator/Maturity.php b/src/Domain/Maturity/Calculator/Maturity.php
index 42472d971104b1f07663afccc43305f586bf2c69..c5704d1fdbf48296acb1dfc968f7bc26820db431 100644
--- a/src/Domain/Maturity/Calculator/Maturity.php
+++ b/src/Domain/Maturity/Calculator/Maturity.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Calculator/MaturityHandler.php b/src/Domain/Maturity/Calculator/MaturityHandler.php
index 907a066696b93065910d69b1c9f7981a94f659ae..4e008468a3b7a48fe847a2d7b63bf44172c1e664 100644
--- a/src/Domain/Maturity/Calculator/MaturityHandler.php
+++ b/src/Domain/Maturity/Calculator/MaturityHandler.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Controller/ReferentielController.php b/src/Domain/Maturity/Controller/ReferentielController.php
index b6537ebb4b25fcc4d7b0a22a135031eef4883b8b..2377aec338319cd6659d240afe2b264ea3105648 100644
--- a/src/Domain/Maturity/Controller/ReferentielController.php
+++ b/src/Domain/Maturity/Controller/ReferentielController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Controller/SurveyController.php b/src/Domain/Maturity/Controller/SurveyController.php
index 977c7fe02abd6263655390f914575d01e23a90a8..64cefc498e5b81b332b3582f6f06d306f9a4c072 100644
--- a/src/Domain/Maturity/Controller/SurveyController.php
+++ b/src/Domain/Maturity/Controller/SurveyController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/AnswerType.php b/src/Domain/Maturity/Form/Type/AnswerType.php
index 45e035115799e0c3e260304060e786bde8362f2b..1554e7625aecf1f737217c0cd25f8c3949f08199 100644
--- a/src/Domain/Maturity/Form/Type/AnswerType.php
+++ b/src/Domain/Maturity/Form/Type/AnswerType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/DomainType.php b/src/Domain/Maturity/Form/Type/DomainType.php
index 7c52cc35eb75378965f3de7bd5b13bef21a499ba..00d0782a6cb36444a5ba56a6fc01b50437eb5020 100644
--- a/src/Domain/Maturity/Form/Type/DomainType.php
+++ b/src/Domain/Maturity/Form/Type/DomainType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/ModeleReferentielRightsType.php b/src/Domain/Maturity/Form/Type/ModeleReferentielRightsType.php
index d65535be0a6e61b6ae0add89633edd79784cbc29..9bf3e6bf565b4c183796ddbfeff3b6c99be33082 100644
--- a/src/Domain/Maturity/Form/Type/ModeleReferentielRightsType.php
+++ b/src/Domain/Maturity/Form/Type/ModeleReferentielRightsType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2021 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -55,7 +54,7 @@ class ModeleReferentielRightsType extends AbstractType
             ])
             ->add('authorizedCollectivityTypes', DictionaryType::class, [
                 'name'     => 'user_collectivity_type',
-                'label'    => false,
+                'label'    => 'global.label.organization_type',
                 'required' => false,
                 'multiple' => true,
                 'expanded' => false,
@@ -65,7 +64,7 @@ class ModeleReferentielRightsType extends AbstractType
             ])
             ->add('authorizedCollectivities', EntityType::class, [
                 'class'         => Collectivity::class,
-                'label'         => false,
+                'label'         => 'global.label.organization_list',
                 'query_builder' => function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->orderBy('c.name', 'ASC');
diff --git a/src/Domain/Maturity/Form/Type/QuestionType.php b/src/Domain/Maturity/Form/Type/QuestionType.php
index 05b0a1ac66eeddb917fa2794d94daef92be66984..e7262b1d4491db80551ac1e72da8a8ed79bce593 100644
--- a/src/Domain/Maturity/Form/Type/QuestionType.php
+++ b/src/Domain/Maturity/Form/Type/QuestionType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/ReferentielType.php b/src/Domain/Maturity/Form/Type/ReferentielType.php
index 12777a768a6b826ccd5946ba307431d7d2b4de83..97bb328dcbff5d3e2d65a39b08568c68339adfd5 100644
--- a/src/Domain/Maturity/Form/Type/ReferentielType.php
+++ b/src/Domain/Maturity/Form/Type/ReferentielType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/SurveyAnswerType.php b/src/Domain/Maturity/Form/Type/SurveyAnswerType.php
index 8e8f4102c5abae871fdf0dca087e84f256264d72..bb87e89376488e6f926e9d2f35e1002c0d8c9e8b 100644
--- a/src/Domain/Maturity/Form/Type/SurveyAnswerType.php
+++ b/src/Domain/Maturity/Form/Type/SurveyAnswerType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/SurveyType.php b/src/Domain/Maturity/Form/Type/SurveyType.php
index 64956ebad89a2efbfcc433e030c8b8bfd9a79283..50869242d1ce518c6a8ee34c082455782ed13f2d 100644
--- a/src/Domain/Maturity/Form/Type/SurveyType.php
+++ b/src/Domain/Maturity/Form/Type/SurveyType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/SyntheseAnswerType.php b/src/Domain/Maturity/Form/Type/SyntheseAnswerType.php
index 1f32f771dcee522bc883738671e3e8d9c48c6a1c..34d713b8b7f0d9f2bf1dc4093a9c0b1295094747 100644
--- a/src/Domain/Maturity/Form/Type/SyntheseAnswerType.php
+++ b/src/Domain/Maturity/Form/Type/SyntheseAnswerType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Form/Type/SyntheseType.php b/src/Domain/Maturity/Form/Type/SyntheseType.php
index 166a47e3defb5c3adf8cb4453ef31b9e8f945df9..bf56cc6d1d5b07a39fa02b6fca09b83b12684431 100644
--- a/src/Domain/Maturity/Form/Type/SyntheseType.php
+++ b/src/Domain/Maturity/Form/Type/SyntheseType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/Answer.php b/src/Domain/Maturity/Model/Answer.php
index 6e6625ee38655126da12350094730fe833cabd13..079f663a51b234d79629c3b4de7646ad46cea055 100644
--- a/src/Domain/Maturity/Model/Answer.php
+++ b/src/Domain/Maturity/Model/Answer.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/AnswerSurvey.php b/src/Domain/Maturity/Model/AnswerSurvey.php
index 467f506786ba14128ea1525bfd88b03adfda7173..2be1e648df38c3d09351525b6af58f4181f14af6 100644
--- a/src/Domain/Maturity/Model/AnswerSurvey.php
+++ b/src/Domain/Maturity/Model/AnswerSurvey.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/Domain.php b/src/Domain/Maturity/Model/Domain.php
index cf0c512574f257bf8fee48ec1a9d0ba3b6967460..db5d44746e1e2f1143652454846df6f1ae6ca956 100644
--- a/src/Domain/Maturity/Model/Domain.php
+++ b/src/Domain/Maturity/Model/Domain.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/Maturity.php b/src/Domain/Maturity/Model/Maturity.php
index 072c2e000878715f1ed13a9d78425c7d0872b4bc..0dd9ccda5972d99a98abef92514955b3874cae78 100644
--- a/src/Domain/Maturity/Model/Maturity.php
+++ b/src/Domain/Maturity/Model/Maturity.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/OptionalAnswer.php b/src/Domain/Maturity/Model/OptionalAnswer.php
index d78b55d818509ecc8b07446b817aae638f706599..04b745785cc14e2fd251c3c350f03888a4cfd4be 100644
--- a/src/Domain/Maturity/Model/OptionalAnswer.php
+++ b/src/Domain/Maturity/Model/OptionalAnswer.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/Question.php b/src/Domain/Maturity/Model/Question.php
index d015467ba40a77038e9c76cbd0502ca68619c9e9..62d21f9e9a45556671623b1a428c03d04eaee51c 100644
--- a/src/Domain/Maturity/Model/Question.php
+++ b/src/Domain/Maturity/Model/Question.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/Referentiel.php b/src/Domain/Maturity/Model/Referentiel.php
index d5b226f5fbedc34ee133882594341e73fc0de28f..3f714a9f45f825ef2af4de3cd361c5b9bfb0bd67 100644
--- a/src/Domain/Maturity/Model/Referentiel.php
+++ b/src/Domain/Maturity/Model/Referentiel.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Model/Survey.php b/src/Domain/Maturity/Model/Survey.php
index e69b494d3838556e79cc39cde46c1e999a7e52db..bb04eaf9fc34053b51ed31f96d47a86ad805a6fc 100644
--- a/src/Domain/Maturity/Model/Survey.php
+++ b/src/Domain/Maturity/Model/Survey.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Repository/Question.php b/src/Domain/Maturity/Repository/Question.php
index b3c7f8a7a97af85f7ed50fdaaa095fc626eccbbe..8f212a11192749f8d7eb0c3a9965e5268cb27d69 100644
--- a/src/Domain/Maturity/Repository/Question.php
+++ b/src/Domain/Maturity/Repository/Question.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Repository/Survey.php b/src/Domain/Maturity/Repository/Survey.php
index 23d663456fcc993939ee0e99ea163b20b80b74e3..f0106a937fa7a23212ee65d0fd3bc5d097bde5a6 100644
--- a/src/Domain/Maturity/Repository/Survey.php
+++ b/src/Domain/Maturity/Repository/Survey.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriber.php b/src/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriber.php
index 75ddd8e5b4054e41f509b13c6e216b61827e18e0..53c1a1c668ee67bd0a6ece4bf80ee31efb75d560 100644
--- a/src/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriber.php
+++ b/src/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Maturity/Twig/Extension/SurveyExtension.php b/src/Domain/Maturity/Twig/Extension/SurveyExtension.php
index 1a32c225cd7fea31e54ba4e5e822e5c517b1ee68..0f87596d0f4db97b82ed7dd9963a349b64f335ba 100644
--- a/src/Domain/Maturity/Twig/Extension/SurveyExtension.php
+++ b/src/Domain/Maturity/Twig/Extension/SurveyExtension.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Controller/NotificationController.php b/src/Domain/Notification/Controller/NotificationController.php
index 5f378714a497e764031a0763f24f01e1bc7e4bb9..5735cebe4f19b3e78b710a84b500bf736ed201e5 100644
--- a/src/Domain/Notification/Controller/NotificationController.php
+++ b/src/Domain/Notification/Controller/NotificationController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Controller/NotificationUserController.php b/src/Domain/Notification/Controller/NotificationUserController.php
index 8c868475fd2a57c04f720e5db37d78a0bafbf098..adbd2779089e46ae61ff1537394f3f00306e1eaf 100644
--- a/src/Domain/Notification/Controller/NotificationUserController.php
+++ b/src/Domain/Notification/Controller/NotificationUserController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Dictionary/NotificationActionDictionary.php b/src/Domain/Notification/Dictionary/NotificationActionDictionary.php
index 3519611958a3effa4159eba0e2dac8b26e9fa148..df47572910b7c685af32cc774bb4b83d8ff1ab3b 100644
--- a/src/Domain/Notification/Dictionary/NotificationActionDictionary.php
+++ b/src/Domain/Notification/Dictionary/NotificationActionDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Dictionary/NotificationActionUserDictionary.php b/src/Domain/Notification/Dictionary/NotificationActionUserDictionary.php
index 406ab7176fd4ffd09627e349045b46ceab0cd3c7..715116ac1d30d83688da5529cc38f0135523b54a 100644
--- a/src/Domain/Notification/Dictionary/NotificationActionUserDictionary.php
+++ b/src/Domain/Notification/Dictionary/NotificationActionUserDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Dictionary/NotificationMailParametersFrequencyDictionary.php b/src/Domain/Notification/Dictionary/NotificationMailParametersFrequencyDictionary.php
index c175708292cfa7f220cea5cff687312ea6c7a370..861235efe5f8cc3475f9f4c8a80dbb57e5000511 100644
--- a/src/Domain/Notification/Dictionary/NotificationMailParametersFrequencyDictionary.php
+++ b/src/Domain/Notification/Dictionary/NotificationMailParametersFrequencyDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Dictionary/NotificationModuleDictionary.php b/src/Domain/Notification/Dictionary/NotificationModuleDictionary.php
index 2e4931c52e447629b25c6d616c07f734b24f7183..e553b61c20cca3ac6255e4f88de5dd606f8bbd71 100644
--- a/src/Domain/Notification/Dictionary/NotificationModuleDictionary.php
+++ b/src/Domain/Notification/Dictionary/NotificationModuleDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Dictionary/NotificationModuleUserDictionary.php b/src/Domain/Notification/Dictionary/NotificationModuleUserDictionary.php
index 5430930e79a3332a87550a94746dcdae8f4f7a20..fabcbc0d145da0ff23a5d8a8f8ced7bc06653596 100644
--- a/src/Domain/Notification/Dictionary/NotificationModuleUserDictionary.php
+++ b/src/Domain/Notification/Dictionary/NotificationModuleUserDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Dictionary/NotificationStateDictionary.php b/src/Domain/Notification/Dictionary/NotificationStateDictionary.php
index 9d467526d00806d7402953c1f8e3beab2d4d620b..28c33399adfeb30339c74b149877861fbd8ea37f 100644
--- a/src/Domain/Notification/Dictionary/NotificationStateDictionary.php
+++ b/src/Domain/Notification/Dictionary/NotificationStateDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author <chayrouse@datakode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Model/Notification.php b/src/Domain/Notification/Model/Notification.php
index ffdfa8d1a9a096a20e69804c4efe45b61bdc79ed..73fb6a4f0f8df6ecf202b8223ca49325f737753a 100644
--- a/src/Domain/Notification/Model/Notification.php
+++ b/src/Domain/Notification/Model/Notification.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Model/NotificationUser.php b/src/Domain/Notification/Model/NotificationUser.php
index a368efa949489f237294a342e6b2a387077dd5c3..c5fd4d99cf18cebdd9c0a5230a7e0e7fa1cfc1f1 100644
--- a/src/Domain/Notification/Model/NotificationUser.php
+++ b/src/Domain/Notification/Model/NotificationUser.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Repository/Notification.php b/src/Domain/Notification/Repository/Notification.php
index a1e1fad5456cda2777170b0438576c660bf256e6..f1d7613919672d76d1c3ddb52c2b1aff519dd3d9 100644
--- a/src/Domain/Notification/Repository/Notification.php
+++ b/src/Domain/Notification/Repository/Notification.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Notification/Repository/NotificationUser.php b/src/Domain/Notification/Repository/NotificationUser.php
index d86a10f88a0cbfef2dfb66d12437b878ab1ceefc..56551e73693a4b41be03950803abe5ad3e7bfc9f 100644
--- a/src/Domain/Notification/Repository/NotificationUser.php
+++ b/src/Domain/Notification/Repository/NotificationUser.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Calculator/Completion/AbstractCompletion.php b/src/Domain/Registry/Calculator/Completion/AbstractCompletion.php
index ab55e16a13ea3ef37eb50ab027b6e801f74e2cf0..a55ab8512f8b025536faaf9bd3415fa9aa4d482e 100644
--- a/src/Domain/Registry/Calculator/Completion/AbstractCompletion.php
+++ b/src/Domain/Registry/Calculator/Completion/AbstractCompletion.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletion.php b/src/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletion.php
index 8e250571d24deaa10fa0cd425479b0eb283a87d0..d3bafbc3c99a8ad54af5f81aaee01a813ab7bb31 100644
--- a/src/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletion.php
+++ b/src/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletion.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Calculator/Completion/TreatmentCompletion.php b/src/Domain/Registry/Calculator/Completion/TreatmentCompletion.php
index 76807709e5fde7e0ba3a81140e188b09250f5ab1..94271bfc80cfe008d9f3b263c8fd9e0c7ee8aa04 100644
--- a/src/Domain/Registry/Calculator/Completion/TreatmentCompletion.php
+++ b/src/Domain/Registry/Calculator/Completion/TreatmentCompletion.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Controller/ConformiteTraitementController.php b/src/Domain/Registry/Controller/ConformiteTraitementController.php
index 52f99d63a39f4239072b7f32d9a14a6bba689b9e..f751b06f53a7d0d4003a4cf7dfafde91f056ec8a 100644
--- a/src/Domain/Registry/Controller/ConformiteTraitementController.php
+++ b/src/Domain/Registry/Controller/ConformiteTraitementController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Controller/ContractorController.php b/src/Domain/Registry/Controller/ContractorController.php
index 2896261c481ad568e70032a865e2170b708a2712..1a227bf7926f066c3ac6d6d12f6338fb9217c82d 100644
--- a/src/Domain/Registry/Controller/ContractorController.php
+++ b/src/Domain/Registry/Controller/ContractorController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Controller/MesurementController.php b/src/Domain/Registry/Controller/MesurementController.php
index fe662fb45815af94206adbc321000d76639b287b..e016d427c2a589f0899e5d738f364910f9fe02c1 100644
--- a/src/Domain/Registry/Controller/MesurementController.php
+++ b/src/Domain/Registry/Controller/MesurementController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Controller/ProofController.php b/src/Domain/Registry/Controller/ProofController.php
index 7e2e6041fbe86c5411f1a3d99c7d6fa7e441c71e..5150cf02ebff1eb34501b679581ed43c01641771 100644
--- a/src/Domain/Registry/Controller/ProofController.php
+++ b/src/Domain/Registry/Controller/ProofController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Controller/RequestController.php b/src/Domain/Registry/Controller/RequestController.php
index 9772eadd3da9710258c7730d5676af1986b58867..096ae8bdda62813b13cafac3c2fb1caa9f63f721 100644
--- a/src/Domain/Registry/Controller/RequestController.php
+++ b/src/Domain/Registry/Controller/RequestController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Controller/ToolController.php b/src/Domain/Registry/Controller/ToolController.php
index d0c5dfabc2de180edb8467a6108e031c5442a381..c6176f9f2d05ee901d24c903a18c105884605541 100644
--- a/src/Domain/Registry/Controller/ToolController.php
+++ b/src/Domain/Registry/Controller/ToolController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -398,7 +397,7 @@ class ToolController extends CRUDController
             <i aria-hidden="true" class="fa fa-pencil"></i> ' .
                 $this->translator->trans('global.action.edit')
                 . '</a>
-            
+
             <a href="' .
                 $this->router->generate('registry_tool_delete', ['id' => $tool->getId()]) .
                 '"><i aria-hidden="true" class="fa fa-trash"></i> ' .
diff --git a/src/Domain/Registry/Controller/TreatmentController.php b/src/Domain/Registry/Controller/TreatmentController.php
index 33ab376d06537f00b21c390ec8735c29e3477e0a..0d7723165d6c8b02f90a0d8ff3b07d52c4e860ff 100644
--- a/src/Domain/Registry/Controller/TreatmentController.php
+++ b/src/Domain/Registry/Controller/TreatmentController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -373,9 +372,9 @@ class TreatmentController extends CRUDController
                 'gestionnaire'           => $treatment->getManager(),
                 'sousTraitant'           => $contractors,
                 'controleAcces'          => $treatment->getSecurityAccessControl()->isCheck() ? $yes : $no,
-                'tracabilite'            => $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
-                'saving'                 => $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
                 'update'                 => $treatment->getSecurityUpdate()->isCheck() ? $yes : $no,
+                'saving'                 => $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
+                'tracabilite'            => $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
                 'other'                  => $treatment->getSecurityOther()->isCheck() ? $yes : $no,
                 'entitledPersons'        => $treatment->isSecurityEntitledPersons() ? $yes : $no,
                 'openAccounts'           => $treatment->isSecurityOpenAccounts() ? $yes : $no,
diff --git a/src/Domain/Registry/Controller/ViolationController.php b/src/Domain/Registry/Controller/ViolationController.php
index 700f52825dd2e3dbdc772d67b50000736fbec39c..d82f524da38c24b97732158867df95f7a7c7e9a8 100644
--- a/src/Domain/Registry/Controller/ViolationController.php
+++ b/src/Domain/Registry/Controller/ViolationController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ConformiteTraitementLevelDictionary.php b/src/Domain/Registry/Dictionary/ConformiteTraitementLevelDictionary.php
index 84652b0a0879b06a4f98098673dd63133a53e1e6..3dab27614f92224d4bda9495a6daeaf9a4c7e248 100644
--- a/src/Domain/Registry/Dictionary/ConformiteTraitementLevelDictionary.php
+++ b/src/Domain/Registry/Dictionary/ConformiteTraitementLevelDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/DelayPeriodDictionary.php b/src/Domain/Registry/Dictionary/DelayPeriodDictionary.php
index 61fecd0c51dcb14895a9c97bd6647a70b89c63b9..0558358eaf7e83a30396379e2640579c392940cd 100644
--- a/src/Domain/Registry/Dictionary/DelayPeriodDictionary.php
+++ b/src/Domain/Registry/Dictionary/DelayPeriodDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/MesurementPriorityDictionary.php b/src/Domain/Registry/Dictionary/MesurementPriorityDictionary.php
index 93e6ca8071c479b76eecc840d5392f9fa2eb4147..b6f494e29853ed27763a2e18600627c398fb299e 100644
--- a/src/Domain/Registry/Dictionary/MesurementPriorityDictionary.php
+++ b/src/Domain/Registry/Dictionary/MesurementPriorityDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/MesurementStatusDictionary.php b/src/Domain/Registry/Dictionary/MesurementStatusDictionary.php
index 7310899c7b8a9cd30192940d555aef1ac5d6ee3b..3a47e376ff7d2338ff7cf11c4dfdb91248a88b81 100644
--- a/src/Domain/Registry/Dictionary/MesurementStatusDictionary.php
+++ b/src/Domain/Registry/Dictionary/MesurementStatusDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/MesurementTypeDictionary.php b/src/Domain/Registry/Dictionary/MesurementTypeDictionary.php
index d674e4c9c392e31da2a46d1f4ef79a29cc84cf12..96ab9096122e784b21801df6a6279c5ca2986ea9 100644
--- a/src/Domain/Registry/Dictionary/MesurementTypeDictionary.php
+++ b/src/Domain/Registry/Dictionary/MesurementTypeDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ProofTypeDictionary.php b/src/Domain/Registry/Dictionary/ProofTypeDictionary.php
index d21652345ef8f197b1705037e663cf0bafeef0b3..be9cb3353cdaf3b89811610671478b264627d30b 100644
--- a/src/Domain/Registry/Dictionary/ProofTypeDictionary.php
+++ b/src/Domain/Registry/Dictionary/ProofTypeDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/RequestAnswerTypeDictionary.php b/src/Domain/Registry/Dictionary/RequestAnswerTypeDictionary.php
index d7db9fe10a68c5b1a0fd5a5552c10893bc3fe6a3..de64b18b9f35fd3bc5b9eee3c0219cc4aee46493 100644
--- a/src/Domain/Registry/Dictionary/RequestAnswerTypeDictionary.php
+++ b/src/Domain/Registry/Dictionary/RequestAnswerTypeDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/RequestCivilityDictionary.php b/src/Domain/Registry/Dictionary/RequestCivilityDictionary.php
index 6c4f047bc541f728e90e122c05b3132db94e9ca9..450e24c463aa9bf099f6a5d43f20b84a14ee2c9f 100644
--- a/src/Domain/Registry/Dictionary/RequestCivilityDictionary.php
+++ b/src/Domain/Registry/Dictionary/RequestCivilityDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/RequestObjectDictionary.php b/src/Domain/Registry/Dictionary/RequestObjectDictionary.php
index 37f7df258a0fd13a783ee2f4d517d01d6856817f..e27ed8fafa5d8bea40ef8257966cbbd34031ad73 100644
--- a/src/Domain/Registry/Dictionary/RequestObjectDictionary.php
+++ b/src/Domain/Registry/Dictionary/RequestObjectDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/RequestStateDictionary.php b/src/Domain/Registry/Dictionary/RequestStateDictionary.php
index bbc867f14981cd605950893c130258ea339887f5..a00e16f96a26cad947b38e88d134c48e49e3880d 100644
--- a/src/Domain/Registry/Dictionary/RequestStateDictionary.php
+++ b/src/Domain/Registry/Dictionary/RequestStateDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ToolTypeDictionary.php b/src/Domain/Registry/Dictionary/ToolTypeDictionary.php
index 6d1e35c4c5812b501e84669c0621d771115f1007..97055cc77fe92b4131f08a509c2ae399b1d41871 100644
--- a/src/Domain/Registry/Dictionary/ToolTypeDictionary.php
+++ b/src/Domain/Registry/Dictionary/ToolTypeDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/TreatmentAuthorDictionary.php b/src/Domain/Registry/Dictionary/TreatmentAuthorDictionary.php
index 6ba9764bc5667f1fc3d91920ce1144c71d44fe04..b89c2891cb31b19316feb055bb758feb4086e253 100644
--- a/src/Domain/Registry/Dictionary/TreatmentAuthorDictionary.php
+++ b/src/Domain/Registry/Dictionary/TreatmentAuthorDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/TreatmentAvisAipdDictionary.php b/src/Domain/Registry/Dictionary/TreatmentAvisAipdDictionary.php
index ba0d3409b5fae414c2260a91baf4b1b2ddfab008..bd568e36c9f3d5f943acb594d334689fe0c13a26 100644
--- a/src/Domain/Registry/Dictionary/TreatmentAvisAipdDictionary.php
+++ b/src/Domain/Registry/Dictionary/TreatmentAvisAipdDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/TreatmentCollectingMethodDictionary.php b/src/Domain/Registry/Dictionary/TreatmentCollectingMethodDictionary.php
index b1fd7c6a84016082d7d00cbd68fea3c8daa8eb76..64d370b26516b07af6504f336c595a4ccbe02b78 100644
--- a/src/Domain/Registry/Dictionary/TreatmentCollectingMethodDictionary.php
+++ b/src/Domain/Registry/Dictionary/TreatmentCollectingMethodDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/TreatmentLegalBasisDictionary.php b/src/Domain/Registry/Dictionary/TreatmentLegalBasisDictionary.php
index 71a19ae1e304dd6ec93d676a053d6804ca1daa61..1842c8e75ff3e07ab9f495aa336dc455e06a87f9 100644
--- a/src/Domain/Registry/Dictionary/TreatmentLegalBasisDictionary.php
+++ b/src/Domain/Registry/Dictionary/TreatmentLegalBasisDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php b/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php
index 43d240b3e36567e1fe2f04e7e2be08a81a83a98c..ea848c575de49819e584c6173c505f7d372edd06 100644
--- a/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php
+++ b/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/TreatmentUltimateFateDictionary.php b/src/Domain/Registry/Dictionary/TreatmentUltimateFateDictionary.php
index 29d186934639a0c2ea6afb44b48e22b817e63e68..8239ae6b5db9b6d3a69f3db8abd6f5d1aee8da7b 100644
--- a/src/Domain/Registry/Dictionary/TreatmentUltimateFateDictionary.php
+++ b/src/Domain/Registry/Dictionary/TreatmentUltimateFateDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationCauseDictionary.php b/src/Domain/Registry/Dictionary/ViolationCauseDictionary.php
index 42ef3216fc42631cf795c1bafcdb2ad7832eba65..dd95118d2cfa3cdb43a5450c95729a472690e2f1 100644
--- a/src/Domain/Registry/Dictionary/ViolationCauseDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationCauseDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationCommunicationDictionary.php b/src/Domain/Registry/Dictionary/ViolationCommunicationDictionary.php
index c760f91f4cc766696f8b4cfb6a725e9f5942e261..62a0a96623177c89ad5cc140a2f925f0068468f6 100644
--- a/src/Domain/Registry/Dictionary/ViolationCommunicationDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationCommunicationDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationConcernedDataDictionary.php b/src/Domain/Registry/Dictionary/ViolationConcernedDataDictionary.php
index 598af617157fe2e0cf5eda389c1e85ec1c581d78..52df1d5ac02f437915270c997d0988e71040a0a4 100644
--- a/src/Domain/Registry/Dictionary/ViolationConcernedDataDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationConcernedDataDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionary.php b/src/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionary.php
index 4193da7b2c4d10627f5fc97e5e2187bfbcc4af3f..56f867da9c45c605db58e3480a45310681f317dc 100644
--- a/src/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationGravityDictionary.php b/src/Domain/Registry/Dictionary/ViolationGravityDictionary.php
index b49c73b7b785e1d9c3ed573ad6e361ecc094e147..c5e236ea0987234b5de70d7207c6c71a4fb805ad 100644
--- a/src/Domain/Registry/Dictionary/ViolationGravityDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationGravityDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationImpactDictionary.php b/src/Domain/Registry/Dictionary/ViolationImpactDictionary.php
index c57d322d0aacc3e9bb02abbf1438ecc3ceaf45a4..33d1261b19de0001b939e14a47ffa58882840c96 100644
--- a/src/Domain/Registry/Dictionary/ViolationImpactDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationImpactDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationNatureDictionary.php b/src/Domain/Registry/Dictionary/ViolationNatureDictionary.php
index c4b039c583297d42e850a11a7c5d5c261dfc13f5..a1da343d61e84b1705282343c0fa588835621b0e 100644
--- a/src/Domain/Registry/Dictionary/ViolationNatureDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationNatureDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationNotificationDictionary.php b/src/Domain/Registry/Dictionary/ViolationNotificationDictionary.php
index 78020d818d609ad490de6db47909176990f374ce..4c10df4821cb7d270dc3a8b5cb7591b8222519b3 100644
--- a/src/Domain/Registry/Dictionary/ViolationNotificationDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationNotificationDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationNotificationListDictionary.php b/src/Domain/Registry/Dictionary/ViolationNotificationListDictionary.php
index 1860a57cb79b969a483b7526dffa22afb2c9fd07..9822df431268d4c257e88ead50e4f1c1b7cf4105 100644
--- a/src/Domain/Registry/Dictionary/ViolationNotificationListDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationNotificationListDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Dictionary/ViolationOriginDictionary.php b/src/Domain/Registry/Dictionary/ViolationOriginDictionary.php
index 44a00404b450228978c0bb3d75c5640ea519c798..3fdce49db8da906604a446bb7d11f51c547453a5 100644
--- a/src/Domain/Registry/Dictionary/ViolationOriginDictionary.php
+++ b/src/Domain/Registry/Dictionary/ViolationOriginDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementType.php b/src/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementType.php
index b494601bca78ca36d08f4015f85fe1b9e88781a7..0574a20962ebacd7f802d2996869d2560e206375 100644
--- a/src/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementType.php
+++ b/src/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/ConformiteTraitement/ReponseType.php b/src/Domain/Registry/Form/Type/ConformiteTraitement/ReponseType.php
index 7323831fc8f166d96c1242751cb58ee27606c04e..26932e35d999a9908844a1b779825221f7d6a792 100644
--- a/src/Domain/Registry/Form/Type/ConformiteTraitement/ReponseType.php
+++ b/src/Domain/Registry/Form/Type/ConformiteTraitement/ReponseType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/ContractorType.php b/src/Domain/Registry/Form/Type/ContractorType.php
index 3dd71cc780a6b21940e7ee4947c25f700444af20..eda5d1d0e496da2ee3ec16e29a0e2678db40f34a 100644
--- a/src/Domain/Registry/Form/Type/ContractorType.php
+++ b/src/Domain/Registry/Form/Type/ContractorType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/Embeddable/AddressType.php b/src/Domain/Registry/Form/Type/Embeddable/AddressType.php
index ea00bc9a08584e1e11f27322bf98d37c6cae9ae7..55124943a741e253c8102dd43310482ebc60907c 100644
--- a/src/Domain/Registry/Form/Type/Embeddable/AddressType.php
+++ b/src/Domain/Registry/Form/Type/Embeddable/AddressType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaType.php b/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaType.php
index 26ad7713cd931da17edc67bc93a508cbb3adeb29..f0d1a58093be9989a5f30bd4d1f91b5365769511 100644
--- a/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaType.php
+++ b/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceType.php b/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceType.php
index 3958e965b5b3d761c588ef9293b4c6d90f3d48fb..e6fc3d16f2bc3ac982903020dc72b5a7da905d27 100644
--- a/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceType.php
+++ b/src/Domain/Registry/Form/Type/Embeddable/ComplexChoiceType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/Embeddable/DelayType.php b/src/Domain/Registry/Form/Type/Embeddable/DelayType.php
index 28fddd0261d6bcfd45c7d7ba631d4cf495baf08c..0f9562f2ed85c11e00c6bcc453e11cba3c44ceb1 100644
--- a/src/Domain/Registry/Form/Type/Embeddable/DelayType.php
+++ b/src/Domain/Registry/Form/Type/Embeddable/DelayType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/Embeddable/RequestAnswerType.php b/src/Domain/Registry/Form/Type/Embeddable/RequestAnswerType.php
index 1a39a8e4b64758207d729d1611cfb0131e43d914..5d8437daac06a163d02dbde1515a874767c4752f 100644
--- a/src/Domain/Registry/Form/Type/Embeddable/RequestAnswerType.php
+++ b/src/Domain/Registry/Form/Type/Embeddable/RequestAnswerType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/Embeddable/RequestApplicantType.php b/src/Domain/Registry/Form/Type/Embeddable/RequestApplicantType.php
index 6c5fbaecdfb955092d93f840342230275f90693e..93c73dd8777c55b387d63c2ef8c33d175506fa4f 100644
--- a/src/Domain/Registry/Form/Type/Embeddable/RequestApplicantType.php
+++ b/src/Domain/Registry/Form/Type/Embeddable/RequestApplicantType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleType.php b/src/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleType.php
index 4eac363cbf9edfe1228cb48d720cfc9028932e62..d206877916393895cbfb13afc8a0b2da52ea2a0f 100644
--- a/src/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleType.php
+++ b/src/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/MesurementType.php b/src/Domain/Registry/Form/Type/MesurementType.php
index 2260f1743dc4067b1fdf6f19e33cb4d59e0b717d..2ab2d55649a781f8d774389d0d203a1c6606d31c 100644
--- a/src/Domain/Registry/Form/Type/MesurementType.php
+++ b/src/Domain/Registry/Form/Type/MesurementType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -134,11 +133,11 @@ class MesurementType extends LinkableType
                     'class' => 'datepicker',
                 ],
             ])
-            ->add('comment', TextType::class, [
+            ->add('comment', TextareaType::class, [
                 'label'    => 'registry.mesurement.label.comment',
                 'required' => false,
                 'attr'     => [
-                    'maxlength' => 255,
+                    'rows' => 3,
                 ],
                 'purify_html' => true,
             ])
diff --git a/src/Domain/Registry/Form/Type/ProofType.php b/src/Domain/Registry/Form/Type/ProofType.php
index 9b64e24dfab114147babfac07df8cb3eb6b4d7c6..9ca1d54d8dbc9e2d096fee09d0f22e92448cf828 100644
--- a/src/Domain/Registry/Form/Type/ProofType.php
+++ b/src/Domain/Registry/Form/Type/ProofType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -122,6 +121,8 @@ class ProofType extends LinkableType
                             // PPT / PPTX
                             'application/vnd.ms-powerpoint',
                             'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+                            // TXT / LOG / CSV / MD
+                            'text/plain',
                         ],
                         'groups' => ['default'],
                     ]),
diff --git a/src/Domain/Registry/Form/Type/RequestType.php b/src/Domain/Registry/Form/Type/RequestType.php
index 11cd26eaf4aa86b9e293ccae231d9958ae84f4f2..91a701082d24d0a852cab7cd4dfd9357fe43c091 100644
--- a/src/Domain/Registry/Form/Type/RequestType.php
+++ b/src/Domain/Registry/Form/Type/RequestType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/ToolType.php b/src/Domain/Registry/Form/Type/ToolType.php
index 85475cbf351f528175bea07d5ba1f8e3b24dca38..5a663e0140d84ad8f674cf232edc43a8a8efeacb 100644
--- a/src/Domain/Registry/Form/Type/ToolType.php
+++ b/src/Domain/Registry/Form/Type/ToolType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php b/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php
index edc7558995817ccc9af73328dfe2a1d2658f0f7d..aeb5a9ffd9ad71cb0ae4fe4618872f5a70819792 100644
--- a/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php
+++ b/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Form/Type/TreatmentType.php b/src/Domain/Registry/Form/Type/TreatmentType.php
index aeb12b1bf3bb4c94d25a39b17dfc6ec36af7ddaa..833a6a9969996ee2d1704f02b7c55f556533bf73 100644
--- a/src/Domain/Registry/Form/Type/TreatmentType.php
+++ b/src/Domain/Registry/Form/Type/TreatmentType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -199,7 +198,7 @@ class TreatmentType extends LinkableType
                     'class'            => 'selectpicker',
                     'data-live-search' => 'true',
                     'title'            => 'global.placeholder.multiple_select',
-                    'aria-label'       => 'Catégorie des données',
+                    'aria-label'       => 'Catégorie de données',
                 ],
             ])
             ->add('dataCategoryOther', TextareaType::class, [
@@ -230,16 +229,16 @@ class TreatmentType extends LinkableType
                 'label'    => 'registry.treatment.label.security_access_control',
                 'required' => false,
             ])
-            ->add('securityTracability', ComplexChoiceAreaType::class, [
-                'label'    => 'registry.treatment.label.security_tracability',
+            ->add('securityUpdate', ComplexChoiceAreaType::class, [
+                'label'    => 'registry.treatment.label.security_update',
                 'required' => false,
             ])
             ->add('securitySaving', ComplexChoiceAreaType::class, [
                 'label'    => 'registry.treatment.label.security_saving',
                 'required' => false,
             ])
-            ->add('securityUpdate', ComplexChoiceAreaType::class, [
-                'label'    => 'registry.treatment.label.security_update',
+            ->add('securityTracability', ComplexChoiceAreaType::class, [
+                'label'    => 'registry.treatment.label.security_tracability',
                 'required' => false,
             ])
             ->add('securityOther', ComplexChoiceAreaType::class, [
diff --git a/src/Domain/Registry/Form/Type/ViolationType.php b/src/Domain/Registry/Form/Type/ViolationType.php
index 184d35d4d872748a1b46d7308010894b5fd66383..50ab6d0578b15e473de98b958c6d6696e87b5552 100644
--- a/src/Domain/Registry/Form/Type/ViolationType.php
+++ b/src/Domain/Registry/Form/Type/ViolationType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php b/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php
index a2916aba7d853d61024f7bf7988e3133b3f993fe..ed779966ed83afc2039e36e18d4b2a484547e428 100644
--- a/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php
+++ b/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/ConformiteTraitement/Question.php b/src/Domain/Registry/Model/ConformiteTraitement/Question.php
index cea129fb496b243cf5dc2fbf141e6d639fdbc215..9278ccd799327d933024435d04501c0d4aafea51 100644
--- a/src/Domain/Registry/Model/ConformiteTraitement/Question.php
+++ b/src/Domain/Registry/Model/ConformiteTraitement/Question.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/ConformiteTraitement/Reponse.php b/src/Domain/Registry/Model/ConformiteTraitement/Reponse.php
index b5db5a0d9bf6973817d4785b1e75eb80c1e030bb..d40ea8a5b8e26873f0be3ebed03745316a55c106 100644
--- a/src/Domain/Registry/Model/ConformiteTraitement/Reponse.php
+++ b/src/Domain/Registry/Model/ConformiteTraitement/Reponse.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Contractor.php b/src/Domain/Registry/Model/Contractor.php
index 391001741733187f159cca3f1b0d712e89d5f4b9..c6d4603aadc6f32d17a055b11ab7ce75643ee6c9 100644
--- a/src/Domain/Registry/Model/Contractor.php
+++ b/src/Domain/Registry/Model/Contractor.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Embeddable/Address.php b/src/Domain/Registry/Model/Embeddable/Address.php
index b2ab70383ac0d109b57b8993f2e0318b31253995..ac9a3d6c315ec297511cd3431b21f34c0815982d 100644
--- a/src/Domain/Registry/Model/Embeddable/Address.php
+++ b/src/Domain/Registry/Model/Embeddable/Address.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Embeddable/ComplexChoice.php b/src/Domain/Registry/Model/Embeddable/ComplexChoice.php
index 5d6ddee5112cf74df7abf23d9f6d2894ba06d022..52a09b15976fde376d06e306b2564f85de428f19 100644
--- a/src/Domain/Registry/Model/Embeddable/ComplexChoice.php
+++ b/src/Domain/Registry/Model/Embeddable/ComplexChoice.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Embeddable/Delay.php b/src/Domain/Registry/Model/Embeddable/Delay.php
index 7dd6499576670c254734eb6b73f46aa2a775562b..c9121b2166a633209c6a04315501247c4ce5af77 100644
--- a/src/Domain/Registry/Model/Embeddable/Delay.php
+++ b/src/Domain/Registry/Model/Embeddable/Delay.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Embeddable/RequestAnswer.php b/src/Domain/Registry/Model/Embeddable/RequestAnswer.php
index eeed1dd77af8e05742aac78f5cf94cc9139eb54e..8f9c5ad0f421e190e0f26cea883111782770e2a3 100644
--- a/src/Domain/Registry/Model/Embeddable/RequestAnswer.php
+++ b/src/Domain/Registry/Model/Embeddable/RequestAnswer.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Embeddable/RequestApplicant.php b/src/Domain/Registry/Model/Embeddable/RequestApplicant.php
index 4169f35ac42c33ecedc2061d99b583a30eab04e1..3b96a1598ca3cfab93aa118f9a96f9fb95d44073 100644
--- a/src/Domain/Registry/Model/Embeddable/RequestApplicant.php
+++ b/src/Domain/Registry/Model/Embeddable/RequestApplicant.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Embeddable/RequestConcernedPeople.php b/src/Domain/Registry/Model/Embeddable/RequestConcernedPeople.php
index 5a768d332ad8845580dbc089b87255428f085368..a38561e3e18ba5a88d00415d8bb113c5e1fed061 100644
--- a/src/Domain/Registry/Model/Embeddable/RequestConcernedPeople.php
+++ b/src/Domain/Registry/Model/Embeddable/RequestConcernedPeople.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Mesurement.php b/src/Domain/Registry/Model/Mesurement.php
index 07fc5f58c77635b688db63c70e0e60a36d4dd366..cabadb41563e7bc923331823cb9a0b6bb3c64be1 100644
--- a/src/Domain/Registry/Model/Mesurement.php
+++ b/src/Domain/Registry/Model/Mesurement.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Proof.php b/src/Domain/Registry/Model/Proof.php
index fb19b7010ff9a3633d0a8c3dd546374464ee4dc1..7a91c15874585ec23e87127df8a525bd678da289 100644
--- a/src/Domain/Registry/Model/Proof.php
+++ b/src/Domain/Registry/Model/Proof.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/PublicConfiguration.php b/src/Domain/Registry/Model/PublicConfiguration.php
index 9fa282035d06da9d8ca1b891517ebe9efbbe5265..db6f13e8f8f45b5e4e0f7fd91328365cd2ef5f0d 100644
--- a/src/Domain/Registry/Model/PublicConfiguration.php
+++ b/src/Domain/Registry/Model/PublicConfiguration.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Request.php b/src/Domain/Registry/Model/Request.php
index 8c63bcf74292f8d1c1468d288385d315c931967b..e999a732904978e457078d697cee29f0c1b35fcc 100644
--- a/src/Domain/Registry/Model/Request.php
+++ b/src/Domain/Registry/Model/Request.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Tool.php b/src/Domain/Registry/Model/Tool.php
index 39a2005feca302e97259f9f3b5e63c9526e6cb93..1e565f79ad7be39a47e21b3b2f850e4e6f429d61 100644
--- a/src/Domain/Registry/Model/Tool.php
+++ b/src/Domain/Registry/Model/Tool.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Treatment.php b/src/Domain/Registry/Model/Treatment.php
index a0900c9ad6e9720dabbfabc3c4f0b79df88902b0..3c575702171e463b5e731dd710fd9fb468505758 100644
--- a/src/Domain/Registry/Model/Treatment.php
+++ b/src/Domain/Registry/Model/Treatment.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -150,11 +149,11 @@ class Treatment implements LoggableSubject, CollectivityRelated
     private $securityAccessControl;
 
     /**
-     * FR: Tracabilité (mesure de sécurité).
+     * FR: Mises à jour (mesure de sécurité).
      *
      * @var ComplexChoice
      */
-    private $securityTracability;
+    private $securityUpdate;
 
     /**
      * FR: Sauvegarde (mesure de sécurité).
@@ -164,11 +163,11 @@ class Treatment implements LoggableSubject, CollectivityRelated
     private $securitySaving;
 
     /**
-     * FR: Mises à jour (mesure de sécurité).
+     * FR: Tracabilité (mesure de sécurité).
      *
      * @var ComplexChoice
      */
-    private $securityUpdate;
+    private $securityTracability;
 
     /**
      * FR: Autres (mesure de sécurité).
@@ -433,9 +432,9 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->dataCategories  = [];
 
         $this->securityAccessControl             = new ComplexChoice();
-        $this->securityTracability               = new ComplexChoice();
-        $this->securitySaving                    = new ComplexChoice();
         $this->securityUpdate                    = new ComplexChoice();
+        $this->securitySaving                    = new ComplexChoice();
+        $this->securityTracability               = new ComplexChoice();
         $this->securityOther                     = new ComplexChoice();
         $this->securityEntitledPersons           = false;
         $this->securityOpenAccounts              = false;
@@ -698,14 +697,14 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->securityAccessControl = $securityAccessControl;
     }
 
-    public function getSecurityTracability(): ComplexChoice
+    public function getSecurityUpdate(): ComplexChoice
     {
-        return $this->securityTracability;
+        return $this->securityUpdate;
     }
 
-    public function setSecurityTracability(ComplexChoice $securityTracability): void
+    public function setSecurityUpdate(ComplexChoice $securityUpdate): void
     {
-        $this->securityTracability = $securityTracability;
+        $this->securityUpdate = $securityUpdate;
     }
 
     public function getSecuritySaving(): ComplexChoice
@@ -718,14 +717,14 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->securitySaving = $securitySaving;
     }
 
-    public function getSecurityUpdate(): ComplexChoice
+    public function getSecurityTracability(): ComplexChoice
     {
-        return $this->securityUpdate;
+        return $this->securityTracability;
     }
 
-    public function setSecurityUpdate(ComplexChoice $securityUpdate): void
+    public function setSecurityTracability(ComplexChoice $securityTracability): void
     {
-        $this->securityUpdate = $securityUpdate;
+        $this->securityTracability = $securityTracability;
     }
 
     public function getSecurityOther(): ComplexChoice
diff --git a/src/Domain/Registry/Model/TreatmentDataCategory.php b/src/Domain/Registry/Model/TreatmentDataCategory.php
index 48da214a98025b92ce41239c2bde949a93413783..ebcb0682ebe698e768e7d5e258e521f6be95add9 100644
--- a/src/Domain/Registry/Model/TreatmentDataCategory.php
+++ b/src/Domain/Registry/Model/TreatmentDataCategory.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Model/Violation.php b/src/Domain/Registry/Model/Violation.php
index 6764dfa372bb41b37f2ff5f8445e69f0eab545d6..f2835f6e3eb612ced1c21a6d35afc1553ead327e 100644
--- a/src/Domain/Registry/Model/Violation.php
+++ b/src/Domain/Registry/Model/Violation.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php b/src/Domain/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php
index 5895b86b59bb75b860dfa126525be9390d920af3..ee2fdae594df39996506476e6c1060f1552689c1 100644
--- a/src/Domain/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php
+++ b/src/Domain/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/ConformiteTraitement/Question.php b/src/Domain/Registry/Repository/ConformiteTraitement/Question.php
index 238b5e7c5991c84e2c6d97d996403c020329d8ec..e83c6462e2578a4bf6c3cd8916b888db301c0f47 100644
--- a/src/Domain/Registry/Repository/ConformiteTraitement/Question.php
+++ b/src/Domain/Registry/Repository/ConformiteTraitement/Question.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/Contractor.php b/src/Domain/Registry/Repository/Contractor.php
index 891eea7572116a04a7dc77da4dc5049697608a2b..2a822730e09c376f3034c7342d8ced215919f311 100644
--- a/src/Domain/Registry/Repository/Contractor.php
+++ b/src/Domain/Registry/Repository/Contractor.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/Mesurement.php b/src/Domain/Registry/Repository/Mesurement.php
index 0654e1683571159900fb6a143ef24e055d925932..0e574fe7c7b0f40e06b7f4014976236d5cdfd0a8 100644
--- a/src/Domain/Registry/Repository/Mesurement.php
+++ b/src/Domain/Registry/Repository/Mesurement.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/Proof.php b/src/Domain/Registry/Repository/Proof.php
index f8e6dcc93999804e4d017b3e123ceaf3654ebd73..c48746a238b3ee2ecda1c8d7f249f2f8acc21ed0 100644
--- a/src/Domain/Registry/Repository/Proof.php
+++ b/src/Domain/Registry/Repository/Proof.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/Request.php b/src/Domain/Registry/Repository/Request.php
index 14ed673ffafb29b23c38143ae3b038d9da5f9510..c4702e895819c59f665eb8601f78cd45be4d299d 100644
--- a/src/Domain/Registry/Repository/Request.php
+++ b/src/Domain/Registry/Repository/Request.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/Tool.php b/src/Domain/Registry/Repository/Tool.php
index 53fecdc2bbdb386fd3e1cd0a8b782564b296a3c4..6ceb70f390b4801b1849dd6e84d2c5a8040799aa 100644
--- a/src/Domain/Registry/Repository/Tool.php
+++ b/src/Domain/Registry/Repository/Tool.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/Treatment.php b/src/Domain/Registry/Repository/Treatment.php
index ccb20c5269e84bfb57f0d9af7894545db3356092..fcb7ae5238d45117285b19d5baea540600cafc23 100644
--- a/src/Domain/Registry/Repository/Treatment.php
+++ b/src/Domain/Registry/Repository/Treatment.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Repository/Violation.php b/src/Domain/Registry/Repository/Violation.php
index ad1b024fbfce7f829c586f70e00acf6c9af4bd68..c166c97b47830821325d9e440e33d94d27b77633 100644
--- a/src/Domain/Registry/Repository/Violation.php
+++ b/src/Domain/Registry/Repository/Violation.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriber.php b/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriber.php
index 18c8cf1453f7acae3254c27ae3f3988480d07e73..513cd1d1b537c30fd05e13ddceb59167cdd8bdb9 100644
--- a/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriber.php
+++ b/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriber.php b/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriber.php
index 40bd539b9d5ff2140d567cb5de3bb705b17e8b4a..4b11e68ec1f174878465402e23dfe9b7c9479c6d 100644
--- a/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriber.php
+++ b/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/TreatmentCompletionSubscriber.php b/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/TreatmentCompletionSubscriber.php
index 9eb3cc9ffcbcdc9d5713b13075ef1aaaaee1d4ec..51627cf6f1cdbfaafb453aba8d9730b85f76b151 100644
--- a/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/TreatmentCompletionSubscriber.php
+++ b/src/Domain/Registry/Symfony/EventSubscriber/Doctrine/TreatmentCompletionSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/EventSubscriber/Event/ConformiteTraitementEvent.php b/src/Domain/Registry/Symfony/EventSubscriber/Event/ConformiteTraitementEvent.php
index 3127da4aa40b3c4aac16fb8207300afabee04845..0bdb738b2fcb8d1159e8e89e1050f6662df636ad 100644
--- a/src/Domain/Registry/Symfony/EventSubscriber/Event/ConformiteTraitementEvent.php
+++ b/src/Domain/Registry/Symfony/EventSubscriber/Event/ConformiteTraitementEvent.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriber.php b/src/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriber.php
index 0e65226f58ee7d29d409b5b230b331e567aa0012..45b4214704480a20fe2c23f70e0fcfe1264849db 100644
--- a/src/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriber.php
+++ b/src/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaison.php b/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaison.php
index 31d53236bbd469d3fd1ad56b52258426cd2cdf6c..1f83f6b8340f876934f1806a9f42a7be49defe5d 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaison.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaison.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidator.php b/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidator.php
index 5b56b5d55101122b29b2905e872ff1beb5b819fb..7352236fd00f57869db606d8e9478b1273fa9ed0 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidator.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeople.php b/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeople.php
index 93a3240732ec832bf2bc1c5590c56269b86dc9df..cc8b7d955364cefdc3ab5127c796b0a1d252a535 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeople.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeople.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidator.php b/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidator.php
index f7d8457fa3c520c0a69137d9f24259c57e8feffc..f416275e0e61f04b68fb683e3c4f9658920a1c72 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidator.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReason.php b/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReason.php
index e41ed88fd3efe530013ab8e762c0691dc563c99e..e5d90761b14435d965c12b7973e90365efade055 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReason.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReason.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidator.php b/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidator.php
index 1720c938f0ff7269e0d8d5e69c9c2245b771a938..d0f81e59cf077d6cfbf1c12de1cd3d7b1303996a 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidator.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeople.php b/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeople.php
index 12c3f74bb7f29ca64ae93258a4c381904478cab6..b8d0bce110c45726aa8e9c7b32b0ff1f673e41ba 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeople.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeople.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidator.php b/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidator.php
index 73345c042e7f30f71300ba73df32e38f4fc05708..03ea62660e7318c6a51e81ab2ac6c2127d3abc1f 100644
--- a/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidator.php
+++ b/src/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Registry/Twig/Extension/ConformiteTraitementExtension.php b/src/Domain/Registry/Twig/Extension/ConformiteTraitementExtension.php
index 737c65692a4e6d08996eb3c00de3872f38b07fb1..ee2c96f3bd326c844fcd3c7a68b7c558dcfb0ab0 100644
--- a/src/Domain/Registry/Twig/Extension/ConformiteTraitementExtension.php
+++ b/src/Domain/Registry/Twig/Extension/ConformiteTraitementExtension.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Controller/DashboardController.php b/src/Domain/Reporting/Controller/DashboardController.php
index 0030b1d3d5db76de91900874dc814878c9f166d7..e13204a1096f42c048b721b0ed2ca8b141c4847a 100644
--- a/src/Domain/Reporting/Controller/DashboardController.php
+++ b/src/Domain/Reporting/Controller/DashboardController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Controller/ReviewController.php b/src/Domain/Reporting/Controller/ReviewController.php
index 1022f446bfec0bcc7a30b5060648e003ce031e85..6a189643dff0e4c01ddd6cbac439d69a710957cb 100644
--- a/src/Domain/Reporting/Controller/ReviewController.php
+++ b/src/Domain/Reporting/Controller/ReviewController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Dictionary/LogJournalActionDictionary.php b/src/Domain/Reporting/Dictionary/LogJournalActionDictionary.php
index 97047190d233defbe64ec26cee19317b449833ae..d43291fc50056a61aec2b6e7afeda5783fe9b097 100644
--- a/src/Domain/Reporting/Dictionary/LogJournalActionDictionary.php
+++ b/src/Domain/Reporting/Dictionary/LogJournalActionDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Dictionary/LogJournalSubjectDictionary.php b/src/Domain/Reporting/Dictionary/LogJournalSubjectDictionary.php
index 5838893b76594fc8a7beae3efe4dd483e18dfd7e..d8b452d7daf2423c33e851a833aadeeff9d26de8 100644
--- a/src/Domain/Reporting/Dictionary/LogJournalSubjectDictionary.php
+++ b/src/Domain/Reporting/Dictionary/LogJournalSubjectDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php b/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php
index 79820d965eb34fa1355653584cd495e312a8f428..a293f56acfdbae2d91edea66b16ff299167f47c1 100644
--- a/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Csv/CollectivityGenerator.php b/src/Domain/Reporting/Generator/Csv/CollectivityGenerator.php
index 1b75a5f85bed68ef0cc0d9d161f9cd159e1e3890..f930520fd04581035bf850c3b086c8dd72dc64e9 100644
--- a/src/Domain/Reporting/Generator/Csv/CollectivityGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/CollectivityGenerator.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -340,7 +340,7 @@ class CollectivityGenerator extends AbstractGenerator
             'Actions de protection planifiées',
             'Nombre de preuves déposées',
             'Nombre de traitements',
-            'Nombre de sous traitants',
+            'Nombre de sous-traitants',
             'Nombre de violation de données',
             'Nombre de demandes de personnes concernées',
             'Date du dernier traitement modifié',
diff --git a/src/Domain/Reporting/Generator/Csv/ContractorGenerator.php b/src/Domain/Reporting/Generator/Csv/ContractorGenerator.php
index 5ffdb24e36d980cdbb829c9b9f649ab47a88fb9f..33123dacb3f7a28673886eccd287890bb1ad5dae 100644
--- a/src/Domain/Reporting/Generator/Csv/ContractorGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/ContractorGenerator.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Csv/GeneratorInterface.php b/src/Domain/Reporting/Generator/Csv/GeneratorInterface.php
index 4a46cad6220deb9129a893e3f8031bf2590f9018..2b69c9df022d2ab084f8e985778ed842f3418e66 100644
--- a/src/Domain/Reporting/Generator/Csv/GeneratorInterface.php
+++ b/src/Domain/Reporting/Generator/Csv/GeneratorInterface.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Csv/MesurementGenerator.php b/src/Domain/Reporting/Generator/Csv/MesurementGenerator.php
index cbd374ad55808cbd2882a4578405775654f030cf..4ee88718f25fbcb61b545f2f6ded66cdfb816021 100644
--- a/src/Domain/Reporting/Generator/Csv/MesurementGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/MesurementGenerator.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
index 9c63ef02bba5da94565e08657275dcc72f00b2c5..75169e99bfae794deefa84260f699d85ab5eb535 100644
--- a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -337,12 +337,12 @@ class TreatmentGenerator extends AbstractGenerator
         return [
             $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_access_control'),
             $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_access_control') . ' - Commentaire',
-            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability'),
-            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability') . ' - Commentaire',
-            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving'),
-            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving') . ' - Commentaire',
             $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_update'),
             $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_update') . ' - Commentaire',
+            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving'),
+            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving') . ' - Commentaire',
+            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability'),
+            $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability') . ' - Commentaire',
             $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_other'),
             $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_other') . ' - Commentaire',
             $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_entitled_persons'),
@@ -359,12 +359,12 @@ class TreatmentGenerator extends AbstractGenerator
         return [
             $treatment->getSecurityAccessControl()->isCheck() ? $yes : $no,
             $treatment->getSecurityAccessControl()->getComment(),
-            $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
-            $treatment->getSecurityTracability()->getComment(),
-            $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
-            $treatment->getSecuritySaving()->getComment(),
             $treatment->getSecurityUpdate()->isCheck() ? $yes : $no,
             $treatment->getSecurityUpdate()->getComment(),
+            $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
+            $treatment->getSecuritySaving()->getComment(),
+            $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
+            $treatment->getSecurityTracability()->getComment(),
             $treatment->getSecurityOther()->isCheck() ? $yes : $no,
             $treatment->getSecurityOther()->getComment(),
             $treatment->isSecurityEntitledPersons() ? $yes : $no,
diff --git a/src/Domain/Reporting/Generator/LogJournalLinkGenerator.php b/src/Domain/Reporting/Generator/LogJournalLinkGenerator.php
index 55d173c325338c14768146ebc28e8997626e4f81..a72f33ae83b397d5011225509caa40a5fe0ab692 100644
--- a/src/Domain/Reporting/Generator/LogJournalLinkGenerator.php
+++ b/src/Domain/Reporting/Generator/LogJournalLinkGenerator.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Word/AbstractGenerator.php b/src/Domain/Reporting/Generator/Word/AbstractGenerator.php
index 64ea45af3596c97e57c26691a7caa0edfc1f0cba..08317f14513fdf86dea4da935b871d28c710a725 100644
--- a/src/Domain/Reporting/Generator/Word/AbstractGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/AbstractGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php b/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php
index 186e8ef134b40a8cc53619af97b114bf962fc2a5..1a375e8e779b5f2a5090bd62b7b73313779565b4 100644
--- a/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -412,7 +411,7 @@ class ConformiteTraitementGenerator extends AbstractGenerator implements Impress
             ];
 
             $section->addTitle('Historique', 3);
-            $this->addTable($section, $historyData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $historyData, false, self::TABLE_ORIENTATION_VERTICAL);
         }
     }
 
diff --git a/src/Domain/Reporting/Generator/Word/ContractorGenerator.php b/src/Domain/Reporting/Generator/Word/ContractorGenerator.php
index 6a67ac3a33a3f987754bdf0c28df7a1520ee7b5f..548c8d69cee765d92a3b20309f6d978130cd288a 100644
--- a/src/Domain/Reporting/Generator/Word/ContractorGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/ContractorGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -121,7 +120,7 @@ class ContractorGenerator extends AbstractGenerator implements ImpressionGenerat
                 'Nom',
                 'Référent',
                 'Clauses contractuelles vérifiées',
-                'A adopté les éléments de sécurité nécessaires',
+                'Adopte les éléments de sécurité nécessaires',
                 'Tient à jour un registre des traitements',
                 'Envoi des données hors UE',
             ],
@@ -154,6 +153,21 @@ class ContractorGenerator extends AbstractGenerator implements ImpressionGenerat
             $section->addTitle($contractor->getName(), 2);
 
             $generalInformationsData = [
+                [
+                    'Nom',
+                    $contractor->getName(),
+                ],
+            ];
+
+            // Ajouter les services si le module est actif
+            if ($contractor->getCollectivity()->getIsServicesEnabled()) {
+                $generalInformationsData[] = [
+                    'Service',
+                    $contractor->getService(),
+                ];
+            }
+
+            $generalInformationsData = array_merge($generalInformationsData, [
                 [
                     'Agent référent',
                     $contractor->getReferent() ?? $this->parameterBag->get('APP_DEFAULT_REFERENT'),
@@ -163,7 +177,7 @@ class ContractorGenerator extends AbstractGenerator implements ImpressionGenerat
                     $contractor->isContractualClausesVerified() ? 'Oui' : 'Non',
                 ],
                 [
-                    'A adopté les éléments de sécurité nécessaires',
+                    'Adopte les éléments de sécurité nécessaires',
                     $contractor->isAdoptedSecurityFeatures() ? 'Oui' : 'Non',
                 ],
                 [
@@ -178,25 +192,32 @@ class ContractorGenerator extends AbstractGenerator implements ImpressionGenerat
                     'Autres informations',
                     $contractor->getOtherInformations(),
                 ],
-            ];
+            ]);
 
             $addressData = [
                 [
-                    'Responsable de traitement - Prénom',
+                    'Prénom',
                     $contractor->getLegalManager()->getFirstName(),
                 ],
                 [
-                    'Responsable de traitement - Nom',
+                    'Nom',
                     $contractor->getLegalManager()->getLastName(),
                 ],
                 [
                     'Adresse',
-                    [
-                        $contractor->getAddress()->getLineOne(),
-                        $contractor->getAddress()->getLineTwo(),
-                        $contractor->getAddress()->getZipCode(),
-                        $contractor->getAddress()->getCity(),
-                    ],
+                    $contractor->getAddress()->getLineOne(),
+                ],
+                [
+                    'Complément d\'adresse',
+                    $contractor->getAddress()->getLineTwo(),
+                ],
+                [
+                    'Code postal',
+                    $contractor->getAddress()->getZipCode(),
+                ],
+                [
+                    'Ville',
+                    $contractor->getAddress()->getCity(),
                 ],
                 [
                     'Pays',
@@ -214,31 +235,40 @@ class ContractorGenerator extends AbstractGenerator implements ImpressionGenerat
 
             $dpoData = [
                 [
-                    'Civilité',
-                    !\is_null($contractor->getDpo()->getCivility()) ? ContactCivilityDictionary::getCivilities()[$contractor->getDpo()->getCivility()] : '',
-                ],
-                [
-                    'Prénom',
-                    $contractor->getDpo()->getFirstName(),
-                ],
-                [
-                    'Nom',
-                    $contractor->getDpo()->getLastName(),
-                ],
-                [
-                    'Fonction',
-                    $contractor->getDpo()->getJob(),
-                ],
-                [
-                    'Email',
-                    $contractor->getDpo()->getMail(),
-                ],
-                [
-                    'Téléphone',
-                    $contractor->getDpo()->getPhoneNumber(),
+                    'Le sous-traitant a désigné un DPD',
+                    $contractor->isHasDpo() ? 'Oui' : 'Non',
                 ],
             ];
 
+            if ($contractor->isHasDpo()) {
+                $dpoData = array_merge($dpoData, [
+                    [
+                        'Civilité',
+                        !\is_null($contractor->getDpo()->getCivility()) ? ContactCivilityDictionary::getCivilities()[$contractor->getDpo()->getCivility()] : '',
+                    ],
+                    [
+                        'Prénom',
+                        $contractor->getDpo()->getFirstName(),
+                    ],
+                    [
+                        'Nom',
+                        $contractor->getDpo()->getLastName(),
+                    ],
+                    [
+                        'Fonction',
+                        $contractor->getDpo()->getJob(),
+                    ],
+                    [
+                        'Email',
+                        $contractor->getDpo()->getMail(),
+                    ],
+                    [
+                        'Téléphone',
+                        $contractor->getDpo()->getPhoneNumber(),
+                    ],
+                ]);
+            }
+
             $historyData = [
                 [
                     'Date de création',
@@ -255,19 +285,19 @@ class ContractorGenerator extends AbstractGenerator implements ImpressionGenerat
             ];
 
             $section->addTitle('Informations générales', 3);
-            $this->addTable($section, $generalInformationsData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $generalInformationsData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Coordonnées', 3);
-            $this->addTable($section, $addressData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $addressData, false, self::TABLE_ORIENTATION_VERTICAL);
 
-            $section->addTitle('DPD', 3);
-            $this->addTable($section, $dpoData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $section->addTitle('Délégué à la protection des données', 3);
+            $this->addTable($section, $dpoData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Éléments associés', 3);
             $this->addLinkedData($section, $contractor);
 
             $section->addTitle('Historique', 3);
-            $this->addTable($section, $historyData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $historyData, false, self::TABLE_ORIENTATION_VERTICAL);
         }
     }
 }
diff --git a/src/Domain/Reporting/Generator/Word/GeneratorInterface.php b/src/Domain/Reporting/Generator/Word/GeneratorInterface.php
index 8d1cb5b6d6c1458684342206d32407f69883f60d..88634a773f5d26e734c50378b21dba2d1d64224d 100644
--- a/src/Domain/Reporting/Generator/Word/GeneratorInterface.php
+++ b/src/Domain/Reporting/Generator/Word/GeneratorInterface.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Word/ImpressionGeneratorInterface.php b/src/Domain/Reporting/Generator/Word/ImpressionGeneratorInterface.php
index bf06d77d7c5f0cf4542324858581b8cbf51140f5..5f4eabe10c8fc08ca9937e083b839ed995e80764 100644
--- a/src/Domain/Reporting/Generator/Word/ImpressionGeneratorInterface.php
+++ b/src/Domain/Reporting/Generator/Word/ImpressionGeneratorInterface.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Word/MaturityGenerator.php b/src/Domain/Reporting/Generator/Word/MaturityGenerator.php
index 45ff277a24a239882ab5a1c602d17686f3c34b1f..b2d045b4166216d194be839d79a68c499dde4e7d 100644
--- a/src/Domain/Reporting/Generator/Word/MaturityGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/MaturityGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -42,44 +41,69 @@ class MaturityGenerator extends AbstractGenerator implements ImpressionGenerator
 
                 return;
             }
-            $section->addTitle('Contexte', 3);
+
+            $section->addTitle($data['new']->getReferentiel()->getName(), 3);
+
+            if (null !== $data['new']->getReferentiel()->getDescription()) {
+                $section->addText($data['new']->getReferentiel()->getDescription());
+            }
+
+            $section->addText('Score de l\'indice de maturité : ' . round($data['new']->getScore() / 10, 1));
+
+            if (isset($data['old'])) {
+                $section->addText('Score de l\'indice de maturité précédent : ' . round($data['old']->getScore() / 10, 1));
+            }
         } else {
             if (!isset($data['new'])) {
                 $section->addText('Aucun indice de maturité à l\'heure actuelle.');
 
                 return;
             }
+
             $section->addTitle('Contexte', 1);
-        }
 
-        $table = $section->addTable([
-            'borderColor' => '006699',
-            'borderSize'  => 6,
-            'cellMargin'  => 100,
-        ]);
-
-        $cellStyle = ['bgColor' => '3c8dbc'];
-        $textStyle = ['bold' => true, 'color' => 'ffffff'];
-        $table->addRow();
-        $cell = $table->addCell(3000, $cellStyle);
-        $cell->addText('Référentiel', $textStyle);
-        $cell = $table->addCell(7000);
-        $cell->addText($data['new']->getReferentiel()->getName());
-        $table->addRow();
-        $cell = $table->addCell(3000, $cellStyle);
-        $cell->addText('Description', $textStyle);
-        $cell = $table->addCell(7000);
-        $cell->addText($data['new']->getReferentiel()->getDescription());
-        $table->addRow();
-        $cell = $table->addCell(3000, $cellStyle);
-        $cell->addText('Date de l\'indice de maturité', $textStyle);
-        $cell = $table->addCell(7000);
-        $cell->addText($data['new']->getCreatedAt()->format('d/m/Y'));
-        $table->addRow();
-        $cell = $table->addCell(3000, $cellStyle);
-        $cell->addText('Date de l\'indice de maturité précédent', $textStyle);
-        $cell = $table->addCell(7000);
-        $cell->addText(isset($data['old']) ? $data['old']->getCreatedAt()->format('d/m/Y') : 'Aucun');
+            $table = $section->addTable([
+                'borderColor' => '006699',
+                'borderSize'  => 6,
+                'cellMargin'  => 100,
+            ]);
+
+            $cellStyle = ['bgColor' => '3c8dbc'];
+            $textStyle = ['bold' => true, 'color' => 'ffffff'];
+            $table->addRow();
+            $cell = $table->addCell(3000, $cellStyle);
+            $cell->addText('Référentiel', $textStyle);
+            $cell = $table->addCell(7000);
+            $cell->addText($data['new']->getReferentiel()->getName());
+            $table->addRow();
+            $cell = $table->addCell(3000, $cellStyle);
+            $cell->addText('Description', $textStyle);
+            $cell = $table->addCell(7000);
+            $cell->addText($data['new']->getReferentiel()->getDescription());
+            $table->addRow();
+            $cell = $table->addCell(3000, $cellStyle);
+            $cell->addText('Date de l\'indice de maturité', $textStyle);
+            $cell = $table->addCell(7000);
+            $cell->addText($data['new']->getCreatedAt()->format('d/m/Y'));
+            $table->addRow();
+            $cell = $table->addCell(3000, $cellStyle);
+            $cell->addText('Score de l\'indice de maturité', $textStyle);
+            $cell = $table->addCell(7000);
+            $cell->addText(round($data['new']->getScore() / 10, 1));
+
+            if (isset($data['old'])) {
+                $table->addRow();
+                $cell = $table->addCell(3000, $cellStyle);
+                $cell->addText('Date de l\'indice de maturité précédent', $textStyle);
+                $cell = $table->addCell(7000);
+                $cell->addText(isset($data['old']) ? $data['old']->getCreatedAt()->format('d/m/Y') : 'Aucun');
+                $table->addRow();
+                $cell = $table->addCell(3000, $cellStyle);
+                $cell->addText('Score de l\'indice de maturité précédent', $textStyle);
+                $cell = $table->addCell(7000);
+                $cell->addText(round($data['old']->getScore() / 10, 1));
+            }
+        }
     }
 
     public function addSyntheticView(Section $section, array $data): void
@@ -87,9 +111,6 @@ class MaturityGenerator extends AbstractGenerator implements ImpressionGenerator
         if (!isset($data['new'])) {
             return;
         }
-        if (isset($data['bilanReport']) && $data['bilanReport']) {
-            $section->addTitle("Résultat de l'évaluation", 3);
-        }
 
         $maturityList = [];
         $domainsName  = [];
diff --git a/src/Domain/Reporting/Generator/Word/MesurementGenerator.php b/src/Domain/Reporting/Generator/Word/MesurementGenerator.php
index 44c7606d1f12945164ae2da819530e5fbc6a7126..585b55d6490057316d4fdcc4135ecbde2ddfdcbb 100644
--- a/src/Domain/Reporting/Generator/Word/MesurementGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/MesurementGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -71,7 +70,7 @@ class MesurementGenerator extends AbstractGenerator implements ImpressionGenerat
         foreach ($data as $mesurement) {
             if (MesurementStatusDictionary::STATUS_APPLIED === $mesurement->getStatus()) {
                 $appliedMesurement[] = [
-                    $mesurement->getCreatedAt()->format('d/m/Y'),
+                    $mesurement->getPlanificationDate() ? $mesurement->getPlanificationDate()->format('d/m/Y') : '',
                     $mesurement->getName(),
                 ];
             } elseif (!\is_null($mesurement->getPlanificationDate()) && MesurementStatusDictionary::STATUS_NOT_APPLIED === $mesurement->getStatus()) {
@@ -314,6 +313,17 @@ class MesurementGenerator extends AbstractGenerator implements ImpressionGenerat
                     'Nom',
                     $mesurement->getName(),
                 ],
+            ];
+
+            // Ajouter les services si le module est actif
+            if ($mesurement->getCollectivity()->getIsServicesEnabled()) {
+                $generalInformationsData[] = [
+                    'Service',
+                    $mesurement->getService(),
+                ];
+            }
+
+            $generalInformationsData = array_merge($generalInformationsData, [
                 [
                     'Description',
                     $mesurement->getDescription() ? \preg_split('/\R/', $mesurement->getDescription()) : null,
@@ -334,7 +344,7 @@ class MesurementGenerator extends AbstractGenerator implements ImpressionGenerat
                     'Charge',
                     $mesurement->getCharge(),
                 ],
-            ];
+            ]);
 
             $applicationData = [
                 [
@@ -342,9 +352,9 @@ class MesurementGenerator extends AbstractGenerator implements ImpressionGenerat
                     MesurementStatusDictionary::getStatus()[$mesurement->getStatus()],
                 ],
                 [
-                    'Planification',
+                    'Échéance',
                     MesurementStatusDictionary::STATUS_NOT_APPLICABLE !== $mesurement->getStatus()
-                        ? ($mesurement->getPlanificationDate() ? $this->getDate($mesurement->getPlanificationDate()) : null)
+                        ? ($mesurement->getPlanificationDate() ? $this->getDate($mesurement->getPlanificationDate(), 'd/m/Y') : null)
                         : 'Non applicable',
                 ],
                 [
@@ -363,22 +373,22 @@ class MesurementGenerator extends AbstractGenerator implements ImpressionGenerat
                     $this->getDate($mesurement->getUpdatedAt()),
                 ],
                 [
-                    'Modifié par ',
+                    'Modifié par',
                     $mesurement->getUpdatedBy(),
                 ],
             ];
 
             $section->addTitle('Informations générales', 3);
-            $this->addTable($section, $generalInformationsData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $generalInformationsData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Application', 3);
-            $this->addTable($section, $applicationData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $applicationData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Éléments associés', 3);
             $this->addLinkedData($section, $mesurement);
 
             $section->addTitle('Historique', 3);
-            $this->addTable($section, $historyData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $historyData, false, self::TABLE_ORIENTATION_VERTICAL);
         }
     }
 
diff --git a/src/Domain/Reporting/Generator/Word/OverviewGenerator.php b/src/Domain/Reporting/Generator/Word/OverviewGenerator.php
index c5985418a83c1f32a8eb25b4ed1ac236456d9b87..67a573de2269dc985310e46887649364b139832b 100644
--- a/src/Domain/Reporting/Generator/Word/OverviewGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/OverviewGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Word/ProofGenerator.php b/src/Domain/Reporting/Generator/Word/ProofGenerator.php
index 24e43dab15da3e94250ed941cc3438a4047b868c..0ce4f2d716773b50f06492129d75eab6606b8c0f 100644
--- a/src/Domain/Reporting/Generator/Word/ProofGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/ProofGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -74,9 +73,9 @@ class ProofGenerator extends AbstractGenerator implements ImpressionGeneratorInt
         $proofAnnexListTable = $section->addTable($this->tableStyle);
         $proofAnnexListTable->addRow(null, ['tblHeader' => true, 'cantsplit' => true]);
         $cell = $proofAnnexListTable->addCell(2500, $this->cellHeadStyle);
-        $cell->addText('Nom du document', $this->textHeadStyle);
+        $cell->addText('Nom', $this->textHeadStyle);
         $cell = $proofAnnexListTable->addCell(2500, $this->cellHeadStyle);
-        $cell->addText('Type de document', $this->textHeadStyle);
+        $cell->addText('Type', $this->textHeadStyle);
         $cell = $proofAnnexListTable->addCell(2500, $this->cellHeadStyle);
         $cell->addText('Date de dépôt', $this->textHeadStyle);
 
diff --git a/src/Domain/Reporting/Generator/Word/RequestGenerator.php b/src/Domain/Reporting/Generator/Word/RequestGenerator.php
index 8ba032a0a53eb337201968ddd5fb59cbfb19e96e..403b69eea962e7aa6620b7a34473e5cb147bfa3e 100644
--- a/src/Domain/Reporting/Generator/Word/RequestGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/RequestGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -50,9 +49,9 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
         $tableData = [
             [
                 'Date de la demande',
-                'Objet',
+                'Objet de la demande',
                 'Date de traitement',
-                'État de la demande',
+                'Statut',
             ],
         ];
         $nbTotal = \count($data);
@@ -87,7 +86,7 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
             [
                 'Personne concernée',
                 'Date de la demande',
-                'Objet',
+                'Objet de la demande',
                 'Date de traitement',
             ],
         ];
@@ -121,7 +120,18 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
                 $section->addPageBreak();
             }
             $section->addTitle($request->__toString(), 2);
-            $requestData = [
+
+            $requestData = [];
+
+            // Ajouter les services si le module est actif
+            if ($request->getCollectivity()->getIsServicesEnabled()) {
+                $requestData[] = [
+                    'Service',
+                    $request->getService(),
+                ];
+            }
+
+            $requestData = array_merge($requestData, [
                 [
                     'Objet de la demande',
                     $request->getObject() ? RequestObjectDictionary::getObjects()[$request->getObject()] : null,
@@ -150,7 +160,7 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
                     'Demande légitime',
                     $request->isLegitimateRequest() ? 'Oui' : 'Non',
                 ],
-            ];
+            ]);
 
             $applicant     = $request->getApplicant();
             $applicantData = [
@@ -179,7 +189,7 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
                     $applicant->getPhoneNumber(),
                 ],
                 [
-                    'Est la personne concernée',
+                    'Personne concernée',
                     $applicant->isConcernedPeople() ? 'Oui' : 'Non',
                 ],
             ];
@@ -219,21 +229,9 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
             $response     = $request->getAnswer();
             $responseData = [
                 [
-                    'État de la demande',
+                    'Statut',
                     $request->getState() ? RequestStateDictionary::getStates()[$request->getState()] : '',
                 ],
-                [
-                    'Réponse apportée',
-                    $response->getResponse(),
-                ],
-                [
-                    'Date de la réponse',
-                    $this->getDate($response->getDate(), 'd/m/Y'),
-                ],
-                [
-                    'Moyen de la réponse',
-                    $response->getType() ? RequestAnswerTypeDictionary::getTypes()[$response->getType()] : null,
-                ],
             ];
 
             if (RequestStateDictionary::STATE_DENIED === $request->getState()) {
@@ -243,6 +241,21 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
                 ];
             }
 
+            $responseData[] = [
+                'Réponse apportée',
+                $response->getResponse(),
+            ];
+
+            $responseData[] = [
+                'Date de la réponse',
+                $this->getDate($response->getDate(), 'd/m/Y'),
+            ];
+
+            $responseData[] = [
+                'Moyen de la réponse',
+                $response->getType() ? RequestAnswerTypeDictionary::getTypes()[$response->getType()] : null,
+            ];
+
             $historyData = [
                 [
                     'Date de création',
@@ -259,25 +272,25 @@ class RequestGenerator extends AbstractGenerator implements ImpressionGeneratorI
             ];
 
             $section->addTitle('Demande', 3);
-            $this->addTable($section, $requestData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $requestData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Demandeur', 3);
-            $this->addTable($section, $applicantData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $applicantData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             // Only display concerned people if applicant isn't concerned one
             if (!$applicant->isConcernedPeople()) {
                 $section->addTitle('Personne concernée', 3);
-                $this->addTable($section, $concernedPeopleData, true, self::TABLE_ORIENTATION_VERTICAL);
+                $this->addTable($section, $concernedPeopleData, false, self::TABLE_ORIENTATION_VERTICAL);
             }
 
             $section->addTitle('Réponse', 3);
-            $this->addTable($section, $responseData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $responseData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Éléments associés', 3);
             $this->addLinkedData($section, $request);
 
             $section->addTitle('Historique', 3);
-            $this->addTable($section, $historyData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $historyData, false, self::TABLE_ORIENTATION_VERTICAL);
         }
     }
 }
diff --git a/src/Domain/Reporting/Generator/Word/ToolGenerator.php b/src/Domain/Reporting/Generator/Word/ToolGenerator.php
index 03c84665dd8ab4376d0f6deecb217c8a4c975fe2..3ac1eeee47c11b963b469f38c8717230bf3bb680 100644
--- a/src/Domain/Reporting/Generator/Word/ToolGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/ToolGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -116,6 +115,21 @@ class ToolGenerator extends AbstractGenerator implements ImpressionGeneratorInte
             $section->addTitle($tool->getName(), 2);
 
             $generalInformationsData = [
+                [
+                    'Nom',
+                    $tool->getName(),
+                ],
+            ];
+
+            // Ajouter les services si le module est actif
+            if ($tool->getCollectivity()->getIsServicesEnabled()) {
+                $generalInformationsData[] = [
+                    'Service',
+                    $tool->getService(),
+                ];
+            }
+
+            $generalInformationsData = array_merge($generalInformationsData, [
                 [
                     'Type',
                     ToolTypeDictionary::getTypes()[$tool->getType()],
@@ -140,7 +154,7 @@ class ToolGenerator extends AbstractGenerator implements ImpressionGeneratorInte
                     'Pays d\'hébergement ou de stockage',
                     $this->translator->trans($tool->getCountryType()),
                 ],
-            ];
+            ]);
 
             if (Tool::COUNTRY_FRANCE !== $tool->getCountryType()) {
                 $generalInformationsData[] = [
@@ -230,15 +244,16 @@ class ToolGenerator extends AbstractGenerator implements ImpressionGeneratorInte
             ];
 
             $section->addTitle('Informations générales', 3);
-            $this->addTable($section, $generalInformationsData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $generalInformationsData, false, self::TABLE_ORIENTATION_VERTICAL);
+
             $section->addTitle('Mesures de sécurité et confidentialité', 3);
-            $this->addTable($section, $securityData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $securityData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Éléments associés', 3);
             $this->addLinkedData($section, $tool);
 
             $section->addTitle('Historique', 3);
-            $this->addTable($section, $historyData, true, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $historyData, false, self::TABLE_ORIENTATION_VERTICAL);
         }
     }
 }
diff --git a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
index 06e477497e248a3dc3f06e386e8fceaf3ab2adab..e2f7bb821f7f74526f75cf2418967649e8314b80 100644
--- a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -27,6 +26,7 @@ namespace App\Domain\Reporting\Generator\Word;
 use App\Domain\Registry\Dictionary\TreatmentAuthorDictionary;
 use App\Domain\Registry\Dictionary\TreatmentCollectingMethodDictionary;
 use App\Domain\Registry\Dictionary\TreatmentLegalBasisDictionary;
+use App\Domain\Registry\Dictionary\TreatmentStatutDictionary;
 use App\Domain\Registry\Dictionary\TreatmentUltimateFateDictionary;
 use App\Domain\Registry\Model\Treatment;
 use PhpOffice\PhpWord\Element\Section;
@@ -93,14 +93,14 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                 if ($treatment->getSecurityAccessControl()->isCheck()) {
                     ++$security['accessControl'];
                 }
-                if ($treatment->getSecurityTracability()->isCheck()) {
-                    ++$security['tracability'];
+                if ($treatment->getSecurityUpdate()->isCheck()) {
+                    ++$security['update'];
                 }
                 if ($treatment->getSecuritySaving()->isCheck()) {
                     ++$security['saving'];
                 }
-                if ($treatment->getSecurityUpdate()->isCheck()) {
-                    ++$security['update'];
+                if ($treatment->getSecurityTracability()->isCheck()) {
+                    ++$security['tracability'];
                 }
             }
         }
@@ -203,15 +203,36 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
 
             $section->addTitle($treatment->getName() . ('draft' === $treatment->getStatut() ? ' (Brouillon)' : ''), 2);
 
-            $generalInformationsData = [
+            $precoDPDData = [
                 [
-                    'Publique',
-                    $treatment->getPublic() ? 'Oui' : 'Non',
+                    'Statut',
+                    $treatment->getStatut() && isset(TreatmentStatutDictionary::getStatuts()[$treatment->getStatut()]) ? TreatmentStatutDictionary::getStatuts()[$treatment->getStatut()] : '',
                 ],
+            ];
+
+            if (!empty($treatment->getDpoMessage())) {
+                $precoDPDData[] = [
+                    'Préconisations',
+                    $treatment->getDpoMessage(),
+                ];
+            }
+
+            $generalInformationsData = [
                 [
-                    'Service',
-                    $treatment->getService() ? $treatment->getService()->getName() : '',
+                    'Nom',
+                    $treatment->getName(),
                 ],
+            ];
+
+            // Ajouter les services si le module est actif
+            if ($treatment->getCollectivity()->getIsServicesEnabled()) {
+                $generalInformationsData[] = [
+                    'Service',
+                    $treatment->getService(),
+                ];
+            }
+
+            $generalInformationsData = array_merge($generalInformationsData, [
                 [
                     'Finalités',
                     $treatment->getGoal() ? \preg_split('/\R/', $treatment->getGoal()) : null,
@@ -220,12 +241,23 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     'En tant que',
                     !\is_null($treatment->getAuthor()) && array_key_exists($treatment->getAuthor(), TreatmentAuthorDictionary::getAuthors()) ? TreatmentAuthorDictionary::getAuthors()[$treatment->getAuthor()] : $treatment->getAuthor(),
                 ],
+            ]);
+
+            // Ajouter les coordonnées du responsable de traitement si l'auteur est différent du Responsable de Traitement
+            if ('processing_manager' !== $treatment->getAuthor()) {
+                $generalInformationsData[] = [
+                    'Coordonnées du responsable de traitement',
+                    $treatment->getCoordonneesResponsableTraitement() ? $treatment->getCoordonneesResponsableTraitement() : 'Non renseigné',
+                ];
+            }
+
+            $generalInformationsData = array_merge($generalInformationsData, [
                 [
                     'Gestionnaire',
                     $treatment->getManager() ?? $this->parameterBag->get('APP_DEFAULT_REFERENT'),
                 ],
                 [
-                    'Statut',
+                    'État',
                     $treatment->isActive() ? 'Actif' : 'Inactif',
                 ],
                 [
@@ -236,55 +268,73 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     'Justification de la base légale',
                     $treatment->getLegalBasisJustification() ? \preg_split('/\R/', $treatment->getLegalBasisJustification()) : null,
                 ],
+            ]);
+
+            // Ajouter le consentement demandé et son format si la base légale est "consent"
+            if ('consent' === $treatment->getLegalBasis()) {
+                $generalInformationsData = array_merge($generalInformationsData, [
+                    [
+                        'Consentement demandé',
+                        $treatment->getConsentRequest() ? 'Oui' : 'Non',
+                    ],
+                    [
+                        'Format de la demande du consentement',
+                        $treatment->getConsentRequestFormat(),
+                    ],
+                ]);
+            }
+
+            $generalInformationsData = array_merge($generalInformationsData, [
                 [
                     'Observations',
                     $treatment->getObservation() ? \preg_split('/\R/', $treatment->getObservation()) : null,
                 ],
-            ];
+                [
+                    'Registre public',
+                    $treatment->getPublic() ? 'Oui' : 'Non',
+                ],
+            ]);
 
             $detailsData = [
-                0 => [
-                    'Estimation du nombre de personnes concernées',
+                [
+                    'Nombre de personnes concernées',
                     $treatment->getEstimatedConcernedPeople(),
                 ],
-                1 => [
+                [
                     'Logiciels et supports',
                     \is_string($treatment->getToolsString()) ? $treatment->getToolsString() : null,
                 ],
-                2 => [
-                    'Gestion papier',
+                [
+                    'Traitement papier',
                     $treatment->isPaperProcessing() ? 'Oui' : 'Non',
                 ],
-                3 => [
+                [
                     'Durée de conservation',
                     // Defined below
                 ],
-                4 => [
-                    'Sort final',
-                    '',
-                ],
-                5 => [
+                [
                     'Origine des données',
                     $treatment->getDataOrigin(),
                 ],
-                6 => [
-                    'Moyens de la collecte des données	',
+                [
+                    'Moyens de la collecte',
                     !\is_null($treatment->getCollectingMethod()) ? join(', ', array_map(function ($cm) {
                         return TreatmentCollectingMethodDictionary::getMethods()[$cm];
                     }, $treatment->getCollectingMethod())) : '',
                 ],
-                7 => [
-                    'Mentions légales apposées',
-                    $treatment->getLegalMentions() ? 'Oui' : 'Non',
-                ],
-                8 => [
-                    'Consentement demandé',
-                    $treatment->getConsentRequest() ? 'Oui' : 'Non',
-                ],
-                9 => [
-                    'Format de la demande du consentement',
-                    $treatment->getConsentRequestFormat(),
-                ],
+            ];
+
+            // Ajouter l'autre moyen de collecte si le champ n'est pas vide
+            if (!empty($treatment->getOtherCollectingMethod())) {
+                $detailsData[] = [
+                    'Autre moyen de collecte',
+                    $treatment->getOtherCollectingMethod(),
+                ];
+            }
+
+            $detailsData[] = [
+                'Mentions légales apposées',
+                $treatment->getLegalMentions() ? 'Oui' : 'Non',
             ];
 
             // "Durée de conservation"
@@ -324,7 +374,7 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     $treatment->getRecipientCategory() ? \preg_split('/\R/', $treatment->getRecipientCategory()) : null,
                 ],
                 [
-                    'Sous-traitant(s)',
+                    'Sous-traitants',
                     \implode(', ', $treatment->getContractors()->toArray()),
                 ],
             ];
@@ -341,7 +391,7 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     $treatment->getConcernedPeopleUser()->getComment(),
                 ],
                 [
-                    'Salariés',
+                    'Agents / Salariés',
                     $treatment->getConcernedPeopleAgent()->isCheck() ? 'Oui' : 'Non',
                     $treatment->getConcernedPeopleAgent()->getComment(),
                 ],
@@ -360,6 +410,11 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     $treatment->getConcernedPeoplePartner()->isCheck() ? 'Oui' : 'Non',
                     $treatment->getConcernedPeoplePartner()->getComment(),
                 ],
+                [
+                    'Usagers / Résidents',
+                    $treatment->getConcernedPeopleUsager()->isCheck() ? 'Oui' : 'Non',
+                    $treatment->getConcernedPeopleUsager()->getComment(),
+                ],
                 [
                     'Autres',
                     $treatment->getConcernedPeopleOther()->isCheck() ? 'Oui' : 'Non',
@@ -374,9 +429,9 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     $treatment->getSecurityAccessControl()->getComment(),
                 ],
                 [
-                    'Traçabilité',
-                    $treatment->getSecurityTracability()->isCheck() ? 'Oui' : 'Non',
-                    $treatment->getSecurityTracability()->getComment(),
+                    'Mise à jour',
+                    $treatment->getSecurityUpdate()->isCheck() ? 'Oui' : 'Non',
+                    $treatment->getSecurityUpdate()->getComment(),
                 ],
                 [
                     'Sauvegarde',
@@ -384,9 +439,9 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     $treatment->getSecuritySaving()->getComment(),
                 ],
                 [
-                    'Mise à jour',
-                    $treatment->getSecurityUpdate()->isCheck() ? 'Oui' : 'Non',
-                    $treatment->getSecurityUpdate()->getComment(),
+                    'Traçabilité',
+                    $treatment->getSecurityTracability()->isCheck() ? 'Oui' : 'Non',
+                    $treatment->getSecurityTracability()->getComment(),
                 ],
                 [
                     'Autres',
@@ -394,23 +449,27 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     $treatment->getSecurityOther()->getComment(),
                 ],
                 [
-                    'Je suis en capacité de ressortir les personnes habilitées',
+                    'À tout moment, il est possible de ressortir les personnes habilitées',
                     $treatment->isSecurityEntitledPersons() ? 'Oui' : 'Non',
                     '',
                 ],
                 [
-                    'La personne ou la procédure qui permet d’ouvrir des comptes est clairement identifiée	',
+                    'La personne ou la procédure qui permet d’ouvrir des comptes est clairement identifiée',
                     $treatment->isSecurityOpenAccounts() ? 'Oui' : 'Non',
                     '',
                 ],
                 [
-                    'Les spécificités de sensibilisation liées à ce traitement sont délivrées	',
+                    'Les spécificités de sensibilisation liées à ce traitement sont délivrées',
                     $treatment->isSecuritySpecificitiesDelivered() ? 'Oui' : 'Non',
                     '',
                 ],
             ];
 
             $specificData = [
+                [
+                    'Est exempté d\'AIPD',
+                    $treatment->isExemptAIPD() ? 'Oui' : 'Non',
+                ],
                 [
                     'Surveillance systématique',
                     $treatment->isSystematicMonitoring() ? 'Oui' : 'Non',
@@ -432,13 +491,17 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     $treatment->isEvaluationOrRating() ? 'Oui' : 'Non',
                 ],
                 [
-                    'Décisions automatisées  avec  effet  juridique',
+                    'Décisions automatisées avec effet',
                     $treatment->isAutomatedDecisionsWithLegalEffect() ? 'Oui' : 'Non',
                 ],
                 [
                     'Exclusion automatique d\'un service',
                     $treatment->isAutomaticExclusionService() ? 'Oui' : 'Non',
                 ],
+                [
+                    'Usage innovant',
+                    $treatment->isInnovativeUse() ? 'Oui' : 'Non',
+                ],
             ];
 
             $historyData = [
@@ -456,27 +519,30 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                 ],
             ];
 
+            $section->addTitle('Statut et préconisations DPD', 3);
+            $this->addTable($section, $precoDPDData, false, self::TABLE_ORIENTATION_VERTICAL);
+
             $section->addTitle('Informations générales', 3);
             $this->addTable($section, $generalInformationsData, false, self::TABLE_ORIENTATION_VERTICAL);
 
+            $section->addTitle('Catégorie de données', 3);
+            $this->addTable($section, $categoryData, false, self::TABLE_ORIENTATION_VERTICAL);
+
+            $section->addTitle('Destinataires', 3);
+            $this->addTable($section, $goalData, false, self::TABLE_ORIENTATION_VERTICAL);
+
+            $section->addTitle('Traitement spécifique', 3);
+            $this->addTable($section, $specificData, false, self::TABLE_ORIENTATION_VERTICAL);
+
             $section->addTitle('Détails - Personnes concernées', 3);
             $this->addTable($section, $concernedPeopleData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Détails', 3);
             $this->addTable($section, $detailsData, false, self::TABLE_ORIENTATION_VERTICAL);
 
-            $section->addTitle('Catégorie de données', 3);
-            $this->addTable($section, $categoryData, false, self::TABLE_ORIENTATION_VERTICAL);
-
-            $section->addTitle('Destination', 3);
-            $this->addTable($section, $goalData, false, self::TABLE_ORIENTATION_VERTICAL);
-
             $section->addTitle('Mesures de sécurité et confidentialité', 3);
             $this->addTable($section, $securityData, false, self::TABLE_ORIENTATION_VERTICAL);
 
-            $section->addTitle('Traitement spécifique', 3);
-            $this->addTable($section, $specificData, false, self::TABLE_ORIENTATION_VERTICAL);
-
             $section->addTitle('Éléments associés', 3);
             $this->addLinkedData($section, $treatment);
 
@@ -508,21 +574,24 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
             $cell->addText($item->getManager());
             $cell    = $treatmentAnnexListTable->addCell(1500);
             $support = $item->isPaperProcessing() ? 'Papier, ' : '';
-            $support = $item->getSoftware() ? $support . $item->getSoftware() : rtrim($support, ', ');
+            $support = $item->getCollectivity() && $item->getCollectivity()->isHasModuleTools() ? $item->getToolsString() : $item->getSoftware();
 
             $cell->addText($support);
             $cell = $treatmentAnnexListTable->addCell(2000);
             if ($item->getSecurityAccessControl()->isCheck()) {
                 $cell->addListItem('Contrôle d\'accès', null, [], [], ['spaceAfter' => 0]);
             }
-            if ($item->getSecurityTracability()->isCheck()) {
-                $cell->addListItem('Traçabilité', null, [], [], ['spaceAfter' => 0]);
+            if ($item->getSecurityUpdate()->isCheck()) {
+                $cell->addListItem('Mise à jour', null, [], [], ['spaceAfter' => 0]);
             }
             if ($item->getSecuritySaving()->isCheck()) {
                 $cell->addListItem('Sauvegarde', null, [], [], ['spaceAfter' => 0]);
             }
-            if ($item->getSecurityUpdate()->isCheck()) {
-                $cell->addListItem('Mise à jour', null, [], [], ['spaceAfter' => 0]);
+            if ($item->getSecurityTracability()->isCheck()) {
+                $cell->addListItem('Traçabilité', null, [], [], ['spaceAfter' => 0]);
+            }
+            if ($item->getSecurityOther()->isCheck()) {
+                $cell->addListItem('Autres', null, [], [], ['spaceAfter' => 0]);
             }
         }
     }
diff --git a/src/Domain/Reporting/Generator/Word/UserGenerator.php b/src/Domain/Reporting/Generator/Word/UserGenerator.php
index 5135d670e20e714ce557a13da2b84755e3cfa826..422d45304b8951765bee4f2dad728ba2350540e4 100644
--- a/src/Domain/Reporting/Generator/Word/UserGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/UserGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Generator/Word/ViolationGenerator.php b/src/Domain/Reporting/Generator/Word/ViolationGenerator.php
index 1b5ab83ef2978ab892f23a1e1b8e08258abcffb2..a636a3edb257c7a5c8dc0f5fd548ddab1d65980a 100644
--- a/src/Domain/Reporting/Generator/Word/ViolationGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/ViolationGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -137,7 +136,7 @@ class ViolationGenerator extends AbstractGenerator implements ImpressionGenerato
         $tableData = [
             [
                 'Date',
-                'Nature',
+                'Natures',
                 'Cause',
                 'Niveau de gravité',
             ],
@@ -177,12 +176,23 @@ class ViolationGenerator extends AbstractGenerator implements ImpressionGenerato
 
             $cellDate = $this->getDate($violation->getDate(), 'd/m/Y');
 
-            $natures                = join(', ', array_map(function ($n) { return ViolationNatureDictionary::getNatures()[$n] ?? $n; }, (array) $violation->getViolationNatures()));
-            $generalInformationData = [
+            $generalInformationsData = [
                 [
                     'Date de la violation',
                     $cellDate,
                 ],
+            ];
+
+            // Ajouter les services si le module est actif
+            if ($violation->getCollectivity()->getIsServicesEnabled()) {
+                $generalInformationsData[] = [
+                    'Service',
+                    $violation->getService(),
+                ];
+            }
+
+            $natures                 = join(', ', array_map(function ($n) { return ViolationNatureDictionary::getNatures()[$n] ?? $n; }, (array) $violation->getViolationNatures()));
+            $generalInformationsData = array_merge($generalInformationsData, [
                 [
                     'Violation en cours',
                     $violation->isInProgress() ? 'Oui' : 'Non',
@@ -212,10 +222,10 @@ class ViolationGenerator extends AbstractGenerator implements ImpressionGenerato
                     $violation->getNbAffectedRows(),
                 ],
                 [
-                    'Nombre approximatif de personnes concernés par la violation',
+                    'Nombre approximatif de personnes concernées par la violation',
                     $violation->getNbAffectedPersons(),
                 ],
-            ];
+            ]);
 
             $consequenceData = [
                 [
@@ -268,7 +278,7 @@ class ViolationGenerator extends AbstractGenerator implements ImpressionGenerato
             ];
 
             $section->addTitle('Informations sur la violation', 3);
-            $this->addTable($section, $generalInformationData, false, self::TABLE_ORIENTATION_VERTICAL);
+            $this->addTable($section, $generalInformationsData, false, self::TABLE_ORIENTATION_VERTICAL);
 
             $section->addTitle('Conséquences de la violation', 3);
             $this->addTable($section, $consequenceData, false, self::TABLE_ORIENTATION_VERTICAL);
diff --git a/src/Domain/Reporting/Handler/ExportCsvHandler.php b/src/Domain/Reporting/Handler/ExportCsvHandler.php
index 2ae239d995736c16e498be83c2477f54049425c7..da5ca3a0888586b8ffa7b56f310e0a07fdc9968b 100644
--- a/src/Domain/Reporting/Handler/ExportCsvHandler.php
+++ b/src/Domain/Reporting/Handler/ExportCsvHandler.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Handler/MetricsHandler.php b/src/Domain/Reporting/Handler/MetricsHandler.php
index be356b29292b86c26d9e03e8f4f6811f0afbe8e4..1ea3a30b68d182ccc085bafa3d0495eea52751f6 100644
--- a/src/Domain/Reporting/Handler/MetricsHandler.php
+++ b/src/Domain/Reporting/Handler/MetricsHandler.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Handler/WordHandler.php b/src/Domain/Reporting/Handler/WordHandler.php
index 2ad8a1c559dd4ad9fc7777e7019f967ce67da3be..6a4c755d1c576396bee83f19b0ce826385e78902 100644
--- a/src/Domain/Reporting/Handler/WordHandler.php
+++ b/src/Domain/Reporting/Handler/WordHandler.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Metrics/AdminMetric.php b/src/Domain/Reporting/Metrics/AdminMetric.php
index b55431baea2a30ec383c916fa9b506d899af30b7..d15eeaee8344773b5df7908e773011c951db9350 100644
--- a/src/Domain/Reporting/Metrics/AdminMetric.php
+++ b/src/Domain/Reporting/Metrics/AdminMetric.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Metrics/MetricInterface.php b/src/Domain/Reporting/Metrics/MetricInterface.php
index 242bc2829102abe574e804a8d3b047a675b010e0..a05dd3ccd82726d26b651c29740cff8f58fa8dd1 100644
--- a/src/Domain/Reporting/Metrics/MetricInterface.php
+++ b/src/Domain/Reporting/Metrics/MetricInterface.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Metrics/UserMetric.php b/src/Domain/Reporting/Metrics/UserMetric.php
index b8b8e0d1b12b0ad0391ed60c818b11d69182f74b..ed37ce0ddf8b2057574e24bef8c851a562141e54 100644
--- a/src/Domain/Reporting/Metrics/UserMetric.php
+++ b/src/Domain/Reporting/Metrics/UserMetric.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -181,7 +181,7 @@ class UserMetric implements MetricInterface
                             'yes' => 0,
                             'no'  => 0,
                         ],
-                        'securityTracability' => [
+                        'securityUpdate' => [
                             'yes' => 0,
                             'no'  => 0,
                         ],
@@ -189,7 +189,7 @@ class UserMetric implements MetricInterface
                             'yes' => 0,
                             'no'  => 0,
                         ],
-                        'securityUpdate' => [
+                        'securityTracability' => [
                             'yes' => 0,
                             'no'  => 0,
                         ],
@@ -375,20 +375,20 @@ class UserMetric implements MetricInterface
                 } else {
                     ++$data['treatment']['value']['data']['securityAccessControl']['no'];
                 }
-                if ($treatment->getSecurityTracability()->isCheck()) {
-                    ++$data['treatment']['value']['data']['securityTracability']['yes'];
+                if ($treatment->getSecurityUpdate()->isCheck()) {
+                    ++$data['treatment']['value']['data']['securityUpdate']['yes'];
                 } else {
-                    ++$data['treatment']['value']['data']['securityTracability']['no'];
+                    ++$data['treatment']['value']['data']['securityUpdate']['no'];
                 }
                 if ($treatment->getSecuritySaving()->isCheck()) {
                     ++$data['treatment']['value']['data']['securitySaving']['yes'];
                 } else {
                     ++$data['treatment']['value']['data']['securitySaving']['no'];
                 }
-                if ($treatment->getSecurityUpdate()->isCheck()) {
-                    ++$data['treatment']['value']['data']['securityUpdate']['yes'];
+                if ($treatment->getSecurityTracability()->isCheck()) {
+                    ++$data['treatment']['value']['data']['securityTracability']['yes'];
                 } else {
-                    ++$data['treatment']['value']['data']['securityUpdate']['no'];
+                    ++$data['treatment']['value']['data']['securityTracability']['no'];
                 }
             }
         }
diff --git a/src/Domain/Reporting/Model/LoggableSubject.php b/src/Domain/Reporting/Model/LoggableSubject.php
index 8388ad6656c507c4996a84e4889cf75dfc6a76df..30b5bd2fa0327e741bbf8620a5f647b95473b9b9 100644
--- a/src/Domain/Reporting/Model/LoggableSubject.php
+++ b/src/Domain/Reporting/Model/LoggableSubject.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Repository/LogJournal.php b/src/Domain/Reporting/Repository/LogJournal.php
index 71d77f7639d3f71c2fb7229f3c8363bf1e179478..e2a43d811fb57c914219d8cc2f28cf097b2eda98 100644
--- a/src/Domain/Reporting/Repository/LogJournal.php
+++ b/src/Domain/Reporting/Repository/LogJournal.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Reporting/Symfony/EventSubscriber/Doctrine/LogJournalDoctrineSubscriber.php b/src/Domain/Reporting/Symfony/EventSubscriber/Doctrine/LogJournalDoctrineSubscriber.php
index e4e139886ab36e6d9d6a6728145b00253d985acb..048c9497136f221fdf8033a003c5a503c7da31c7 100644
--- a/src/Domain/Reporting/Symfony/EventSubscriber/Doctrine/LogJournalDoctrineSubscriber.php
+++ b/src/Domain/Reporting/Symfony/EventSubscriber/Doctrine/LogJournalDoctrineSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Component/Mailer.php b/src/Domain/User/Component/Mailer.php
index 902c7f8ea346d05034373c7db4a2f06f0fd83d34..ff553b60941d1472c643a00c01925b55843f62ca 100644
--- a/src/Domain/User/Component/Mailer.php
+++ b/src/Domain/User/Component/Mailer.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Component/TokenGenerator.php b/src/Domain/User/Component/TokenGenerator.php
index 614d8c8745f1c21c6d4dc8486cf06095d8c90d49..1f15060c8e94f76cf03a7e3f79ffe9560c42cc7f 100644
--- a/src/Domain/User/Component/TokenGenerator.php
+++ b/src/Domain/User/Component/TokenGenerator.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Controller/CollectivityController.php b/src/Domain/User/Controller/CollectivityController.php
index 789bcbc02278f176c1335fd2bbf7107df1b86fb6..7c1927b691c8827749c90c528c580d2d9a44635b 100644
--- a/src/Domain/User/Controller/CollectivityController.php
+++ b/src/Domain/User/Controller/CollectivityController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Controller/ProfileController.php b/src/Domain/User/Controller/ProfileController.php
index bd5919c23379ddfc5b10043d7e60e359c4171ec8..3fc929a5d74005d5e4b5b8438f602a9f922b8752 100644
--- a/src/Domain/User/Controller/ProfileController.php
+++ b/src/Domain/User/Controller/ProfileController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Controller/SecurityController.php b/src/Domain/User/Controller/SecurityController.php
index 39a7d5a1a53eeb3ee3da690b5fe3b35817289f7a..c6b4a44017fdec397c88cafd4039d82319dde532 100644
--- a/src/Domain/User/Controller/SecurityController.php
+++ b/src/Domain/User/Controller/SecurityController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Controller/UserController.php b/src/Domain/User/Controller/UserController.php
index 1f480dd75f0b84b18c3ebc7ec048af2174de8b51..cc6bfdd0df71f2b56ff0201e432367d749053020 100644
--- a/src/Domain/User/Controller/UserController.php
+++ b/src/Domain/User/Controller/UserController.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Dictionary/CollectivityTypeDictionary.php b/src/Domain/User/Dictionary/CollectivityTypeDictionary.php
index 98c865fb74ab637929f09c3d71171cf415786889..9046d9fbc086fce11441b280ff8e2e3e0a3229ac 100644
--- a/src/Domain/User/Dictionary/CollectivityTypeDictionary.php
+++ b/src/Domain/User/Dictionary/CollectivityTypeDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Dictionary/ContactCivilityDictionary.php b/src/Domain/User/Dictionary/ContactCivilityDictionary.php
index 9554cd468446cf21a4b463221cc9759a509f3ea6..3b727efebcfa075f3cc23d43784ce8ecd7522cf7 100644
--- a/src/Domain/User/Dictionary/ContactCivilityDictionary.php
+++ b/src/Domain/User/Dictionary/ContactCivilityDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Dictionary/UserMoreInfoDictionary.php b/src/Domain/User/Dictionary/UserMoreInfoDictionary.php
index 43d3a34373536aa610ddeaf19b8948a0275ffa0f..a34fa9c8a5cb7024c5a8a5556f8cbbf277395b64 100644
--- a/src/Domain/User/Dictionary/UserMoreInfoDictionary.php
+++ b/src/Domain/User/Dictionary/UserMoreInfoDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Dictionary/UserRoleDictionary.php b/src/Domain/User/Dictionary/UserRoleDictionary.php
index 57e4fcc3f85275b0354c5337238edd28d04a1e03..10886307ea0f028eaa90904100d7f198f72f025f 100644
--- a/src/Domain/User/Dictionary/UserRoleDictionary.php
+++ b/src/Domain/User/Dictionary/UserRoleDictionary.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/DataTransformer/MoreInfoTransformer.php b/src/Domain/User/Form/DataTransformer/MoreInfoTransformer.php
index 8bf8b82e589aba994c64fdf7cbfca1d87879a89d..f7e9472ad2f6b1aabb1da321fc0e86a5e40472e0 100644
--- a/src/Domain/User/Form/DataTransformer/MoreInfoTransformer.php
+++ b/src/Domain/User/Form/DataTransformer/MoreInfoTransformer.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/DataTransformer/RoleTransformer.php b/src/Domain/User/Form/DataTransformer/RoleTransformer.php
index bc21dffd0b7a1e1120b05ade8fc3ee28c002a999..0c342ec8b566b77d4ed634f1e80812d3eda0a8a2 100644
--- a/src/Domain/User/Form/DataTransformer/RoleTransformer.php
+++ b/src/Domain/User/Form/DataTransformer/RoleTransformer.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/AddressType.php b/src/Domain/User/Form/Type/AddressType.php
index e862d7f344299e248ea623c3f523e6f585c70b74..9491813caaef3f69574f1a799a3e8c6f3baa0233 100644
--- a/src/Domain/User/Form/Type/AddressType.php
+++ b/src/Domain/User/Form/Type/AddressType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/CollectivityType.php b/src/Domain/User/Form/Type/CollectivityType.php
index af01362dc7d871efedef04c911e5eee3b5ea4307..e3f6d34e74074513eb2be5199c22c26d55144193 100644
--- a/src/Domain/User/Form/Type/CollectivityType.php
+++ b/src/Domain/User/Form/Type/CollectivityType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/ComiteIlContactType.php b/src/Domain/User/Form/Type/ComiteIlContactType.php
index c4b1b0091bb74b09a6b0df258d0ba0dc6c32f1e3..36561dae587684d252bdfe1cbbb74bfc3ab481ee 100644
--- a/src/Domain/User/Form/Type/ComiteIlContactType.php
+++ b/src/Domain/User/Form/Type/ComiteIlContactType.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/ContactType.php b/src/Domain/User/Form/Type/ContactType.php
index 8603e5a3feddbff6334851ba699a494a63d8705f..1312b0ea4cc5ba2c6159c8663d6a2738ab0c3ba7 100644
--- a/src/Domain/User/Form/Type/ContactType.php
+++ b/src/Domain/User/Form/Type/ContactType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php b/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php
index 823a115de620f733fd9e395f0293a275ad94a706..aa35a953e8ecbf69dc3b7dffa5547b90d3ebf7f9 100644
--- a/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php
+++ b/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/ResetPasswordType.php b/src/Domain/User/Form/Type/ResetPasswordType.php
index 6e02c15a6cbd45e3cef51f12ca5ec3162dc50b29..241fca186fa9ac27b033f33229b4fdc4e3b164b6 100644
--- a/src/Domain/User/Form/Type/ResetPasswordType.php
+++ b/src/Domain/User/Form/Type/ResetPasswordType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/ReviewDataType.php b/src/Domain/User/Form/Type/ReviewDataType.php
index 8f934f303696412d6340a0d876003f8d116e2df8..201125e4f7e7d7960fc82bef114624ce32915306 100644
--- a/src/Domain/User/Form/Type/ReviewDataType.php
+++ b/src/Domain/User/Form/Type/ReviewDataType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/ServiceType.php b/src/Domain/User/Form/Type/ServiceType.php
index feca700612eb38c6cd76076029997c047ef9f9f0..91b64b39fd8af9648d28709a474561dc626b5b76 100644
--- a/src/Domain/User/Form/Type/ServiceType.php
+++ b/src/Domain/User/Form/Type/ServiceType.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Form/Type/UserType.php b/src/Domain/User/Form/Type/UserType.php
index b66aad39d4ab08d93aea24b309f1f809ef7be18f..c868b29dcc1152a72ea1a1792d335ed45a2d07c4 100644
--- a/src/Domain/User/Form/Type/UserType.php
+++ b/src/Domain/User/Form/Type/UserType.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Model/Collectivity.php b/src/Domain/User/Model/Collectivity.php
index d26694d02a7bf7783f585a1b55a48a578c9dfd83..ed59505a90b0b191a289c07cf405e9afe09756bc 100644
--- a/src/Domain/User/Model/Collectivity.php
+++ b/src/Domain/User/Model/Collectivity.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Model/ComiteIlContact.php b/src/Domain/User/Model/ComiteIlContact.php
index f45b9b499e4cab34aa8dbaf75b1ef154f2424d73..bc92c5d286cd440796dbf29fc2b192e49753780d 100644
--- a/src/Domain/User/Model/ComiteIlContact.php
+++ b/src/Domain/User/Model/ComiteIlContact.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Model/Embeddable/Address.php b/src/Domain/User/Model/Embeddable/Address.php
index 4a58fa43efa7695466874f3a9bc724e60db05ae7..1b70f57b934257ea18c78f5f4cc070984db73c34 100644
--- a/src/Domain/User/Model/Embeddable/Address.php
+++ b/src/Domain/User/Model/Embeddable/Address.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Model/Embeddable/Contact.php b/src/Domain/User/Model/Embeddable/Contact.php
index 099b649feb3a9e2ead01e1b9cc5d6f72222cc1a7..788c1fc3c569707de8c6ea6f0c451109bdd4680c 100644
--- a/src/Domain/User/Model/Embeddable/Contact.php
+++ b/src/Domain/User/Model/Embeddable/Contact.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Model/ReviewData.php b/src/Domain/User/Model/ReviewData.php
index db6305bf1e85d6ec4f888668cee09d39b9b09811..65e440f3d1a3153bfb0a377548056f1ba81b2e0a 100644
--- a/src/Domain/User/Model/ReviewData.php
+++ b/src/Domain/User/Model/ReviewData.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Model/Service.php b/src/Domain/User/Model/Service.php
index 45ac1a109c62eea2c217dfcf9c1bd0e4eddad0a1..6d6f375088048223e09f5bd2a6e5eb6bffa550fd 100644
--- a/src/Domain/User/Model/Service.php
+++ b/src/Domain/User/Model/Service.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Model/User.php b/src/Domain/User/Model/User.php
index 079de60769b816960477498f096556e97bd1ad7a..45107371cc458da7381203a78295927b6a6c0706 100644
--- a/src/Domain/User/Model/User.php
+++ b/src/Domain/User/Model/User.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Repository/Collectivity.php b/src/Domain/User/Repository/Collectivity.php
index 683423556d00656186b7f8a24a959333b3138dab..9a82ecb879a724f74e0d9eb1f085461fc64ed429 100644
--- a/src/Domain/User/Repository/Collectivity.php
+++ b/src/Domain/User/Repository/Collectivity.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Repository/LoginAttempt.php b/src/Domain/User/Repository/LoginAttempt.php
index 80a9f5cc83128ade7565259c91f66102ab4da04a..e7c044f5af8adc4288cfdd4e5e281093ff1c6ef0 100644
--- a/src/Domain/User/Repository/LoginAttempt.php
+++ b/src/Domain/User/Repository/LoginAttempt.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Repository/User.php b/src/Domain/User/Repository/User.php
index d5f1f8044e011b1194427b3ba707e8a9a1f4c6f0..db1bfd5c321a4a95f476d280eec05b94fbfe7382 100644
--- a/src/Domain/User/Repository/User.php
+++ b/src/Domain/User/Repository/User.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriber.php b/src/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriber.php
index 5b1792d638599aa5f435de8cd537fb40631c9cfb..9f580aee04ea074e70d0ae767380edf2ff86b6d5 100644
--- a/src/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriber.php
+++ b/src/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriber.php b/src/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriber.php
index 986dc2a0af859fc11befbc9386a2e7f8b5572720..9d23ca2854ae638cc87a08e7679093a3b9e1a63a 100644
--- a/src/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriber.php
+++ b/src/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Symfony/EventSubscriber/Kernel/ExceptionSubscriber.php b/src/Domain/User/Symfony/EventSubscriber/Kernel/ExceptionSubscriber.php
index ff3a022748b76a331bc847c0e04aa3371340da54..3383a0fd13b55ff820b864d3926d2f062fea676f 100644
--- a/src/Domain/User/Symfony/EventSubscriber/Kernel/ExceptionSubscriber.php
+++ b/src/Domain/User/Symfony/EventSubscriber/Kernel/ExceptionSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriber.php b/src/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriber.php
index d4f5bf103cf45f7bf0180d4699c92768ad5f3ff8..2c6c765330a6761c4254a5111a21267d2f492d3f 100644
--- a/src/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriber.php
+++ b/src/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriber.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Symfony/Security/Authorization/UserAuthorization.php b/src/Domain/User/Symfony/Security/Authorization/UserAuthorization.php
index 509c242690bce0a0300202792bfcd63e88621ab2..4a947b30ff673c354bf690343ad73cb7499af85c 100644
--- a/src/Domain/User/Symfony/Security/Authorization/UserAuthorization.php
+++ b/src/Domain/User/Symfony/Security/Authorization/UserAuthorization.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/User/Symfony/Security/Checker/UserChecker.php b/src/Domain/User/Symfony/Security/Checker/UserChecker.php
index ceadb51b0d51d38bfacc7920a851c08a2f5b5e9d..7411e7704ee86fd1b8158b6415e0d1420450944d 100644
--- a/src/Domain/User/Symfony/Security/Checker/UserChecker.php
+++ b/src/Domain/User/Symfony/Security/Checker/UserChecker.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Admin/Repository/Duplication.php b/src/Infrastructure/ORM/Admin/Repository/Duplication.php
index 8fe3959f9f23ce53418ad6b40c07e33387c4e05a..1e5ff8495c8d4d8866f35f6b4375461da4e83040 100644
--- a/src/Infrastructure/ORM/Admin/Repository/Duplication.php
+++ b/src/Infrastructure/ORM/Admin/Repository/Duplication.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Documentation/Repository/Category.php b/src/Infrastructure/ORM/Documentation/Repository/Category.php
index 1d782a747a87ff916531e2d71470e9732ee37d1b..337be0e0643580a2ba337a93466bce15bf63f1fe 100644
--- a/src/Infrastructure/ORM/Documentation/Repository/Category.php
+++ b/src/Infrastructure/ORM/Documentation/Repository/Category.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Documentation/Repository/Document.php b/src/Infrastructure/ORM/Documentation/Repository/Document.php
index 8c0c66f0e8769071d4b08f2b63711ba8b849d381..fe8280e4891b16599c0c5435c9f83d31e0b2d85f 100644
--- a/src/Infrastructure/ORM/Documentation/Repository/Document.php
+++ b/src/Infrastructure/ORM/Documentation/Repository/Document.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Maturity/Repository/Question.php b/src/Infrastructure/ORM/Maturity/Repository/Question.php
index c83dad95db9401d235fce0179a346f3fa6771e6e..49d7e21abdbe2bc94889c8fa34cba418223239ba 100644
--- a/src/Infrastructure/ORM/Maturity/Repository/Question.php
+++ b/src/Infrastructure/ORM/Maturity/Repository/Question.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Maturity/Repository/Referentiel.php b/src/Infrastructure/ORM/Maturity/Repository/Referentiel.php
index 0476b831d4f3f077ee21240252a927cd443484bb..887b10884fcaea990bed8d81f7c4c075bd7202c8 100644
--- a/src/Infrastructure/ORM/Maturity/Repository/Referentiel.php
+++ b/src/Infrastructure/ORM/Maturity/Repository/Referentiel.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Maturity/Repository/Survey.php b/src/Infrastructure/ORM/Maturity/Repository/Survey.php
index 7fe0a974e442c29ab34d26f5ee1c844b97d6c252..d605db32d209070ab546165422e1fe33cb632684 100644
--- a/src/Infrastructure/ORM/Maturity/Repository/Survey.php
+++ b/src/Infrastructure/ORM/Maturity/Repository/Survey.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -146,7 +145,7 @@ class Survey extends CRUDRepository implements Repository\Survey
             $sql .= ') ';
         }
 
-        $sql .= ' 
+        $sql .= '
             GROUP BY uc.id
         ) a';
 
diff --git a/src/Infrastructure/ORM/Notification/Repository/Notification.php b/src/Infrastructure/ORM/Notification/Repository/Notification.php
index bfc904375263fc1ff60770787554a4c2da7723f0..366b31d15ca1dca69ec9ab6b492187deec673c2b 100644
--- a/src/Infrastructure/ORM/Notification/Repository/Notification.php
+++ b/src/Infrastructure/ORM/Notification/Repository/Notification.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php b/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php
index 378db9a4d03dfaba42d851e35b23857e9cab4a7f..e2c275e19edeaf9e364b50a5ef1ae17e72fac512 100644
--- a/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php
+++ b/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml b/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml
index c28e29cf62c8654a31b40029a8f9f54cc419c1e8..a3be0a80af1a8435553f583480c2cdcb3ccbca55 100644
--- a/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml
+++ b/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml
@@ -69,9 +69,9 @@
         <field name="consentRequestFormat" column="consent_request_format" type="text" nullable="true"/>
 
         <embedded name="securityAccessControl" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_access_control_"/>
-        <embedded name="securityTracability" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_tracability_"/>
-        <embedded name="securitySaving" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_saving_"/>
         <embedded name="securityUpdate" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_update_"/>
+        <embedded name="securitySaving" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_saving_"/>
+        <embedded name="securityTracability" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_tracability_"/>
         <embedded name="securityOther" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_other_"/>
 
         <embedded name="concernedPeopleParticular" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="concerned_people_particular_"/>
diff --git a/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php b/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php
index 26806a957b54b5706bc42b5e1c8a4bfb44653713..f83dd1a6f9fa7cdbed54574d4fdbe78eba4c1632 100644
--- a/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php
+++ b/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/ConformiteTraitement.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/Question.php b/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/Question.php
index 45f69e8caa31395e268f012d9e71c93dcc8641ed..83afe8a0340ff1c46dae9f95a806a8e1917995ce 100644
--- a/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/Question.php
+++ b/src/Infrastructure/ORM/Registry/Repository/ConformiteTraitement/Question.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Registry/Repository/Contractor.php b/src/Infrastructure/ORM/Registry/Repository/Contractor.php
index edd3ddc8a0c4681c9efa57bbc7b2bcc9d9d94942..60bc4caafa5a078314d795909c53a0c837fd4a5b 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Contractor.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Contractor.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php
index f9636024a58534249ccac90a673fb6e3d777585e..34486c8c2e80cb94f9edeb50f7798490ac009d1a 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Registry/Repository/Proof.php b/src/Infrastructure/ORM/Registry/Repository/Proof.php
index 9088a0c1d3ae3e02d012ce85b92bb433391634e4..30dafb076fc58776654f851bf04ee1adeba43da5 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Proof.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Proof.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -309,7 +308,7 @@ class Proof implements Repository\Proof
             $sql .= ') ';
         }
 
-        $sql .= ' 
+        $sql .= '
             GROUP BY uc.id
         ) a';
 
@@ -335,7 +334,7 @@ class Proof implements Repository\Proof
             $sql .= ') ';
         }
 
-        $sql .= ' 
+        $sql .= '
             GROUP BY uc.id
         ) a';
 
diff --git a/src/Infrastructure/ORM/Registry/Repository/Request.php b/src/Infrastructure/ORM/Registry/Repository/Request.php
index e8f96ee70b5517058df387566fa635cf67407232..ace3807eb30bdce6731c3f4270f795cc1b972a24 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Request.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Request.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -361,8 +360,8 @@ class Request implements Repository\Request
                 $queryBuilder->addOrderBy('service.name', $orderDir);
                 break;
             case 'personne_concernee':
-                $queryBuilder->addSelect('IFELSE (o.applicant.concernedPeople = 1, 
-                    CONCAT(o.applicant.firstName, \' \', o.applicant.lastName), 
+                $queryBuilder->addSelect('IFELSE (o.applicant.concernedPeople = 1,
+                    CONCAT(o.applicant.firstName, \' \', o.applicant.lastName),
                     CONCAT(o.concernedPeople.firstName, \' \', o.applicant.lastName))
                     AS HIDDEN person_name')
                     ->addOrderBy('person_name', $orderDir);
@@ -428,8 +427,8 @@ class Request implements Repository\Request
                         ->setParameter('service_name', '%' . $search . '%');
                     break;
                 case 'personne_concernee':
-                    $queryBuilder->andWhere('IFELSE (o.applicant.concernedPeople = 1, 
-                        CONCAT(o.applicant.firstName, \' \', o.applicant.lastName), 
+                    $queryBuilder->andWhere('IFELSE (o.applicant.concernedPeople = 1,
+                        CONCAT(o.applicant.firstName, \' \', o.applicant.lastName),
                         CONCAT(o.concernedPeople.firstName, \' \', o.applicant.lastName))
                         LIKE :person_name')
                         ->setParameter('person_name', '%' . $search . '%');
diff --git a/src/Infrastructure/ORM/Registry/Repository/Tool.php b/src/Infrastructure/ORM/Registry/Repository/Tool.php
index b4681ec0f445e99903f8781c292fc12fd26d66e4..a36ffda4bb10719bf12613fe7cd83e421932b990 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Tool.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Tool.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/Registry/Repository/Treatment.php b/src/Infrastructure/ORM/Registry/Repository/Treatment.php
index 571eaabb7ff592e0bb3fff2cec7a491b239c2cce..9a1283728b47f37b5ecbda557a38e2f5498a93bf 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Treatment.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Treatment.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -314,14 +313,14 @@ class Treatment extends CRUDRepository implements Repository\Treatment
             case 'controleAcces':
                 $queryBuilder->addOrderBy('o.securityAccessControl.check', $orderDir);
                 break;
-            case 'tracabilite':
-                $queryBuilder->addOrderBy('o.securityTracability.check', $orderDir);
+            case 'update':
+                $queryBuilder->addOrderBy('o.securityUpdate.check', $orderDir);
                 break;
             case 'saving':
                 $queryBuilder->addOrderBy('o.securitySaving.check', $orderDir);
                 break;
-            case 'update':
-                $queryBuilder->addOrderBy('o.securityUpdate.check', $orderDir);
+            case 'tracabilite':
+                $queryBuilder->addOrderBy('o.securityTracability.check', $orderDir);
                 break;
             case 'other':
                 $queryBuilder->addOrderBy('o.securityOther.check', $orderDir);
@@ -445,17 +444,17 @@ class Treatment extends CRUDRepository implements Repository\Treatment
                     $queryBuilder->andWhere('o.securityAccessControl.check = :access_control')
                         ->setParameter('access_control', $search);
                     break;
-                case 'tracabilite':
-                    $queryBuilder->andWhere('o.securityTracability.check = :tracabilite')
-                        ->setParameter('tracabilite', $search);
+                case 'update':
+                    $queryBuilder->andWhere('o.securityUpdate.check = :update')
+                        ->setParameter('update', $search);
                     break;
                 case 'saving':
                     $queryBuilder->andWhere('o.securitySaving.check = :saving')
                         ->setParameter('saving', $search);
                     break;
-                case 'update':
-                    $queryBuilder->andWhere('o.securityUpdate.check = :update')
-                        ->setParameter('update', $search);
+                case 'tracabilite':
+                    $queryBuilder->andWhere('o.securityTracability.check = :tracabilite')
+                        ->setParameter('tracabilite', $search);
                     break;
                 case 'other':
                     $queryBuilder->andWhere('o.securityOther.check = :other')
diff --git a/src/Infrastructure/ORM/Registry/Repository/Violation.php b/src/Infrastructure/ORM/Registry/Repository/Violation.php
index 0e68c2b9f0dcd7cafeb1d71c4baf35d13d0844cd..33387c99fc2055b8e96de1a91ec739b5579ef0f3 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Violation.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Violation.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/User/Repository/Collectivity.php b/src/Infrastructure/ORM/User/Repository/Collectivity.php
index 72d1fea15398fd43e52a169582b7013d2bccb858..5bc6651a962577fa03d837f27c1dac972d057cf5 100644
--- a/src/Infrastructure/ORM/User/Repository/Collectivity.php
+++ b/src/Infrastructure/ORM/User/Repository/Collectivity.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/User/Repository/LoginAttempt.php b/src/Infrastructure/ORM/User/Repository/LoginAttempt.php
index 5c71ff2d8cbb4fde588b435a6b9c0499f771a905..2940a6b1c74477b55a367c74228e89aebf9d1d24 100644
--- a/src/Infrastructure/ORM/User/Repository/LoginAttempt.php
+++ b/src/Infrastructure/ORM/User/Repository/LoginAttempt.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/ORM/User/Repository/User.php b/src/Infrastructure/ORM/User/Repository/User.php
index 2c42f7dcaa166a01d2a4063ded43486b3c476d55..fa1eca6a17566dbf3ef2beef6aaaed9c64edd2d8 100644
--- a/src/Infrastructure/ORM/User/Repository/User.php
+++ b/src/Infrastructure/ORM/User/Repository/User.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/src/Kernel.php b/src/Kernel.php
index 406841dcfa235d1436f9550b046d54c18ceab85d..8260d7661b47319da51c83d967130b3d86fc49c7 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 namespace App;
diff --git a/templates/Admin/Duplication/new.html.twig b/templates/Admin/Duplication/new.html.twig
index fca67fbc9798dca5fbb9233832caef9f6d760755..54f48704e8a5b698c45da9c603c37ddbff78a7ce 100644
--- a/templates/Admin/Duplication/new.html.twig
+++ b/templates/Admin/Duplication/new.html.twig
@@ -149,16 +149,18 @@
             let targetOption = $('#duplication_targetOption input[type=radio]:checked').val();
             let targetPerType = $('#duplication_targetCollectivityTypes');
             let targetPerCollectivity = $('#duplication_targetCollectivities');
+            let targetPerTypeDiv = targetPerType.closest('.form-group');  // Cible le div parent
+            let targetPerCollectivityDiv = targetPerCollectivity.closest('.form-group');  // Cible le div parent
 
             if (targetOption === '{{ constant('App\\Domain\\Admin\\Dictionary\\DuplicationTargetOptionDictionary::KEY_PER_TYPE') }}') {
-                targetPerType.show();
-                targetPerCollectivity.hide();
+                targetPerTypeDiv.show();  // Afficher le div
+                targetPerCollectivityDiv.hide();  // Cacher le div
             } else if (targetOption === '{{ constant('App\\Domain\\Admin\\Dictionary\\DuplicationTargetOptionDictionary::KEY_PER_COLLECTIVITY') }}') {
-                targetPerType.hide();
-                targetPerCollectivity.show();
+                targetPerTypeDiv.hide();  // Cacher le div
+                targetPerCollectivityDiv.show();  // Afficher le div
             } else {
-                targetPerType.hide();
-                targetPerCollectivity.hide();
+                targetPerTypeDiv.hide();  // Cacher le div
+                targetPerCollectivityDiv.hide();  // Cacher le div
             }
         }
 
diff --git a/templates/Aipd/Analyse_impact/pdf.html.twig b/templates/Aipd/Analyse_impact/pdf.html.twig
index d3defafa29d719a7025c103b46e463f579d935c2..88455be6a0ee74faa1177e49edd7a275436dbb60 100644
--- a/templates/Aipd/Analyse_impact/pdf.html.twig
+++ b/templates/Aipd/Analyse_impact/pdf.html.twig
@@ -765,113 +765,149 @@
         <div style="page-break-before: always;"></div>
         <h3>6.3 Fiche de traitement</h3>
         {% set traitement = object.conformiteTraitement.traitement %}
+
+        {# DPO Statut #}
+        <div class="box box-solid box-default">
+            <div class="box-header with-border">
+                <h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
+            </div>
+            <div class="box-body no-padding">
+                <table role="presentation" class="table">
+                    <tbody>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.statut'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.statut is defined and traitement.statut %}
+                                    {{ traitement.statut|dictionary('treatment_statut') }}
+                                {% endif %}
+                            </td>
+                        </tr>
+                        {% if traitement.dpoMessage is not null %}
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.dpoMessage'|trans }}</strong></td>
+                                <td>{{ traitement.dpoMessage }}</td>
+                            </tr>
+                        {% endif %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
         {# GENERAL #}
         <div class="box box-solid box-info">
             <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.tab.general'|trans }}</h3></div>
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.public == true %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
-                        <td>{{ traitement.name }}</td>
-                    </tr>
-                    {% if traitement.service %}
                         <tr>
-                            <td><strong>{{ 'registry.label.service'|trans }}</strong></td>
-                            <td>{{ traitement.service }}</td>
+                            <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
+                            <td>{{ traitement.name }}</td>
                         </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
-                        <td>{{ traitement.goal|nl2br }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
-                        <td>{% if traitement.author is not null %}{{ traitement.author|dictionary('registry_treatment_author') }}{% endif %}</td>
-                    </tr>
-                    {% if traitement.author != "processing_manager" %}
+                        {% if traitement.collectivity.isServicesEnabled %}
+                            <tr>
+                                <td><strong>{{ 'registry.label.service'|trans }}</strong></td>
+                                <td>{{ traitement.service }}</td>
+                            </tr>
+                        {% endif %}
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
-                            <td>{{ traitement.coordonneesResponsableTraitement|nl2br }}</td>
+                            <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+                            <td>{{ traitement.goal|nl2br }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.author is not null %}
+                                    {{ traitement.author|dictionary('registry_treatment_author') }}
+                                {% endif %}
+                            </td>
+                        </tr>
+                        {% if traitement.author != "processing_manager" %}
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
+                                <td>{{ traitement.coordonneesResponsableTraitement|nl2br }}</td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
+                            <td>{{ traitement.manager }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.active %}
+                                    <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
+                            <td>{{ traitement.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
+                            <td>{{ traitement.legalBasisJustification|nl2br }}</td>
+                        </tr>
+                        {% if traitement.legalBasis == 'consent' %}
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
+                                <td>
+                                    {% if traitement.consentRequest %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
+                                <td>{{ traitement.consentRequestFormat }}</td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
+                            <td>{{ traitement.observation|nl2br }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.public == true %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
                         </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
-                        <td>{{ traitement.manager }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.active %}
-                                <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
-                        <td>{{ traitement.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
-                        <td>{{ traitement.legalBasisJustification|nl2br }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
-                        <td>{{ traitement.observation|nl2br }}</td>
-                    </tr>
                     </tbody>
                 </table>
             </div>
         </div>
 
-        {# DPO Statut #}
-        {% if traitement.dpoMessage is not null %}
-            <div class="box box-solid box-primary">
-                <div class="box-header with-border">
-                    <h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
-                </div>
-                <div class="box-body">
-                    {{ traitement.dpoMessage }}
-                </div>
-            </div>
-        {% endif %}
-
         {# DATA CATEGORY #}
         <div class="box box-solid box-warning">
             <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                                {% for category in traitement.dataCategories %}
-                                    <li>
-                                        {% if category.sensible %}<strong>{% endif %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
+                            <td>
+                                <ul class="ps-1">
+                                    {% for category in traitement.dataCategories %}
+                                        <li>
+                                            {% if category.sensible %}<strong>{% endif %}
                                             {{ category.name }}
                                             {% if category.sensible %}</strong>{% endif %}
-                                    </li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
-                        <td>{{ traitement.dataCategoryOther|nl2br }}</td>
-                    </tr>
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
+                            <td>{{ traitement.dataCategoryOther|nl2br }}</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -883,20 +919,20 @@
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
-                        <td>{{ traitement.recipientCategory|nl2br }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                                {% for contractor in traitement.contractors %}
-                                    <li>{{ contractor }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
+                            <td>{{ traitement.recipientCategory|nl2br }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
+                            <td>
+                                <ul class="ps-1">
+                                    {% for contractor in traitement.contractors %}
+                                        <li>{{ contractor }}</li>
+                                    {% endfor %}
+                                </ul>
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -908,96 +944,97 @@
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.ExemptAIPD %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.systematicMonitoring %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.largeScaleCollection %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.vulnerablePeople %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.dataCrossing %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.evaluationOrRating %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.automatedDecisionsWithLegalEffect %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.automaticExclusionService %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.innovativeUse %}
-                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.ExemptAIPD %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.systematicMonitoring %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.largeScaleCollection %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.vulnerablePeople %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.dataCrossing %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.evaluationOrRating %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.automatedDecisionsWithLegalEffect %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.automaticExclusionService %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.innovativeUse %}
+                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </tbody>
                 </table>
             </div>
         </div>
@@ -1008,199 +1045,205 @@
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeopleParticular.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeopleParticular.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeopleParticular.comment }}</p>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeopleParticular.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeopleParticular.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeopleParticular.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeopleUser.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeopleUser.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeopleUser.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeopleUser.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeopleUser.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeopleUser.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeopleAgent.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeopleAgent.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeopleAgent.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeopleAgent.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeopleAgent.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeopleAgent.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeopleElected.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeopleElected.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeopleElected.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeopleElected.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeopleElected.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeopleElected.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeopleCompany.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeopleCompany.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeopleCompany.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeopleCompany.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeopleCompany.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeopleCompany.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeoplePartner.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeoplePartner.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeoplePartner.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeoplePartner.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeoplePartner.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeoplePartner.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeopleUsager.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeopleUsager.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeopleUsager.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeopleUsager.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeopleUsager.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeopleUsager.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.concernedPeopleOther.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.concernedPeopleOther.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.concernedPeopleOther.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.concernedPeopleOther.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.concernedPeopleOther.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.concernedPeopleOther.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
-                        <td>{{ traitement.estimatedConcernedPeople }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>
-
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
+                            <td>{{ traitement.estimatedConcernedPeople }}</td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <strong>
+                                    {% if traitement.collectivity.hasModuleTools %}
+                                        {{ 'global.label.linked_tool'|trans }}
+                                    {% else %}
+                                        {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                    {% endif %}
+                                </strong>
+                            </td>
+                            <td>
                                 {% if traitement.collectivity.hasModuleTools %}
-                                    {{ 'global.label.linked_tool'|trans }}
+                                    <ul class="ps-1">
+                                        {% for tool in traitement.tools %}
+                                            <li>{{ tool.name }}</li>
+                                        {% endfor %}
+                                    </ul>
                                 {% else %}
-                                    {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                    {{ traitement.software }}
                                 {% endif %}
-                            </strong></td>
-                        <td>
-                            {% if traitement.collectivity.hasModuleTools %}
-                                {{ traitement.tools|map(t => t.name)|join(', ') }}
-                            {% else %}
-                                {{ traitement.software }}
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.paperProcessing %}
-                                <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.paperProcessing %}
+                                    <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
                 <table class="table" style="border-top: #f4f4f4 1px solid">
                     <tbody>
-                    <tr>
-                        <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
-                        <td style="padding-top: 10px; width: 80%">
-                            {% for method in traitement.shelfLifes %}
-                                <div class="box box-default">
-                                    <div class="box-body no-padding">
-                                        <table class="table">
-                                            <tbody>
-                                            <tr>
-                                                <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
-                                                <td>{{ method.name }}</td>
-                                            </tr>
-                                            <tr>
-                                                <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
-                                                <td>{{ method.duration }}</td>
-                                            </tr>
-                                            <tr>
-                                                <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
-                                                <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
+                        <tr>
+                            <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
+                            <td style="padding-top: 10px; width: 80%">
+                                {% for method in traitement.shelfLifes %}
+                                    <div class="box box-default">
+                                        <div class="box-body no-padding">
+                                            <table class="table">
+                                                <tbody>
+                                                    <tr>
+                                                        <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
+                                                        <td>{{ method.name }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
+                                                        <td>{{ method.duration }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
+                                                        <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
                                     </div>
-                                </div>
-                            {% endfor %}
-                        </td>
-                    </tr>
+                                {% endfor %}
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
                 <table class="table">
                     <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
-                        <td>{{ traitement.dataOrigin }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                                {% for method in traitement.collectingMethod %}
-                                    <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    {% if  traitement.otherCollectingMethod is not null %}
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
-                            <td>{{ traitement.otherCollectingMethod }}</td>
+                            <td><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
+                            <td>{{ traitement.dataOrigin }}</td>
                         </tr>
-                    {% endif %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
+                            <td>
+                                <ul class="ps-1">
+                                    {% for method in traitement.collectingMethod %}
+                                        <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
+                                    {% endfor %}
+                                </ul>
+                            </td>
+                        </tr>
+                        {% if  traitement.otherCollectingMethod is not null %}
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
+                                <td>{{ traitement.otherCollectingMethod }}</td>
+                            </tr>
+                        {% endif %}
+                    </tbody>
                 </table>
             </div>
         </div>
@@ -1211,101 +1254,101 @@
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securityAccessControl.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.securityAccessControl.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.securityAccessControl.comment }}</p>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securityAccessControl.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.securityAccessControl.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.securityAccessControl.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securitytracability.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.securitytracability.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.securitytracability.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securityUpdate.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.securityUpdate.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.securityUpdate.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securitySaving.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.securitySaving.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.securitySaving.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securitySaving.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.securitySaving.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.securitySaving.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securityUpdate.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.securityUpdate.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.securityUpdate.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securitytracability.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.securitytracability.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.securitytracability.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securityOther.check %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% if traitement.securityOther.comment is not empty %}
-                                    <p class="mt-2">{{ traitement.securityOther.comment }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securityOther.check %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% if traitement.securityOther.comment is not empty %}
+                                        <p class="mt-2">{{ traitement.securityOther.comment }}</p>
+                                    {% endif %}
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                 {% endif %}
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securityEntitledPersons %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securityOpenAccounts %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
-                        <td>
-                            {% if traitement.securitySpecificitiesDelivered %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securityEntitledPersons %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securityOpenAccounts %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.securitySpecificitiesDelivered %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -1317,6 +1360,8 @@
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
+                        {# TREATMENTS #}
+                        {% include '_Utils/_show_block_treatments.html.twig' with { treatments: traitement.treatments } %}
                         {# REQUESTS #}
                         {% include '_Utils/_show_block_requests.html.twig' with { requests: traitement.requests } %}
                         {# VIOLATIONS #}
@@ -1449,26 +1494,26 @@
             <div class="box-body no-padding">
                 <table class="table">
                     <tbody>
-                    {% if is_granted('ROLE_REFERENT') %}
+                        {% if is_granted('ROLE_REFERENT') %}
+                            <tr>
+                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                <td>
+                                    {{ traitement.collectivity }}
+                                </td>
+                            </tr>
+                        {% endif %}
                         <tr>
-                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                            <td>
-                                {{ traitement.collectivity }}
-                            </td>
+                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                            <td>{{ traitement.createdAt|date('d/m/Y H:i') }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                            <td>{{ traitement.updatedAt|date('d/m/Y H:i') }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                            <td>{{ traitement.updatedBy }}</td>
                         </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                        <td>{{ traitement.createdAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                        <td>{{ traitement.updatedAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                        <td>{{ traitement.updatedBy }}</td>
-                    </tr>
                     </tbody>
                 </table>
             </div>
diff --git a/templates/Aipd/Modele_analyse/rights.html.twig b/templates/Aipd/Modele_analyse/rights.html.twig
index cf9213a9200dc549f10191b8316fc92e7fd58709..ee6988ac8fafbd7cba5c7d172de505f695377338 100644
--- a/templates/Aipd/Modele_analyse/rights.html.twig
+++ b/templates/Aipd/Modele_analyse/rights.html.twig
@@ -6,7 +6,10 @@
 {% block title %}{{ 'aipd.modele_analyse.title.rights'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body_head %}
-    <h1>{{ 'aipd.modele_analyse.title.rights'|trans }}</h1>
+    <h1>
+        {{ 'aipd.modele_analyse.title.rights'|trans }}
+        <small>{{ form.vars.value.nom}}</small>
+    </h1>
 {% endblock %}
 
 {% block breadcrumb %}
@@ -73,16 +76,18 @@
             let targetOption = $('#modele_analyse_rights_optionRightSelection input[type=radio]:checked').val();
             let targetPerType = $('#modele_analyse_rights_authorizedCollectivityTypes');
             let targetPerCollectivity = $('#modele_analyse_rights_authorizedCollectivities');
+            let targetPerTypeDiv = targetPerType.closest('.form-group');  // Cible le div parent
+            let targetPerCollectivityDiv = targetPerCollectivity.closest('.form-group');  // Cible le div parent
 
             if (targetOption === '{{ constant('App\\Domain\\Admin\\Dictionary\\DuplicationTargetOptionDictionary::KEY_PER_TYPE') }}') {
-                targetPerType.show();
-                targetPerCollectivity.hide();
+                targetPerTypeDiv.show();  // Afficher le div
+                targetPerCollectivityDiv.hide();  // Cacher le div
             } else if (targetOption === '{{ constant('App\\Domain\\Admin\\Dictionary\\DuplicationTargetOptionDictionary::KEY_PER_COLLECTIVITY') }}') {
-                targetPerType.hide();
-                targetPerCollectivity.show();
+                targetPerTypeDiv.hide();  // Cacher le div
+                targetPerCollectivityDiv.show();  // Afficher le div
             } else {
-                targetPerType.hide();
-                targetPerCollectivity.hide();
+                targetPerTypeDiv.hide();  // Cacher le div
+                targetPerCollectivityDiv.hide();  // Cacher le div
             }
         }
 
diff --git a/templates/Maturity/Referentiel/rights.html.twig b/templates/Maturity/Referentiel/rights.html.twig
index 43a056958bcf5858d97352207239363ca6548aa0..f8ea984c475d99dea35e0224a16d9f5d5d530ffb 100644
--- a/templates/Maturity/Referentiel/rights.html.twig
+++ b/templates/Maturity/Referentiel/rights.html.twig
@@ -6,7 +6,10 @@
 {% block title %}{{ 'maturity.referentiel.title.rights'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body_head %}
-    <h1>{{ 'maturity.referentiel.title.rights'|trans }}</h1>
+    <h1>
+        {{ 'maturity.referentiel.title.rights'|trans }}
+        <small>{{ form.vars.value.name}}</small>
+    </h1>
 {% endblock %}
 
 {% block breadcrumb %}
@@ -76,16 +79,18 @@
             let targetOption = $('#modele_referentiel_rights_optionRightSelection input[type=radio]:checked').val();
             let targetPerType = $('#modele_referentiel_rights_authorizedCollectivityTypes');
             let targetPerCollectivity = $('#modele_referentiel_rights_authorizedCollectivities');
+            let targetPerTypeDiv = targetPerType.closest('.form-group');  // Cible le div parent
+            let targetPerCollectivityDiv = targetPerCollectivity.closest('.form-group');  // Cible le div parent
 
             if (targetOption === '{{ constant('App\\Domain\\Admin\\Dictionary\\DuplicationTargetOptionDictionary::KEY_PER_TYPE') }}') {
-                targetPerType.show();
-                targetPerCollectivity.hide();
+                targetPerTypeDiv.show();  // Afficher le div
+                targetPerCollectivityDiv.hide();  // Cacher le div
             } else if (targetOption === '{{ constant('App\\Domain\\Admin\\Dictionary\\DuplicationTargetOptionDictionary::KEY_PER_COLLECTIVITY') }}') {
-                targetPerType.hide();
-                targetPerCollectivity.show();
+                targetPerTypeDiv.hide();  // Cacher le div
+                targetPerCollectivityDiv.show();  // Afficher le div
             } else {
-                targetPerType.hide();
-                targetPerCollectivity.hide();
+                targetPerTypeDiv.hide();  // Cacher le div
+                targetPerCollectivityDiv.hide();  // Cacher le div
             }
         }
 
diff --git a/templates/Page/plan_annuel_2025.html.twig b/templates/Page/plan_annuel_2025.html.twig
index deeee4a296a7863a6a063423ebc26257630592da..22c83661a03deef8da21de2e1bc51e3088e11dca 100644
--- a/templates/Page/plan_annuel_2025.html.twig
+++ b/templates/Page/plan_annuel_2025.html.twig
@@ -48,7 +48,7 @@
                 <tbody>
                     <tr>
                         <th scope="row">Budget 2025</th>
-                        <td>Vote du budget 2025 pour les développements du troisième lot lié à l’accessibilité. Une partie des développements peut être réalisé par l'équipe Madis sur les moyens humains consacrés au projet.</td>
+                        <td>Vote du budget 2025 pour les développements du troisième lot lié à l’accessibilité. Une partie des développements peut être réalisée par l'équipe Madis sur les moyens humains consacrés au projet.</td>
                         <td></td>
                         <td><span class="badge">Non prévu</span></td>
                     </tr>
@@ -89,19 +89,19 @@
                     <tr>
                         <th scope="row">Schéma pluriannuel</th>
                         <td>Rédaction du schéma pluriannuel 2025 – 2027</td>
-                        <td>1<sup>er</sup> trimestre 2025</td>
+                        <td>Janvier 2025</td>
                         <td><span class="badge bg-green">Réalisé</span></td>
                     </tr>
                     <tr>
                         <th scope="row">Plan annuel 2025</th>
                         <td>Rédaction des actions du plan annuel 2025</td>
-                        <td>1<sup>er</sup> trimestre 2025</td>
+                        <td>Janvier 2025</td>
                         <td><span class="badge bg-green">Réalisé</span></td>
                     </tr>
                     <tr>
                         <th scope="row">Publication</th>
                         <td>Publication du schéma pluriannuel 2025 – 2027, ainsi que du plan annuel 2025</td>
-                        <td>1<sup>er</sup> trimestre 2025</td>
+                        <td>Janvier 2025</td>
                         <td><span class="badge bg-green">Réalisé</span></td>
                     </tr>
                 </tbody>
diff --git a/templates/Registry/Contractor/pdf.html.twig b/templates/Registry/Contractor/pdf.html.twig
index a1db834f6a6377bd7f68ff9472bbd6e88cc48e12..003798709fefc84156ba70b3df94a7c1fbb5b47f 100644
--- a/templates/Registry/Contractor/pdf.html.twig
+++ b/templates/Registry/Contractor/pdf.html.twig
@@ -12,64 +12,64 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.name'|trans }}</strong></td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                {% if object.collectivity.isServicesEnabled %}
-                    <tr>
-                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                        <td>{{ object.service }}</td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.referent'|trans }}</strong></td>
-                    <td>{{ object.referent }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.contractual_clauses_verified'|trans }}</strong></td>
-                    <td>
-                        {% if object.contractualClausesVerified %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.adopted_security_features'|trans }}</strong></td>
-                    <td>
-                        {% if object.adoptedSecurityFeatures %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.maintains_treatment_register'|trans }}</strong></td>
-                    <td>
-                        {% if object.maintainsTreatmentRegister %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.sending_data_outside_eu'|trans }}</strong></td>
-                    <td>
-                        {% if object.sendingDataOutsideEu %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.other_informations'|trans }}</strong></td>
-                    <td>{{ object.otherInformations|nl2br }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.name'|trans }}</strong></td>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                    {% if object.collectivity.isServicesEnabled %}
+                        <tr>
+                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                            <td>{{ object.service }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.referent'|trans }}</strong></td>
+                        <td>{{ object.referent }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.contractual_clauses_verified'|trans }}</strong></td>
+                        <td>
+                            {% if object.contractualClausesVerified %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.adopted_security_features'|trans }}</strong></td>
+                        <td>
+                            {% if object.adoptedSecurityFeatures %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.maintains_treatment_register'|trans }}</strong></td>
+                        <td>
+                            {% if object.maintainsTreatmentRegister %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.sending_data_outside_eu'|trans }}</strong></td>
+                        <td>
+                            {% if object.sendingDataOutsideEu %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.other_informations'|trans }}</strong></td>
+                        <td>{{ object.otherInformations|nl2br }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -81,46 +81,46 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.contractor.label.has_dpo'|trans }}</strong></td>
-                    <td>
-                        <span class="badge">
-                            {% if object.hasDpo %}
-                                {{ 'global.label.yes'|trans }}
-                            {% else %}
-                                {{ 'global.label.no'|trans }}
+                    <tr>
+                        <td><strong>{{ 'registry.contractor.label.has_dpo'|trans }}</strong></td>
+                        <td>
+                            <span class="badge">
+                                {% if object.hasDpo %}
+                                    {{ 'global.label.yes'|trans }}
+                                {% else %}
+                                    {{ 'global.label.no'|trans }}
+                                {% endif %}
+                            </span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                        <td>
+                            {% if object.dpo.civility is not null %}
+                                {{ object.dpo.civility|dictionary('user_contact_civility') }}
                             {% endif %}
-                        </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                    <td>
-                        {% if object.dpo.civility is not null %}
-                            {{ object.dpo.civility|dictionary('user_contact_civility') }}
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                    <td>{{ object.dpo.firstName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                    <td>{{ object.dpo.lastName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.job'|trans }}</strong></td>
-                    <td>{{ object.dpo.job }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                    <td>{{ object.dpo.mail }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                    <td>{{ object.dpo.phoneNumber }}</td>
-                </tr>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                        <td>{{ object.dpo.firstName }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                        <td>{{ object.dpo.lastName }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.job'|trans }}</strong></td>
+                        <td>{{ object.dpo.job }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                        <td>{{ object.dpo.mail }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                        <td>{{ object.dpo.phoneNumber }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -132,42 +132,42 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                    <td>{{ object.legalManager.firstName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                    <td>{{ object.legalManager.lastName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                    <td>{{ object.address.lineOne }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.address.line_two'|trans }}</strong></td>
-                    <td>{{ object.address.lineTwo }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.address.zip_code'|trans }}</strong></td>
-                    <td>{{ object.address.zipCode }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.address.city'|trans }}</strong></td>
-                    <td>{{ object.address.city }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.address.country'|trans }}</strong></td>
-                    <td>{{ object.address.country }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                    <td>{{ object.address.mail }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                    <td>{{ object.address.phoneNumber }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                        <td>{{ object.legalManager.firstName }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                        <td>{{ object.legalManager.lastName }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                        <td>{{ object.address.lineOne }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.address.line_two'|trans }}</strong></td>
+                        <td>{{ object.address.lineTwo }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.address.zip_code'|trans }}</strong></td>
+                        <td>{{ object.address.zipCode }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.address.city'|trans }}</strong></td>
+                        <td>{{ object.address.city }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.address.country'|trans }}</strong></td>
+                        <td>{{ object.address.country }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                        <td>{{ object.address.mail }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                        <td>{{ object.address.phoneNumber }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -179,21 +179,22 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {# TREATMENTS #}
-                {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                {# CONTRACTORS #}
-                {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                {% if object.collectivity.isHasModuleTools %}
-                    {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                {% endif %}
-                {# REQUESTS #}
-                {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                {# VIOLATIONS #}
-                {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                {# PROOFS #}
-                {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                {# MESUREMENTS #}
-                {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                    {# TREATMENTS #}
+                    {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                    {# CONTRACTORS #}
+                    {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                    {# TOOLS #}
+                    {% if object.collectivity.isHasModuleTools %}
+                        {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                    {% endif %}
+                    {# REQUESTS #}
+                    {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                    {# VIOLATIONS #}
+                    {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                    {# PROOFS #}
+                    {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                    {# MESUREMENTS #}
+                    {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                 </tbody>
             </table>
         </div>
@@ -205,26 +206,26 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {% if is_granted('ROLE_REFERENT') %}
+                    {% if is_granted('ROLE_REFERENT') %}
+                        <tr>
+                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                            <td>
+                                {{ object.collectivity }}
+                            </td>
+                        </tr>
+                    {% endif %}
                     <tr>
-                        <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                        <td>
-                            {{ object.collectivity }}
-                        </td>
+                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                        <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                        <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                        <td>{{ object.updatedBy }}</td>
                     </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                    <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                    <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                    <td>{{ object.updatedBy }}</td>
-                </tr>
                 </tbody>
             </table>
         </div>
diff --git a/templates/Registry/Contractor/pdf_all.html.twig b/templates/Registry/Contractor/pdf_all.html.twig
index 983d15e598a3fb9e25385a6914726350e8a85242..a3995780ca272f92a34cfd3e3db2df910f92ef70 100644
--- a/templates/Registry/Contractor/pdf_all.html.twig
+++ b/templates/Registry/Contractor/pdf_all.html.twig
@@ -5,231 +5,232 @@
 
 {% block body %}
     {% for object in objects %}
-    <div style="page-break-after: always">
-        <h1 class="text-center">{{ object.name }}</h1>
-        {# GENERAL #}
-        <div class="box box-solid box-info">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.name'|trans }}</strong></td>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    {% if object.collectivity.isServicesEnabled %}
-                        <tr>
-                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                            <td>{{ object.service }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.referent'|trans }}</strong></td>
-                        <td>{{ object.referent }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.contractual_clauses_verified'|trans }}</strong></td>
-                        <td>
-                            {% if object.contractualClausesVerified %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+        <div style="page-break-after: always">
+            <h1 class="text-center">{{ object.name }}</h1>
+            {# GENERAL #}
+            <div class="box box-solid box-info">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.name'|trans }}</strong></td>
+                                <td>{{ object.name }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
                             {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.adopted_security_features'|trans }}</strong></td>
-                        <td>
-                            {% if object.adoptedSecurityFeatures %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.maintains_treatment_register'|trans }}</strong></td>
-                        <td>
-                            {% if object.maintainsTreatmentRegister %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.sending_data_outside_eu'|trans }}</strong></td>
-                        <td>
-                            {% if object.sendingDataOutsideEu %}
-                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.other_informations'|trans }}</strong></td>
-                        <td>{{ object.otherInformations|nl2br }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.referent'|trans }}</strong></td>
+                                <td>{{ object.referent }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.contractual_clauses_verified'|trans }}</strong></td>
+                                <td>
+                                    {% if object.contractualClausesVerified %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.adopted_security_features'|trans }}</strong></td>
+                                <td>
+                                    {% if object.adoptedSecurityFeatures %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.maintains_treatment_register'|trans }}</strong></td>
+                                <td>
+                                    {% if object.maintainsTreatmentRegister %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.sending_data_outside_eu'|trans }}</strong></td>
+                                <td>
+                                    {% if object.sendingDataOutsideEu %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.other_informations'|trans }}</strong></td>
+                                <td>{{ object.otherInformations|nl2br }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# DPO #}
-        <div class="box box-solid box-success">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.contractor.tab.dpo'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.contractor.label.has_dpo'|trans }}</strong></td>
-                        <td>
-                            <span class="badge">
-                                {% if object.hasDpo %}
-                                    {{ 'global.label.yes'|trans }}
-                                {% else %}
-                                    {{ 'global.label.no'|trans }}
-                                {% endif %}
-                            </span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                        <td>
-                            {% if object.dpo.civility is not null %}
-                                {{ object.dpo.civility|dictionary('user_contact_civility') }}
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                        <td>{{ object.dpo.firstName }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                        <td>{{ object.dpo.lastName }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.job'|trans }}</strong></td>
-                        <td>{{ object.dpo.job }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                        <td>{{ object.dpo.mail }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                        <td>{{ object.dpo.phoneNumber }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+            {# DPO #}
+            <div class="box box-solid box-success">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.contractor.tab.dpo'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.has_dpo'|trans }}</strong></td>
+                                <td>
+                                    <span class="badge">
+                                        {% if object.hasDpo %}
+                                            {{ 'global.label.yes'|trans }}
+                                        {% else %}
+                                            {{ 'global.label.no'|trans }}
+                                        {% endif %}
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                                <td>
+                                    {% if object.dpo.civility is not null %}
+                                        {{ object.dpo.civility|dictionary('user_contact_civility') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                <td>{{ object.dpo.firstName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                <td>{{ object.dpo.lastName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.job'|trans }}</strong></td>
+                                <td>{{ object.dpo.job }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                <td>{{ object.dpo.mail }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                <td>{{ object.dpo.phoneNumber }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# COORDINATES #}
-        <div class="box box-solid box-primary">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.contractor.tab.coordinates'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                        <td>{{ object.legalManager.firstName }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                        <td>{{ object.legalManager.lastName }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                        <td>{{ object.address.lineOne }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.address.line_two'|trans }}</strong></td>
-                        <td>{{ object.address.lineTwo }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.address.zip_code'|trans }}</strong></td>
-                        <td>{{ object.address.zipCode }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.address.city'|trans }}</strong></td>
-                        <td>{{ object.address.city }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.address.country'|trans }}</strong></td>
-                        <td>{{ object.address.country }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                        <td>{{ object.address.mail }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                        <td>{{ object.address.phoneNumber }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+            {# COORDINATES #}
+            <div class="box box-solid box-primary">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.contractor.tab.coordinates'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                <td>{{ object.legalManager.firstName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                <td>{{ object.legalManager.lastName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                                <td>{{ object.address.lineOne }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.line_two'|trans }}</strong></td>
+                                <td>{{ object.address.lineTwo }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.zip_code'|trans }}</strong></td>
+                                <td>{{ object.address.zipCode }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.city'|trans }}</strong></td>
+                                <td>{{ object.address.city }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.country'|trans }}</strong></td>
+                                <td>{{ object.address.country }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                <td>{{ object.address.mail }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                <td>{{ object.address.phoneNumber }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# LINKED MODULES #}
-        <div class="box box-solid box-warning">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    {# TREATMENTS #}
-                    {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                    {# CONTRACTORS #}
-                    {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                    {% if object.collectivity.isHasModuleTools %}
-                        {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                    {% endif %}
-                    {# REQUESTS #}
-                    {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                    {# VIOLATIONS #}
-                    {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                    {# PROOFS #}
-                    {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                    {# MESUREMENTS #}
-                    {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
-                    </tbody>
-                </table>
+            {# LINKED MODULES #}
+            <div class="box box-solid box-warning">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# CONTRACTORS #}
+                            {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                            {% endif %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# HISTORIC #}
-        <div class="box box-solid box-default">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    {% if is_granted('ROLE_REFERENT') %}
-                        <tr>
-                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                            <td>
-                                {{ object.collectivity }}
-                            </td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                        <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                        <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                        <td>{{ object.updatedBy }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+            {# HISTORIC #}
+            <div class="box box-solid box-default">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>
+                                        {{ object.collectivity }}
+                                    </td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div>
-    </div>
     {% endfor %}
 {% endblock %}
diff --git a/templates/Registry/Contractor/show.html.twig b/templates/Registry/Contractor/show.html.twig
index 0c28dfe36bc2bb094b8e70793131d13499cab7e7..32adba8be84b9abfaf08ec280464c2ba373d90c3 100644
--- a/templates/Registry/Contractor/show.html.twig
+++ b/templates/Registry/Contractor/show.html.twig
@@ -21,28 +21,27 @@
 {% endblock %}
 
 {% block body %}
-
     {% if is_granted('ROLE_PREVIEW') %}
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="mb-1">
-                <a href="{{ path('registry_contractor_list') }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-arrow-left"></i>
-                    {{ 'global.action.back_to_list'|trans }}
-                </a>
-                {% if (actionEnabled) %}
-                    <a href="{{ path('registry_contractor_edit', {'id': object.id}) }}" class="btn btn-default">
-                        <i aria-hidden="true" class="fa fa-pencil"></i>
-                        {{ 'global.action.edit'|trans }}
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="mb-1">
+                    <a href="{{ path('registry_contractor_list') }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-arrow-left"></i>
+                        {{ 'global.action.back_to_list'|trans }}
+                    </a>
+                    {% if (actionEnabled) %}
+                        <a href="{{ path('registry_contractor_edit', {'id': object.id}) }}" class="btn btn-default">
+                            <i aria-hidden="true" class="fa fa-pencil"></i>
+                            {{ 'global.action.edit'|trans }}
+                        </a>
+                    {% endif %}
+                    <a href="{{ path('registry_contractor_pdf', {'id': object.id}) }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-print"></i>
+                        {{ 'global.action.print'|trans }}
                     </a>
-                {% endif %}
-                <a href="{{ path('registry_contractor_pdf', {'id': object.id}) }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-print"></i>
-                    {{ 'global.action.print'|trans }}
-                </a>
+                </div>
             </div>
         </div>
-    </div>
     {% endif %}
 
     <div class="row">
@@ -54,64 +53,64 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.name'|trans }}</strong></td>
-                            <td>{{ object.name }}</td>
-                        </tr>
-                        {% if object.collectivity.isServicesEnabled %}
                             <tr>
-                                <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                                <td>{{ object.service }}</td>
+                                <td><strong>{{ 'registry.contractor.label.name'|trans }}</strong></td>
+                                <td>{{ object.name }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.referent'|trans }}</strong></td>
+                                <td>{{ object.referent }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.contractual_clauses_verified'|trans }}</strong></td>
+                                <td>
+                                    {% if object.contractualClausesVerified %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.adopted_security_features'|trans }}</strong></td>
+                                <td>
+                                    {% if object.adoptedSecurityFeatures %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.maintains_treatment_register'|trans }}</strong></td>
+                                <td>
+                                    {% if object.maintainsTreatmentRegister %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.sending_data_outside_eu'|trans }}</strong></td>
+                                <td>
+                                    {% if object.sendingDataOutsideEu %}
+                                        <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.other_informations'|trans }}</strong></td>
+                                <td>{{ object.otherInformations|nl2br }}</td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.referent'|trans }}</strong></td>
-                            <td>{{ object.referent }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.contractual_clauses_verified'|trans }}</strong></td>
-                            <td>
-                                {% if object.contractualClausesVerified %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.adopted_security_features'|trans }}</strong></td>
-                            <td>
-                                {% if object.adoptedSecurityFeatures %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.maintains_treatment_register'|trans }}</strong></td>
-                            <td>
-                                {% if object.maintainsTreatmentRegister %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.sending_data_outside_eu'|trans }}</strong></td>
-                            <td>
-                                {% if object.sendingDataOutsideEu %}
-                                    <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.other_informations'|trans }}</strong></td>
-                            <td>{{ object.otherInformations|nl2br }}</td>
-                        </tr>
                         </tbody>
                     </table>
                 </div>
@@ -123,46 +122,46 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.contractor.label.has_dpo'|trans }}</strong></td>
-                            <td>
-                                <span class="badge">
-                                    {% if object.hasDpo %}
-                                        {{ 'global.label.yes'|trans }}
-                                    {% else %}
-                                        {{ 'global.label.no'|trans }}
+                            <tr>
+                                <td><strong>{{ 'registry.contractor.label.has_dpo'|trans }}</strong></td>
+                                <td>
+                                    <span class="badge">
+                                        {% if object.hasDpo %}
+                                            {{ 'global.label.yes'|trans }}
+                                        {% else %}
+                                            {{ 'global.label.no'|trans }}
+                                        {% endif %}
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                                <td>
+                                    {% if object.dpo.civility is not null %}
+                                        {{ object.dpo.civility|dictionary('user_contact_civility') }}
                                     {% endif %}
-                                </span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                            <td>
-                                {% if object.dpo.civility is not null %}
-                                    {{ object.dpo.civility|dictionary('user_contact_civility') }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                            <td>{{ object.dpo.firstName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                            <td>{{ object.dpo.lastName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.job'|trans }}</strong></td>
-                            <td>{{ object.dpo.job }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                            <td>{{ object.dpo.mail }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                            <td>{{ object.dpo.phoneNumber }}</td>
-                        </tr>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                <td>{{ object.dpo.firstName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                <td>{{ object.dpo.lastName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.job'|trans }}</strong></td>
+                                <td>{{ object.dpo.job }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                <td>{{ object.dpo.mail }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                <td>{{ object.dpo.phoneNumber }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -174,28 +173,28 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {% if is_granted('ROLE_REFERENT') %}
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>
+                                        <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
+                                            {{ object.collectivity }}
+                                        </a>
+                                    </td>
+                                </tr>
+                            {% endif %}
                             <tr>
-                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                                <td>
-                                    <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
-                                        {{ object.collectivity }}
-                                    </a>
-                                </td>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                            <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                            <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                            <td>{{ object.updatedBy }}</td>
-                        </tr>
                         </tbody>
                     </table>
                 </div>
@@ -210,42 +209,42 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                            <td>{{ object.legalManager.firstName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                            <td>{{ object.legalManager.lastName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                            <td>{{ object.address.lineOne }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.address.line_two'|trans }}</strong></td>
-                            <td>{{ object.address.lineTwo }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.address.zip_code'|trans }}</strong></td>
-                            <td>{{ object.address.zipCode }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.address.city'|trans }}</strong></td>
-                            <td>{{ object.address.city }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.address.country'|trans }}</strong></td>
-                            <td>{{ object.address.country }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                            <td>{{ object.address.mail }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                            <td>{{ object.address.phoneNumber }}</td>
-                        </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                <td>{{ object.legalManager.firstName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                <td>{{ object.legalManager.lastName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                                <td>{{ object.address.lineOne }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.line_two'|trans }}</strong></td>
+                                <td>{{ object.address.lineTwo }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.zip_code'|trans }}</strong></td>
+                                <td>{{ object.address.zipCode }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.city'|trans }}</strong></td>
+                                <td>{{ object.address.city }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.country'|trans }}</strong></td>
+                                <td>{{ object.address.country }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                <td>{{ object.address.mail }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                <td>{{ object.address.phoneNumber }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -257,27 +256,26 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {# TREATMENTS #}
-                        {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                        {# CONTRACTORS #}
-                        {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                        {% if object.collectivity.isHasModuleTools %}
-                            {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                        {% endif %}
-                        {# REQUESTS #}
-                        {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                        {# VIOLATIONS #}
-                        {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                        {# PROOFS #}
-                        {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                        {# MESUREMENTS #}
-                        {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
-
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# CONTRACTORS #}
+                            {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                            {% endif %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                         </tbody>
                     </table>
                 </div>
             </div>
         </div>
-
     </div>
 {% endblock %}
diff --git a/templates/Registry/Mesurement/_form.html.twig b/templates/Registry/Mesurement/_form.html.twig
index aab4d74c35462bb0c6488a68fd46e45e2220e434..b1291a7f24874a3456822319a8186df8127ff88b 100644
--- a/templates/Registry/Mesurement/_form.html.twig
+++ b/templates/Registry/Mesurement/_form.html.twig
@@ -5,76 +5,75 @@
 {% endif %}
 
 {{ form_start(form) }}
+    {% macro complex_choice(field) %}
+        <div class="row complex-choice-group">
+            <div class="col-sm-1 check">{{ form_row(field.check) }}</div>
+            <div class="col-sm-3">{{ form_label(field) }}</div>
+            <div class="col-sm-8 comment">{{ form_widget(field.comment) }}</div>
+        </div>
+    {% endmacro %}
 
-{% macro complex_choice(field) %}
-<div class="row complex-choice-group">
-    <div class="col-sm-1 check">{{ form_row(field.check) }}</div>
-    <div class="col-sm-3">{{ form_label(field) }}</div>
-    <div class="col-sm-8 comment">{{ form_widget(field.comment) }}</div>
-</div>
-{% endmacro %}
-{% import _self as macro %}
-
-<div class="row">
-    <div class="col-md-6">
-        {# GENERAL INFORMATIONS #}
-        <div class="box box-solid box-info">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
-            <div class="box-body">
-                {{ form_row(form.name) }}
-                {% if serviceEnabled is defined and serviceEnabled %}
-                    {{ form_row(form.service) }}
-                {% endif %}
-                {{ form_row(form.description) }}
-                {#{{ form_row(form.type) }}#}
-                {{ form_row(form.manager) }}
-                {{ form_row(form.priority) }}
-                {{ form_row(form.cost) }}
-                {{ form_row(form.charge) }}
+    {% import _self as macro %}
+    
+    <div class="row">
+        <div class="col-md-6">
+            {# GENERAL INFORMATIONS #}
+            <div class="box box-solid box-info">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
+                <div class="box-body">
+                    {{ form_row(form.name) }}
+                    {% if serviceEnabled is defined and serviceEnabled %}
+                        {{ form_row(form.service) }}
+                    {% endif %}
+                    {{ form_row(form.description) }}
+                    {#{{ form_row(form.type) }}#}
+                    {{ form_row(form.manager) }}
+                    {{ form_row(form.priority) }}
+                    {{ form_row(form.cost) }}
+                    {{ form_row(form.charge) }}
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="col-md-6">
-        {# APPLICATION #}
-        <div class="box box-solid box-success">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.mesurement.tab.application'|trans }}</h3></div>
-            <div class="box-body">
-                {{ form_row(form.status) }}
-                {{ form_row(form.planificationDate) }}
-                {{ form_row(form.comment) }}
+        <div class="col-md-6">
+            {# APPLICATION #}
+            <div class="box box-solid box-success">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.mesurement.tab.application'|trans }}</h3></div>
+                <div class="box-body">
+                    {{ form_row(form.status) }}
+                    {{ form_row(form.planificationDate) }}
+                    {{ form_row(form.comment) }}
+                </div>
             </div>
-        </div>
 
-        {# LINKED MODULES #}
-        <div class="box box-solid box-warning">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-            <div class="box-body">
-                {{ form_row(form.treatments) }}
-                {{ form_row(form.contractors) }}
-                {% if form.tools is defined %}
-                    {{ form_row(form.tools) }}
-                {% endif %}
-                {{ form_row(form.requests) }}
-                {{ form_row(form.violations) }}
-                {{ form_row(form.proofs) }}
-                {{ form_row(form.mesurements) }}
+            {# LINKED MODULES #}
+            <div class="box box-solid box-warning">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                <div class="box-body">
+                    {{ form_row(form.treatments) }}
+                    {{ form_row(form.contractors) }}
+                    {% if form.tools is defined %}
+                        {{ form_row(form.tools) }}
+                    {% endif %}
+                    {{ form_row(form.requests) }}
+                    {{ form_row(form.violations) }}
+                    {{ form_row(form.proofs) }}
+                    {{ form_row(form.mesurements) }}
+                </div>
             </div>
         </div>
     </div>
-</div>
 
-<div class="row">
-    <div class="col-md-12">
-        <div class="box box-solid">
-            <div class="box-body text-center">
-                <a href="{{ path('registry_mesurement_list') }}" class="btn btn-default">
-                    {{ 'global.action.back_to_list'|trans }}
-                </a>
-                <input type="submit" class="btn btn-primary" value="{{ submitValue }}">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-solid">
+                <div class="box-body text-center">
+                    <a href="{{ path('registry_mesurement_list') }}" class="btn btn-default">
+                        {{ 'global.action.back_to_list'|trans }}
+                    </a>
+                    <input type="submit" class="btn btn-primary" value="{{ submitValue }}">
+                </div>
             </div>
         </div>
     </div>
-</div>
-
 {{ form_end(form) }}
diff --git a/templates/Registry/Mesurement/pdf.html.twig b/templates/Registry/Mesurement/pdf.html.twig
index 745b9c89ce0acaed9efd34c0f9ef873c191864b3..c1b1e528968c7e421b87280f25c1cd07b85fa830 100644
--- a/templates/Registry/Mesurement/pdf.html.twig
+++ b/templates/Registry/Mesurement/pdf.html.twig
@@ -8,45 +8,44 @@
 {% block body_head %}{{ object.name }}{% endblock %}
 
 {% block body %}
-
     {# GENERAL INFORMATIONS #}
     <div class="box box-solid box-info">
         <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.name'|trans }}</strong></td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                {% if object.collectivity.isServicesEnabled %}
                     <tr>
-                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                        <td>{{ object.service }}</td>
+                        <td><strong>{{ 'registry.mesurement.label.name'|trans }}</strong></td>
+                        <td>{{ object.name }}</td>
                     </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.description'|trans }}</strong></td>
-                    <td>{{ object.description|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.manager'|trans }}</strong></td>
-                    <td>{{ object.manager }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.priority'|trans }}</strong></td>
-                    {% if object.priority is not null %}
-                        <td>{{ object.priority|dictionary('registry_mesurement_priority') }}</td>
+                    {% if object.collectivity.isServicesEnabled %}
+                        <tr>
+                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                            <td>{{ object.service }}</td>
+                        </tr>
                     {% endif %}
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.cost'|trans }}</strong></td>
-                    <td>{{ object.cost }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.charge'|trans }}</strong></td>
-                    <td>{{ object.charge }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.description'|trans }}</strong></td>
+                        <td>{{ object.description|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.manager'|trans }}</strong></td>
+                        <td>{{ object.manager }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.priority'|trans }}</strong></td>
+                        {% if object.priority is not null %}
+                            <td>{{ object.priority|dictionary('registry_mesurement_priority') }}</td>
+                        {% endif %}
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.cost'|trans }}</strong></td>
+                        <td>{{ object.cost }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.charge'|trans }}</strong></td>
+                        <td>{{ object.charge }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -58,26 +57,27 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.status'|trans }}</strong></td>
-                    <td>{{ object.status|dictionary('registry_mesurement_status') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.planification_date'|trans }}</strong></td>
-                    <td>
-                        {% if object.planificationDate is not null %}
-                            {{ object.planificationDate|date('d/m/Y') }}
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.mesurement.label.comment'|trans }}</strong></td>
-                    <td>
-                        {% if object.comment is not null %}
-                            {{ object.comment }}
-                        {% endif %}
-                    </td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.status'|trans }}</strong></td>
+                        <td>{{ object.status|dictionary('registry_mesurement_status') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.planification_date'|trans }}</strong></td>
+                        <td>
+                            {% if object.planificationDate is not null %}
+                                {{ object.planificationDate|date('d/m/Y') }}
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.mesurement.label.comment'|trans }}</strong></td>
+                        <td>
+                            {% if object.comment is not null %}
+                                {{ object.comment }}
+                            {% endif %}
+                        </td>
+                    </tr>
+                </tbody>
             </table>
         </div>
     </div>
@@ -92,6 +92,7 @@
                 {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
                 {# CONTRACTORS #}
                 {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                {# TOOLS #}
                 {% if object.collectivity.isHasModuleTools %}
                     {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
                 {% endif %}
diff --git a/templates/Registry/Mesurement/pdf_all.html.twig b/templates/Registry/Mesurement/pdf_all.html.twig
index a235a25f4a371e91136f1d0ceb8bc709d183c998..108a3e6048a4b14f86242cdbbe9e9f4bf466e273 100644
--- a/templates/Registry/Mesurement/pdf_all.html.twig
+++ b/templates/Registry/Mesurement/pdf_all.html.twig
@@ -5,137 +5,139 @@
 
 {% block body %}
     {% for object in objects %}
-    <div style="page-break-after: always">
-        <h1 class="text-center">{{ object.name }}</h1>
-        {# GENERAL INFORMATIONS #}
-        <div class="box box-solid box-info">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.name'|trans }}</strong></td>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    {% if object.collectivity.isServicesEnabled %}
-                        <tr>
-                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                            <td>{{ object.service }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.description'|trans }}</strong></td>
-                        <td>{{ object.description|nl2br }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.manager'|trans }}</strong></td>
-                        <td>{{ object.manager }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.priority'|trans }}</strong></td>
-                        {% if object.priority is not null %}
-                            <td>{{ object.priority|dictionary('registry_mesurement_priority') }}</td>
-                        {% endif %}
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.cost'|trans }}</strong></td>
-                        <td>{{ object.cost }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.charge'|trans }}</strong></td>
-                        <td>{{ object.charge }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+        <div style="page-break-after: always">
+            <h1 class="text-center">{{ object.name }}</h1>
+            {# GENERAL INFORMATIONS #}
+            <div class="box box-solid box-info">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.name'|trans }}</strong></td>
+                                <td>{{ object.name }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.description'|trans }}</strong></td>
+                                <td>{{ object.description|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.manager'|trans }}</strong></td>
+                                <td>{{ object.manager }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.priority'|trans }}</strong></td>
+                                {% if object.priority is not null %}
+                                    <td>{{ object.priority|dictionary('registry_mesurement_priority') }}</td>
+                                {% endif %}
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.cost'|trans }}</strong></td>
+                                <td>{{ object.cost }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.charge'|trans }}</strong></td>
+                                <td>{{ object.charge }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# APPLICATION #}
-        <div class="box box-solid box-success">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.mesurement.tab.application'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.status'|trans }}</strong></td>
-                        <td>{{ object.status|dictionary('registry_mesurement_status') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.planification_date'|trans }}</strong></td>
-                        <td>
-                            {% if object.planificationDate is not null %}
-                                {{ object.planificationDate|date('d/m/Y') }}
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.mesurement.label.comment'|trans }}</strong></td>
-                        <td>
-                            {% if object.comment is not null %}
-                                {{ object.comment }}
-                            {% endif %}
-                        </td>
-                    </tr>
-                </table>
+            {# APPLICATION #}
+            <div class="box box-solid box-success">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.mesurement.tab.application'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.status'|trans }}</strong></td>
+                                <td>{{ object.status|dictionary('registry_mesurement_status') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.planification_date'|trans }}</strong></td>
+                                <td>
+                                    {% if object.planificationDate is not null %}
+                                        {{ object.planificationDate|date('d/m/Y') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.comment'|trans }}</strong></td>
+                                <td>
+                                    {% if object.comment is not null %}
+                                        {{ object.comment }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# LINKED MODULES #}
-        <div class="box box-solid box-warning">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    {# TREATMENTS #}
-                    {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                    {# CONTRACTORS #}
-                    {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                    {% if object.collectivity.isHasModuleTools %}
-                        {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                    {% endif %}
-                    {# REQUESTS #}
-                    {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                    {# VIOLATIONS #}
-                    {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                    {# PROOFS #}
-                    {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                    {# MESUREMENTS #}
-                    {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
-                    </tbody>
-                </table>
+            {# LINKED MODULES #}
+            <div class="box box-solid box-warning">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# CONTRACTORS #}
+                            {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                            {% endif %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# HISTORIC #}
-        <div class="box box-solid box-default">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    {% if is_granted('ROLE_REFERENT') %}
+            {# HISTORIC #}
+            <div class="box box-solid box-default">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                        {% if is_granted('ROLE_REFERENT') %}
+                            <tr>
+                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                <td>
+                                    {{ object.collectivity }}
+                                </td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                            <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                            <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                        </tr>
                         <tr>
-                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                            <td>
-                                {{ object.collectivity }}
-                            </td>
+                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                            <td>{{ object.updatedBy }}</td>
                         </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                        <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                        <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                        <td>{{ object.updatedBy }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div>
-    </div>
     {% endfor %}
 {% endblock %}
diff --git a/templates/Registry/Mesurement/show.html.twig b/templates/Registry/Mesurement/show.html.twig
index fa454e39dfbea926611a9c76371f1e2bd664830c..7fce23989dfd442957e820f114521113300d3e6c 100644
--- a/templates/Registry/Mesurement/show.html.twig
+++ b/templates/Registry/Mesurement/show.html.twig
@@ -21,28 +21,27 @@
 {% endblock %}
 
 {% block body %}
-
     {% if is_granted('ROLE_PREVIEW') %}
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="mb-1">
-                <a href="{{ referer }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-arrow-left"></i>
-                    {{ 'global.action.back_to_list'|trans }}
-                </a>
-                {% if (actionEnabled) %}
-                <a href="{{ path('registry_mesurement_edit', {'id': object.id}) }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-pencil"></i>
-                    {{ 'global.action.edit'|trans }}
-                </a>
-                {% endif %}
-                <a href="{{ path('registry_mesurement_pdf', {'id': object.id}) }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-print"></i>
-                    {{ 'global.action.print'|trans }}
-                </a>
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="mb-1">
+                    <a href="{{ referer }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-arrow-left"></i>
+                        {{ 'global.action.back_to_list'|trans }}
+                    </a>
+                    {% if (actionEnabled) %}
+                    <a href="{{ path('registry_mesurement_edit', {'id': object.id}) }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-pencil"></i>
+                        {{ 'global.action.edit'|trans }}
+                    </a>
+                    {% endif %}
+                    <a href="{{ path('registry_mesurement_pdf', {'id': object.id}) }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-print"></i>
+                        {{ 'global.action.print'|trans }}
+                    </a>
+                </div>
             </div>
         </div>
-    </div>
     {% endif %}
 
     <div class="row">
@@ -54,44 +53,44 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.name'|trans }}</strong></td>
-                            <td>{{ object.name }}</td>
-                        </tr>
-                        {% if object.collectivity.isServicesEnabled %}
-                        <tr>
-                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                            <td>{{ object.service }}</td>
-                        </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.description'|trans }}</strong></td>
-                            <td>{{ object.description|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.manager'|trans }}</strong></td>
-                            <td>{{ object.manager }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.priority'|trans }}</strong></td>
-                            {% if object.priority is not null %}
-                                <td>{{ object.priority|dictionary('registry_mesurement_priority') }}</td>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.name'|trans }}</strong></td>
+                                <td>{{ object.name }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                            <tr>
+                                <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                <td>{{ object.service }}</td>
+                            </tr>
                             {% endif %}
-                        </tr>
-                        {#
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.show.type'|trans }}</strong></td>
-                            <td>{{ object.type|dictionary('registry_mesurement_type') }}</td>
-                        </tr>
-                        #}
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.cost'|trans }}</strong></td>
-                            <td>{{ object.cost }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.charge'|trans }}</strong></td>
-                            <td>{{ object.charge }}</td>
-                        </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.description'|trans }}</strong></td>
+                                <td>{{ object.description|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.manager'|trans }}</strong></td>
+                                <td>{{ object.manager }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.priority'|trans }}</strong></td>
+                                {% if object.priority is not null %}
+                                    <td>{{ object.priority|dictionary('registry_mesurement_priority') }}</td>
+                                {% endif %}
+                            </tr>
+                            {#
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.show.type'|trans }}</strong></td>
+                                <td>{{ object.type|dictionary('registry_mesurement_type') }}</td>
+                            </tr>
+                            #}
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.cost'|trans }}</strong></td>
+                                <td>{{ object.cost }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.charge'|trans }}</strong></td>
+                                <td>{{ object.charge }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -103,28 +102,28 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {% if is_granted('ROLE_REFERENT') %}
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>
+                                        <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
+                                            {{ object.collectivity }}
+                                        </a>
+                                    </td>
+                                </tr>
+                            {% endif %}
                             <tr>
-                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                                <td>
-                                    <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
-                                        {{ object.collectivity }}
-                                    </a>
-                                </td>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                            <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                            <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                            <td>{{ object.updatedBy }}</td>
-                        </tr>
                         </tbody>
                     </table>
                 </div>
@@ -139,22 +138,22 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.status'|trans }}</strong></td>
-                            <td>{{ object.status|dictionary('registry_mesurement_status') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.planification_date'|trans }}</strong></td>
-                            <td>
-                                {% if object.planificationDate is not null %}
-                                    {{ object.planificationDate|date('d/m/Y') }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.mesurement.label.comment'|trans }}</strong></td>
-                            <td>{{ object.comment }}</td>
-                        </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.status'|trans }}</strong></td>
+                                <td>{{ object.status|dictionary('registry_mesurement_status') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.planification_date'|trans }}</strong></td>
+                                <td>
+                                    {% if object.planificationDate is not null %}
+                                        {{ object.planificationDate|date('d/m/Y') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.mesurement.label.comment'|trans }}</strong></td>
+                                <td>{{ object.comment }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -166,21 +165,22 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {# TREATMENTS #}
-                        {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                        {# CONTRACTORS #}
-                        {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                        {% if object.collectivity.isHasModuleTools %}
-                            {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                        {% endif %}
-                        {# REQUESTS #}
-                        {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                        {# VIOLATIONS #}
-                        {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                        {# PROOFS #}
-                        {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                        {# MESUREMENTS #}
-                        {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# CONTRACTORS #}
+                            {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                            {% endif %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                         </tbody>
                     </table>
                 </div>
diff --git a/templates/Registry/Request/list.html.twig b/templates/Registry/Request/list.html.twig
index deea71f66c9aa7a38a59b87a60fc631f349e41fc..b1f8bcd1d584af6f3e35c20a9c09576a073c1aa9 100644
--- a/templates/Registry/Request/list.html.twig
+++ b/templates/Registry/Request/list.html.twig
@@ -40,16 +40,16 @@
                     {{ 'registry.request.action.new'|trans }}
                 </a>
             {% endif %}
-            <a href="{{ path('registry_request_report') }}" class="btn btn-default">
-                <i aria-hidden="true" class="fa fa-clipboard-list"></i>
-                {{ 'global.action.report'|trans }}
-            </a>
             {% if app.request.query.get('archive') == 'true' %}
                 <a href="{{ path('registry_request_list', {'archive' : 'false'}) }}" class="btn btn-default">
                     <i aria-hidden="true" class="fa fa-archive"></i>
                     {{ 'registry.request.action.not_archived'|trans }}
                 </a>
             {% else %}
+                <a href="{{ path('registry_request_report') }}" class="btn btn-default">
+                    <i aria-hidden="true" class="fa fa-clipboard-list"></i>
+                    {{ 'global.action.report'|trans }}
+                </a>
                 <a href="{{ path('registry_request_list', {'archive' : 'true'}) }}" class="btn btn-default">
                     <i aria-hidden="true" class="fa fa-archive"></i>
                     {{ 'registry.request.action.archived'|trans }}
diff --git a/templates/Registry/Request/pdf.html.twig b/templates/Registry/Request/pdf.html.twig
index ae8c325de7049b93811a1243c7ea802e7827d317..d18a0c1ad51464b0e4d891c05f4f858be326e0fa 100644
--- a/templates/Registry/Request/pdf.html.twig
+++ b/templates/Registry/Request/pdf.html.twig
@@ -18,58 +18,58 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.object'|trans }}</strong></td>
-                    <td>{{ object.object|dictionary('registry_request_object') }}</td>
-                </tr>
-                {% if object.collectivity.isServicesEnabled %}
                     <tr>
-                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                        <td>{{ object.service }}</td>
+                        <td><strong>{{ 'registry.request.label.object'|trans }}</strong></td>
+                        <td>{{ object.object|dictionary('registry_request_object') }}</td>
+                    </tr>
+                    {% if object.collectivity.isServicesEnabled %}
+                        <tr>
+                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                            <td>{{ object.service }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.request.label.other_object'|trans }}</strong></td>
+                        <td>{{ object.otherObject }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.request.label.date'|trans }}</strong></td>
+                        <td>{{ object.date|date('d/m/Y') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.request.label.reason'|trans }}</strong></td>
+                        <td>{{ object.reason }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.request.label.complete'|trans }}</strong></td>
+                        <td>
+                            {% if object.complete %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.request.label.legitimate_applicant'|trans }}</strong></td>
+                        <td>
+                            {% if object.legitimateApplicant %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.request.label.legitimate_request'|trans }}</strong></td>
+                        <td>
+                            {% if object.legitimateRequest %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
                     </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.request.label.other_object'|trans }}</strong></td>
-                    <td>{{ object.otherObject }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.date'|trans }}</strong></td>
-                    <td>{{ object.date|date('d/m/Y') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.reason'|trans }}</strong></td>
-                    <td>{{ object.reason }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.complete'|trans }}</strong></td>
-                    <td>
-                        {% if object.complete %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.legitimate_applicant'|trans }}</strong></td>
-                    <td>
-                        {% if object.legitimateApplicant %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.legitimate_request'|trans }}</strong></td>
-                    <td>
-                        {% if object.legitimateRequest %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
                 </tbody>
             </table>
         </div>
@@ -81,30 +81,38 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.answer_response'|trans }}</strong></td>
-                    <td>{{ object.answer.response|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.answer_date'|trans }}</strong></td>
-                    <td>{% if object.answer.date %}{{ object.answer.date|date('d/m/Y') }}{% endif %}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.answer_type'|trans }}</strong></td>
-                    <td>{% if object.answer.type is not null %}{{ object.answer.type|dictionary('registry_request_answer_type') }}{% endif %}</td>
-                </tr>
-                {% if object.state is not same as "" %}
+                    {% if object.state is not same as "" %}
+                        <tr>
+                            <td><strong>{{ 'registry.request.label.state'|trans }}</strong></td>
+                            <td>{{ object.state|dictionary('registry_request_state') }}</td>
+                        </tr>
+                    {% endif %}
+                    {% if object.state == constant('App\\Domain\\Registry\\Dictionary\\RequestStateDictionary::STATE_DENIED') %}
+                        <tr>
+                            <td><strong>{{ 'registry.request.label.state_rejection_reason'|trans }}</strong></td>
+                            <td>{{ object.stateRejectionReason }}</td>
+                        </tr>
+                    {% endif %}
                     <tr>
-                        <td><strong>{{ 'registry.request.label.state'|trans }}</strong></td>
-                        <td>{{ object.state|dictionary('registry_request_state') }}</td>
+                        <td><strong>{{ 'registry.request.label.answer_response'|trans }}</strong></td>
+                        <td>{{ object.answer.response|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.request.label.answer_date'|trans }}</strong></td>
+                        <td>
+                            {% if object.answer.date %}
+                                {{ object.answer.date|date('d/m/Y') }}
+                            {% endif %}
+                        </td>
                     </tr>
-                {% endif %}
-                {% if object.state == constant('App\\Domain\\Registry\\Dictionary\\RequestStateDictionary::STATE_DENIED') %}
                     <tr>
-                        <td><strong>{{ 'registry.request.label.state_rejection_reason'|trans }}</strong></td>
-                        <td>{{ object.stateRejectionReason }}</td>
+                        <td><strong>{{ 'registry.request.label.answer_type'|trans }}</strong></td>
+                        <td>
+                            {% if object.answer.type is not null %}
+                                {{ object.answer.type|dictionary('registry_request_answer_type') }}
+                            {% endif %}
+                        </td>
                     </tr>
-                {% endif %}
                 </tbody>
             </table>
         </div>
@@ -116,84 +124,84 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                    <td>{{ object.applicant.civility|dictionary('registry_request_civility') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                    <td>{{ object.applicant.firstName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                    <td>{{ object.applicant.lastName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                    <td>{{ object.applicant.address }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                    <td>{{ object.applicant.mail }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                    <td>{{ object.applicant.phoneNumber }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.concerned_people'|trans }}</strong></td>
-                    <td>
-                        {% if object.applicant.concernedPeople %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    {# CONCERNED PEOPLE #}
-    {% if not object.applicant.concernedPeople %}
-        <div class="box box-solid box-success">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.concerned_people'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
                     <tr>
                         <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                        <td>
-                            {% if object.concernedPeople.civility %}
-                                {{ object.concernedPeople.civility|dictionary('registry_request_civility') }}
-                            {% endif %}
-                        </td>
+                        <td>{{ object.applicant.civility|dictionary('registry_request_civility') }}</td>
                     </tr>
                     <tr>
                         <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.firstName }}</td>
+                        <td>{{ object.applicant.firstName }}</td>
                     </tr>
                     <tr>
                         <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.lastName }}</td>
+                        <td>{{ object.applicant.lastName }}</td>
                     </tr>
                     <tr>
                         <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.address }}</td>
+                        <td>{{ object.applicant.address }}</td>
                     </tr>
                     <tr>
                         <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.mail }}</td>
+                        <td>{{ object.applicant.mail }}</td>
                     </tr>
                     <tr>
                         <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.phoneNumber }}</td>
+                        <td>{{ object.applicant.phoneNumber }}</td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.request.label.link_with_applicant'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.linkWithApplicant }}</td>
+                        <td><strong>{{ 'registry.request.label.concerned_people'|trans }}</strong></td>
+                        <td>
+                            {% if object.applicant.concernedPeople %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
                     </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    {# CONCERNED PEOPLE #}
+    {% if not object.applicant.concernedPeople %}
+        <div class="box box-solid box-success">
+            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.concerned_people'|trans }}</h3></div>
+            <div class="box-body no-padding">
+                <table class="table">
+                    <tbody>
+                        <tr>
+                            <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                            <td>
+                                {% if object.concernedPeople.civility %}
+                                    {{ object.concernedPeople.civility|dictionary('registry_request_civility') }}
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                            <td>{{ object.concernedPeople.firstName }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                            <td>{{ object.concernedPeople.lastName }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                            <td>{{ object.concernedPeople.address }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                            <td>{{ object.concernedPeople.mail }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                            <td>{{ object.concernedPeople.phoneNumber }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.request.label.link_with_applicant'|trans }}</strong></td>
+                            <td>{{ object.concernedPeople.linkWithApplicant }}</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -206,21 +214,22 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {# TREATMENTS #}
-                {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                {# CONTRACTORS #}
-                {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                {% if object.collectivity.isHasModuleTools %}
-                    {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                {% endif %}
-                {# REQUESTS #}
-                {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                {# VIOLATIONS #}
-                {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                {# PROOFS #}
-                {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                {# MESUREMENTS #}
-                {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                    {# TREATMENTS #}
+                    {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                    {# CONTRACTORS #}
+                    {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                    {# TOOLS #}
+                    {% if object.collectivity.isHasModuleTools %}
+                        {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                    {% endif %}
+                    {# REQUESTS #}
+                    {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                    {# VIOLATIONS #}
+                    {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                    {# PROOFS #}
+                    {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                    {# MESUREMENTS #}
+                    {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                 </tbody>
             </table>
         </div>
@@ -232,26 +241,26 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {% if is_granted('ROLE_REFERENT') %}
+                    {% if is_granted('ROLE_REFERENT') %}
+                        <tr>
+                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                            <td>
+                                {{ object.collectivity }}
+                            </td>
+                        </tr>
+                    {% endif %}
                     <tr>
-                        <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                        <td>
-                            {{ object.collectivity }}
-                        </td>
+                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                        <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                        <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                        <td>{{ object.updatedBy }}</td>
                     </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                    <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                    <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                    <td>{{ object.updatedBy }}</td>
-                </tr>
                 </tbody>
             </table>
         </div>
diff --git a/templates/Registry/Request/pdf_all.html.twig b/templates/Registry/Request/pdf_all.html.twig
index 7236226d7296545d33ba7839ca6d31c71cca8446..6b5c4751041ff18d7defb8b2a480284dc1cdf5f6 100644
--- a/templates/Registry/Request/pdf_all.html.twig
+++ b/templates/Registry/Request/pdf_all.html.twig
@@ -4,253 +4,262 @@
 {% set menuItem = 'registry_request' %}
 
 {% block body %}
-{% for object in objects %}
-<div style="page-break-after: always">
-    <h1 class="text-center">Demande de {{ object.applicant.firstName ~ ' ' ~ object.applicant.lastName }}</small></h1>
-    {# REQUEST #}
-    <div class="box box-solid box-info">
-        <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.request'|trans }}</h3></div>
-        <div class="box-body no-padding">
-            <table class="table">
-                <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.object'|trans }}</strong></td>
-                    <td>{{ object.object|dictionary('registry_request_object') }}</td>
-                </tr>
-                {% if object.collectivity.isServicesEnabled %}
-                    <tr>
-                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                        <td>{{ object.service }}</td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.request.label.other_object'|trans }}</strong></td>
-                    <td>{{ object.otherObject }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.date'|trans }}</strong></td>
-                    <td>{{ object.date|date('d/m/Y') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.reason'|trans }}</strong></td>
-                    <td>{{ object.reason }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.complete'|trans }}</strong></td>
-                    <td>
-                        {% if object.complete %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.legitimate_applicant'|trans }}</strong></td>
-                    <td>
-                        {% if object.legitimateApplicant %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.legitimate_request'|trans }}</strong></td>
-                    <td>
-                        {% if object.legitimateRequest %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
+    {% for object in objects %}
+        <div style="page-break-after: always">
+            <h1 class="text-center">Demande de {{ object.applicant.firstName ~ ' ' ~ object.applicant.lastName }}</small></h1>
+            {# REQUEST #}
+            <div class="box box-solid box-info">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.request'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.object'|trans }}</strong></td>
+                                <td>{{ object.object|dictionary('registry_request_object') }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.other_object'|trans }}</strong></td>
+                                <td>{{ object.otherObject }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.date'|trans }}</strong></td>
+                                <td>{{ object.date|date('d/m/Y') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.reason'|trans }}</strong></td>
+                                <td>{{ object.reason }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.complete'|trans }}</strong></td>
+                                <td>
+                                    {% if object.complete %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.legitimate_applicant'|trans }}</strong></td>
+                                <td>
+                                    {% if object.legitimateApplicant %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.legitimate_request'|trans }}</strong></td>
+                                <td>
+                                    {% if object.legitimateRequest %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
 
-    {# ANSWER #}
-    <div class="box box-solid box-primary">
-        <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.answer'|trans }}</h3></div>
-        <div class="box-body no-padding">
-            <table class="table">
-                <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.answer_response'|trans }}</strong></td>
-                    <td>{{ object.answer.response|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.answer_date'|trans }}</strong></td>
-                    <td>{% if object.answer.date %}{{ object.answer.date|date('d/m/Y') }}{% endif %}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.answer_type'|trans }}</strong></td>
-                    <td>{% if object.answer.type is not null %}{{ object.answer.type|dictionary('registry_request_answer_type') }}{% endif %}</td>
-                </tr>
-                {% if object.state is not same as "" %}
-                    <tr>
-                        <td><strong>{{ 'registry.request.label.state'|trans }}</strong></td>
-                        <td>{{ object.state|dictionary('registry_request_state') }}</td>
-                    </tr>
-                {% endif %}
-                {% if object.state == constant('App\\Domain\\Registry\\Dictionary\\RequestStateDictionary::STATE_DENIED') %}
-                    <tr>
-                        <td><strong>{{ 'registry.request.label.state_rejection_reason'|trans }}</strong></td>
-                        <td>{{ object.stateRejectionReason }}</td>
-                    </tr>
-                {% endif %}
-                </tbody>
-            </table>
-        </div>
-    </div>
+            {# ANSWER #}
+            <div class="box box-solid box-primary">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.answer'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {% if object.state is not same as "" %}
+                                <tr>
+                                    <td><strong>{{ 'registry.request.label.state'|trans }}</strong></td>
+                                    <td>{{ object.state|dictionary('registry_request_state') }}</td>
+                                </tr>
+                            {% endif %}
+                            {% if object.state == constant('App\\Domain\\Registry\\Dictionary\\RequestStateDictionary::STATE_DENIED') %}
+                                <tr>
+                                    <td><strong>{{ 'registry.request.label.state_rejection_reason'|trans }}</strong></td>
+                                    <td>{{ object.stateRejectionReason }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.answer_response'|trans }}</strong></td>
+                                <td>{{ object.answer.response|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.answer_date'|trans }}</strong></td>
+                                <td>
+                                    {% if object.answer.date %}
+                                        {{ object.answer.date|date('d/m/Y') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.answer_type'|trans }}</strong></td>
+                                <td>
+                                    {% if object.answer.type is not null %}
+                                        {{ object.answer.type|dictionary('registry_request_answer_type') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
 
-    {# APPLICANT #}
-    <div class="box box-solid box-primary">
-        <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.applicant'|trans }}</h3></div>
-        <div class="box-body no-padding">
-            <table class="table">
-                <tbody>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                    <td>{{ object.applicant.civility|dictionary('registry_request_civility') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                    <td>{{ object.applicant.firstName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                    <td>{{ object.applicant.lastName }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                    <td>{{ object.applicant.address }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                    <td>{{ object.applicant.mail }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                    <td>{{ object.applicant.phoneNumber }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.request.label.concerned_people'|trans }}</strong></td>
-                    <td>
-                        {% if object.applicant.concernedPeople %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
+            {# APPLICANT #}
+            <div class="box box-solid box-primary">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.applicant'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                                <td>{{ object.applicant.civility|dictionary('registry_request_civility') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                <td>{{ object.applicant.firstName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                <td>{{ object.applicant.lastName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                                <td>{{ object.applicant.address }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                <td>{{ object.applicant.mail }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                <td>{{ object.applicant.phoneNumber }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.concerned_people'|trans }}</strong></td>
+                                <td>
+                                    {% if object.applicant.concernedPeople %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            {# CONCERNED PEOPLE #}
+            {% if not object.applicant.concernedPeople %}
+                <div class="box box-solid box-success">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.concerned_people'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table class="table">
+                            <tbody>
+                                <tr>
+                                    <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.concernedPeople.civility %}
+                                            {{ object.concernedPeople.civility|dictionary('registry_request_civility') }}
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                    <td>{{ object.concernedPeople.firstName }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                    <td>{{ object.concernedPeople.lastName }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                                    <td>{{ object.concernedPeople.address }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                    <td>{{ object.concernedPeople.mail }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                    <td>{{ object.concernedPeople.phoneNumber }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.request.label.link_with_applicant'|trans }}</strong></td>
+                                    <td>{{ object.concernedPeople.linkWithApplicant }}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            {% endif %}
 
-    {# CONCERNED PEOPLE #}
-    {% if not object.applicant.concernedPeople %}
-        <div class="box box-solid box-success">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.concerned_people'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                        <td>
-                            {% if object.concernedPeople.civility %}
-                                {{ object.concernedPeople.civility|dictionary('registry_request_civility') }}
+            {# LINKED MODULES #}
+            <div class="box box-solid box-warning">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# CONTRACTORS #}
+                            {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
                             {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.firstName }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.lastName }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.address }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.mail }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.phoneNumber }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.request.label.link_with_applicant'|trans }}</strong></td>
-                        <td>{{ object.concernedPeople.linkWithApplicant }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
-    {% endif %}
 
-    {# LINKED MODULES #}
-    <div class="box box-solid box-warning">
-        <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-        <div class="box-body no-padding">
-            <table class="table">
-                <tbody>
-                {# TREATMENTS #}
-                {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                {# CONTRACTORS #}
-                {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                {% if object.collectivity.isHasModuleTools %}
-                    {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                {% endif %}
-                {# REQUESTS #}
-                {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                {# VIOLATIONS #}
-                {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                {# PROOFS #}
-                {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                {# MESUREMENTS #}
-                {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    {# HISTORIC #}
-    <div class="box box-solid box-default">
-        <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
-        <div class="box-body no-padding">
-            <table class="table">
-                <tbody>
-                {% if is_granted('ROLE_REFERENT') %}
-                    <tr>
-                        <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                        <td>
-                            {{ object.collectivity }}
-                        </td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                    <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                    <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                    <td>{{ object.updatedBy }}</td>
-                </tr>
-                </tbody>
-            </table>
+            {# HISTORIC #}
+            <div class="box box-solid box-default">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>
+                                        {{ object.collectivity }}
+                                    </td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-{% endfor %}
+    {% endfor %}
 {% endblock %}
diff --git a/templates/Registry/Request/show.html.twig b/templates/Registry/Request/show.html.twig
index 4ac609a16a78b35c851e25281527967b8e77d65c..4dce312759b5a3c9863771d47d0128df83fdfc9f 100644
--- a/templates/Registry/Request/show.html.twig
+++ b/templates/Registry/Request/show.html.twig
@@ -21,7 +21,6 @@
 {% endblock %}
 
 {% block body %}
-
     <div class="row">
         <div class="col-xs-12">
             <div class="mb-1">
@@ -52,62 +51,64 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.object'|trans }}</strong></td>
-                            <td>{% if object.object in dictionary('registry_request_object').values|keys %}
-                                    {{ object.object|dictionary('registry_request_object') }}
-                                {% else %}
-                                    {{ object.object }}
-                                {% endif %}</td>
-                        </tr>
-                        {% if object.collectivity.isServicesEnabled %}
                             <tr>
-                                <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                                <td>{{ object.service }}</td>
+                                <td><strong>{{ 'registry.request.label.object'|trans }}</strong></td>
+                                <td>
+                                    {% if object.object in dictionary('registry_request_object').values|keys %}
+                                        {{ object.object|dictionary('registry_request_object') }}
+                                    {% else %}
+                                        {{ object.object }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.other_object'|trans }}</strong></td>
+                                <td>{{ object.otherObject }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.date'|trans }}</strong></td>
+                                <td>{{ object.date|date('d/m/Y') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.reason'|trans }}</strong></td>
+                                <td>{{ object.reason }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.complete'|trans }}</strong></td>
+                                <td>
+                                    {% if object.complete %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.legitimate_applicant'|trans }}</strong></td>
+                                <td>
+                                    {% if object.legitimateApplicant %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.legitimate_request'|trans }}</strong></td>
+                                <td>
+                                    {% if object.legitimateRequest %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.other_object'|trans }}</strong></td>
-                            <td>{{ object.otherObject }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.date'|trans }}</strong></td>
-                            <td>{{ object.date|date('d/m/Y') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.reason'|trans }}</strong></td>
-                            <td>{{ object.reason }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.complete'|trans }}</strong></td>
-                            <td>
-                                {% if object.complete %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.legitimate_applicant'|trans }}</strong></td>
-                            <td>
-                                {% if object.legitimateApplicant %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.legitimate_request'|trans }}</strong></td>
-                            <td>
-                                {% if object.legitimateRequest %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
                         </tbody>
                     </table>
                 </div>
@@ -119,33 +120,42 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.answer_response'|trans }}</strong></td>
-                            <td>{{ object.answer.response|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.answer_date'|trans }}</strong></td>
-                            <td>{% if object.answer.date %}{{ object.answer.date|date('d/m/Y') }}{% endif %}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.answer_type'|trans }}</strong></td>
-                            <td>{% if object.answer.type is not null %}{{ object.answer.type|dictionary('registry_request_answer_type') }}{% endif %}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.state'|trans }}</strong></td>
-                            <td>{% if object.state in (dictionary('registry_request_state').values|keys) %}
-                                    {{ object.state|dictionary('registry_request_state') }}
-                                {% else %}
-                                    {{ object.state }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                        {% if object.state == constant('App\\Domain\\Registry\\Dictionary\\RequestStateDictionary::STATE_DENIED') %}
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.state_rejection_reason'|trans }}</strong></td>
-                            <td>{{ object.stateRejectionReason }}</td>
-                        </tr>
-                        {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.state'|trans }}</strong></td>
+                                <td>
+                                    {% if object.state in (dictionary('registry_request_state').values|keys) %}
+                                        {{ object.state|dictionary('registry_request_state') }}
+                                    {% else %}
+                                        {{ object.state }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            {% if object.state == constant('App\\Domain\\Registry\\Dictionary\\RequestStateDictionary::STATE_DENIED') %}
+                                <tr>
+                                    <td><strong>{{ 'registry.request.label.state_rejection_reason'|trans }}</strong></td>
+                                    <td>{{ object.stateRejectionReason }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.answer_response'|trans }}</strong></td>
+                                <td>{{ object.answer.response|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.answer_date'|trans }}</strong></td>
+                                <td>
+                                    {% if object.answer.date %}
+                                        {{ object.answer.date|date('d/m/Y') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.answer_type'|trans }}</strong></td>
+                                <td>
+                                    {% if object.answer.type is not null %}
+                                        {{ object.answer.type|dictionary('registry_request_answer_type') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -157,35 +167,34 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {% if is_granted('ROLE_REFERENT') %}
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>
+                                        <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
+                                            {{ object.collectivity }}
+                                        </a>
+                                    </td>
+                                </tr>
+                            {% endif %}
                             <tr>
-                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                                <td>
-                                    <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
-                                        {{ object.collectivity }}
-                                    </a>
-                                </td>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                            <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                            <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                            <td>{{ object.updatedBy }}</td>
-                        </tr>
                         </tbody>
                     </table>
                 </div>
             </div>
         </div>
 
-
         {# RIGHT #}
         <div class="col-md-6">
             {# APPLICANT #}
@@ -194,40 +203,40 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                            <td>{{ object.applicant.civility|dictionary('registry_request_civility') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                            <td>{{ object.applicant.firstName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                            <td>{{ object.applicant.lastName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                            <td>{{ object.applicant.address }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                            <td>{{ object.applicant.mail }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                            <td>{{ object.applicant.phoneNumber }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.concerned_people'|trans }}</strong></td>
-                            <td>
-                                {% if object.applicant.concernedPeople %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                                <td>{{ object.applicant.civility|dictionary('registry_request_civility') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                <td>{{ object.applicant.firstName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                <td>{{ object.applicant.lastName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                                <td>{{ object.applicant.address }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                <td>{{ object.applicant.mail }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                <td>{{ object.applicant.phoneNumber }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.concerned_people'|trans }}</strong></td>
+                                <td>
+                                    {% if object.applicant.concernedPeople %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -240,38 +249,38 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeople.civility %}
-                                    {{ object.concernedPeople.civility|dictionary('registry_request_civility') }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
-                            <td>{{ object.concernedPeople.firstName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
-                            <td>{{ object.concernedPeople.lastName }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
-                            <td>{{ object.concernedPeople.address }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
-                            <td>{{ object.concernedPeople.mail }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
-                            <td>{{ object.concernedPeople.phoneNumber }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.request.label.link_with_applicant'|trans }}</strong></td>
-                            <td>{{ object.concernedPeople.linkWithApplicant }}</td>
-                        </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.civility'|trans }}</strong></td>
+                                <td>
+                                    {% if object.concernedPeople.civility %}
+                                        {{ object.concernedPeople.civility|dictionary('registry_request_civility') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.first_name'|trans }}</strong></td>
+                                <td>{{ object.concernedPeople.firstName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.last_name'|trans }}</strong></td>
+                                <td>{{ object.concernedPeople.lastName }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.address.line_one'|trans }}</strong></td>
+                                <td>{{ object.concernedPeople.address }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.email'|trans }}</strong></td>
+                                <td>{{ object.concernedPeople.mail }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.contact.phone_number'|trans }}</strong></td>
+                                <td>{{ object.concernedPeople.phoneNumber }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.request.label.link_with_applicant'|trans }}</strong></td>
+                                <td>{{ object.concernedPeople.linkWithApplicant }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -288,6 +297,7 @@
                             {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
                             {# CONTRACTORS #}
                             {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
                             {% if object.collectivity.isHasModuleTools %}
                                 {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
                             {% endif %}
@@ -304,6 +314,5 @@
                 </div>
             </div>
         </div>
-
     </div>
 {% endblock %}
diff --git a/templates/Registry/Tool/_form.html.twig b/templates/Registry/Tool/_form.html.twig
index c918eccb31357734f177993b1d01c38feb7533a8..df04314d09ef3dbd57aad5f25359b9cfef549460 100644
--- a/templates/Registry/Tool/_form.html.twig
+++ b/templates/Registry/Tool/_form.html.twig
@@ -5,79 +5,74 @@
 {% endif %}
 
 {{ form_start(form) }}
-
-<div class="row">
-    {# LEFT #}
-    <div class="col-md-6">
-        {# GENERAL #}
-        <div class="box box-solid box-info">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
-            <div class="box-body">
-                {{ form_row(form.name) }}
-                {% if serviceEnabled is defined and serviceEnabled %}
-                    {{ form_row(form.service) }}
-                {% endif %}
-                {{ form_row(form.type) }}
-                {{ form_row(form.description) }}
-                {{ form_row(form.editor) }}
-                {{ form_row(form.contractors) }}
-                {{ form_row(form.prod_date) }}
-                {{ form_row(form.country_type) }}
-                {{ form_row(form.country_name) }}
-                {{ form_row(form.country_guarantees) }}
-                {{ form_row(form.manager) }}
-
-                {{ form_row(form.other_info) }}
-
+    <div class="row">
+        {# LEFT #}
+        <div class="col-md-6">
+            {# GENERAL #}
+            <div class="box box-solid box-info">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
+                <div class="box-body">
+                    {{ form_row(form.name) }}
+                    {% if serviceEnabled is defined and serviceEnabled %}
+                        {{ form_row(form.service) }}
+                    {% endif %}
+                    {{ form_row(form.type) }}
+                    {{ form_row(form.description) }}
+                    {{ form_row(form.editor) }}
+                    {{ form_row(form.contractors) }}
+                    {{ form_row(form.prod_date) }}
+                    {{ form_row(form.country_type) }}
+                    {{ form_row(form.country_name) }}
+                    {{ form_row(form.country_guarantees) }}
+                    {{ form_row(form.manager) }}
+                    {{ form_row(form.other_info) }}
+                </div>
             </div>
         </div>
-    </div>
-
-    {# RIGHT #}
-    <div class="col-md-6">
 
-        {# SECURITY #}
-        <div class="box box-solid box-primary">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.tool.tab.measures'|trans }}</h3></div>
-            <div class="box-body">
-                {{ form_row(form.archival) }}
-                {{ form_row(form.encrypted) }}
-                {{ form_row(form.access_control) }}
-                {{ form_row(form.update) }}
-                {{ form_row(form.backup) }}
-                {{ form_row(form.deletion) }}
-                {{ form_row(form.tracking) }}
-                {{ form_row(form.has_comment) }}
-                {{ form_row(form.other) }}
+        {# RIGHT #}
+        <div class="col-md-6">
+            {# SECURITY #}
+            <div class="box box-solid box-primary">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.tool.tab.measures'|trans }}</h3></div>
+                <div class="box-body">
+                    {{ form_row(form.archival) }}
+                    {{ form_row(form.encrypted) }}
+                    {{ form_row(form.access_control) }}
+                    {{ form_row(form.update) }}
+                    {{ form_row(form.backup) }}
+                    {{ form_row(form.deletion) }}
+                    {{ form_row(form.tracking) }}
+                    {{ form_row(form.has_comment) }}
+                    {{ form_row(form.other) }}
+                </div>
             </div>
-        </div>
-        {# LINKED MODULES #}
-        <div class="box box-solid box-warning">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-            <div class="box-body">
-                {{ form_row(form.treatments) }}
-                {% if form.tools is defined %}
-                    {{ form_row(form.tools) }}
-                {% endif %}
-                {{ form_row(form.requests) }}
-                {{ form_row(form.violations) }}
-                {{ form_row(form.proofs) }}
-                {{ form_row(form.mesurements) }}
+
+            {# LINKED MODULES #}
+            <div class="box box-solid box-warning">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                <div class="box-body">
+                    {{ form_row(form.treatments) }}
+                    {% if form.tools is defined %}
+                        {{ form_row(form.tools) }}
+                    {% endif %}
+                    {{ form_row(form.requests) }}
+                    {{ form_row(form.violations) }}
+                    {{ form_row(form.proofs) }}
+                    {{ form_row(form.mesurements) }}
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="col-md-12">
-        <div class="box box-solid">
-            <div class="box-body text-center">
-                <a href="{{ path('registry_tool_list') }}" class="btn btn-default">
-                    {{ 'global.action.back_to_list'|trans }}
-                </a>
-                <input type="submit" class="btn btn-primary" value="{{ submitValue }}">
+        <div class="col-md-12">
+            <div class="box box-solid">
+                <div class="box-body text-center">
+                    <a href="{{ path('registry_tool_list') }}" class="btn btn-default">
+                        {{ 'global.action.back_to_list'|trans }}
+                    </a>
+                    <input type="submit" class="btn btn-primary" value="{{ submitValue }}">
+                </div>
             </div>
         </div>
     </div>
-</div>
-
-
 {{ form_end(form) }}
diff --git a/templates/Registry/Tool/list.html.twig b/templates/Registry/Tool/list.html.twig
index 9936ca72bdd9760ec9488cae3ead2f850aeb5c07..faab463ba8fb37802df2c217bf0b1dd176adeb41 100644
--- a/templates/Registry/Tool/list.html.twig
+++ b/templates/Registry/Tool/list.html.twig
@@ -163,10 +163,10 @@
                             <tr>
                                 <th scope="col" >{{ 'registry.tool.label.name'|trans }}</th>
                                 {% if is_granted('ROLE_REFERENT') %}
-                                <th scope="col" >{{ 'global.label.organization'|trans }}</th>
+                                    <th scope="col" >{{ 'global.label.organization'|trans }}</th>
                                 {% endif %}
                                 {% if app.user.hasServices %}
-                                <th scope="col" >{{ 'global.label.service'|trans }}</th>
+                                    <th scope="col" >{{ 'global.label.service'|trans }}</th>
                                 {% endif %}
                                 <th scope="col" >{{ 'registry.tool.label.type'|trans }}</th>
                                 <th scope="col" >{{ 'registry.tool.label.editor'|trans }}</th>
diff --git a/templates/Registry/Tool/pdf.html.twig b/templates/Registry/Tool/pdf.html.twig
index c81ea04cdef8dc8a210a0c5abb609402a6038b7a..f321b67d07a7ad8aed360d8ed5506d511fecd2ae 100644
--- a/templates/Registry/Tool/pdf.html.twig
+++ b/templates/Registry/Tool/pdf.html.twig
@@ -14,72 +14,72 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.name'|trans }}</strong></td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                {% if object.collectivity.isServicesEnabled %}
                     <tr>
-                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                        <td>{{ object.service }}</td>
+                        <td><strong>{{ 'registry.tool.label.name'|trans }}</strong></td>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                    {% if object.collectivity.isServicesEnabled %}
+                        <tr>
+                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                            <td>{{ object.service }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.type'|trans }}</strong></td>
+                        <td>{{ object.type|dictionary('registry_tool_type') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.description'|trans }}</strong></td>
+                        <td>{{ object.description|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.editor'|trans }}</strong></td>
+                        <td>{{ object.editor }}</td>
                     </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.type'|trans }}</strong></td>
-                    <td>{{ object.type|dictionary('registry_tool_type') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.description'|trans }}</strong></td>
-                    <td>{{ object.description|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.editor'|trans }}</strong></td>
-                    <td>{{ object.editor }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                            {% for contractor in object.contractors %}
-                                <li>{{ contractor }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.prod_date'|trans }}</strong></td>
-                    <td>{{ object.prodDate|date('d/m/Y') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.country_type'|trans }}</strong></td>
-                    <td>
-                        {{ object.countryType|trans }}
-                    </td>
-                </tr>
-                {% if object.countryType != 'registry.tool.label.country.france'  %}
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.country_name'|trans }}</strong></td>
-                    <td>
-                        {{ object.countryName}}
-                    </td>
-                </tr>
-                {% endif %}
-                {% if object.countryType != 'registry.tool.label.country.france' and object.countryType != 'registry.tool.label.country.eu'  %}
                     <tr>
-                        <td><strong>{{ 'registry.tool.label.country_guarantees'|trans }}</strong></td>
+                        <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
                         <td>
-                            {{ object.countryGuarantees}}
+                            <ul class="ps-1">
+                                {% for contractor in object.contractors %}
+                                    <li>{{ contractor }}</li>
+                                {% endfor %}
+                            </ul>
                         </td>
                     </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.manager'|trans }}</strong></td>
-                    <td>{{ object.manager }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.other_info'|trans }}</strong></td>
-                    <td>{{ object.otherInfo|nl2br }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.prod_date'|trans }}</strong></td>
+                        <td>{{ object.prodDate|date('d/m/Y') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.country_type'|trans }}</strong></td>
+                        <td>
+                            {{ object.countryType|trans }}
+                        </td>
+                    </tr>
+                    {% if object.countryType != 'registry.tool.label.country.france'  %}
+                        <tr>
+                            <td><strong>{{ 'registry.tool.label.country_name'|trans }}</strong></td>
+                            <td>
+                                {{ object.countryName}}
+                            </td>
+                        </tr>
+                    {% endif %}
+                    {% if object.countryType != 'registry.tool.label.country.france' and object.countryType != 'registry.tool.label.country.eu'  %}
+                        <tr>
+                            <td><strong>{{ 'registry.tool.label.country_guarantees'|trans }}</strong></td>
+                            <td>
+                                {{ object.countryGuarantees}}
+                            </td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.manager'|trans }}</strong></td>
+                        <td>{{ object.manager }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.other_info'|trans }}</strong></td>
+                        <td>{{ object.otherInfo|nl2br }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -91,106 +91,105 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.archival'|trans }}</strong></td>
-                    <td>
-                        {% if object.archival.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.archival.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.encrypted'|trans }}</strong></td>
-                    <td>
-                        {% if object.encrypted.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.encrypted.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.access_control'|trans }}</strong></td>
-                    <td>
-                        {% if object.accessControl.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.accessControl.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.update'|trans }}</strong></td>
-                    <td>
-                        {% if object.update.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.update.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.backup'|trans }}</strong></td>
-                    <td>
-                        {% if object.backup.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.backup.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.deletion'|trans }}</strong></td>
-                    <td>
-                        {% if object.deletion.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.deletion.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.tracking'|trans }}</strong></td>
-                    <td>
-                        {% if object.tracking.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.tracking.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.has_comment'|trans }}</strong></td>
-                    <td>
-                        {% if object.hasComment.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.hasComment.comment }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.tool.label.other'|trans }}</strong></td>
-                    <td>
-                        {% if object.other.check == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.other.comment }}</td>
-                </tr>
-
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.archival'|trans }}</strong></td>
+                        <td>
+                            {% if object.archival.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.archival.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.encrypted'|trans }}</strong></td>
+                        <td>
+                            {% if object.encrypted.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.encrypted.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.access_control'|trans }}</strong></td>
+                        <td>
+                            {% if object.accessControl.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.accessControl.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.update'|trans }}</strong></td>
+                        <td>
+                            {% if object.update.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.update.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.backup'|trans }}</strong></td>
+                        <td>
+                            {% if object.backup.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.backup.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.deletion'|trans }}</strong></td>
+                        <td>
+                            {% if object.deletion.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.deletion.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.tracking'|trans }}</strong></td>
+                        <td>
+                            {% if object.tracking.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.tracking.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.has_comment'|trans }}</strong></td>
+                        <td>
+                            {% if object.hasComment.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.hasComment.comment }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.tool.label.other'|trans }}</strong></td>
+                        <td>
+                            {% if object.other.check == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.other.comment }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -202,19 +201,20 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {# TREATMENTS #}
-                {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                {% if object.collectivity.hasModuleTools %}
-                    {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                {% endif %}
-                {# CONTRACTORS #}
-
-                {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                {# PROOFS #}
-                {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                {# MESUREMENTS #}
-                {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                    {# TREATMENTS #}
+                    {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                    {# TOOLS #}
+                    {% if object.collectivity.hasModuleTools %}
+                        {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                    {% endif %}
+                    {# CONTRACTORS #}
+                    {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                    {# VIOLATIONS #}
+                    {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                    {# PROOFS #}
+                    {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                    {# MESUREMENTS #}
+                    {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                 </tbody>
             </table>
         </div>
diff --git a/templates/Registry/Tool/show.html.twig b/templates/Registry/Tool/show.html.twig
index 4194df4eff9d36d82e95f3504966c081456dd3bc..829bce638682782276415738d83bcfad50ce2804 100644
--- a/templates/Registry/Tool/show.html.twig
+++ b/templates/Registry/Tool/show.html.twig
@@ -21,28 +21,27 @@
 {% endblock %}
 
 {% block body %}
-
     {% if is_granted('ROLE_PREVIEW') %}
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="mb-1">
-                <a href="{{ path('registry_tool_list') }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-arrow-left"></i>
-                    {{ 'global.action.back_to_list'|trans }}
-                </a>
-            {% if (actionEnabled) %}
-                <a href="{{ path('registry_tool_edit', {'id': object.id}) }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-pencil"></i>
-                    {{ 'global.action.edit'|trans }}
-                </a>
-            {% endif %}
-                <a href="{{ path('registry_tool_pdf', {'id': object.id}) }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-print"></i>
-                    {{ 'global.action.print'|trans }}
-                </a>
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="mb-1">
+                    <a href="{{ path('registry_tool_list') }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-arrow-left"></i>
+                        {{ 'global.action.back_to_list'|trans }}
+                    </a>
+                    {% if (actionEnabled) %}
+                        <a href="{{ path('registry_tool_edit', {'id': object.id}) }}" class="btn btn-default">
+                            <i aria-hidden="true" class="fa fa-pencil"></i>
+                            {{ 'global.action.edit'|trans }}
+                        </a>
+                    {% endif %}
+                    <a href="{{ path('registry_tool_pdf', {'id': object.id}) }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-print"></i>
+                        {{ 'global.action.print'|trans }}
+                    </a>
+                </div>
             </div>
         </div>
-    </div>
     {% endif %}
 
     <div class="row">
@@ -54,72 +53,72 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.name'|trans }}</strong></td>
-                            <td>{{ object.name }}</td>
-                        </tr>
-                        {% if object.collectivity.isServicesEnabled %}
                             <tr>
-                                <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                                <td>{{ object.service }}</td>
+                                <td><strong>{{ 'registry.tool.label.name'|trans }}</strong></td>
+                                <td>{{ object.name }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.type'|trans }}</strong></td>
+                                <td>{{ object.type|dictionary('registry_tool_type') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.description'|trans }}</strong></td>
+                                <td>{{ object.description|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.editor'|trans }}</strong></td>
+                                <td>{{ object.editor }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for contractor in object.contractors %}
+                                            <li><a href="{{ path('registry_contractor_show', {'id': contractor.id}) }}" >{{ contractor }}</a></li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.prod_date'|trans }}</strong></td>
+                                <td>{{ object.prodDate|date('d/m/Y') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.country_type'|trans }}</strong></td>
+                                <td>
+                                    {{ object.countryType|trans }}
+                                </td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.type'|trans }}</strong></td>
-                            <td>{{ object.type|dictionary('registry_tool_type') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.description'|trans }}</strong></td>
-                            <td>{{ object.description|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.editor'|trans }}</strong></td>
-                            <td>{{ object.editor }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                    {% for contractor in object.contractors %}
-                                        <li><a href="{{ path('registry_contractor_show', {'id': contractor.id}) }}" >{{ contractor }}</a></li>
-                                    {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.prod_date'|trans }}</strong></td>
-                            <td>{{ object.prodDate|date('d/m/Y') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.country_type'|trans }}</strong></td>
-                            <td>
-                                {{ object.countryType|trans }}
-                            </td>
-                        </tr>
-                        {% if object.countryType != 'registry.tool.label.country.france'  %}
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.country_name'|trans }}</strong></td>
-                            <td>
-                                {{ object.countryName}}
-                            </td>
-                        </tr>
-                        {% endif %}
-                        {% if object.countryType != 'registry.tool.label.country.france' and object.countryType != 'registry.tool.label.country.eu'  %}
+                            {% if object.countryType != 'registry.tool.label.country.france' %}
                             <tr>
-                                <td><strong>{{ 'registry.tool.label.country_guarantees'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.tool.label.country_name'|trans }}</strong></td>
                                 <td>
-                                    {{ object.countryGuarantees}}
+                                    {{ object.countryName}}
                                 </td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.manager'|trans }}</strong></td>
-                            <td>{{ object.manager }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.other_info'|trans }}</strong></td>
-                            <td>{{ object.otherInfo|nl2br }}</td>
-                        </tr>
+                            {% endif %}
+                            {% if object.countryType != 'registry.tool.label.country.france' and object.countryType != 'registry.tool.label.country.eu'  %}
+                                <tr>
+                                    <td><strong>{{ 'registry.tool.label.country_guarantees'|trans }}</strong></td>
+                                    <td>
+                                        {{ object.countryGuarantees}}
+                                    </td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.manager'|trans }}</strong></td>
+                                <td>{{ object.manager }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.other_info'|trans }}</strong></td>
+                                <td>{{ object.otherInfo|nl2br }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -131,28 +130,28 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {% if is_granted('ROLE_REFERENT') %}
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>
+                                        <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
+                                            {{ object.collectivity }}
+                                        </a>
+                                    </td>
+                                </tr>
+                            {% endif %}
                             <tr>
-                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                                <td>
-                                    <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
-                                        {{ object.collectivity }}
-                                    </a>
-                                </td>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                            <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                            <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                            <td>{{ object.updatedBy }}</td>
-                        </tr>
                         </tbody>
                     </table>
                 </div>
@@ -167,106 +166,105 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.archival'|trans }}</strong></td>
-                            <td>
-                                {% if object.archival.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.archival.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.encrypted'|trans }}</strong></td>
-                            <td>
-                                {% if object.encrypted.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.encrypted.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.access_control'|trans }}</strong></td>
-                            <td>
-                                {% if object.accessControl.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.accessControl.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.update'|trans }}</strong></td>
-                            <td>
-                                {% if object.update.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.update.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.backup'|trans }}</strong></td>
-                            <td>
-                                {% if object.backup.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.backup.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.deletion'|trans }}</strong></td>
-                            <td>
-                                {% if object.deletion.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.deletion.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.tracking'|trans }}</strong></td>
-                            <td>
-                                {% if object.tracking.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.tracking.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.has_comment'|trans }}</strong></td>
-                            <td>
-                                {% if object.hasComment.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.hasComment.comment }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.tool.label.other'|trans }}</strong></td>
-                            <td>
-                                {% if object.other.check == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ object.other.comment }}</td>
-                        </tr>
-
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.archival'|trans }}</strong></td>
+                                <td>
+                                    {% if object.archival.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.archival.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.encrypted'|trans }}</strong></td>
+                                <td>
+                                    {% if object.encrypted.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.encrypted.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.access_control'|trans }}</strong></td>
+                                <td>
+                                    {% if object.accessControl.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.accessControl.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.update'|trans }}</strong></td>
+                                <td>
+                                    {% if object.update.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.update.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.backup'|trans }}</strong></td>
+                                <td>
+                                    {% if object.backup.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.backup.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.deletion'|trans }}</strong></td>
+                                <td>
+                                    {% if object.deletion.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.deletion.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.tracking'|trans }}</strong></td>
+                                <td>
+                                    {% if object.tracking.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.tracking.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.has_comment'|trans }}</strong></td>
+                                <td>
+                                    {% if object.hasComment.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.hasComment.comment }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.tool.label.other'|trans }}</strong></td>
+                                <td>
+                                    {% if object.other.check == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                                <td>{{ object.other.comment }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -278,20 +276,20 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {# TREATMENTS #}
-                        {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-
-                        {% if object.collectivity.isHasModuleTools %}
-                            {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                        {% endif %}
-                        {# REQUESTS #}
-                        {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                        {# VIOLATIONS #}
-                        {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                        {# PROOFS #}
-                        {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                        {# MESUREMENTS #}
-                        {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                            {% endif %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                         </tbody>
                     </table>
                 </div>
diff --git a/templates/Registry/Treatment/_form.html.twig b/templates/Registry/Treatment/_form.html.twig
index b40f73c75c698ef36dff3f92ed6fe802d47f70af..0c47318d82366ea4013b879dc2158f1bbeb93147 100644
--- a/templates/Registry/Treatment/_form.html.twig
+++ b/templates/Registry/Treatment/_form.html.twig
@@ -33,31 +33,29 @@
                     {{ form_row(form.dpoMessage) }}
                 </div>
             </div>
-        {% else %}
-            {% if object.name %}
-                <div class="box box-solid">
-                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3></div>
-                    <div class="box-body no-padding">
-                        <table role="presentation" class="table">
-                            <tbody>
+        {% elseif object.name %}
+            <div class="box box-solid">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table role="presentation" class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.statut'|trans }}</strong></td>
+                                <td>
+                                    {{ object.statut ? object.statut|dictionary('treatment_statut') : '' }}
+                                    {{ form_row(form.statut) }}
+                                </td>
+                            </tr>
+                            {% if is_granted('ROLE_ADMIN') or (is_granted('ROLE_USER') and object.dpoMessage is not null) %}
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.statut'|trans }}</strong></td>
-                                    <td>
-                                        {{ object.statut ? object.statut|dictionary('treatment_statut') : '' }}
-                                        {{ form_row(form.statut) }}
-                                    </td>
+                                    <td><strong>{{ 'registry.treatment.label.dpoMessage'|trans }}</strong></td>
+                                    <td>{{ object.dpoMessage }}</td>
                                 </tr>
-                                {% if is_granted('ROLE_ADMIN') or (is_granted('ROLE_USER') and object.dpoMessage is not null) %}
-                                    <tr>
-                                        <td><strong>{{ 'registry.treatment.label.dpoMessage'|trans }}</strong></td>
-                                        <td>{{ object.dpoMessage }}</td>
-                                    </tr>
-                                {% endif %}
-                            </tbody>
-                        </table>
-                    </div>
+                            {% endif %}
+                        </tbody>
+                    </table>
                 </div>
-            {% endif %}
+            </div>
         {% endif %}
 
         {# GENERAL #}
@@ -77,6 +75,8 @@
                 {{ form_row(form.active) }}
                 {{ form_row(form.legalBasis) }}
                 {{ form_row(form.legalBasisJustification) }}
+                {{ form_row(form.consentRequest) }}
+                {{ form_row(form.consentRequestFormat) }}
                 {{ form_row(form.observation) }}
                 {{ form_row(form.public) }}
             </div>
@@ -123,38 +123,38 @@
         <div class="box box-solid box-primary">
             <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.details'|trans }}</h3></div>
             <div class="box-body">
-              <div class="form-group">
-                <label class="control-label required">
-                  {{ 'registry.treatment.label.concerned_people'|trans }}
-                </label>
+                <div class="form-group">
+                    <label class="control-label required">
+                        {{ 'registry.treatment.label.concerned_people'|trans }}
+                    </label>
 
-                {% set concernedPeopleErrorBlock = null %}
-                {% for error in form.vars.errors %}
-                    {% if error.origin.name == 'concernedPeopleParticular' %}
-                        {% set concernedPeopleErrorBlock %}
-                            <p role="alert" class="help-block"><i aria-hidden="true" class="fa-solid fa-circle-exclamation"></i> {{ error.message }}</p>
-                        {% endset %}
-                    {% endif %}
-                {% endfor %}
-                <div class="{% if concernedPeopleErrorBlock is not null %} has-error{% endif %}">
-                    {{ form_row(form.concernedPeopleParticular) }}
-                    {{ form_row(form.concernedPeopleUser) }}
-                    {{ form_row(form.concernedPeopleAgent) }}
-                    {{ form_row(form.concernedPeopleElected) }}
-                    {{ form_row(form.concernedPeopleCompany) }}
-                    {{ form_row(form.concernedPeoplePartner) }}
-                    {{ form_row(form.concernedPeopleUsager) }}
-                    {{ form_row(form.concernedPeopleOther) }}
-                    {% if concernedPeopleErrorBlock is not null %}
-                        {{ concernedPeopleErrorBlock }}
-                    {% endif %}
-                  </div>
+                    {% set concernedPeopleErrorBlock = null %}
+                    {% for error in form.vars.errors %}
+                        {% if error.origin.name == 'concernedPeopleParticular' %}
+                            {% set concernedPeopleErrorBlock %}
+                                <p role="alert" class="help-block"><i aria-hidden="true" class="fa-solid fa-circle-exclamation"></i> {{ error.message }}</p>
+                            {% endset %}
+                        {% endif %}
+                    {% endfor %}
+                    <div class="{% if concernedPeopleErrorBlock is not null %} has-error{% endif %}">
+                        {{ form_row(form.concernedPeopleParticular) }}
+                        {{ form_row(form.concernedPeopleUser) }}
+                        {{ form_row(form.concernedPeopleAgent) }}
+                        {{ form_row(form.concernedPeopleElected) }}
+                        {{ form_row(form.concernedPeopleCompany) }}
+                        {{ form_row(form.concernedPeoplePartner) }}
+                        {{ form_row(form.concernedPeopleUsager) }}
+                        {{ form_row(form.concernedPeopleOther) }}
+                        {% if concernedPeopleErrorBlock is not null %}
+                            {{ concernedPeopleErrorBlock }}
+                        {% endif %}
+                    </div>
                 </div>
                 {{ form_row(form.estimatedConcernedPeople) }}
                 {% if form.tools is defined %}
-                {{ form_row(form.tools) }}
+                    {{ form_row(form.tools) }}
                 {% else %}
-                {{ form_row(form.software) }}
+                    {{ form_row(form.software) }}
                 {% endif %}
                 {{ form_row(form.paperProcessing) }}
 
@@ -178,9 +178,6 @@
                 {{ form_row(form.collectingMethod) }}
                 {{ form_row(form.otherCollectingMethod) }}
                 {{ form_row(form.legalMentions) }}
-                {{ form_row(form.consentRequest) }}
-                {{ form_row(form.consentRequestFormat) }}
-
             </div>
         </div>
 
@@ -189,9 +186,9 @@
             <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
             <div class="box-body">
                 {{ form_row(form.securityAccessControl) }}
-                {{ form_row(form.securityTracability) }}
-                {{ form_row(form.securitySaving) }}
                 {{ form_row(form.securityUpdate) }}
+                {{ form_row(form.securitySaving) }}
+                {{ form_row(form.securityTracability) }}
                 {{ form_row(form.securityOther) }}
                 {{ form_row(form.securityEntitledPersons) }}
                 {{ form_row(form.securityOpenAccounts) }}
@@ -210,5 +207,4 @@
             </div>
         </div>
     </div>
-
 </div>
diff --git a/templates/Registry/Treatment/configuration.html.twig b/templates/Registry/Treatment/configuration.html.twig
index 74cc90e29dd280d83306f359d79369a230df38f0..8322ecfb1b234ec7f512d45fbae4a0d40e37a0d3 100644
--- a/templates/Registry/Treatment/configuration.html.twig
+++ b/templates/Registry/Treatment/configuration.html.twig
@@ -56,6 +56,8 @@
                     {{ form_row(form.active) }}
                     {{ form_row(form.legalBasis) }}
                     {{ form_row(form.legalBasisJustification) }}
+                    {{ form_row(form.consentRequest) }}
+                    {{ form_row(form.consentRequestFormat) }}
                     {{ form_row(form.observation) }}
                 </div>
             </div>
@@ -154,8 +156,6 @@
                     {{ form_row(form.dataOrigin) }}
                     {{ form_row(form.collectingMethod) }}
                     {{ form_row(form.legalMentions) }}
-                    {{ form_row(form.consentRequest) }}
-                    {{ form_row(form.consentRequestFormat) }}
                 </div>
             </div>
 
@@ -166,9 +166,9 @@
                 </div>
                 <div class="box-body">
                     {{ form_row(form.securityAccessControl) }}
-                    {{ form_row(form.securityTracability) }}
-                    {{ form_row(form.securitySaving) }}
                     {{ form_row(form.securityUpdate) }}
+                    {{ form_row(form.securitySaving) }}
+                    {{ form_row(form.securityTracability) }}
                     {{ form_row(form.securityOther) }}
                     {{ form_row(form.securityEntitledPersons) }}
                     {{ form_row(form.securityOpenAccounts) }}
diff --git a/templates/Registry/Treatment/list.html.twig b/templates/Registry/Treatment/list.html.twig
index 8325de3d9413e2e2b03e1ca700e184293e3978db..68bd1b6f88f0b1adf4ce7cdd59c2ed5b226a5c5c 100644
--- a/templates/Registry/Treatment/list.html.twig
+++ b/templates/Registry/Treatment/list.html.twig
@@ -39,16 +39,16 @@
                     {{ 'registry.treatment.action.new'|trans }}
                 </a>
             {% endif %}
-            <a href="{{ path('registry_treatment_report') }}" class="btn btn-default">
-                <i aria-hidden="true" class="fa fa-clipboard-list"></i>
-                {{ 'global.action.report'|trans }}
-            </a>
             {% if app.request.query.get('active') == 'false' %}
                 <a href="{{ path('registry_treatment_list', {'active' : 'true'}) }}" class="btn btn-default">
                     <i aria-hidden="true" class="fa fa-list"></i>
                     {{ 'registry.treatment.action.active'|trans }}
                 </a>
             {% else %}
+                <a href="{{ path('registry_treatment_report') }}" class="btn btn-default">
+                    <i aria-hidden="true" class="fa fa-clipboard-list"></i>
+                    {{ 'global.action.report'|trans }}
+                </a>
                 <a href="{{ path('registry_treatment_list', {'active' : 'false'}) }}" class="btn btn-default">
                     <i aria-hidden="true" class="fa fa-list"></i>
                     {{ 'registry.treatment.action.inactive'|trans }}
@@ -150,8 +150,8 @@
                                     </select>
                                 </th>
                                 <th scope="col">
-                                    <select class="form-control" id="search_tracabilite" style="width: 100%;">
-                                        <option value="">{{ 'registry.treatment.label.security_tracability'|trans }}</option>
+                                    <select class="form-control" id="search_update" style="width: 100%;">
+                                        <option value="">{{ 'registry.treatment.label.security_update'|trans }}</option>
                                         <option value="1">{{ 'global.label.yes'|trans }}</option>
                                         <option value="0">{{ 'global.label.no'|trans }}</option>
                                     </select>
@@ -164,8 +164,8 @@
                                     </select>
                                 </th>
                                 <th scope="col">
-                                    <select class="form-control" id="search_update" style="width: 100%;">
-                                        <option value="">{{ 'registry.treatment.label.security_update'|trans }}</option>
+                                    <select class="form-control" id="search_tracabilite" style="width: 100%;">
+                                        <option value="">{{ 'registry.treatment.label.security_tracability'|trans }}</option>
                                         <option value="1">{{ 'global.label.yes'|trans }}</option>
                                         <option value="0">{{ 'global.label.no'|trans }}</option>
                                     </select>
@@ -264,9 +264,9 @@
                                 <th scope="col">{{ 'global.label.linked_contractor'|trans }}</th>
                                 <th scope="col">{{ 'registry.treatment.list.sensitive_data'|trans }}</th>
                                 <th scope="col">{{ 'registry.treatment.label.security_access_control'|trans }}</th>
-                                <th scope="col">{{ 'registry.treatment.label.security_tracability'|trans }}</th>
-                                <th scope="col">{{ 'registry.treatment.label.security_saving'|trans }}</th>
                                 <th scope="col">{{ 'registry.treatment.label.security_update'|trans }}</th>
+                                <th scope="col">{{ 'registry.treatment.label.security_saving'|trans }}</th>
+                                <th scope="col">{{ 'registry.treatment.label.security_tracability'|trans }}</th>
                                 <th scope="col">{{ 'registry.treatment.label.security_other'|trans }}</th>
                                 <th scope="col" style="max-width: 60px;">{{ 'registry.treatment.list.entitled_persons'|trans }}</th>
                                 <th scope="col" style="max-width: 60px;">{{ 'registry.treatment.list.open_accounts'|trans }}</th>
@@ -316,9 +316,9 @@
         {"data": "sousTraitant", "visible": false, "orderable": true},
         {"data": "sensitiveData", "visible": true},
         {"data": "controleAcces", "visible": false},
-        {"data": "tracabilite", "visible": false},
-        {"data": "saving", "visible": false},
         {"data": "update", "visible": false},
+        {"data": "saving", "visible": false},
+        {"data": "tracabilite", "visible": false},
         {"data": "other", "visible": false},
         {"data": "entitledPersons", "visible": false},
         {"data": "openAccounts", "visible": false},
@@ -347,9 +347,9 @@
             {"data": "sousTraitant", "visible": false, "orderable": true},
             {"data": "sensitiveData", "visible": true},
             {"data": "controleAcces", "visible": false},
-            {"data": "tracabilite", "visible": false},
-            {"data": "saving", "visible": false},
             {"data": "update", "visible": false},
+            {"data": "saving", "visible": false},
+            {"data": "tracabilite", "visible": false},
             {"data": "other", "visible": false},
             {"data": "entitledPersons", "visible": false},
             {"data": "openAccounts", "visible": false},
@@ -380,9 +380,9 @@
             {"data": "sousTraitant", "visible": false, "orderable": true},
             {"data": "sensitiveData", "visible": true},
             {"data": "controleAcces", "visible": false},
-            {"data": "tracabilite", "visible": false},
-            {"data": "saving", "visible": false},
             {"data": "update", "visible": false},
+            {"data": "saving", "visible": false},
+            {"data": "tracabilite", "visible": false},
             {"data": "other", "visible": false},
             {"data": "entitledPersons", "visible": false},
             {"data": "openAccounts", "visible": false},
@@ -580,8 +580,8 @@
                 oTable.column(col + 9).search($(this).val()).draw() ;
             });
 
-            $('#search_tracabilite').off('change');
-            $('#search_tracabilite').change(function(){
+            $('#search_update').off('change');
+            $('#search_update').change(function(){
                 oTable.column(col + 10).search($(this).val()).draw() ;
             });
 
@@ -590,8 +590,8 @@
                 oTable.column(col + 11).search($(this).val()).draw() ;
             });
 
-            $('#search_update').off('change');
-            $('#search_update').change(function(){
+            $('#search_tracabilite').off('change');
+            $('#search_tracabilite').change(function(){
                 oTable.column(col + 12).search($(this).val()).draw() ;
             });
 
diff --git a/templates/Registry/Treatment/pdf.html.twig b/templates/Registry/Treatment/pdf.html.twig
index 9b572ebd6372fb76475582ba500be11877fb2560..1913f8cea32ca82e36e878d0126b4bee69c78df0 100644
--- a/templates/Registry/Treatment/pdf.html.twig
+++ b/templates/Registry/Treatment/pdf.html.twig
@@ -6,113 +6,145 @@
 {% block body_head %}{{ object.name }}{% endblock %}
 
 {% block body %}
+
+    {# DPO Statut #}
+    <div class="box box-solid box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
+        </div>
+        <div class="box-body no-padding">
+            <table role="presentation" class="table">
+                <tbody>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.statut'|trans }}</strong></td>
+                        <td>
+                            {% if object.statut is defined and object.statut %}
+                                {{ object.statut|dictionary('treatment_statut') }}
+                            {% endif %}
+                        </td>
+                    </tr>
+                    {% if object.dpoMessage is not null %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.dpoMessage'|trans }}</strong></td>
+                            <td>{{ object.dpoMessage }}</td>
+                        </tr>
+                    {% endif %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+
     {# GENERAL #}
     <div class="box box-solid box-info">
         <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
-                    <td>
-                        {% if object.public == true %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                {% if object.collectivity.isServicesEnabled %}
-                    <tr>
-                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                        <td>{{ object.service }}</td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
-                    <td>{{ object.goal|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
-                    <td>{% if object.author is not null %}{{ object.author|dictionary('registry_treatment_author') }}{% endif %}</td>
-                </tr>
-                {% if object.author != "processing_manager" %}
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
-                        <td>{{ object.coordonneesResponsableTraitement|nl2br }}</td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
-                    <td>{{ object.manager }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
-                    <td>
-                        {% if object.active %}
-                            <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
-                    <td>{{ object.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
-                    <td>{{ object.legalBasisJustification|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
-                    <td>{{ object.observation|nl2br }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                    {% if object.collectivity.isServicesEnabled %}
+                        <tr>
+                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                            <td>{{ object.service }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+                        <td>{{ object.goal|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
+                        <td>{% if object.author is not null %}{{ object.author|dictionary('registry_treatment_author') }}{% endif %}</td>
+                    </tr>
+                    {% if object.author != "processing_manager" %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
+                            <td>{{ object.coordonneesResponsableTraitement|nl2br }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
+                        <td>{{ object.manager }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+                        <td>
+                            {% if object.active %}
+                                <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
+                        <td>{{ object.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
+                        <td>{{ object.legalBasisJustification|nl2br }}</td>
+                    </tr>
+                    {% if object.legalBasis == 'consent' %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
+                            <td>
+                                {% if object.consentRequest %}
+                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
+                            <td>{{ object.consentRequestFormat }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
+                        <td>{{ object.observation|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
+                        <td>
+                            {% if object.public == true %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>
     </div>
 
-    {# DPO Statut #}
-    {% if object.dpoMessage is not null %}
-        <div class="box box-solid box-primary">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
-            </div>
-            <div class="box-body">
-                {{ object.dpoMessage }}
-            </div>
-        </div>
-    {% endif %}
-
     {# DATA CATEGORY #}
     <div class="box box-solid box-warning">
         <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                        {% for category in object.dataCategories %}
-                            <li>
-                                {% if category.sensible %}<strong>{% endif %}
-                                {{ category.name }}
-                                {% if category.sensible %}</strong>{% endif %}
-                            </li>
-                        {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
-                    <td>{{ object.dataCategoryOther|nl2br }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                            {% for category in object.dataCategories %}
+                                <li>
+                                    {% if category.sensible %}<strong>{% endif %}
+                                    {{ category.name }}
+                                    {% if category.sensible %}</strong>{% endif %}
+                                </li>
+                            {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
+                        <td>{{ object.dataCategoryOther|nl2br }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -124,20 +156,20 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
-                    <td>{{ object.recipientCategory|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                            {% for contractor in object.contractors %}
-                                <li>{{ contractor }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
+                        <td>{{ object.recipientCategory|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                                {% for contractor in object.contractors %}
+                                    <li>{{ contractor }}</li>
+                                {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -149,96 +181,97 @@
         <div class="box-body no-padding">
             <table role="presentation" class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
-                    <td>
-                        {% if object.ExemptAIPD %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
-                    <td>
-                        {% if object.systematicMonitoring %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
-                    <td>
-                        {% if object.largeScaleCollection %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
-                    <td>
-                        {% if object.vulnerablePeople %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
-                    <td>
-                        {% if object.dataCrossing %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
-                    <td>
-                        {% if object.evaluationOrRating %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
-                    <td>
-                        {% if object.automatedDecisionsWithLegalEffect %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
-                    <td>
-                        {% if object.automaticExclusionService %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
-                    <td>
-                        {% if object.innovativeUse %}
-                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
+                        <td>
+                            {% if object.ExemptAIPD %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+                        <td>
+                            {% if object.systematicMonitoring %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+                        <td>
+                            {% if object.largeScaleCollection %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+                        <td>
+                            {% if object.vulnerablePeople %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+                        <td>
+                            {% if object.dataCrossing %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+                        <td>
+                            {% if object.evaluationOrRating %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+                        <td>
+                            {% if object.automatedDecisionsWithLegalEffect %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+                        <td>
+                            {% if object.automaticExclusionService %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
+                        <td>
+                            {% if object.innovativeUse %}
+                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                </tbody>
             </table>
         </div>
     </div>
@@ -249,228 +282,215 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type col-md-8"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
-                    <td class="col-md-4">
-                        {% if object.concernedPeopleParticular.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeopleParticular.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type col-md-8"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
+                        <td class="col-md-4">
+                            {% if object.concernedPeopleParticular.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeopleParticular.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
-                    <td>
-                        {% if object.concernedPeopleUser.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeopleUser.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
+                        <td>
+                            {% if object.concernedPeopleUser.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeopleUser.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
-                    <td>
-                        {% if object.concernedPeopleAgent.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeopleAgent.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
+                        <td>
+                            {% if object.concernedPeopleAgent.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeopleAgent.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
-                    <td>
-                        {% if object.concernedPeopleElected.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeopleElected.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
+                        <td>
+                            {% if object.concernedPeopleElected.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeopleElected.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
-                    <td>
-                        {% if object.concernedPeopleCompany.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeopleCompany.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
+                        <td>
+                            {% if object.concernedPeopleCompany.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeopleCompany.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
-                    <td>
-                        {% if object.concernedPeoplePartner.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeoplePartner.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
+                        <td>
+                            {% if object.concernedPeoplePartner.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeoplePartner.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong></td>
-                    <td>
-                        {% if object.concernedPeopleUsager.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeopleUsager.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong></td>
+                        <td>
+                            {% if object.concernedPeopleUsager.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeopleUsager.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
-                    <td>
-                        {% if object.concernedPeopleOther.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.concernedPeopleOther.comment is not empty %}
-                                <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
+                        <td>
+                            {% if object.concernedPeopleOther.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.concernedPeopleOther.comment is not empty %}
+                                    <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
-                    <td>{{ object.estimatedConcernedPeople }}</td>
-                </tr>
-                <tr>
-                    <td><strong>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
+                        <td>{{ object.estimatedConcernedPeople }}</td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong>
+                                {% if object.collectivity.hasModuleTools %}
+                                    {{ 'global.label.linked_tool'|trans }}
+                                {% else %}
+                                    {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                {% endif %}
+                            </strong>
+                        </td>
+                        <td>
                             {% if object.collectivity.hasModuleTools %}
-                                {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                <ul class="ps-1">
+                                    {% for tool in object.tools %}
+                                        <li>{{ tool.name }}</li>
+                                    {% endfor %}
+                                </ul>
                             {% else %}
-                                {{ 'global.label.linked_tool'|trans }}
+                                {{ object.software }}
                             {% endif %}
-                        </strong></td>
-                    <td>
-                        {% if object.collectivity.hasModuleTools %}
-                            <ul class="ps-1">
-                                {% for tool in object.tools %}
-                                    <li>{{ tool.name }}</li>
-                                {% endfor %}
-                            </ul>
-                        {% else %}
-                            {{ object.software }}
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
-                    <td>
-                        {% if object.paperProcessing %}
-                            <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
+                        <td>
+                            {% if object.paperProcessing %}
+                                <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
                 </tbody>
             </table>
             <table class="table" style="border-top: #f4f4f4 1px solid">
                 <tbody>
-                <tr>
-                    <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
-                    <td style="padding-top: 10px; width: 80%">
-                        {% for method in object.shelfLifes %}
-                            <div class="box box-default">
-                                <div class="box-body no-padding">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr>
-                                            <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
-                                            <td>{{ method.name }}</td>
-                                        </tr>
-                                        <tr>
-                                            <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
-                                            <td>{{ method.duration }}</td>
-                                        </tr>
-                                        <tr>
-                                            <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
-                                            <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
+                    <tr>
+                        <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
+                        <td style="padding-top: 10px; width: 80%">
+                            {% for method in object.shelfLifes %}
+                                <div class="box box-default">
+                                    <div class="box-body no-padding">
+                                        <table class="table">
+                                            <tbody>
+                                                <tr>
+                                                    <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
+                                                    <td>{{ method.name }}</td>
+                                                </tr>
+                                                <tr>
+                                                    <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
+                                                    <td>{{ method.duration }}</td>
+                                                </tr>
+                                                <tr>
+                                                    <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
+                                                    <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
                                 </div>
-                            </div>
-                        {% endfor %}
-                    </td>
-                </tr>
+                            {% endfor %}
+                        </td>
+                    </tr>
                 </tbody>
             </table>
             <table class="table">
                 <tbody>
-                <tr>
-                    <td class="col-md-8"><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
-                    <td class="col-md-4">{{ object.dataOrigin }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                            {% for method in object.collectingMethod %}
-                                <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                {% if  object.otherCollectingMethod is not null %}
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
-                        <td>{{ object.otherCollectingMethod }}</td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong></td>
-                    <td>
-                        {% if object.legalMentions %}
-                            <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
-                    <td>
-                        {% if object.consentRequest %}
-                            <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                {% if  object.consentRequestFormat is not null %}
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
-                        <td>{{ object.consentRequestFormat }}</td>
+                        <td class="col-md-8"><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
+                        <td class="col-md-4">{{ object.dataOrigin }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                                {% for method in object.collectingMethod %}
+                                    <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
+                                {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
+                    {% if object.otherCollectingMethod is not null %}
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
+                            <td>{{ object.otherCollectingMethod }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong></td>
+                        <td>
+                            {% if object.legalMentions %}
+                                <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
                     </tr>
-                {% endif %}
+                </tbody>
             </table>
         </div>
     </div>
@@ -481,101 +501,101 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
-                    <td>
-                        {% if object.securityAccessControl.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.securityAccessControl.comment is not empty %}
-                                <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
+                        <td>
+                            {% if object.securityAccessControl.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.securityAccessControl.comment is not empty %}
+                                    <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
-                    <td>
-                        {% if object.securitytracability.check %}
-                           <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                           {% if object.securitytracability.comment is not empty %}
-                               <p class="mt-2">{{ object.securitytracability.comment }}</p>
-                           {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
-                    <td>
-                        {% if object.securitySaving.check %}
-                           <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                           {% if object.securitySaving.comment is not empty %}
-                               <p class="mt-2">{{ object.securitySaving.comment }}</p>
-                           {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
-                    <td>
-                        {% if object.securityUpdate.check %}
-                           <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                           {% if object.securityUpdate.comment is not empty %}
-                               <p class="mt-2">{{ object.securityUpdate.comment }}</p>
-                           {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
-                    <td>
-                        {% if object.securityOther.check %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                            {% if object.securityOther.comment is not empty %}
-                                <p class="mt-2">{{ object.securityOther.comment }}</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+                        <td>
+                            {% if object.securityUpdate.check %}
+                               <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                               {% if object.securityUpdate.comment is not empty %}
+                                   <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+                               {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                             {% endif %}
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
-                    <td>
-                        {% if object.securityEntitledPersons %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
-                    <td>
-                        {% if object.securityOpenAccounts %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
-                    <td>
-                        {% if object.securitySpecificitiesDelivered %}
-                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
+                        <td>
+                            {% if object.securitySaving.check %}
+                               <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                               {% if object.securitySaving.comment is not empty %}
+                                   <p class="mt-2">{{ object.securitySaving.comment }}</p>
+                               {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+                        <td>
+                            {% if object.securitytracability.check %}
+                               <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                               {% if object.securitytracability.comment is not empty %}
+                                   <p class="mt-2">{{ object.securitytracability.comment }}</p>
+                               {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
+                        <td>
+                            {% if object.securityOther.check %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                {% if object.securityOther.comment is not empty %}
+                                    <p class="mt-2">{{ object.securityOther.comment }}</p>
+                                {% endif %}
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
+                        <td>
+                            {% if object.securityEntitledPersons %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
+                        <td>
+                            {% if object.securityOpenAccounts %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
+                        <td>
+                            {% if object.securitySpecificitiesDelivered %}
+                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -721,26 +741,26 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {% if is_granted('ROLE_REFERENT') %}
-                    <tr>
-                        <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                        <td>
-                            {{ object.collectivity }}
-                        </td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                    <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                    <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                    <td>{{ object.updatedBy }}</td>
-                </tr>
+                    {% if is_granted('ROLE_REFERENT') %}
+                        <tr>
+                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                            <td>
+                                {{ object.collectivity }}
+                            </td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                        <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                        <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                        <td>{{ object.updatedBy }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
diff --git a/templates/Registry/Treatment/pdf_all.html.twig b/templates/Registry/Treatment/pdf_all.html.twig
index 102629c18d241c8d186e129ff28c41ba3755dfab..99acc3e9a69b0c9ae7bea6d43e03580fb70bf32e 100644
--- a/templates/Registry/Treatment/pdf_all.html.twig
+++ b/templates/Registry/Treatment/pdf_all.html.twig
@@ -6,748 +6,768 @@
 {% block body %}
     {% if objects|length %}
         {% for object in objects %}
-        <div style="page-break-after: always">
-            <h1 class="text-center">{{ object.name }}</h1>
-            {# GENERAL #}
-            <div class="box box-solid box-info">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
-                            <td>
-                                {% if object.public == true %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
-                            <td>{{ object.name }}</td>
-                        </tr>
-                        {% if object.collectivity.isServicesEnabled %}
-                            <tr>
-                                <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                                <td>{{ object.service }}</td>
-                            </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
-                            <td>{{ object.goal|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
-                            <td>{% if object.author is not null %}{{ object.author|dictionary('registry_treatment_author') }}{% endif %}</td>
-                        </tr>
-                        {% if object.author != "processing_manager" %}
-                            <tr>
-                                <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
-                                <td>{{ object.coordonneesResponsableTraitement|nl2br }}</td>
-                            </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
-                            <td>{{ object.manager }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
-                            <td>
-                                {% if object.active %}
-                                    <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
-                            <td>{{ object.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
-                            <td>{{ object.legalBasisJustification|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
-                            <td>{{ object.observation|nl2br }}</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+            <div style="page-break-after: always">
+                <h1 class="text-center">{{ object.name }}</h1>
 
-            {# DPO Statut #}
-            {% if object.dpoMessage is not null %}
-                <div class="box box-solid box-primary">
+                {# DPO Statut #}
+                <div class="box box-solid box-default">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
                     </div>
-                    <div class="box-body">
-                        {{ object.dpoMessage }}
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.statut'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.statut is defined and object.statut %}
+                                            {{ object.statut|dictionary('treatment_statut') }}
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                {% if object.dpoMessage is not null %}
+                                    <tr>
+                                        <td><strong>{{ 'registry.treatment.label.dpoMessage'|trans }}</strong></td>
+                                        <td>{{ object.dpoMessage }}</td>
+                                    </tr>
+                                {% endif %}
+                            </tbody>
+                        </table>
                     </div>
                 </div>
-            {% endif %}
-
-            {# DATA CATEGORY #}
-            <div class="box box-solid box-warning">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                {% for category in object.dataCategories %}
-                                    <li>
-                                        {% if category.sensible %}<strong>{% endif %}
-                                        {{ category.name }}
-                                        {% if category.sensible %}</strong>{% endif %}
-                                    </li>
-                                {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
-                            <td>{{ object.dataCategoryOther|nl2br }}</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            {# RECIPIENTS #}
-            <div class="box box-solid box-primary">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.recipients'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
-                            <td>{{ object.recipientCategory|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                    {% for contractor in object.contractors %}
-                                        <li>{{ contractor }}</li>
-                                    {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
 
-            {# SPECIFIC #}
-            <div class="box box-solid box-info">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
-                            <td>
-                                {% if object.ExemptAIPD %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
-                            <td>
-                                {% if object.systematicMonitoring %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
-                            <td>
-                                {% if object.largeScaleCollection %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
-                            <td>
-                                {% if object.vulnerablePeople %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
-                            <td>
-                                {% if object.dataCrossing %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
-                            <td>
-                                {% if object.evaluationOrRating %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
-                            <td>
-                                {% if object.automatedDecisionsWithLegalEffect %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                {# GENERAL #}
+                <div class="box box-solid box-info">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table class="table">
+                            <tbody>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
+                                    <td>{{ object.name }}</td>
+                                </tr>
+                                {% if object.collectivity.isServicesEnabled %}
+                                    <tr>
+                                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                        <td>{{ object.service }}</td>
+                                    </tr>
                                 {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
-                            <td>
-                                {% if object.automaticExclusionService %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+                                    <td>{{ object.goal|nl2br }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
+                                    <td>{% if object.author is not null %}{{ object.author|dictionary('registry_treatment_author') }}{% endif %}</td>
+                                </tr>
+                                {% if object.author != "processing_manager" %}
+                                    <tr>
+                                        <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
+                                        <td>{{ object.coordonneesResponsableTraitement|nl2br }}</td>
+                                    </tr>
                                 {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
-                            <td>
-                                {% if object.innovativeUse %}
-                                    <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
+                                    <td>{{ object.manager }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.active %}
+                                            <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
+                                    <td>{{ object.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
+                                    <td>{{ object.legalBasisJustification|nl2br }}</td>
+                                </tr>
+                                {% if object.legalBasis == 'consent' %}
+                                    <tr>
+                                        <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
+                                        <td>
+                                            {% if object.consentRequest %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
+                                        <td>{{ object.consentRequestFormat }}</td>
+                                    </tr>
                                 {% endif %}
-                            </td>
-                        </tr>
-                    </table>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
+                                    <td>{{ object.observation|nl2br }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.public == true %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
 
-            {# DETAILS #}
-            <div class="box box-solid box-primary">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.details'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type col-md-8"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
-                            <td class="col-md-4">
-                                {% if object.concernedPeopleParticular.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeopleParticular.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeopleUser.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeopleUser.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeopleAgent.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeopleAgent.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeopleElected.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeopleElected.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeopleCompany.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeopleCompany.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeoplePartner.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeoplePartner.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeopleUsager.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeopleUsager.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
-                            <td>
-                                {% if object.concernedPeopleOther.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.concernedPeopleOther.comment is not empty %}
-                                        <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
-                            <td>{{ object.estimatedConcernedPeople }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>
-                                    {% if object.collectivity.hasModuleTools %}
-                                        {{ 'registry.treatment.label.tools_if_inactif'|trans }}
-                                    {% else %}
-                                        {{ 'global.label.linked_tool'|trans }}
-                                    {% endif %}
-                                </strong></td>
-                            <td>
-                                {% if object.collectivity.hasModuleTools %}
-                                    <ul class="ps-1">
-                                        {% for tool in object.tools %}
-                                            <li>{{ tool.name }}</li>
+                {# DATA CATEGORY #}
+                <div class="box box-solid box-warning">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table class="table">
+                            <tbody>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
+                                    <td>
+                                        <ul class="ps-1">
+                                        {% for category in object.dataCategories %}
+                                            <li>
+                                                {% if category.sensible %}<strong>{% endif %}
+                                                {{ category.name }}
+                                                {% if category.sensible %}</strong>{% endif %}
+                                            </li>
                                         {% endfor %}
-                                    </ul>
-                                {% else %}
-                                    {{ object.software }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
-                            <td>
-                                {% if object.paperProcessing %}
-                                    <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="table" style="border-top: #f4f4f4 1px solid">
-                        <tbody>
-                        <tr>
-                            <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
-                            <td style="padding-top: 10px; width: 80%">
-                                {% for method in object.shelfLifes %}
-                                    <div class="box box-default">
-                                        <div class="box-body no-padding">
-                                            <table class="table">
-                                                <tbody>
-                                                <tr>
-                                                    <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
-                                                    <td>{{ method.name }}</td>
-                                                </tr>
-                                                <tr>
-                                                    <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
-                                                    <td>{{ method.duration }}</td>
-                                                </tr>
-                                                <tr>
-                                                    <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
-                                                    <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
-                                                </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                {% endfor %}
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td class="col-md-8"><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
-                            <td class="col-md-4">{{ object.dataOrigin }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                    {% for method in object.collectingMethod %}
-                                        <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
-                                    {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        {% if  object.otherCollectingMethod is not null %}
-                            <tr>
-                                <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
-                                <td>{{ object.otherCollectingMethod }}</td>
-                            </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong></td>
-                            <td>
-                                {% if object.legalMentions %}
-                                    <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
-                            <td>
-                                {% if object.consentRequest %}
-                                    <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        {% if  object.consentRequestFormat is not null %}
-                            <tr>
-                                <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
-                                <td>{{ object.consentRequestFormat }}</td>
-                            </tr>
-                        {% endif %}
-                    </table>
+                                        </ul>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
+                                    <td>{{ object.dataCategoryOther|nl2br }}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
 
-            {# SECURITY #}
-            <div class="box box-solid box-success">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
-                            <td>
-                                {% if object.securityAccessControl.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.securityAccessControl.comment is not empty %}
-                                        <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
-                            <td>
-                                {% if object.securitytracability.check %}
-                                   <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                   {% if object.securitytracability.comment is not empty %}
-                                       <p class="mt-2">{{ object.securitytracability.comment }}</p>
-                                   {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
-                            <td>
-                                {% if object.securitySaving.check %}
-                                   <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                   {% if object.securitySaving.comment is not empty %}
-                                       <p class="mt-2">{{ object.securitySaving.comment }}</p>
-                                   {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
-                            <td>
-                                {% if object.securityUpdate.check %}
-                                   <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                   {% if object.securityUpdate.comment is not empty %}
-                                       <p class="mt-2">{{ object.securityUpdate.comment }}</p>
-                                   {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
-                            <td>
-                                {% if object.securityOther.check %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% if object.securityOther.comment is not empty %}
-                                        <p class="mt-2">{{ object.securityOther.comment }}</p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
-                            <td>
-                                {% if object.securityEntitledPersons %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
-                            <td>
-                                {% if object.securityOpenAccounts %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
-                            <td>
-                                {% if object.securitySpecificitiesDelivered %}
-                                    <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                {# RECIPIENTS #}
+                <div class="box box-solid box-primary">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.recipients'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table class="table">
+                            <tbody>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
+                                    <td>{{ object.recipientCategory|nl2br }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
+                                    <td>
+                                        <ul class="ps-1">
+                                            {% for contractor in object.contractors %}
+                                                <li>{{ contractor }}</li>
+                                            {% endfor %}
+                                        </ul>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
 
-            {# LINKED MODULES #}
-            <div class="box box-solid box-warning">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table class="table">
-                        <tbody>
-                            {# TREATMENTS #}
-                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                            {# REQUESTS #}
-                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                            {# VIOLATIONS #}
-                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                            {# PROOFS #}
-                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                            {# MESUREMENTS #}
-                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
-                        </tbody>
-                    </table>
+                {# SPECIFIC #}
+                <div class="box box-solid box-info">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.ExemptAIPD %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.systematicMonitoring %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.largeScaleCollection %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.vulnerablePeople %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.dataCrossing %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.evaluationOrRating %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.automatedDecisionsWithLegalEffect %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.automaticExclusionService %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.innovativeUse %}
+                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
 
-            {# TREATMENT CONFORMITY & AIPD #}
-            {% if object.collectivity.hasModuleConformiteTraitement %}
-                {# TREATMENT CONFORMITY #}
-                <div class="box box-solid box-success">
-                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.conformite'|trans }}</h3></div>
+                {# DETAILS #}
+                <div class="box box-solid box-primary">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.details'|trans }}</h3></div>
                     <div class="box-body no-padding">
-                        <table role="presentation" class="table">
+                        <table class="table">
                             <tbody>
                                 <tr>
-                                    <td style="width: 35%">
-                                        <strong>{{ 'registry.treatment.label.last_conformite_traitement'|trans }}</strong>
+                                    <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
+                                </tr>
+                                <tr>
+                                    <td class="concerned-people-type col-md-8"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
+                                    <td class="col-md-4">
+                                        {% if object.concernedPeopleParticular.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeopleParticular.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
                                     </td>
+                                </tr>
+                                <tr>
+                                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
                                     <td>
-                                        {% if object.conformiteTraitement is not null %}
-                                            {{ object.conformiteTraitement.updatedAt|date('d/m/Y') }}
+                                        {% if object.concernedPeopleUser.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeopleUser.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+                                            {% endif %}
                                         {% else %}
-                                            <i>{{ 'registry.treatment.label.no_conformite_traitement'|trans }}</i>
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                         {% endif %}
                                     </td>
                                 </tr>
-                                {% if object.conformiteTraitement is not null %}
-                                    <tr>
-                                        <td>
-                                            <strong>{{ 'registry.conformite_traitement.label.conformite_traitement'|trans }}</strong>
-                                        </td>
-                                        <td>
-                                            {{ getConformiteTraitementLabel(object.conformiteTraitement)|raw }}
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <strong>{{ 'registry.conformite_traitement.label.conformite_reponse'|trans }}</strong>
-                                        </td>
-                                        <td>
-                                            {% set nbTotal = object.conformiteTraitement.nbConformes + object.conformiteTraitement.nbNonConformesMineures + object.conformiteTraitement.nbNonConformesMajeures %}
-                                            {% set widthNbConforme = ((object.conformiteTraitement.nbConformes * 100) / nbTotal)|round %}
-                                            {% set widthnbNonConformesMineures = ((object.conformiteTraitement.nbNonConformesMineures * 100) / nbTotal)|round %}
-                                            {% set widthnbNonConformesMajeures = 100 - (widthNbConforme + widthnbNonConformesMineures) %}
-                                            <div class="stacked-bar-graph">
-                                                {% if widthNbConforme %}<span style="width:{{ widthNbConforme }}%" class="bar-conforme tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.conforme'|trans }} {{ object.conformiteTraitement.nbConformes }}</span></span>{% endif %}
-                                                {% if widthnbNonConformesMineures %}<span style="width:{{ widthnbNonConformesMineures }}%" class="bar-non-conforme-mineure tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.minor_conforme'|trans }} {{ object.conformiteTraitement.nbNonConformesMineures }}</span></span>{% endif %}
-                                                {% if widthnbNonConformesMajeures %}<span style="width:{{ widthnbNonConformesMajeures }}%" class="bar-non-conforme-majeure tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.major_conforme'|trans }} {{ object.conformiteTraitement.nbNonConformesMajeures }}</span></span>{% endif %}
+                                <tr>
+                                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.concernedPeopleAgent.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeopleAgent.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.concernedPeopleElected.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeopleElected.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.concernedPeopleCompany.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeopleCompany.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.concernedPeoplePartner.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeoplePartner.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.concernedPeopleUsager.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeopleUsager.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.concernedPeopleOther.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.concernedPeopleOther.comment is not empty %}
+                                                <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
+                                    <td>{{ object.estimatedConcernedPeople }}</td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <strong>
+                                            {% if object.collectivity.hasModuleTools %}
+                                                {{ 'global.label.linked_tool'|trans }}
+                                            {% else %}
+                                                {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                            {% endif %}
+                                        </strong>
+                                    </td>
+                                    <td>
+                                        {% if object.collectivity.hasModuleTools %}
+                                            <ul class="ps-1">
+                                                {% for tool in object.tools %}
+                                                    <li>{{ tool.name }}</li>
+                                                {% endfor %}
+                                            </ul>
+                                        {% else %}
+                                            {{ object.software }}
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.paperProcessing %}
+                                            <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <table class="table" style="border-top: #f4f4f4 1px solid">
+                            <tbody>
+                                <tr>
+                                    <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
+                                    <td style="padding-top: 10px; width: 80%">
+                                        {% for method in object.shelfLifes %}
+                                            <div class="box box-default">
+                                                <div class="box-body no-padding">
+                                                    <table class="table">
+                                                        <tbody>
+                                                            <tr>
+                                                                <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
+                                                                <td>{{ method.name }}</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
+                                                                <td>{{ method.duration }}</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
+                                                                <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
                                             </div>
-                                        </td>
+                                        {% endfor %}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <table class="table">
+                            <tbody>
+                                <tr>
+                                    <td class="col-md-8"><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
+                                    <td class="col-md-4">{{ object.dataOrigin }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
+                                    <td>
+                                        <ul class="ps-1">
+                                            {% for method in object.collectingMethod %}
+                                                <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
+                                            {% endfor %}
+                                        </ul>
+                                    </td>
+                                </tr>
+                                {% if object.otherCollectingMethod is not null %}
+                                    <tr>
+                                        <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
+                                        <td>{{ object.otherCollectingMethod }}</td>
                                     </tr>
                                 {% endif %}
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.legalMentions %}
+                                            <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
                             </tbody>
                         </table>
                     </div>
                 </div>
-                {# AIPD #}
-                {% if object.conformiteTraitement is not null %}
-                    {% set analyseImpact = object.conformiteTraitement.lastAnalyseImpact %}
-                {% endif %}
-                <div class="box box-solid box-primary">
-                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.last_aipd'|trans }}</h3></div>
+
+                {# SECURITY #}
+                <div class="box box-solid box-success">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
                     <div class="box-body no-padding">
-                        <table role="presentation" class="table">
+                        <table class="table">
                             <tbody>
                                 <tr>
-                                    <td style="width: 35%">
-                                        <strong>{{ 'aipd.treatment.label.last_aipd'|trans }}</strong>
+                                    <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.securityAccessControl.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.securityAccessControl.comment is not empty %}
+                                                <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.securityUpdate.check %}
+                                           <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                           {% if object.securityUpdate.comment is not empty %}
+                                               <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+                                           {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.securitySaving.check %}
+                                           <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                           {% if object.securitySaving.comment is not empty %}
+                                               <p class="mt-2">{{ object.securitySaving.comment }}</p>
+                                           {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.securitytracability.check %}
+                                           <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                           {% if object.securitytracability.comment is not empty %}
+                                               <p class="mt-2">{{ object.securitytracability.comment }}</p>
+                                           {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.securityOther.check %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% if object.securityOther.comment is not empty %}
+                                                <p class="mt-2">{{ object.securityOther.comment }}</p>
+                                            {% endif %}
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.securityEntitledPersons %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.securityOpenAccounts %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
                                     </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
                                     <td>
-                                        {% if object.conformiteTraitement is null %}
-                                            <i>{{ 'aipd.treatment.label.no_conformite_traitement'|trans }}</i>
-                                        {% elseif object.conformiteTraitement is not null and analyseImpact is null %}
-                                            <i>{{ 'aipd.treatment.label.no_aipd'|trans }}</i>
+                                        {% if object.securitySpecificitiesDelivered %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
-                                            {{ analyseImpact.createdAt|date('d/m/Y') }}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                         {% endif %}
                                     </td>
                                 </tr>
-                                {% if object.conformiteTraitement is not null and analyseImpact is not null %}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+
+                {# LINKED MODULES #}
+                <div class="box box-solid box-warning">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table class="table">
+                            <tbody>
+                                {# TREATMENTS #}
+                                {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                                {# REQUESTS #}
+                                {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                                {# VIOLATIONS #}
+                                {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                                {# PROOFS #}
+                                {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                                {# MESUREMENTS #}
+                                {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+
+                {# TREATMENT CONFORMITY & AIPD #}
+                {% if object.collectivity.hasModuleConformiteTraitement %}
+                    {# TREATMENT CONFORMITY #}
+                    <div class="box box-solid box-success">
+                        <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.conformite'|trans }}</h3></div>
+                        <div class="box-body no-padding">
+                            <table role="presentation" class="table">
+                                <tbody>
                                     <tr>
-                                        <td>
-                                            <strong>{{ 'aipd.treatment.label.avis_aipd'|trans }}</strong>
+                                        <td style="width: 35%">
+                                            <strong>{{ 'registry.treatment.label.last_conformite_traitement'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% set labelAipdColor = "label-default" %}
-                                            {% if analyseImpact.statut == "defavorable" %}
-                                                {% set labelAipdColor = "label-danger" %}
-                                            {% elseif analyseImpact.statut == "favorable_reserve" %}
-                                                {% set labelAipdColor = "label-warning" %}
-                                            {% elseif analyseImpact.statut == "favorable" %}
-                                                {% set labelAipdColor = "label-success" %}
+                                            {% if object.conformiteTraitement is not null %}
+                                                {{ object.conformiteTraitement.updatedAt|date('d/m/Y') }}
+                                            {% else %}
+                                                <i>{{ 'registry.treatment.label.no_conformite_traitement'|trans }}</i>
                                             {% endif %}
-                                            {% set statut = analyseImpact.statut %}
-                                            {% set labelStatut = "aipd.analyse_impact.values." ~ object.conformiteTraitement.lastAnalyseImpact.statut %}
-                                            <span class="label {{ labelAipdColor }}" style="display: inline-block;">
-                                                {{ labelStatut|trans}}
-                                            </span>
                                         </td>
                                     </tr>
+                                    {% if object.conformiteTraitement is not null %}
+                                        <tr>
+                                            <td>
+                                                <strong>{{ 'registry.conformite_traitement.label.conformite_traitement'|trans }}</strong>
+                                            </td>
+                                            <td>
+                                                {{ getConformiteTraitementLabel(object.conformiteTraitement)|raw }}
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <strong>{{ 'registry.conformite_traitement.label.conformite_reponse'|trans }}</strong>
+                                            </td>
+                                            <td>
+                                                {% set nbTotal = object.conformiteTraitement.nbConformes + object.conformiteTraitement.nbNonConformesMineures + object.conformiteTraitement.nbNonConformesMajeures %}
+                                                {% set widthNbConforme = ((object.conformiteTraitement.nbConformes * 100) / nbTotal)|round %}
+                                                {% set widthnbNonConformesMineures = ((object.conformiteTraitement.nbNonConformesMineures * 100) / nbTotal)|round %}
+                                                {% set widthnbNonConformesMajeures = 100 - (widthNbConforme + widthnbNonConformesMineures) %}
+                                                <div class="stacked-bar-graph">
+                                                    {% if widthNbConforme %}<span style="width:{{ widthNbConforme }}%" class="bar-conforme tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.conforme'|trans }} {{ object.conformiteTraitement.nbConformes }}</span></span>{% endif %}
+                                                    {% if widthnbNonConformesMineures %}<span style="width:{{ widthnbNonConformesMineures }}%" class="bar-non-conforme-mineure tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.minor_conforme'|trans }} {{ object.conformiteTraitement.nbNonConformesMineures }}</span></span>{% endif %}
+                                                    {% if widthnbNonConformesMajeures %}<span style="width:{{ widthnbNonConformesMajeures }}%" class="bar-non-conforme-majeure tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.major_conforme'|trans }} {{ object.conformiteTraitement.nbNonConformesMajeures }}</span></span>{% endif %}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    {% endif %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    {# AIPD #}
+                    {% if object.conformiteTraitement is not null %}
+                        {% set analyseImpact = object.conformiteTraitement.lastAnalyseImpact %}
+                    {% endif %}
+                    <div class="box box-solid box-primary">
+                        <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.last_aipd'|trans }}</h3></div>
+                        <div class="box-body no-padding">
+                            <table role="presentation" class="table">
+                                <tbody>
                                     <tr>
-                                        <td>
-                                            <strong>{{ 'aipd.analyse_impact.list.date_validation'|trans }}</strong>
+                                        <td style="width: 35%">
+                                            <strong>{{ 'aipd.treatment.label.last_aipd'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if analyseImpact.isValidated %}
-                                                {{ analyseImpact.dateValidation|date('d/m/Y') }}
+                                            {% if object.conformiteTraitement is null %}
+                                                <i>{{ 'aipd.treatment.label.no_conformite_traitement'|trans }}</i>
+                                            {% elseif object.conformiteTraitement is not null and analyseImpact is null %}
+                                                <i>{{ 'aipd.treatment.label.no_aipd'|trans }}</i>
                                             {% else %}
-                                                {{ 'aipd.treatment.label.validation_in_progress'|trans }}
+                                                {{ analyseImpact.createdAt|date('d/m/Y') }}
                                             {% endif %}
                                         </td>
                                     </tr>
+                                    {% if object.conformiteTraitement is not null and analyseImpact is not null %}
+                                        <tr>
+                                            <td>
+                                                <strong>{{ 'aipd.treatment.label.avis_aipd'|trans }}</strong>
+                                            </td>
+                                            <td>
+                                                {% set labelAipdColor = "label-default" %}
+                                                {% if analyseImpact.statut == "defavorable" %}
+                                                    {% set labelAipdColor = "label-danger" %}
+                                                {% elseif analyseImpact.statut == "favorable_reserve" %}
+                                                    {% set labelAipdColor = "label-warning" %}
+                                                {% elseif analyseImpact.statut == "favorable" %}
+                                                    {% set labelAipdColor = "label-success" %}
+                                                {% endif %}
+                                                {% set statut = analyseImpact.statut %}
+                                                {% set labelStatut = "aipd.analyse_impact.values." ~ object.conformiteTraitement.lastAnalyseImpact.statut %}
+                                                <span class="label {{ labelAipdColor }}" style="display: inline-block;">
+                                                    {{ labelStatut|trans}}
+                                                </span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <strong>{{ 'aipd.analyse_impact.list.date_validation'|trans }}</strong>
+                                            </td>
+                                            <td>
+                                                {% if analyseImpact.isValidated %}
+                                                    {{ analyseImpact.dateValidation|date('d/m/Y') }}
+                                                {% else %}
+                                                    {{ 'aipd.treatment.label.validation_in_progress'|trans }}
+                                                {% endif %}
+                                            </td>
+                                        </tr>
+                                    {% endif %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                {% endif %}
+
+                {# HISTORIC #}
+                <div class="box box-solid box-default">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table class="table">
+                            <tbody>
+                                {% if is_granted('ROLE_REFERENT') %}
+                                    <tr>
+                                        <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                        <td>
+                                            {{ object.collectivity }}
+                                        </td>
+                                    </tr>
                                 {% endif %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                    <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                    <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                    <td>{{ object.updatedBy }}</td>
+                                </tr>
                             </tbody>
                         </table>
                     </div>
                 </div>
-            {% endif %}
-
-            {# HISTORIC #}
-            <div class="box box-solid box-default">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table class="table">
-                        <tbody>
-                        {% if is_granted('ROLE_REFERENT') %}
-                            <tr>
-                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                                <td>
-                                    {{ object.collectivity }}
-                                </td>
-                            </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                            <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                            <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                            <td>{{ object.updatedBy }}</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
             </div>
-        </div>
         {% endfor %}
     {% endif %}
 {% endblock %}
diff --git a/templates/Registry/Treatment/public_show.html.twig b/templates/Registry/Treatment/public_show.html.twig
index f5f190ad9af68ff684f93ef3660d1eb99c7d766e..51bc589d2d7b1cf15b07e6da90c786ece24eb9f9 100644
--- a/templates/Registry/Treatment/public_show.html.twig
+++ b/templates/Registry/Treatment/public_show.html.twig
@@ -18,7 +18,6 @@
     </h1>
 {% endblock %}
 
-
 {% block body %}
     <div class="row">
         <div class="col-xs-12">
@@ -31,870 +30,895 @@
         </div>
     </div>
 
-<div class="row">
-    {# LEFT #}
-    <div class="col-md-6">
-        {# GENERAL #}
-        {% if (
-            (object.name and config.name == true)
-            or (object.service and config.service == true)
-            or (object.goal and config.goal == true)
-            or (object.author and config.author == true)
-            or (object.author == "processing_manager" and object.coordonneesResponsableTraitement and config.coordonneesResponsableTraitement == true)
-            or (object.manager and config.manager == true)
-            or (object.active and config.active == true)
-            or (object.legalBasis and config.legalBasis == true)
-            or (object.legalBasisJustification and config.legalBasisJustification == true)
-            or (object.observation and config.observation == true)
-        ) %}
-            <div class="box box-solid box-info">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'global.tab.general'|trans }}</h3>
-                </div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            {% if (object.name and config.name == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.name'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.name }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.service and config.service == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.label.service'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.service }}</td>
-                                </tr>
-                            {% endif %}
+    <div class="row">
+        {# LEFT #}
+        <div class="col-md-6">
+            {# GENERAL #}
+            {% if (
+                (object.name and config.name == true)
+                or (object.service and config.service == true)
+                or (object.goal and config.goal == true)
+                or (object.author and config.author == true)
+                or (object.author == "processing_manager" and object.coordonneesResponsableTraitement and config.coordonneesResponsableTraitement == true)
+                or (object.manager and config.manager == true)
+                or (object.active and config.active == true)
+                or (object.legalBasis and config.legalBasis == true)
+                or (object.legalBasisJustification and config.legalBasisJustification == true)
+                or (object.consentRequest and config.consentRequest == true)
+                or (object.consentRequestFormat and config.consentRequestFormat == true)
+                or (object.observation and config.observation == true)
+            ) %}
+                <div class="box box-solid box-info">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'global.tab.general'|trans }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                {% if (object.name and config.name == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.name'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.name }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.service and config.service == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.label.service'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.service }}</td>
+                                    </tr>
+                                {% endif %}
 
-                            {% if (object.goal and config.goal == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.goal'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.goal|nl2br }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.author and config.author == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.author'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.author is not null %}
-                                            {{ object.author|dictionary('registry_treatment_author') }}
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.author != "processing_manager" and object.coordonneesResponsableTraitement and config.coordonneesResponsableTraitement == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.coordonneesResponsableTraitement|nl2br }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.manager and config.manager == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.manager'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.manager }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.active and config.active == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.active'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.active %}
-                                            <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.legalBasis and config.legalBasis == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.legalBasisJustification and config.legalBasisJustification == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.legalBasisJustification|nl2br }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.observation and config.observation == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.observation'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.observation|nl2br }}</td>
-                                </tr>
-                            {% endif %}
-                        </tbody>
-                    </table>
+                                {% if (object.goal and config.goal == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.goal'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.goal|nl2br }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.author and config.author == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.author'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.author is not null %}
+                                                {{ object.author|dictionary('registry_treatment_author') }}
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.author != "processing_manager" and object.coordonneesResponsableTraitement and config.coordonneesResponsableTraitement == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.coordonneesResponsableTraitement|nl2br }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.manager and config.manager == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.manager'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.manager }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.active and config.active == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.active'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.active %}
+                                                <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.legalBasis and config.legalBasis == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.legalBasisJustification and config.legalBasisJustification == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.legalBasisJustification|nl2br }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.consentRequest and config.consentRequest == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.consentRequest == 1 %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.consentRequestFormat and config.consentRequestFormat == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.consentRequestFormat }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.observation and config.observation == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.observation'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.observation|nl2br }}</td>
+                                    </tr>
+                                {% endif %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        {# DATA CATEGORY #}
-        {% if (
-            (object.dataCategories and config.dataCategories == true)
-            or  (object.dataCategoryOther and config.dataCategoryOther == true)
+            {# DATA CATEGORY #}
+            {% if (
+                (object.dataCategories and config.dataCategories == true)
+                or  (object.dataCategoryOther and config.dataCategoryOther == true)
             ) %}
-            <div class="box box-solid box-warning">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3>
-                </div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            <tr>
-                                {% if (object.dataCategories and config.dataCategories == true) %}
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.data_category'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        <ul class="ps-1">
-                                            {% for category in object.dataCategories %}
-                                                <li>
-                                                    {% if category.sensible %}
-                                                        <strong>
+                <div class="box box-solid box-warning">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                <tr>
+                                    {% if (object.dataCategories and config.dataCategories == true) %}
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.data_category'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            <ul class="ps-1">
+                                                {% for category in object.dataCategories %}
+                                                    <li>
+                                                        {% if category.sensible %}
+                                                            <strong>
                                                         {% endif %}
                                                         {{ category.name }}
                                                         {% if category.sensible %}
-                                                        </strong>
-                                                    {% endif %}
-                                                </li>
-                                            {% endfor %}
-                                        </ul>
-                                    </td>
+                                                            </strong>
+                                                        {% endif %}
+                                                    </li>
+                                                {% endfor %}
+                                            </ul>
+                                        </td>
+                                    {% endif %}
+                                </tr>
+                                {% if (object.dataCategoryOther and config.dataCategoryOther == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.dataCategoryOther|nl2br }}</td>
+                                    </tr>
                                 {% endif %}
-                            </tr>
-                            {% if (object.dataCategoryOther and config.dataCategoryOther == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.dataCategoryOther|nl2br }}</td>
-                                </tr>
-                            {% endif %}
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        {# RECIPIENTS #}
-        {% if (
-            (object.recipientCategory and config.recipientCategory == true)
-            or ((object.contractors is not empty) and config.contractors == true)) %}
-            <div class="box box-solid box-primary">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'registry.treatment.tab.recipients'|trans }}</h3>
-                </div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            {% if (object.recipientCategory and config.recipientCategory == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.recipientCategory|nl2br }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.contractors and config.contractors == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'global.label.linked_contractor'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        <ul class="ps-1">
-                                            {% for contractor in object.contractors %}
-                                                <li>{{ contractor }}</li>
-                                            {% endfor %}
-                                        </ul>
-                                    </td>
-                                </tr>
-                            {% endif %}
-                        </tbody>
-                    </table>
+            {# RECIPIENTS #}
+            {% if (
+                (object.recipientCategory and config.recipientCategory == true)
+                or ((object.contractors is not empty) and config.contractors == true)
+            ) %}
+                <div class="box box-solid box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'registry.treatment.tab.recipients'|trans }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                {% if (object.recipientCategory and config.recipientCategory == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.recipientCategory|nl2br }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.contractors and config.contractors == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'global.label.linked_contractor'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            <ul class="ps-1">
+                                                {% for contractor in object.contractors %}
+                                                    <li>{{ contractor }}</li>
+                                                {% endfor %}
+                                            </ul>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        {# SPECIFIC #}
-        {% if (
-            (config.exempt_AIPD == true)
-            or (config.systematicMonitoring == true)
-            or (config.largeScaleCollection == true)
-            or (config.vulnerablePeople == true)
-            or (config.dataCrossing == true)
-            or (config.evaluationOrRating == true)
-            or (config.automatedDecisionsWithLegalEffect == true)
-            or (config.automaticExclusionService == true)
-            or (config.innovativeUse == true)) %}
-            <div class="box box-solid box-info">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3>
-                </div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            {% if (config.exempt_AIPD == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.exemptAIPD %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.systematicMonitoring == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.systematicMonitoring %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.largeScaleCollection == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.largeScaleCollection %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.vulnerablePeople == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.vulnerablePeople %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.dataCrossing == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.dataCrossing %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.evaluationOrRating == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.evaluationOrRating %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.automatedDecisionsWithLegalEffect == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.automatedDecisionsWithLegalEffect %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.automaticExclusionService == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.automaticExclusionService %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.innovativeUse == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.innovativeUse %}
-                                            <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                        </tbody>
-                    </table>
+            {# SPECIFIC #}
+            {% if (
+                (config.exempt_AIPD == true)
+                or (config.systematicMonitoring == true)
+                or (config.largeScaleCollection == true)
+                or (config.vulnerablePeople == true)
+                or (config.dataCrossing == true)
+                or (config.evaluationOrRating == true)
+                or (config.automatedDecisionsWithLegalEffect == true)
+                or (config.automaticExclusionService == true)
+                or (config.innovativeUse == true)
+            ) %}
+                <div class="box box-solid box-info">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                {% if (config.exempt_AIPD == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.exemptAIPD %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.systematicMonitoring == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.systematicMonitoring %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.largeScaleCollection == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.largeScaleCollection %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.vulnerablePeople == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.vulnerablePeople %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.dataCrossing == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.dataCrossing %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.evaluationOrRating == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.evaluationOrRating %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.automatedDecisionsWithLegalEffect == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.automatedDecisionsWithLegalEffect %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.automaticExclusionService == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.automaticExclusionService %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.innovativeUse == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.innovativeUse %}
+                                                <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        {# HISTORIC #}
-        {% if (
-            (object.creator and config.creator == true)
-            or (object.collectivity and config.collectivity == true)
+            {# HISTORIC #}
+            {% if (
+                (object.creator and config.creator == true)
+                or (object.collectivity and config.collectivity == true)
             ) %}
-            <div class="box box-solid box-default">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'global.tab.history'|trans }}</h3>
-                </div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            {% if (object.creator and config.creator == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'global.label.created_by'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {{ object.creator }}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.collectivity and config.collectivity == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'global.label.organization'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.collectivity }}</td>
-                                </tr>
-                            {% endif %}
-                        </tbody>
-                    </table>
+                <div class="box box-solid box-default">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'global.tab.history'|trans }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                {% if (object.creator and config.creator == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'global.label.created_by'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {{ object.creator }}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.collectivity and config.collectivity == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'global.label.organization'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.collectivity }}</td>
+                                    </tr>
+                                {% endif %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
-    </div>
-
-    {# RIGHT #}
-    <div class="col-md-6">
-        {# DETAILS #}
-        {% if (
-            (object.concernedPeopleParticular and config.concernedPeopleParticular == true)
-        or (object.concernedPeopleUser and config.concernedPeopleUser == true)
-        or (object.concernedPeopleAgent and config.concernedPeopleAgent == true)
-        or (object.concernedPeopleElected and config.concernedPeopleElected == true)
-        or (object.concernedPeopleCompany and config.concernedPeopleCompany == true)
-        or (object.concernedPeoplePartner and config.concernedPeoplePartner == true)
-        or (object.concernedPeopleUsager and config.concernedPeopleUsager == true)
-        or (object.concernedPeopleOther and config.concernedPeopleOther == true)
-        or (object.estimatedConcernedPeople and config.estimatedConcernedPeople == true)
-        or (object.software and config.software == true)
-        or (object.tools and config.tools == true)
-        or (object.paperProcessing and config.paperProcessing == true)
-        or (object.delay and config.delay == true)
-        or (object.dataOrigin and config.dataOrigin == true)
-        or ((object.collectingMethod is not empty) and config.collectingMethod == true)) %}
+            {% endif %}
+        </div>
 
-            <div class="box box-solid box-primary">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'registry.treatment.tab.details'|trans }}</h3>
-                </div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong>
-                                </td>
-                                <td></td>
-                            </tr>
-                            {% if (object.concernedPeopleParticular and config.concernedPeopleParticular == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeopleParticular.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeopleParticular.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+        {# RIGHT #}
+        <div class="col-md-6">
+            {# DETAILS #}
+            {% if (
+                (object.concernedPeopleParticular and config.concernedPeopleParticular == true)
+                or (object.concernedPeopleUser and config.concernedPeopleUser == true)
+                or (object.concernedPeopleAgent and config.concernedPeopleAgent == true)
+                or (object.concernedPeopleElected and config.concernedPeopleElected == true)
+                or (object.concernedPeopleCompany and config.concernedPeopleCompany == true)
+                or (object.concernedPeoplePartner and config.concernedPeoplePartner == true)
+                or (object.concernedPeopleUsager and config.concernedPeopleUsager == true)
+                or (object.concernedPeopleOther and config.concernedPeopleOther == true)
+                or (object.estimatedConcernedPeople and config.estimatedConcernedPeople == true)
+                or (object.software and config.software == true)
+                or (object.tools and config.tools == true)
+                or (object.paperProcessing and config.paperProcessing == true)
+                or (object.shelfLifes and config.shelfLifes == true)
+                or (object.dataOrigin and config.dataOrigin == true)
+                or ((object.collectingMethod is not empty) and config.collectingMethod == true)
+                or (object.legalMentions and config.legalMentions == true)
+            ) %}
+                <div class="box box-solid box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'registry.treatment.tab.details'|trans }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                {% if (
+                                    (object.concernedPeopleParticular and config.concernedPeopleParticular == true)
+                                    or (object.concernedPeopleUser and config.concernedPeopleUser == true)
+                                    or (object.concernedPeopleAgent and config.concernedPeopleAgent == true)
+                                    or (object.concernedPeopleElected and config.concernedPeopleElected == true)
+                                    or (object.concernedPeopleCompany and config.concernedPeopleCompany == true)
+                                    or (object.concernedPeoplePartner and config.concernedPeoplePartner == true)
+                                    or (object.concernedPeopleUsager and config.concernedPeopleUsager == true)
+                                    or (object.concernedPeopleOther and config.concernedPeopleOther == true)
+                                ) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong>
+                                        </td>
+                                        <td></td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeopleParticular and config.concernedPeopleParticular == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeopleParticular.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeopleParticular.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.concernedPeopleUser and config.concernedPeopleUser == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeopleUser.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeopleUser.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeopleUser and config.concernedPeopleUser == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeopleUser.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeopleUser.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.concernedPeopleAgent and config.concernedPeopleAgent == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeopleAgent.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeopleAgent.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeopleAgent and config.concernedPeopleAgent == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeopleAgent.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeopleAgent.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.concernedPeopleElected and config.concernedPeopleElected == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeopleElected.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeopleElected.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeopleElected and config.concernedPeopleElected == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeopleElected.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeopleElected.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.concernedPeopleCompany and config.concernedPeopleCompany == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeopleCompany.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeopleCompany.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeopleCompany and config.concernedPeopleCompany == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeopleCompany.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeopleCompany.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.concernedPeoplePartner and config.concernedPeoplePartner == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeoplePartner.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeoplePartner.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeoplePartner and config.concernedPeoplePartner == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeoplePartner.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeoplePartner.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.concernedPeopleUsager and config.concernedPeopleUsager == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeopleUsager.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeopleUsager.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeopleUsager and config.concernedPeopleUsager == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeopleUsager.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeopleUsager.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.concernedPeopleOther and config.concernedPeopleOther == true) %}
-                                <tr>
-                                    <td class="concerned-people-type">
-                                        <strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.concernedPeopleOther.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.concernedPeopleOther.comment is not empty %}
-                                                <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.concernedPeopleOther and config.concernedPeopleOther == true) %}
+                                    <tr>
+                                        <td class="concerned-people-type">
+                                            <strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.concernedPeopleOther.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.concernedPeopleOther.comment is not empty %}
+                                                    <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.estimatedConcernedPeople and config.estimatedConcernedPeople == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.estimatedConcernedPeople }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if ((object.tools or object.software) and (config.tools or config.software) == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{% if object.collectivity.hasModuleTools %}
-                                            {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.estimatedConcernedPeople and config.estimatedConcernedPeople == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.estimatedConcernedPeople }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if ((object.tools or object.software) and (config.tools or config.software) == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>
+                                                {% if object.collectivity.hasModuleTools %}
+                                                    {{ 'global.label.linked_tool'|trans }}
+                                                {% else %}
+                                                    {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                                {% endif %}
+                                            </strong>
+                                        </td>
+                                        <td>
+                                            {% if object.collectivity.hasModuleTools %}
+                                                <ul class="ps-1">
+                                                    {% for tool in object.tools %}
+                                                        <li>{{ tool.name }}</li>
+                                                    {% endfor %}
+                                                </ul>
                                             {% else %}
-                                                {{ 'global.label.linked_tool'|trans }}
-                                            {% endif %}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.collectivity.hasModuleTools %}
+                                                {{ object.software }}
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.paperProcessing and config.paperProcessing == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.paperProcessing %}
+                                                <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                    {% if (object.shelfLifes and config.shelfLifes == true) %}
+                            </tbody>
+                        </table>
+                        <table role="presentation" style="border-top: #f4f4f4 1px solid">
+                            <tbody>
+                                <tr>
+                                    <td class="col-sm-2" style="vertical-align: top; padding-left: 10px; padding-top: 10px"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
+                                    <td class="col-sm-10" style="padding-top: 10px">
+                                        {% for method in object.shelfLifes %}
+                                            <div class="box box-default">
+                                                <div class="box-body no-padding">
+                                                    <table role="presentation" class="table">
+                                                        <tbody>
+                                                            <tr>
+                                                                <td style="width: 40%"><strong>{{ 'registry.treatment.label.shelflife_name'|trans }}</strong></td>
+                                                                <td>{{ method.name }}</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td><strong>{{ 'registry.treatment.label.shelflife_duration'|trans }}</strong></td>
+                                                                <td>{{ method.duration }}</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td><strong>{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</strong></td>
+                                                                <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                            </div>
+                                        {% endfor %}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <table role="presentation" class="table">
+                            <tbody>
+                    {% endif %}
+                                {% if (object.dataOrigin and config.dataOrigin == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong>
+                                        </td>
+                                        <td>{{ object.dataOrigin }}</td>
+                                    </tr>
+                                {% endif %}
+                                {% if ((object.collectingMethod is not empty) and config.collectingMethod == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong>
+                                        </td>
+                                        <td>
                                             <ul class="ps-1">
-                                                {% for tool in object.tools %}
-                                                    <li>{{ tool.name }}</li>
+                                                {% for method in object.collectingMethod %}
+                                                    <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
                                                 {% endfor %}
                                             </ul>
-                                        {% else %}
-                                            {{ object.software }}
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.paperProcessing and config.paperProcessing == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.paperProcessing %}
-                                            <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                {% if (object.shelfLifes and config.shelfLifes == true) %}
-                        </tbody>
-                    </table>
-                    <table role="presentation" style="border-top: #f4f4f4 1px solid">
-                        <tbody>
-                            <tr>
-                                <td class="col-sm-2" style="vertical-align: top; padding-left: 10px; padding-top: 10px"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
-                                <td class="col-sm-10" style="padding-top: 10px">
-                                    {% for method in object.shelfLifes %}
-                                        <div class="box box-default">
-                                            <div class="box-body no-padding">
-                                                <table role="presentation" class="table">
-                                                    <tbody>
-                                                    <tr>
-                                                        <td style="width: 40%"><strong>{{ 'registry.treatment.label.shelflife_name'|trans }}</strong></td>
-                                                        <td>{{ method.name }}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td><strong>{{ 'registry.treatment.label.shelflife_duration'|trans }}</strong></td>
-                                                        <td>{{ method.duration }}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td><strong>{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</strong></td>
-                                                        <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
-                                                    </tr>
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                        </div>
-                                    {% endfor %}
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <table role="presentation" class="table">
-                        <tbody>
-                {% endif %}
-                            {% if (object.dataOrigin and config.dataOrigin == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.dataOrigin }}</td>
-                                </tr>
-                            {% endif %}
-                            {% if ((object.collectingMethod is not empty) and config.collectingMethod == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        <ul class="ps-1">
-                                            {% for method in object.collectingMethod %}
-                                                <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
-                                            {% endfor %}
-                                        </ul>
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.legalMentions == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.legalMentions == 1 %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.consentRequest == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.consentRequest == 1 %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (object.consentRequestFormat and config.consentRequestFormat == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong>
-                                    </td>
-                                    <td>{{ object.consentRequestFormat }}</td>
-                                </tr>
-                            {% endif %}
-                        </tbody>
-                    </table>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (object.legalMentions and config.legalMentions == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.legalMentions == 1 %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        {# SECURITY #}
-        {% if (config.securityAccessControl == true or config.securityTracability == true or config.securitySaving == true or config.securityUpdate == true or config.securityOther == true or config.securityEntitledPersons == true) %}
-            <div class="box box-solid box-success">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3>
-                </div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            {% if (config.securityAccessControl == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securityAccessControl.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.securityAccessControl.comment is not empty %}
-                                                <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+            {# SECURITY #}
+            {% if (
+                config.securityAccessControl == true
+                or config.securityUpdate == true
+                or config.securitySaving == true
+                or config.securityTracability == true
+                or config.securityOther == true
+                or config.securityEntitledPersons == true
+            ) %}
+                <div class="box box-solid box-success">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                {% if (config.securityAccessControl == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securityAccessControl.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.securityAccessControl.comment is not empty %}
+                                                    <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.securityTracability == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securitytracability.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.securitytracability.comment is not empty %}
-                                                <p class="mt-2">{{ object.securitytracability.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.securityUpdate == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_update'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securityUpdate.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.securityUpdate.comment is not empty %}
+                                                    <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.securitySaving == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securitySaving.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.securitySaving.comment is not empty %}
-                                                <p class="mt-2">{{ object.securitySaving.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.securitySaving == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securitySaving.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.securitySaving.comment is not empty %}
+                                                    <p class="mt-2">{{ object.securitySaving.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.securityUpdate == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_update'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securityUpdate.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.securityUpdate.comment is not empty %}
-                                                <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.securityTracability == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securitytracability.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.securitytracability.comment is not empty %}
+                                                    <p class="mt-2">{{ object.securitytracability.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.securityOther == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_other'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securityOther.check %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                            {% if object.securityOther.comment is not empty %}
-                                                <p class="mt-2">{{ object.securityOther.comment }}</p>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.securityOther == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_other'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securityOther.check %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                                {% if object.securityOther.comment is not empty %}
+                                                    <p class="mt-2">{{ object.securityOther.comment }}</p>
+                                                {% endif %}
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
                                             {% endif %}
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.securityEntitledPersons == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securityEntitledPersons %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.securityOpenAccounts == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securityOpenAccounts %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                            {% if (config.securitySpecificitiesDelivered == true) %}
-                                <tr>
-                                    <td>
-                                        <strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong>
-                                    </td>
-                                    <td>
-                                        {% if object.securitySpecificitiesDelivered %}
-                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                        </tbody>
-                    </table>
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.securityEntitledPersons == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securityEntitledPersons %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.securityOpenAccounts == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securityOpenAccounts %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                                {% if (config.securitySpecificitiesDelivered == true) %}
+                                    <tr>
+                                        <td>
+                                            <strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong>
+                                        </td>
+                                        <td>
+                                            {% if object.securitySpecificitiesDelivered %}
+                                                <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                            {% else %}
+                                                <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        {# LINKED MODULES #}
-        {% if (object.proofs and config.proofs == true) %}
-            <div class="box box-solid box-warning">
-                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-                <div class="box-body no-padding">
-                    <table role="presentation" class="table">
-                        <tbody>
-                            {# PUBLIC PROOFS #}
-                            {% include '_Utils/_show_public_block_proofs.html.twig' with { proofs: object.proofs } %}
-                        </tbody>
-                    </table>
+            {# LINKED MODULES #}
+            {% if (object.proofs and config.proofs == true) %}
+                <div class="box box-solid box-warning">
+                    <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                    <div class="box-body no-padding">
+                        <table role="presentation" class="table">
+                            <tbody>
+                                {# PUBLIC PROOFS #}
+                                {% include '_Utils/_show_public_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
+        </div>
     </div>
-</div>
 {% endblock %}
diff --git a/templates/Registry/Treatment/show.html.twig b/templates/Registry/Treatment/show.html.twig
index 19c7cc12b4635a5c68d18a981dce224abba65b54..41992c9bdc69d4f6bdce65f4e1492620b56dd33d 100644
--- a/templates/Registry/Treatment/show.html.twig
+++ b/templates/Registry/Treatment/show.html.twig
@@ -21,28 +21,27 @@
 {% endblock %}
 
 {% block body %}
-
     {% if is_granted('ROLE_PREVIEW') %}
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="mb-1">
-                <a href="{{ path('registry_treatment_list') }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-arrow-left"></i>
-                    {{ 'global.action.back_to_list'|trans }}
-                </a>
-                {% if (actionEnabled) %}
-                    <a href="{{ path('registry_treatment_edit', {'id': object.id}) }}" class="btn btn-default">
-                        <i aria-hidden="true" class="fa fa-pencil"></i>
-                        {{ 'global.action.edit'|trans }}
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="mb-1">
+                    <a href="{{ path('registry_treatment_list') }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-arrow-left"></i>
+                        {{ 'global.action.back_to_list'|trans }}
                     </a>
-                {% endif %}
-                <a href="{{ path('registry_treatment_pdf', {'id': object.id}) }}" class="btn btn-default">
-                    <i aria-hidden="true" class="fa fa-print"></i>
-                    {{ 'global.action.print'|trans }}
-                </a>
+                    {% if (actionEnabled) %}
+                        <a href="{{ path('registry_treatment_edit', {'id': object.id}) }}" class="btn btn-default">
+                            <i aria-hidden="true" class="fa fa-pencil"></i>
+                            {{ 'global.action.edit'|trans }}
+                        </a>
+                    {% endif %}
+                    <a href="{{ path('registry_treatment_pdf', {'id': object.id}) }}" class="btn btn-default">
+                        <i aria-hidden="true" class="fa fa-print"></i>
+                        {{ 'global.action.print'|trans }}
+                    </a>
+                </div>
             </div>
         </div>
-    </div>
     {% endif %}
 
     <div class="row">
@@ -79,16 +78,6 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                            <tr>
-                                <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
-                                <td>
-                                    {% if object.public == true %}
-                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                    {% else %}
-                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
-                                    {% endif %}
-                                </td>
-                            </tr>
                             <tr>
                                 <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
                                 <td>{{ object.name }}</td>
@@ -135,10 +124,36 @@
                                 <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
                                 <td>{{ object.legalBasisJustification|nl2br }}</td>
                             </tr>
+                            {% if object.legalBasis == 'consent' %}
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.consentRequest %}
+                                            <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
+                                    <td>{{ object.consentRequestFormat }}</td>
+                                </tr>
+                            {% endif %}
                             <tr>
                                 <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
                                 <td>{{ object.observation|nl2br }}</td>
                             </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
+                                <td>
+                                    {% if object.public == true %}
+                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -454,11 +469,15 @@
                                 <td>{{ object.estimatedConcernedPeople }}</td>
                             </tr>
                             <tr>
-                                <td><strong>{% if object.collectivity.hasModuleTools %}
-                                        {{ 'registry.treatment.label.tools_if_inactif'|trans }}
-                                        {% else %}
+                                <td>
+                                    <strong>
+                                        {% if object.collectivity.hasModuleTools %}
                                             {{ 'global.label.linked_tool'|trans }}
-                                        {% endif %}</strong></td>
+                                        {% else %}
+                                            {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+                                        {% endif %}
+                                    </strong>
+                                </td>
                                 <td>
                                     {% if object.collectivity.hasModuleTools %}
                                         <ul class="ps-1">
@@ -467,7 +486,7 @@
                                             {% endfor %}
                                         </ul>
                                     {% else %}
-                                    {{ object.software }}
+                                        {{ object.software }}
                                     {% endif %}
                                 </td>
                             </tr>
@@ -530,7 +549,7 @@
                                     </ul>
                                 </td>
                             </tr>
-                            {% if  object.otherCollectingMethod is not null %}
+                            {% if object.otherCollectingMethod is not null %}
                                 <tr>
                                     <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
                                     <td>{{ object.otherCollectingMethod }}</td>
@@ -546,24 +565,6 @@
                                     {% endif %}
                                 </td>
                             </tr>
-                            {% if object.legalBasis == 'consent' %}
-                            <tr>
-                                <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
-                                <td>
-                                    {% if object.consentRequest %}
-                                        <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
-                                    {% else %}
-                                        <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
-                                    {% endif %}
-                                </td>
-                            </tr>
-                                {% if  object.consentRequestFormat is not null %}
-                            <tr>
-                                <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
-                                <td>{{ object.consentRequestFormat }}</td>
-                            </tr>
-                                {% endif %}
-                            {% endif %}
                         </tbody>
                     </table>
                 </div>
@@ -589,12 +590,12 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
                                 <td>
-                                    {% if object.securitytracability.check %}
+                                    {% if object.securityUpdate.check %}
                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                       {% if object.securitytracability.comment is not empty %}
-                                           <p class="mt-2">{{ object.securitytracability.comment }}</p>
+                                       {% if object.securityUpdate.comment is not empty %}
+                                           <p class="mt-2">{{ object.securityUpdate.comment }}</p>
                                        {% endif %}
                                     {% else %}
                                         <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
@@ -615,12 +616,12 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
                                 <td>
-                                    {% if object.securityUpdate.check %}
+                                    {% if object.securitytracability.check %}
                                        <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
-                                       {% if object.securityUpdate.comment is not empty %}
-                                           <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+                                       {% if object.securitytracability.comment is not empty %}
+                                           <p class="mt-2">{{ object.securitytracability.comment }}</p>
                                        {% endif %}
                                     {% else %}
                                         <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
@@ -682,17 +683,16 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {# TREATMENTS #}
-                        {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-
-                        {# REQUESTS #}
-                        {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                        {# VIOLATIONS #}
-                        {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                        {# PROOFS #}
-                        {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                        {# MESUREMENTS #}
-                        {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                         </tbody>
                     </table>
                 </div>
diff --git a/templates/Registry/Violation/_form.html.twig b/templates/Registry/Violation/_form.html.twig
index 763795d8d0647be3099c8ec8fbab8fff09ce500a..c19cd9dd3ecfdffff17f223a6483d8804e4689b9 100644
--- a/templates/Registry/Violation/_form.html.twig
+++ b/templates/Registry/Violation/_form.html.twig
@@ -4,7 +4,6 @@
     {% set submitValue = submitValue|default('registry.violation.action.new_submit'|trans) %}
 {% endif %}
 
-
 <div class="row">
     {{ form_start(form) }}
 
diff --git a/templates/Registry/Violation/list.html.twig b/templates/Registry/Violation/list.html.twig
index 4de2d4c0924cab7bc0f22837f381a13c30f91464..56326f9bb19624ce5af8a1c4416059a486f820cd 100644
--- a/templates/Registry/Violation/list.html.twig
+++ b/templates/Registry/Violation/list.html.twig
@@ -40,16 +40,16 @@
                     {{ 'registry.violation.action.new'|trans }}
                 </a>
             {% endif %}
-            <a href="{{ path('registry_violation_report') }}" class="btn btn-default">
-                <i aria-hidden="true" class="fa fa-clipboard-list"></i>
-                {{ 'global.action.report'|trans }}
-            </a>
             {% if app.request.query.get('archive') == 'true' %}
                 <a href="{{ path('registry_violation_list', {'archive' : 'false'}) }}" class="btn btn-default">
                     <i aria-hidden="true" class="fa fa-archive"></i>
                     {{ 'registry.violation.action.not_archived'|trans }}
                 </a>
             {% else %}
+                <a href="{{ path('registry_violation_report') }}" class="btn btn-default">
+                    <i aria-hidden="true" class="fa fa-clipboard-list"></i>
+                    {{ 'global.action.report'|trans }}
+                </a>
                 <a href="{{ path('registry_violation_list', {'archive' : 'true'}) }}" class="btn btn-default">
                     <i aria-hidden="true" class="fa fa-archive"></i>
                     {{ 'registry.violation.action.archived'|trans }}
diff --git a/templates/Registry/Violation/pdf.html.twig b/templates/Registry/Violation/pdf.html.twig
index 82eee136794110de4f9fda9f93870e7e086b0eeb..1c4585a1a7fa7ad30b0ccbcb11e15d3cd11b3db9 100644
--- a/templates/Registry/Violation/pdf.html.twig
+++ b/templates/Registry/Violation/pdf.html.twig
@@ -14,78 +14,78 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.date'|trans }}</strong></td>
-                    <td>{{ object.date|date('d/m/Y') }}</td>
-                </tr>
-                {% if object.collectivity.isServicesEnabled %}
-                    <tr>
-                        <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                        <td>{{ object.service }}</td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.in_progress'|trans }}</strong></td>
-                    <td>
-                        {% if object.inProgress %}
-                            <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
-                        {% else %}
-                            <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.violation_natures'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                            {% for violationNature in object.violationNatures %}
-                                <li>{{ violationNature|dictionary('registry_violation_nature') }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.origins'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                        {% for origin in object.origins %}
-                            <li>{{ origin|dictionary('registry_violation_origin') }}</li>
-                        {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.cause'|trans }}</strong></td>
-                    <td>{{ object.cause|dictionary('registry_violation_cause') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.concerned_data_nature'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                            {% for data in object.concernedDataNature %}
-                                <li>{{ data|dictionary('registry_violation_concerned_data') }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.concerned_people_categories'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                            {% for category in object.concernedPeopleCategories %}
-                                <li>{{ category|dictionary('registry_violation_concerned_people') }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.nb_affected_rows'|trans }}</strong></td>
-                    <td>{{ object.nbAffectedRows }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.nb_affected_persons'|trans }}</strong></td>
-                    <td>{{ object.nbAffectedPersons }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.date'|trans }}</strong></td>
+                        <td>{{ object.date|date('d/m/Y') }}</td>
+                    </tr>
+                    {% if object.collectivity.isServicesEnabled %}
+                        <tr>
+                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                            <td>{{ object.service }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.in_progress'|trans }}</strong></td>
+                        <td>
+                            {% if object.inProgress %}
+                                <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.violation_natures'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                                {% for violationNature in object.violationNatures %}
+                                    <li>{{ violationNature|dictionary('registry_violation_nature') }}</li>
+                                {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.origins'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                                {% for origin in object.origins %}
+                                    <li>{{ origin|dictionary('registry_violation_origin') }}</li>
+                                {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.cause'|trans }}</strong></td>
+                        <td>{{ object.cause|dictionary('registry_violation_cause') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.concerned_data_nature'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                                {% for data in object.concernedDataNature %}
+                                    <li>{{ data|dictionary('registry_violation_concerned_data') }}</li>
+                                {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.concerned_people_categories'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                                {% for category in object.concernedPeopleCategories %}
+                                    <li>{{ category|dictionary('registry_violation_concerned_people') }}</li>
+                                {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.nb_affected_rows'|trans }}</strong></td>
+                        <td>{{ object.nbAffectedRows }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.nb_affected_persons'|trans }}</strong></td>
+                        <td>{{ object.nbAffectedPersons }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -97,48 +97,48 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.potential_impacts_nature'|trans }}</strong></td>
-                    <td>
-                        <ul class="ps-1">
-                            {% for impact in object.potentialImpactsNature %}
-                                <li>{{ impact|dictionary('registry_violation_impact') }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.gravity'|trans }}</strong></td>
-                    <td>{{ object.gravity|dictionary('registry_violation_gravity') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.communication'|trans }}</strong></td>
-                    <td>{{ object.communication|dictionary('registry_violation_communication') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.communication_precision'|trans }}</strong></td>
-                    <td>{{ object.communicationPrecision|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.applied_measures_after_violation'|trans }}</strong></td>
-                    <td>{{ object.appliedMeasuresAfterViolation|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.notification'|trans }}</strong></td>
-                    <td>
-                        {% if object.notification %}
-                            {{ object.notification|dictionary('registry_violation_notification') }}
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.notification_details'|trans }}</strong></td>
-                    <td>{{ object.notificationDetails|nl2br }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'registry.violation.label.comment'|trans }}</strong></td>
-                    <td>{{ object.comment|nl2br }}</td>
-                </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.potential_impacts_nature'|trans }}</strong></td>
+                        <td>
+                            <ul class="ps-1">
+                                {% for impact in object.potentialImpactsNature %}
+                                    <li>{{ impact|dictionary('registry_violation_impact') }}</li>
+                                {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.gravity'|trans }}</strong></td>
+                        <td>{{ object.gravity|dictionary('registry_violation_gravity') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.communication'|trans }}</strong></td>
+                        <td>{{ object.communication|dictionary('registry_violation_communication') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.communication_precision'|trans }}</strong></td>
+                        <td>{{ object.communicationPrecision|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.applied_measures_after_violation'|trans }}</strong></td>
+                        <td>{{ object.appliedMeasuresAfterViolation|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.notification'|trans }}</strong></td>
+                        <td>
+                            {% if object.notification %}
+                                {{ object.notification|dictionary('registry_violation_notification') }}
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.notification_details'|trans }}</strong></td>
+                        <td>{{ object.notificationDetails|nl2br }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.violation.label.comment'|trans }}</strong></td>
+                        <td>{{ object.comment|nl2br }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -150,21 +150,22 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {# TREATMENTS #}
-                {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                {# CONTRACTORS #}
-                {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                {% if object.collectivity.isHasModuleTools %}
-                    {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                {% endif %}
-                {# REQUESTS #}
-                {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                {# VIOLATIONS #}
-                {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                {# PROOFS #}
-                {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                {# MESUREMENTS #}
-                {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                    {# TREATMENTS #}
+                    {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                    {# CONTRACTORS #}
+                    {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                    {# TOOLS #}
+                    {% if object.collectivity.isHasModuleTools %}
+                        {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                    {% endif %}
+                    {# REQUESTS #}
+                    {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                    {# VIOLATIONS #}
+                    {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                    {# PROOFS #}
+                    {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                    {# MESUREMENTS #}
+                    {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                 </tbody>
             </table>
         </div>
@@ -176,24 +177,24 @@
         <div class="box-body no-padding">
             <table class="table">
                 <tbody>
-                {% if is_granted('ROLE_REFERENT') %}
-                    <tr>
-                        <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                        <td>{{ object.collectivity }}</td>
-                    </tr>
-                {% endif %}
-                <tr>
-                    <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                    <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                    <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                </tr>
-                <tr>
-                    <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                    <td>{{ object.updatedBy }}</td>
-                </tr>
+                    {% if is_granted('ROLE_REFERENT') %}
+                        <tr>
+                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                            <td>{{ object.collectivity }}</td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                        <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                        <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                        <td>{{ object.updatedBy }}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
diff --git a/templates/Registry/Violation/pdf_all.html.twig b/templates/Registry/Violation/pdf_all.html.twig
index 9b2c5f21211f5051a916301eef3c0e36f48b1f3c..9c1daba5c938013f9475e6956603ef530aca13a2 100644
--- a/templates/Registry/Violation/pdf_all.html.twig
+++ b/templates/Registry/Violation/pdf_all.html.twig
@@ -5,198 +5,199 @@
 
 {% block body %}
     {% for object in objects %}
-    <div style="page-break-after: always">
-        <h1>Violation du {{ object.date|date('d/m/Y') }}</h1>
-        {# GENERAL #}
-        <div class="box box-solid box-primary">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.violation.tab.information'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.date'|trans }}</strong></td>
-                        <td>{{ object.date|date('d/m/Y') }}</td>
-                    </tr>
-                    {% if object.collectivity.isServicesEnabled %}
-                        <tr>
-                            <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                            <td>{{ object.service }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.in_progress'|trans }}</strong></td>
-                        <td>
-                            {% if object.inProgress %}
-                                <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+        <div style="page-break-after: always">
+            <h1>Violation du {{ object.date|date('d/m/Y') }}</h1>
+            {# GENERAL #}
+            <div class="box box-solid box-primary">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.violation.tab.information'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.date'|trans }}</strong></td>
+                                <td>{{ object.date|date('d/m/Y') }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
                             {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.violation_natures'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                                {% for violationNature in object.violationNatures %}
-                                    <li>{{ violationNature|dictionary('registry_violation_nature') }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.origins'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                            {% for origin in object.origins %}
-                                <li>{{ origin|dictionary('registry_violation_origin') }}</li>
-                            {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.cause'|trans }}</strong></td>
-                        <td>{{ object.cause|dictionary('registry_violation_cause') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.concerned_data_nature'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                                {% for data in object.concernedDataNature %}
-                                    <li>{{ data|dictionary('registry_violation_concerned_data') }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.concerned_people_categories'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                                {% for category in object.concernedPeopleCategories %}
-                                    <li>{{ category|dictionary('registry_violation_concerned_people') }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.nb_affected_rows'|trans }}</strong></td>
-                        <td>{{ object.nbAffectedRows }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.nb_affected_persons'|trans }}</strong></td>
-                        <td>{{ object.nbAffectedPersons }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.in_progress'|trans }}</strong></td>
+                                <td>
+                                    {% if object.inProgress %}
+                                        <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.violation_natures'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for violationNature in object.violationNatures %}
+                                            <li>{{ violationNature|dictionary('registry_violation_nature') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.origins'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for origin in object.origins %}
+                                            <li>{{ origin|dictionary('registry_violation_origin') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.cause'|trans }}</strong></td>
+                                <td>{{ object.cause|dictionary('registry_violation_cause') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.concerned_data_nature'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for data in object.concernedDataNature %}
+                                            <li>{{ data|dictionary('registry_violation_concerned_data') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.concerned_people_categories'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for category in object.concernedPeopleCategories %}
+                                            <li>{{ category|dictionary('registry_violation_concerned_people') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.nb_affected_rows'|trans }}</strong></td>
+                                <td>{{ object.nbAffectedRows }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.nb_affected_persons'|trans }}</strong></td>
+                                <td>{{ object.nbAffectedPersons }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# CONSEQUENCE #}
-        <div class="box box-solid box-success">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'registry.violation.tab.consequence'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.potential_impacts_nature'|trans }}</strong></td>
-                        <td>
-                            <ul class="ps-1">
-                                {% for impact in object.potentialImpactsNature %}
-                                    <li>{{ impact|dictionary('registry_violation_impact') }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.gravity'|trans }}</strong></td>
-                        <td>{{ object.gravity|dictionary('registry_violation_gravity') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.communication'|trans }}</strong></td>
-                        <td>{{ object.communication|dictionary('registry_violation_communication') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.communication_precision'|trans }}</strong></td>
-                        <td>{{ object.communicationPrecision|nl2br }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.applied_measures_after_violation'|trans }}</strong></td>
-                        <td>{{ object.appliedMeasuresAfterViolation|nl2br }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.notification'|trans }}</strong></td>
-                        <td>
-                            {% if object.notification %}
-                                {{ object.notification|dictionary('registry_violation_notification') }}
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.notification_details'|trans }}</strong></td>
-                        <td>{{ object.notificationDetails|nl2br }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'registry.violation.label.comment'|trans }}</strong></td>
-                        <td>{{ object.comment|nl2br }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+            {# CONSEQUENCE #}
+            <div class="box box-solid box-success">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'registry.violation.tab.consequence'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.potential_impacts_nature'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for impact in object.potentialImpactsNature %}
+                                            <li>{{ impact|dictionary('registry_violation_impact') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.gravity'|trans }}</strong></td>
+                                <td>{{ object.gravity|dictionary('registry_violation_gravity') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.communication'|trans }}</strong></td>
+                                <td>{{ object.communication|dictionary('registry_violation_communication') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.communication_precision'|trans }}</strong></td>
+                                <td>{{ object.communicationPrecision|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.applied_measures_after_violation'|trans }}</strong></td>
+                                <td>{{ object.appliedMeasuresAfterViolation|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.notification'|trans }}</strong></td>
+                                <td>
+                                    {% if object.notification %}
+                                        {{ object.notification|dictionary('registry_violation_notification') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.notification_details'|trans }}</strong></td>
+                                <td>{{ object.notificationDetails|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.comment'|trans }}</strong></td>
+                                <td>{{ object.comment|nl2br }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# LINKED MODULES #}
-        <div class="box box-solid box-warning">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    {# TREATMENTS #}
-                    {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                    {# CONTRACTORS #}
-                    {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                    {% if object.collectivity.isHasModuleTools %}
-                        {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                    {% endif %}
-                    {# REQUESTS #}
-                    {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                    {# VIOLATIONS #}
-                    {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                    {# PROOFS #}
-                    {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                    {# MESUREMENTS #}
-                    {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
-                    </tbody>
-                </table>
+            {# LINKED MODULES #}
+            <div class="box box-solid box-warning">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# CONTRACTORS #}
+                            {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                            {% endif %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
 
-        {# HISTORIC #}
-        <div class="box box-solid box-default">
-            <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
-            <div class="box-body no-padding">
-                <table class="table">
-                    <tbody>
-                    {% if is_granted('ROLE_REFERENT') %}
-                        <tr>
-                            <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                            <td>{{ object.collectivity }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                        <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                        <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                        <td>{{ object.updatedBy }}</td>
-                    </tr>
-                    </tbody>
-                </table>
+            {# HISTORIC #}
+            <div class="box box-solid box-default">
+                <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
+                <div class="box-body no-padding">
+                    <table class="table">
+                        <tbody>
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>{{ object.collectivity }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div>
-    </div>
     {% endfor %}
 {% endblock %}
diff --git a/templates/Registry/Violation/show.html.twig b/templates/Registry/Violation/show.html.twig
index ee96fac2edd499117b30d6f0be023376d1e49741..b3802090c0101562b1253b7ffebe368eca479c8f 100644
--- a/templates/Registry/Violation/show.html.twig
+++ b/templates/Registry/Violation/show.html.twig
@@ -21,7 +21,6 @@
 {% endblock %}
 
 {% block body %}
-
     <div class="row">
         <div class="col-xs-12">
             <div class="mb-1">
@@ -52,78 +51,78 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.date'|trans }}</strong></td>
-                            <td>{{ object.date|date('d/m/Y') }}</td>
-                        </tr>
-                        {% if object.collectivity.isServicesEnabled %}
-                            <tr>
-                                <td><strong>{{ 'global.label.service'|trans }}</strong></td>
-                                <td>{{ object.service }}</td>
-                            </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.in_progress'|trans }}</strong></td>
-                            <td>
-                                {% if object.inProgress %}
-                                    <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.violation_natures'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                    {% for violationNature in object.violationNatures %}
-                                        <li>{{ violationNature|dictionary('registry_violation_nature') }}</li>
-                                    {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.origins'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                {% for origin in object.origins %}
-                                    <li>{{ origin|dictionary('registry_violation_origin') }}</li>
-                                {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.cause'|trans }}</strong></td>
-                            <td>{{ object.cause|dictionary('registry_violation_cause') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.concerned_data_nature'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                    {% for data in object.concernedDataNature %}
-                                        <li>{{ data|dictionary('registry_violation_concerned_data') }}</li>
-                                    {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.concerned_people_categories'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                    {% for category in object.concernedPeopleCategories %}
-                                        <li>{{ category|dictionary('registry_violation_concerned_people') }}</li>
-                                    {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.nb_affected_rows'|trans }}</strong></td>
-                            <td>{{ object.nbAffectedRows }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.nb_affected_persons'|trans }}</strong></td>
-                            <td>{{ object.nbAffectedPersons }}</td>
-                        </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.date'|trans }}</strong></td>
+                                <td>{{ object.date|date('d/m/Y') }}</td>
+                            </tr>
+                            {% if object.collectivity.isServicesEnabled %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.service'|trans }}</strong></td>
+                                    <td>{{ object.service }}</td>
+                                </tr>
+                            {% endif %}
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.in_progress'|trans }}</strong></td>
+                                <td>
+                                    {% if object.inProgress %}
+                                        <span class="badge bg-red">{{ 'global.label.yes'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.violation_natures'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for violationNature in object.violationNatures %}
+                                            <li>{{ violationNature|dictionary('registry_violation_nature') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.origins'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for origin in object.origins %}
+                                            <li>{{ origin|dictionary('registry_violation_origin') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.cause'|trans }}</strong></td>
+                                <td>{{ object.cause|dictionary('registry_violation_cause') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.concerned_data_nature'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for data in object.concernedDataNature %}
+                                            <li>{{ data|dictionary('registry_violation_concerned_data') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.concerned_people_categories'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for category in object.concernedPeopleCategories %}
+                                            <li>{{ category|dictionary('registry_violation_concerned_people') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.nb_affected_rows'|trans }}</strong></td>
+                                <td>{{ object.nbAffectedRows }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.nb_affected_persons'|trans }}</strong></td>
+                                <td>{{ object.nbAffectedPersons }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -135,28 +134,28 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {% if is_granted('ROLE_REFERENT') %}
+                            {% if is_granted('ROLE_REFERENT') %}
+                                <tr>
+                                    <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+                                    <td>
+                                        <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
+                                            {{ object.collectivity }}
+                                        </a>
+                                    </td>
+                                </tr>
+                            {% endif %}
                             <tr>
-                                <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
-                                <td>
-                                    <a href="{{ path('user_collectivity_show', {'id': object.collectivity.id }) }}">
-                                        {{ object.collectivity }}
-                                    </a>
-                                </td>
+                                <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+                                <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+                                <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+                                <td>{{ object.updatedBy }}</td>
                             </tr>
-                        {% endif %}
-                        <tr>
-                            <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
-                            <td>{{ object.createdAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
-                            <td>{{ object.updatedAt|date('d/m/Y H:i') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
-                            <td>{{ object.updatedBy }}</td>
-                        </tr>
                         </tbody>
                     </table>
                 </div>
@@ -171,48 +170,48 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.potential_impacts_nature'|trans }}</strong></td>
-                            <td>
-                                <ul class="ps-1">
-                                    {% for impact in object.potentialImpactsNature %}
-                                        <li>{{ impact|dictionary('registry_violation_impact') }}</li>
-                                    {% endfor %}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.gravity'|trans }}</strong></td>
-                            <td>{{ object.gravity|dictionary('registry_violation_gravity') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.communication'|trans }}</strong></td>
-                            <td>{{ object.communication|dictionary('registry_violation_communication') }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.communication_precision'|trans }}</strong></td>
-                            <td>{{ object.communicationPrecision|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.applied_measures_after_violation'|trans }}</strong></td>
-                            <td>{{ object.appliedMeasuresAfterViolation|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.notification'|trans }}</strong></td>
-                            <td>
-                                {% if object.notification %}
-                                    {{ object.notification|dictionary('registry_violation_notification') }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.notification_details'|trans }}</strong></td>
-                            <td>{{ object.notificationDetails|nl2br }}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>{{ 'registry.violation.label.comment'|trans }}</strong></td>
-                            <td>{{ object.comment|nl2br }}</td>
-                        </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.potential_impacts_nature'|trans }}</strong></td>
+                                <td>
+                                    <ul class="ps-1">
+                                        {% for impact in object.potentialImpactsNature %}
+                                            <li>{{ impact|dictionary('registry_violation_impact') }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.gravity'|trans }}</strong></td>
+                                <td>{{ object.gravity|dictionary('registry_violation_gravity') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.communication'|trans }}</strong></td>
+                                <td>{{ object.communication|dictionary('registry_violation_communication') }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.communication_precision'|trans }}</strong></td>
+                                <td>{{ object.communicationPrecision|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.applied_measures_after_violation'|trans }}</strong></td>
+                                <td>{{ object.appliedMeasuresAfterViolation|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.notification'|trans }}</strong></td>
+                                <td>
+                                    {% if object.notification %}
+                                        {{ object.notification|dictionary('registry_violation_notification') }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.notification_details'|trans }}</strong></td>
+                                <td>{{ object.notificationDetails|nl2br }}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.violation.label.comment'|trans }}</strong></td>
+                                <td>{{ object.comment|nl2br }}</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -224,27 +223,26 @@
                 <div class="box-body no-padding">
                     <table role="presentation" class="table">
                         <tbody>
-                        {# TREATMENTS #}
-                        {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
-                        {# CONTRACTORS #}
-                        {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
-                        {% if object.collectivity.isHasModuleTools %}
-                            {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
-                        {% endif %}
-                        {# REQUESTS #}
-                        {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
-                        {# VIOLATIONS #}
-                        {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
-                        {# PROOFS #}
-                        {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
-                        {# MESUREMENTS #}
-                        {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+                            {# TREATMENTS #}
+                            {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+                            {# CONTRACTORS #}
+                            {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+                            {# TOOLS #}
+                            {% if object.collectivity.isHasModuleTools %}
+                                {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+                            {% endif %}
+                            {# REQUESTS #}
+                            {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+                            {# VIOLATIONS #}
+                            {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+                            {# PROOFS #}
+                            {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+                            {# MESUREMENTS #}
+                            {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
                         </tbody>
                     </table>
                 </div>
             </div>
-
         </div>
-
     </div>
 {% endblock %}
diff --git a/tests/Application/Controller/ControllerHelperTest.php b/tests/Application/Controller/ControllerHelperTest.php
index bfed160af2028229b0300420005ba3a305f29861..75eca542af6ed1cbd21fd146141d7983636053d1 100644
--- a/tests/Application/Controller/ControllerHelperTest.php
+++ b/tests/Application/Controller/ControllerHelperTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/DDD/Repository/CRUDRepositoryInterfaceTest.php b/tests/Application/DDD/Repository/CRUDRepositoryInterfaceTest.php
index d8e1a1c5aafc3b0b2238fc69bc109fb6cb8f221e..7a8541d2071c58e99abb0d0b79d9b63917073d48 100644
--- a/tests/Application/DDD/Repository/CRUDRepositoryInterfaceTest.php
+++ b/tests/Application/DDD/Repository/CRUDRepositoryInterfaceTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Doctrine/Repository/CRUDRepositoryTest.php b/tests/Application/Doctrine/Repository/CRUDRepositoryTest.php
index d1f4245c4788404f71709592f6c31b2f6425ed68..ad2463aa39ab4d7cf4390a130dc32404ed0d2714 100644
--- a/tests/Application/Doctrine/Repository/CRUDRepositoryTest.php
+++ b/tests/Application/Doctrine/Repository/CRUDRepositoryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriberTest.php b/tests/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriberTest.php
index 9c48924544254189be63d21679614964e6ad57bf..1608ecf194714587f05fe00e0cda5736ac4aa1ac 100644
--- a/tests/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriberTest.php
+++ b/tests/Application/Symfony/EventSubscriber/Doctrine/HistorySubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriberTest.php b/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriberTest.php
index f10bf4e87ae258cd972955394c722ed9ddaf13e3..40c2cae488c047d4c552c73c33f802940ac36444 100644
--- a/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriberTest.php
+++ b/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCollectivitySubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriberTest.php b/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriberTest.php
index aebe7a54fa311050f5ddbdc70d53d32c7da74996..28832d225779aec86a3d70a08670c5b1057fd9a3 100644
--- a/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriberTest.php
+++ b/tests/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Symfony/Security/UserProviderTest.php b/tests/Application/Symfony/Security/UserProviderTest.php
index d72718fa1ea760692559473610516b46e7a1b5ac..9bb721e86dbd0ac9af7d3edc6e56c55b2f4e850a 100644
--- a/tests/Application/Symfony/Security/UserProviderTest.php
+++ b/tests/Application/Symfony/Security/UserProviderTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidatorTest.php b/tests/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidatorTest.php
index e43f353f77bbe6a551208f8f586aafbb888d58ae..b9da33dfc2408544ff8dc7a7b0f09902f492877c 100644
--- a/tests/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidatorTest.php
+++ b/tests/Application/Symfony/Validator/Constraints/NotBlankDependingOnOtherFieldValueValidatorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Traits/Model/CollectivityTraitTest.php b/tests/Application/Traits/Model/CollectivityTraitTest.php
index 8bc751f63220b042c5fe1baccd8cd415eac64665..63b14253337d27d8aee8c0bc22011fb94022fc34 100644
--- a/tests/Application/Traits/Model/CollectivityTraitTest.php
+++ b/tests/Application/Traits/Model/CollectivityTraitTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Traits/Model/CreatorTraitTest.php b/tests/Application/Traits/Model/CreatorTraitTest.php
index 529487835e2ab087ced4feca4d34944c0840909c..f816cb9155b2f0b86b7701185e408e253ce237d2 100644
--- a/tests/Application/Traits/Model/CreatorTraitTest.php
+++ b/tests/Application/Traits/Model/CreatorTraitTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Application/Traits/Model/HistoryTraitTest.php b/tests/Application/Traits/Model/HistoryTraitTest.php
index 057e63f9ac339edcea03b7e6e98ffdb8d60d170e..dbd51908754b0a6537a86f7c19b95d5e81aeb093 100644
--- a/tests/Application/Traits/Model/HistoryTraitTest.php
+++ b/tests/Application/Traits/Model/HistoryTraitTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Admin/Cloner/AbstractClonerTest.php b/tests/Domain/Admin/Cloner/AbstractClonerTest.php
index 0de7c3b8bb7bc9c10d796441b327161f8c7ef88d..c4e15ec4582fddedf97420dfb841fa41108eb3c5 100644
--- a/tests/Domain/Admin/Cloner/AbstractClonerTest.php
+++ b/tests/Domain/Admin/Cloner/AbstractClonerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Admin/Cloner/ClonerProviderTest.php b/tests/Domain/Admin/Cloner/ClonerProviderTest.php
index b6d381390221d75a248986c20b22c0ad9f820ec9..a2bd4b43d80516fbfcfa8a0c52869d93357ea218 100644
--- a/tests/Domain/Admin/Cloner/ClonerProviderTest.php
+++ b/tests/Domain/Admin/Cloner/ClonerProviderTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Admin/Cloner/ContractorClonerTest.php b/tests/Domain/Admin/Cloner/ContractorClonerTest.php
index 449bc6ab4c77de5e7e8611f1deddfcca78b777c0..3312b7ff1aeab04d4781731c3227bca636f4fe02 100644
--- a/tests/Domain/Admin/Cloner/ContractorClonerTest.php
+++ b/tests/Domain/Admin/Cloner/ContractorClonerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Admin/Cloner/MesurementClonerTest.php b/tests/Domain/Admin/Cloner/MesurementClonerTest.php
index 53354e9e51a7d4bae0be04eec8867df32530c2d3..bd67b51b4c15419f3d0014fdc219786b7d9ea1fc 100644
--- a/tests/Domain/Admin/Cloner/MesurementClonerTest.php
+++ b/tests/Domain/Admin/Cloner/MesurementClonerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Admin/Cloner/TreatmentClonerTest.php b/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
index a718b0634e6ac1fbe69088bc31b463c9441bc055..c6e4c7f88bd4615849076a52c767893b12f19c8e 100644
--- a/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
+++ b/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -95,18 +94,18 @@ class TreatmentClonerTest extends TestCase
         $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityAccessControl);
         $this->assertFalse($securityAccessControl->isCheck());
         $this->assertNull($securityAccessControl->getComment());
-        $securityTracability = $cloned->getSecurityTracability();
-        $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityTracability);
-        $this->assertFalse($securityTracability->isCheck());
-        $this->assertNull($securityTracability->getComment());
-        $securitySaving = $cloned->getSecuritySaving();
-        $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securitySaving);
-        $this->assertFalse($securitySaving->isCheck());
-        $this->assertNull($securitySaving->getComment());
         $securityUpdate = $cloned->getSecurityUpdate();
         $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityUpdate);
         $this->assertFalse($securityUpdate->isCheck());
         $this->assertNull($securityUpdate->getComment());
+        $securitySaving = $cloned->getSecuritySaving();
+        $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securitySaving);
+        $this->assertFalse($securitySaving->isCheck());
+        $this->assertNull($securitySaving->getComment());
+        $securityTracability = $cloned->getSecurityTracability();
+        $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityTracability);
+        $this->assertFalse($securityTracability->isCheck());
+        $this->assertNull($securityTracability->getComment());
         $securityOther = $cloned->getSecurityOther();
         $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityOther);
         $this->assertFalse($securityOther->isCheck());
@@ -156,15 +155,15 @@ class TreatmentClonerTest extends TestCase
         $securityAccessControl = $referent->getSecurityAccessControl();
         $securityAccessControl->setCheck(true);
         $securityAccessControl->setComment('comment');
-        $securityTracability = $referent->getSecurityTracability();
-        $securityTracability->setCheck(true);
-        $securityTracability->setComment('comment');
-        $securitySaving = $referent->getSecuritySaving();
-        $securitySaving->setCheck(true);
-        $securitySaving->setComment('comment');
         $securityUpdate = $referent->getSecurityUpdate();
         $securityUpdate->setCheck(true);
         $securityUpdate->setComment('comment');
+        $securitySaving = $referent->getSecuritySaving();
+        $securitySaving->setCheck(true);
+        $securitySaving->setComment('comment');
+        $securityTracability = $referent->getSecurityTracability();
+        $securityTracability->setCheck(true);
+        $securityTracability->setComment('comment');
         $securityOther = $referent->getSecurityOther();
         $securityOther->setCheck(true);
         $securityOther->setComment('comment');
@@ -206,20 +205,20 @@ class TreatmentClonerTest extends TestCase
         $this->assertEquals($referentSecurityAccessControl->isCheck(), $clonedSecurityAccessControl->isCheck());
         $this->assertEquals($referentSecurityAccessControl->getComment(), $clonedSecurityAccessControl->getComment());
 
-        $referentSecurityTracability = $referent->getSecurityTracability();
-        $clonedSecurityTracability   = $cloned->getSecurityTracability();
-        $this->assertEquals($referentSecurityTracability->isCheck(), $clonedSecurityTracability->isCheck());
-        $this->assertEquals($referentSecurityTracability->getComment(), $clonedSecurityTracability->getComment());
+        $referentSecurityUpdate = $referent->getSecurityUpdate();
+        $clonedSecurityUpdate   = $cloned->getSecurityUpdate();
+        $this->assertEquals($referentSecurityUpdate->isCheck(), $clonedSecurityUpdate->isCheck());
+        $this->assertEquals($referentSecurityUpdate->getComment(), $clonedSecurityUpdate->getComment());
 
         $referentSecuritySaving = $referent->getSecuritySaving();
         $clonedSecuritySaving   = $cloned->getSecuritySaving();
         $this->assertEquals($referentSecuritySaving->isCheck(), $clonedSecuritySaving->isCheck());
         $this->assertEquals($referentSecuritySaving->getComment(), $clonedSecuritySaving->getComment());
 
-        $referentSecurityUpdate = $referent->getSecurityUpdate();
-        $clonedSecurityUpdate   = $cloned->getSecurityUpdate();
-        $this->assertEquals($referentSecurityUpdate->isCheck(), $clonedSecurityUpdate->isCheck());
-        $this->assertEquals($referentSecurityUpdate->getComment(), $clonedSecurityUpdate->getComment());
+        $referentSecurityTracability = $referent->getSecurityTracability();
+        $clonedSecurityTracability   = $cloned->getSecurityTracability();
+        $this->assertEquals($referentSecurityTracability->isCheck(), $clonedSecurityTracability->isCheck());
+        $this->assertEquals($referentSecurityTracability->getComment(), $clonedSecurityTracability->getComment());
 
         $referentSecurityOther = $referent->getSecurityOther();
         $clonedSecurityOther   = $cloned->getSecurityOther();
diff --git a/tests/Domain/Admin/Dictionary/DuplicationTargetOptionDictionaryTest.php b/tests/Domain/Admin/Dictionary/DuplicationTargetOptionDictionaryTest.php
index 23eee37e493dd3023782e5e1b0c0e4c33f263d2a..b8618db712746dae21f03479b56f50aba8f8f671 100644
--- a/tests/Domain/Admin/Dictionary/DuplicationTargetOptionDictionaryTest.php
+++ b/tests/Domain/Admin/Dictionary/DuplicationTargetOptionDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Admin/Dictionary/DuplicationTypeDictionaryTest.php b/tests/Domain/Admin/Dictionary/DuplicationTypeDictionaryTest.php
index c447161321709f18664dbce0e1837cf497fdb92d..90dad50535e0be2668100c14153344881ba5e647 100644
--- a/tests/Domain/Admin/Dictionary/DuplicationTypeDictionaryTest.php
+++ b/tests/Domain/Admin/Dictionary/DuplicationTypeDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Admin/Form/Type/DuplicationTypeTest.php b/tests/Domain/Admin/Form/Type/DuplicationTypeTest.php
index 2bf79237be450e32645acdbfedd2e0f9642b5c4e..319ee5a12e04aa84337d30447e8e862f668eb992 100644
--- a/tests/Domain/Admin/Form/Type/DuplicationTypeTest.php
+++ b/tests/Domain/Admin/Form/Type/DuplicationTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Documentation/Controller/CategoryControllerTest.php b/tests/Domain/Documentation/Controller/CategoryControllerTest.php
index f13a4f351d6f12bf0e5794feba96fd278c3fbdad..b445f3b67ff6bc1121ee9a0f089c6d88eb3545da 100644
--- a/tests/Domain/Documentation/Controller/CategoryControllerTest.php
+++ b/tests/Domain/Documentation/Controller/CategoryControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Documentation/Controller/DocumentControllerTest.php b/tests/Domain/Documentation/Controller/DocumentControllerTest.php
index f72ad66d0f2a548ae3ce6261ec6e678b2e47bda1..29ce35068eb0e34659bd8066e82a27b86dc71d6d 100644
--- a/tests/Domain/Documentation/Controller/DocumentControllerTest.php
+++ b/tests/Domain/Documentation/Controller/DocumentControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Documentation/Form/Type/CategoryTypeTest.php b/tests/Domain/Documentation/Form/Type/CategoryTypeTest.php
index 83e48fdb8c181262b9d6ebd213a21873a4924fb7..7379c55e5bcc7911929796807a11171c1ad39e15 100644
--- a/tests/Domain/Documentation/Form/Type/CategoryTypeTest.php
+++ b/tests/Domain/Documentation/Form/Type/CategoryTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Documentation/Form/Type/DocumentTypeTest.php b/tests/Domain/Documentation/Form/Type/DocumentTypeTest.php
index 4fe550949781cbfe3cec905c6532a8e481393bd9..76a12748b6cd396614dd5dfe9000c01458ed7a05 100644
--- a/tests/Domain/Documentation/Form/Type/DocumentTypeTest.php
+++ b/tests/Domain/Documentation/Form/Type/DocumentTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Documentation/Model/DocumentTest.php b/tests/Domain/Documentation/Model/DocumentTest.php
index 295c978618b059a8f5f845bcdd2b88e49734d9af..2937a661862d5e287b613d28367fffbaf006a345 100644
--- a/tests/Domain/Documentation/Model/DocumentTest.php
+++ b/tests/Domain/Documentation/Model/DocumentTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Documentation/Repository/DocumentTest.php b/tests/Domain/Documentation/Repository/DocumentTest.php
index cf250ea315a55d76e7920240d8e5628cdb94192f..6eda3c7ef3381762e56bc61bea7a1a2cf862a2d9 100644
--- a/tests/Domain/Documentation/Repository/DocumentTest.php
+++ b/tests/Domain/Documentation/Repository/DocumentTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Calculator/MaturityTest.php b/tests/Domain/Maturity/Calculator/MaturityTest.php
index 303291ec79f042637b20d5b74e294d035c9d1fba..1b2ebf0e5cf89d31edbe356afc765951a9c30937 100644
--- a/tests/Domain/Maturity/Calculator/MaturityTest.php
+++ b/tests/Domain/Maturity/Calculator/MaturityTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Controller/ReferentielControllerTest.php b/tests/Domain/Maturity/Controller/ReferentielControllerTest.php
index e427232c980468c6b005d74f66dbbded788fc424..008eb904400a2bbf1c70319be5c116a9d47fb750 100644
--- a/tests/Domain/Maturity/Controller/ReferentielControllerTest.php
+++ b/tests/Domain/Maturity/Controller/ReferentielControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Controller/SurveyControllerTest.php b/tests/Domain/Maturity/Controller/SurveyControllerTest.php
index 20b2cb5cff7bd5d18010178d1d46edada0d69828..5ebd0a71735096901329aa4923a319aa41ff4f98 100644
--- a/tests/Domain/Maturity/Controller/SurveyControllerTest.php
+++ b/tests/Domain/Maturity/Controller/SurveyControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Form/Type/AnswerTypeTest.php b/tests/Domain/Maturity/Form/Type/AnswerTypeTest.php
index 88764127ef948417287ffe3116480d6b641f02d6..0fe83b3259e99577c94a42950363a1edfa0057a5 100644
--- a/tests/Domain/Maturity/Form/Type/AnswerTypeTest.php
+++ b/tests/Domain/Maturity/Form/Type/AnswerTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Form/Type/ReferentielTypeTest.php b/tests/Domain/Maturity/Form/Type/ReferentielTypeTest.php
index e2083c1b5a863ed642a918dbfd015e5a96f94eee..2c45bf0b80a5460e00d1daf50949edc9d1d4bee2 100644
--- a/tests/Domain/Maturity/Form/Type/ReferentielTypeTest.php
+++ b/tests/Domain/Maturity/Form/Type/ReferentielTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Form/Type/SurveyTypeTest.php b/tests/Domain/Maturity/Form/Type/SurveyTypeTest.php
index ff43b043c47d2f9b9ac29fb0017c91dc498ad745..eb52b51aae7767f688446833f226f2b9b303750c 100644
--- a/tests/Domain/Maturity/Form/Type/SurveyTypeTest.php
+++ b/tests/Domain/Maturity/Form/Type/SurveyTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Model/AnswerTest.php b/tests/Domain/Maturity/Model/AnswerTest.php
index c79ca005a4be49ca1cd501e1ed1936846661c32d..779954525627ed77a43a4b02a4025b7f95aee802 100644
--- a/tests/Domain/Maturity/Model/AnswerTest.php
+++ b/tests/Domain/Maturity/Model/AnswerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Model/DomainTest.php b/tests/Domain/Maturity/Model/DomainTest.php
index 2868f9690f43bfe4a0efb6fb34a4be26924fb36f..b1171fb9593c6a36889f74b45a56988fe08bad33 100644
--- a/tests/Domain/Maturity/Model/DomainTest.php
+++ b/tests/Domain/Maturity/Model/DomainTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Model/MaturityTest.php b/tests/Domain/Maturity/Model/MaturityTest.php
index 72ec53ee42df7a9c70305263d99d500d7f00ab1c..081942afc2b192b99d8effc1f5d36c98599baad6 100644
--- a/tests/Domain/Maturity/Model/MaturityTest.php
+++ b/tests/Domain/Maturity/Model/MaturityTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Model/QuestionTest.php b/tests/Domain/Maturity/Model/QuestionTest.php
index 3c27b0c571841d6c5fc2014b653d3b7473305d08..bcb7972c6e96d67aad82a7a5b61b61d7c7e6c14e 100644
--- a/tests/Domain/Maturity/Model/QuestionTest.php
+++ b/tests/Domain/Maturity/Model/QuestionTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Model/ReferentielTest.php b/tests/Domain/Maturity/Model/ReferentielTest.php
index 6cef07c4366c3b650be2c325e66a2882bcf2c7eb..718cb67d6f934296ec703f0679a737133f3de645 100644
--- a/tests/Domain/Maturity/Model/ReferentielTest.php
+++ b/tests/Domain/Maturity/Model/ReferentielTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Model/SurveyTest.php b/tests/Domain/Maturity/Model/SurveyTest.php
index 817f570ecdcc47a860441baa77b82b7cae3f4b16..bed2e53aa2aa57d506300b6b0043f74534c50796 100644
--- a/tests/Domain/Maturity/Model/SurveyTest.php
+++ b/tests/Domain/Maturity/Model/SurveyTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Repository/QuestionTest.php b/tests/Domain/Maturity/Repository/QuestionTest.php
index 87e644d2fbda335bad933d7e292aaf527759aff1..fa89d612e781684309dfb2b2b89f6f3e4d9d92b7 100644
--- a/tests/Domain/Maturity/Repository/QuestionTest.php
+++ b/tests/Domain/Maturity/Repository/QuestionTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Repository/SurveyTest.php b/tests/Domain/Maturity/Repository/SurveyTest.php
index 3f1d13b0df6c5fe3dfe457a891520f54ab132cfe..4ddbcd2f513c9e56b7f41054a8b7c55defc86a37 100644
--- a/tests/Domain/Maturity/Repository/SurveyTest.php
+++ b/tests/Domain/Maturity/Repository/SurveyTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriberTest.php b/tests/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriberTest.php
index 3640767ad94fe264b75d86e576d3f8d63f003883..9cb8cb67233eeeaaf3dcb908371e8a0d4b08e990 100644
--- a/tests/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriberTest.php
+++ b/tests/Domain/Maturity/Symfony/EventSubscriber/Doctrine/GenerateMaturitySubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Notification/Twig/NotificationExtensionTest.php b/tests/Domain/Notification/Twig/NotificationExtensionTest.php
index 423687de3b8f11fbc5c33fe912262a233ef6f242..9a222fa83f46e67c8fe24850c46cb09b3e6a6afa 100644
--- a/tests/Domain/Notification/Twig/NotificationExtensionTest.php
+++ b/tests/Domain/Notification/Twig/NotificationExtensionTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletionTest.php b/tests/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletionTest.php
index c316a40eef13b2e1b13b15b1a2b92fb058699a4e..ad1b960f1c201999fa573c221e9fa811954f9594 100644
--- a/tests/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletionTest.php
+++ b/tests/Domain/Registry/Calculator/Completion/ConformiteTraitementCompletionTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/ConformiteTraitementControllerTest.php b/tests/Domain/Registry/Controller/ConformiteTraitementControllerTest.php
index 6c7942f6dafb8e80f05e88df63cb73a85537be09..662b6e3cc93c05a9d312f0b48b16314f0ae58cb7 100644
--- a/tests/Domain/Registry/Controller/ConformiteTraitementControllerTest.php
+++ b/tests/Domain/Registry/Controller/ConformiteTraitementControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/ContractorControllerTest.php b/tests/Domain/Registry/Controller/ContractorControllerTest.php
index 178bfb243ffa0b2590f16377a2fccd438e0824f0..593a1384619bfca8eeb35cfd96df570d897a8a1e 100644
--- a/tests/Domain/Registry/Controller/ContractorControllerTest.php
+++ b/tests/Domain/Registry/Controller/ContractorControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/MesurementControllerTest.php b/tests/Domain/Registry/Controller/MesurementControllerTest.php
index 7bf2b26bab7a9914ae4d0dd8d4f6670e495549dc..a1abda4ecccf5621dd8c657234846e0ff00fb364 100644
--- a/tests/Domain/Registry/Controller/MesurementControllerTest.php
+++ b/tests/Domain/Registry/Controller/MesurementControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/ProofControllerTest.php b/tests/Domain/Registry/Controller/ProofControllerTest.php
index 3a757cdf247b3255f21d781d9f3da4089a6f7636..a3a4aa69ddfa4d09d34d62d6d65c0df9dfa47b0b 100644
--- a/tests/Domain/Registry/Controller/ProofControllerTest.php
+++ b/tests/Domain/Registry/Controller/ProofControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/RequestControllerTest.php b/tests/Domain/Registry/Controller/RequestControllerTest.php
index 5382f41f4b61510b18cde59159e0ae960b5786d7..40844eb51974314b8e3348e67f68351665be739b 100644
--- a/tests/Domain/Registry/Controller/RequestControllerTest.php
+++ b/tests/Domain/Registry/Controller/RequestControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/ToolControllerTest.php b/tests/Domain/Registry/Controller/ToolControllerTest.php
index dfb7fad4321ece90d661ead6ceb2fafa7964a4ac..e9ade09cc1ed2b524e3890ea7e95edc60f73b716 100644
--- a/tests/Domain/Registry/Controller/ToolControllerTest.php
+++ b/tests/Domain/Registry/Controller/ToolControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/TreatmentControllerTest.php b/tests/Domain/Registry/Controller/TreatmentControllerTest.php
index 90e761551162edbc55e541aafd893cfba860415f..e20ef09820a4b0a90ba8cb8ff06d4822b5eec1c5 100644
--- a/tests/Domain/Registry/Controller/TreatmentControllerTest.php
+++ b/tests/Domain/Registry/Controller/TreatmentControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Controller/ViolationControllerTest.php b/tests/Domain/Registry/Controller/ViolationControllerTest.php
index 51a6a4e6a535cee4f67b45fe162d784037331c36..e4dfba5a7c772c97b5c4863813444bef27d18e11 100644
--- a/tests/Domain/Registry/Controller/ViolationControllerTest.php
+++ b/tests/Domain/Registry/Controller/ViolationControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/DelayPeriodDictionaryTest.php b/tests/Domain/Registry/Dictionary/DelayPeriodDictionaryTest.php
index 79955be9330c202c7c1d0bcef4343494265d4f3a..fe87f9997d2acbf3c0fcf3fad5e2997b3194bf22 100644
--- a/tests/Domain/Registry/Dictionary/DelayPeriodDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/DelayPeriodDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/MesurementStatusDictionaryTest.php b/tests/Domain/Registry/Dictionary/MesurementStatusDictionaryTest.php
index 4e241d84222649f03951fa88caeb52c596bbf325..c915966becea04b6a66f9f2973e4ffe314bcf3c7 100644
--- a/tests/Domain/Registry/Dictionary/MesurementStatusDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/MesurementStatusDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/MesurementTypeDictionaryTest.php b/tests/Domain/Registry/Dictionary/MesurementTypeDictionaryTest.php
index 43d604689aa89b33a9c5935a3ec06dc2a59a8703..c1cb7b3599589156b20c5f3c1e43f9f2947c891b 100644
--- a/tests/Domain/Registry/Dictionary/MesurementTypeDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/MesurementTypeDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ProofTypeDictionaryTest.php b/tests/Domain/Registry/Dictionary/ProofTypeDictionaryTest.php
index eaa4801ab7f2e74569510a7dd2ede07949c0d9f3..38f666c8b77339b506abd268f5c92cc9358b4662 100644
--- a/tests/Domain/Registry/Dictionary/ProofTypeDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ProofTypeDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/RequestAnswerTypeDictionaryTest.php b/tests/Domain/Registry/Dictionary/RequestAnswerTypeDictionaryTest.php
index da7ac2c9374f25a3af2a2b295f66b92f85263cc5..769f3c063a3378425ee73b6f8bf4ffd1b3804aa4 100644
--- a/tests/Domain/Registry/Dictionary/RequestAnswerTypeDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/RequestAnswerTypeDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/RequestCivilityDictionaryTest.php b/tests/Domain/Registry/Dictionary/RequestCivilityDictionaryTest.php
index 83ddb8bb65ffd2b0b57d49dde2979ca762accbd2..b1044c4954db25cae03864b40355f29211ea72ae 100644
--- a/tests/Domain/Registry/Dictionary/RequestCivilityDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/RequestCivilityDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/RequestObjectDictionaryTest.php b/tests/Domain/Registry/Dictionary/RequestObjectDictionaryTest.php
index be21ef38e8c428677efacb080e0844a82142a0d1..2df1d6871c1287b673fee56c73f238701ca6cf3d 100644
--- a/tests/Domain/Registry/Dictionary/RequestObjectDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/RequestObjectDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/RequestStateDictionaryTest.php b/tests/Domain/Registry/Dictionary/RequestStateDictionaryTest.php
index 5b9075c0eece915bcc80e3ab1655cd6520dbd78a..bf4b9b4d12b0728bba311e9587fa2d3f29effcb3 100644
--- a/tests/Domain/Registry/Dictionary/RequestStateDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/RequestStateDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ToolTypeDictionaryTest.php b/tests/Domain/Registry/Dictionary/ToolTypeDictionaryTest.php
index 46bc1c8b391fe3b444e326335f7d10f8c9bc9967..23b2145fc152e0194523170fdddef23f1ce521bd 100644
--- a/tests/Domain/Registry/Dictionary/ToolTypeDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ToolTypeDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/TreatmentLegalBasisDictionaryTest.php b/tests/Domain/Registry/Dictionary/TreatmentLegalBasisDictionaryTest.php
index a19b9fc5c1e499ddcbcae57db687482c5d6cecf3..bd4c6ae873d40790a5044a6b5640bc18601a359e 100644
--- a/tests/Domain/Registry/Dictionary/TreatmentLegalBasisDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/TreatmentLegalBasisDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationCauseDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationCauseDictionaryTest.php
index 57fc91f58331d62dc90f5d2890f3d3cc40ec2465..c23373733b7cfd4e1b98edee03f47e6ff8f8139b 100644
--- a/tests/Domain/Registry/Dictionary/ViolationCauseDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationCauseDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationCommunicationDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationCommunicationDictionaryTest.php
index e6ad48421f92246d020fe99076d9e9110d8f4507..fcacbfb2843a194b3bcaa87c5afd0b83ae412bd9 100644
--- a/tests/Domain/Registry/Dictionary/ViolationCommunicationDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationCommunicationDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationConcernedDataDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationConcernedDataDictionaryTest.php
index 90dc6cfcd9e5748d145caa0a2f2fa8cdd75e6d6c..1e03652dd2b7eee3453edcf3d13bc22edfc591e9 100644
--- a/tests/Domain/Registry/Dictionary/ViolationConcernedDataDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationConcernedDataDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionaryTest.php
index 7b12c2e6a8483300737cba031cb15a9c44b8b1e8..431c601e9e541ea942ac7e172c8df23be92b1869 100644
--- a/tests/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationConcernedPeopleDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationGravityDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationGravityDictionaryTest.php
index a73453160a68ee3f4697ac2ce18a335801445e2d..7160e32a58a373ae38f5a29768e708f44ee0ccfb 100644
--- a/tests/Domain/Registry/Dictionary/ViolationGravityDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationGravityDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationImpactDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationImpactDictionaryTest.php
index e75386f84c4f9cdbae2b02ad99357e0549a49738..aa11ee1ce475d7a567068d337a849849a4f4682e 100644
--- a/tests/Domain/Registry/Dictionary/ViolationImpactDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationImpactDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationNatureDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationNatureDictionaryTest.php
index 1260f937474ad668dda4805e306d48f0a71d3a07..85d454713430dc28521171badee9d8e31c914a80 100644
--- a/tests/Domain/Registry/Dictionary/ViolationNatureDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationNatureDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationNotificationDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationNotificationDictionaryTest.php
index b9d9067bf66ac6efe5bc49039a9bf1976cdfe100..7d6d07841074fcea7a76ac9e84ea8f33c42bfc3c 100644
--- a/tests/Domain/Registry/Dictionary/ViolationNotificationDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationNotificationDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Dictionary/ViolationOriginDictionaryTest.php b/tests/Domain/Registry/Dictionary/ViolationOriginDictionaryTest.php
index 78f8b770d0b538b9ab02dc6da89a5a15f436acb3..b74307fefba20b6b56baec3dada3481088aa2561 100644
--- a/tests/Domain/Registry/Dictionary/ViolationOriginDictionaryTest.php
+++ b/tests/Domain/Registry/Dictionary/ViolationOriginDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementTypeTest.php b/tests/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementTypeTest.php
index 9f0f579deacc52384a6f6a52a46702cd89a02b91..b893e09bf00821ef07324efa2bb7f5b4d5fd0963 100644
--- a/tests/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/ConformiteTraitement/ConformiteTraitementTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/ConformiteTraitement/ReponseTypeTest.php b/tests/Domain/Registry/Form/Type/ConformiteTraitement/ReponseTypeTest.php
index 7b7c82b705116f71e469fbbb8b9e2f25aa389ddd..47732c6b0a78caf561a70d2ee1d1455a783e62b8 100644
--- a/tests/Domain/Registry/Form/Type/ConformiteTraitement/ReponseTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/ConformiteTraitement/ReponseTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/ContractorTypeTest.php b/tests/Domain/Registry/Form/Type/ContractorTypeTest.php
index 7ebd74b252f36431fb0d1d3a83b24063cd7109fb..26ec904fcf844695576821ef66d4fe73b6e06c26 100644
--- a/tests/Domain/Registry/Form/Type/ContractorTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/ContractorTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/Embeddable/AddressTypeTest.php b/tests/Domain/Registry/Form/Type/Embeddable/AddressTypeTest.php
index 0bc39c6540b6343dbbf7978ea48f5d0dac4e212f..3e2f33a4f8600d362ab25daf96456b2850cd4ddb 100644
--- a/tests/Domain/Registry/Form/Type/Embeddable/AddressTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/Embeddable/AddressTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaTypeTest.php b/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaTypeTest.php
index e2d5e83561c2b2dab304cc658a5768ad605ca9e5..13e4683bcb1dd51a7f1877794eede5f37d4e5c31 100644
--- a/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceAreaTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceTypeTest.php b/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceTypeTest.php
index cd2acc951ce204f7d61d729bb84e1610f02c9a3a..c5c842fa11bb21593dd6308981b6abf932bf2933 100644
--- a/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/Embeddable/ComplexChoiceTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/Embeddable/DelayTypeTest.php b/tests/Domain/Registry/Form/Type/Embeddable/DelayTypeTest.php
index 16e954c2af77f3907ba84fb7bced4d735f9bc957..e1ac2268552f675bd645dbac82a6def3beb5bd4b 100644
--- a/tests/Domain/Registry/Form/Type/Embeddable/DelayTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/Embeddable/DelayTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/Embeddable/RequestAnswerTypeTest.php b/tests/Domain/Registry/Form/Type/Embeddable/RequestAnswerTypeTest.php
index 9e5236ef09460de575e966f4ad68d1b0c23d4d51..5d0b3ce6ff877e288398ce2755c2fc9c682b22bb 100644
--- a/tests/Domain/Registry/Form/Type/Embeddable/RequestAnswerTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/Embeddable/RequestAnswerTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/Embeddable/RequestApplicantTypeTest.php b/tests/Domain/Registry/Form/Type/Embeddable/RequestApplicantTypeTest.php
index 53bb56503c9dc414f22680fff59a15aeab63b76d..026a492d829ce64129b20a8bb8970d5ca90032d6 100644
--- a/tests/Domain/Registry/Form/Type/Embeddable/RequestApplicantTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/Embeddable/RequestApplicantTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleTypeTest.php b/tests/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleTypeTest.php
index c9fe2db6b776a05723a411e377368fd889e328e1..9c19c022f6937e75eaef4a36dcecee1aa206b193 100644
--- a/tests/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/Embeddable/RequestConcernedPeopleTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/MesurementTypeTest.php b/tests/Domain/Registry/Form/Type/MesurementTypeTest.php
index a19feb7a05217548dee353228076487f44f12cc2..2312989777d6ab323b7cd2bfa1146234ac81c98d 100644
--- a/tests/Domain/Registry/Form/Type/MesurementTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/MesurementTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -73,7 +72,7 @@ class MesurementTypeTest extends FormTypeHelper
             'charge'            => TextType::class,
             'status'            => DictionaryType::class,
             'planificationDate' => DateType::class,
-            'comment'           => TextType::class,
+            'comment'           => TextareaType::class,
             'priority'          => DictionaryType::class,
             'manager'           => TextType::class,
             'service'           => EntityType::class,
@@ -103,7 +102,7 @@ class MesurementTypeTest extends FormTypeHelper
             'charge'            => TextType::class,
             'status'            => DictionaryType::class,
             'planificationDate' => DateType::class,
-            'comment'           => TextType::class,
+            'comment'           => TextareaType::class,
             'priority'          => DictionaryType::class,
             'manager'           => TextType::class,
             'mesurements'       => EntityType::class,
diff --git a/tests/Domain/Registry/Form/Type/ProofTypeTest.php b/tests/Domain/Registry/Form/Type/ProofTypeTest.php
index 1c72b4c84048a41b00b90fe9dbd17fa94f750b77..a81a8efb5beda0c9362da308ffe640e16cd770b0 100644
--- a/tests/Domain/Registry/Form/Type/ProofTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/ProofTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/RequestTypeTest.php b/tests/Domain/Registry/Form/Type/RequestTypeTest.php
index e99109dbae67e1d9187576bc2bd0113a4149d739..9ffc06288c2fe17a2f22cc8577eb59347fa8ea06 100644
--- a/tests/Domain/Registry/Form/Type/RequestTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/RequestTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/ToolTypeTest.php b/tests/Domain/Registry/Form/Type/ToolTypeTest.php
index d614a189529c4397674c1f1ae431920d01a9ca13..773a6d0c6087a61a2d0be63c3829e12aa5358c61 100644
--- a/tests/Domain/Registry/Form/Type/ToolTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/ToolTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/TreatmentConfigurationTypeTest.php b/tests/Domain/Registry/Form/Type/TreatmentConfigurationTypeTest.php
index bd8e942c35c5ff53d6fe569075a2da05372cbe7d..163281ee50e859f16d2d08d71aa536e8fd714bfa 100644
--- a/tests/Domain/Registry/Form/Type/TreatmentConfigurationTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/TreatmentConfigurationTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php b/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php
index 06f0391819470b9ebaa5d449a00eb00ffc63eef7..304116e7acd2416992036af715389a22230fe9f4 100644
--- a/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -119,9 +118,9 @@ class TreatmentTypeTest extends FormTypeHelper
             'contractors'                       => EntityType::class,
             'shelfLifes'                        => CollectionType::class,
             'securityAccessControl'             => ComplexChoiceAreaType::class,
-            'securityTracability'               => ComplexChoiceAreaType::class,
-            'securitySaving'                    => ComplexChoiceAreaType::class,
             'securityUpdate'                    => ComplexChoiceAreaType::class,
+            'securitySaving'                    => ComplexChoiceAreaType::class,
+            'securityTracability'               => ComplexChoiceAreaType::class,
             'securityOther'                     => ComplexChoiceAreaType::class,
             'systematicMonitoring'              => CheckboxType::class,
             'largeScaleCollection'              => CheckboxType::class,
@@ -190,9 +189,9 @@ class TreatmentTypeTest extends FormTypeHelper
             'tools'                             => EntityType::class,
             'shelfLifes'                        => CollectionType::class,
             'securityAccessControl'             => ComplexChoiceAreaType::class,
-            'securityTracability'               => ComplexChoiceAreaType::class,
-            'securitySaving'                    => ComplexChoiceAreaType::class,
             'securityUpdate'                    => ComplexChoiceAreaType::class,
+            'securitySaving'                    => ComplexChoiceAreaType::class,
+            'securityTracability'               => ComplexChoiceAreaType::class,
             'securityOther'                     => ComplexChoiceAreaType::class,
             'systematicMonitoring'              => CheckboxType::class,
             'largeScaleCollection'              => CheckboxType::class,
diff --git a/tests/Domain/Registry/Form/Type/ViolationTypeTest.php b/tests/Domain/Registry/Form/Type/ViolationTypeTest.php
index 77cc8b3ad7af14be548b4b218800ed2b71dc2c67..30b74f827b5e1e03e260670f8a08d822e4287a40 100644
--- a/tests/Domain/Registry/Form/Type/ViolationTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/ViolationTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/ContractorTest.php b/tests/Domain/Registry/Model/ContractorTest.php
index 26b6347299eeca89250482450e462040dedfeff1..6ea4a326e9bc1f70ba169063ea44e3b8018f1b5c 100644
--- a/tests/Domain/Registry/Model/ContractorTest.php
+++ b/tests/Domain/Registry/Model/ContractorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/Embeddable/ComplexChoiceTest.php b/tests/Domain/Registry/Model/Embeddable/ComplexChoiceTest.php
index 0b5823bb34f717a84e7cf0e16ad717b818efb537..8c0677efe7a35196f4f749db607df6f5e81cc083 100644
--- a/tests/Domain/Registry/Model/Embeddable/ComplexChoiceTest.php
+++ b/tests/Domain/Registry/Model/Embeddable/ComplexChoiceTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/Embeddable/DelayTest.php b/tests/Domain/Registry/Model/Embeddable/DelayTest.php
index 9a3ac5fa7a2b0149497c3ec205b02616275331e4..78fa90dc67f768a015f53d53c0d3ad0caa062458 100644
--- a/tests/Domain/Registry/Model/Embeddable/DelayTest.php
+++ b/tests/Domain/Registry/Model/Embeddable/DelayTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/Embeddable/RequestApplicantTest.php b/tests/Domain/Registry/Model/Embeddable/RequestApplicantTest.php
index e4081b52d396cd3ea156c8612bac8961c107d034..db88df3d48c674416c5c064de687201a4b0c6321 100644
--- a/tests/Domain/Registry/Model/Embeddable/RequestApplicantTest.php
+++ b/tests/Domain/Registry/Model/Embeddable/RequestApplicantTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/MesurementTest.php b/tests/Domain/Registry/Model/MesurementTest.php
index def12bec9aec83b6f73c8774e7830f1ce8920fed..a5e781ca1418dd8a3cb9ca0c8aea2d94280df1be 100644
--- a/tests/Domain/Registry/Model/MesurementTest.php
+++ b/tests/Domain/Registry/Model/MesurementTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/ProofTest.php b/tests/Domain/Registry/Model/ProofTest.php
index 783f98b07e44893184abb5ad4b59a27165271a42..91e779b1844e5825d1d62104ab8d05df353f5278 100644
--- a/tests/Domain/Registry/Model/ProofTest.php
+++ b/tests/Domain/Registry/Model/ProofTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/RequestTest.php b/tests/Domain/Registry/Model/RequestTest.php
index d1e4dbf00ae822440907ca0b05b3a433ba7926b2..129847e7b5b388ad044b8a19dd7deaa14651fc7b 100644
--- a/tests/Domain/Registry/Model/RequestTest.php
+++ b/tests/Domain/Registry/Model/RequestTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/ToolTest.php b/tests/Domain/Registry/Model/ToolTest.php
index 42d97ae0712384d815ad3bd0b52ee7afd7bfaf65..264a5589bdc93cca21499f24fd13c8b24ea3ff87 100644
--- a/tests/Domain/Registry/Model/ToolTest.php
+++ b/tests/Domain/Registry/Model/ToolTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Model/TreatmentTest.php b/tests/Domain/Registry/Model/TreatmentTest.php
index 084aff13d00d674a63418c4744d73d813aee54d1..3e07fa182fa885b7450821b29ceb63bd5299bfff 100644
--- a/tests/Domain/Registry/Model/TreatmentTest.php
+++ b/tests/Domain/Registry/Model/TreatmentTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -52,9 +51,9 @@ class TreatmentTest extends TestCase
         $this->assertEquals(new ArrayCollection(), $model->getContractors());
         $this->assertEquals([], $model->getShelfLifes());
         $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityAccessControl());
-        $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityTracability());
-        $this->assertInstanceOf(ComplexChoice::class, $model->getSecuritySaving());
         $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityUpdate());
+        $this->assertInstanceOf(ComplexChoice::class, $model->getSecuritySaving());
+        $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityTracability());
         $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityOther());
         $this->assertFalse($model->isSystematicMonitoring());
         $this->assertFalse($model->isLargeScaleCollection());
diff --git a/tests/Domain/Registry/Model/ViolationTest.php b/tests/Domain/Registry/Model/ViolationTest.php
index c51b1a39c2f32d1465156d00ab5caea89db3cc37..af52fbe0b721eb2de3b12c1744537564f39ea288 100644
--- a/tests/Domain/Registry/Model/ViolationTest.php
+++ b/tests/Domain/Registry/Model/ViolationTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Repository/ContractorTest.php b/tests/Domain/Registry/Repository/ContractorTest.php
index 16c3c3d6a31dece41b17208962ab191c44ee4e24..c1a5f63a3d0c984cd1cdecf7b1936f8ebbd151fb 100644
--- a/tests/Domain/Registry/Repository/ContractorTest.php
+++ b/tests/Domain/Registry/Repository/ContractorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Repository/MesurementTest.php b/tests/Domain/Registry/Repository/MesurementTest.php
index c7207037196cee2ebf89cf547956055a129fb033..e2f7025db6a58a12da280252b7eabd81d5e7c711 100644
--- a/tests/Domain/Registry/Repository/MesurementTest.php
+++ b/tests/Domain/Registry/Repository/MesurementTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Repository/TreatmentTest.php b/tests/Domain/Registry/Repository/TreatmentTest.php
index b35125ca8084fec753db44ec810925301daf5286..cb9cf17a123a794d16e936415755d0c463cdfefe 100644
--- a/tests/Domain/Registry/Repository/TreatmentTest.php
+++ b/tests/Domain/Registry/Repository/TreatmentTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriberTest.php b/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriberTest.php
index 41a4e8a3ff80d736bf44958feb1ee679c46428a0..dc6de0a29b01dccbf78ed636b212444358f922df 100644
--- a/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriberTest.php
+++ b/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/ConformiteTraitementCompletionSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriberTest.php b/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriberTest.php
index 1586920ab59abf9a39bb7be3fd09b6a73bf3c867..0fcd5de25dd6ee939676287ab9d36528b832165b 100644
--- a/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriberTest.php
+++ b/tests/Domain/Registry/Symfony/EventSubscriber/Doctrine/MesurementSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriberTest.php b/tests/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriberTest.php
index 31dc08a21d4a2e86bec9c9c4a753a7f75e26454e..943095dbc0c2a6dea9c5d81253d7b7d1bf048bc6 100644
--- a/tests/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriberTest.php
+++ b/tests/Domain/Registry/Symfony/EventSubscriber/Kernel/ConformiteTraitementSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidatorTest.php b/tests/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidatorTest.php
index a8f19eb3492fdcf8155ecc47c0085777fd9fcd8c..d618346ee4277b9e54f2352986cfa32320431cb6 100644
--- a/tests/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidatorTest.php
+++ b/tests/Domain/Registry/Symfony/Validator/Constraints/ConformiteOrganisationReponseRaisonValidatorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidatorTest.php b/tests/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidatorTest.php
index ead5093eb0f6028f2c000ae41a9827a87819d899..8d49a5fa058b0b58a5f720fe2ffbe28060460bb2 100644
--- a/tests/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidatorTest.php
+++ b/tests/Domain/Registry/Symfony/Validator/Constraints/RequestConcernedPeopleValidatorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidatorTest.php b/tests/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidatorTest.php
index d9885ba3c924b77dd64de006bf6989099c0da0ad..9185a137ed74a8d26a1ec6fc0f12a64bff3b4c56 100644
--- a/tests/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidatorTest.php
+++ b/tests/Domain/Registry/Symfony/Validator/Constraints/RequestStateRejectionReasonValidatorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidatorTest.php b/tests/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidatorTest.php
index a8cb57270fe45c0c4f1a6e37b57b581d49fc180d..76a99a68e784abba75436a1ebd0359c55e5570ae 100644
--- a/tests/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidatorTest.php
+++ b/tests/Domain/Registry/Symfony/Validator/Constraints/TreatmentConcernedPeopleValidatorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Controller/ReviewControllerTest.php b/tests/Domain/Reporting/Controller/ReviewControllerTest.php
index b370c8c52335d2dcccc2fcea31b4a530e7a7010c..6021f730a4f8eb014c58bdea1c0aa722c644a1ff 100644
--- a/tests/Domain/Reporting/Controller/ReviewControllerTest.php
+++ b/tests/Domain/Reporting/Controller/ReviewControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Generator/Csv/FooCsvGeneratorTest.php b/tests/Domain/Reporting/Generator/Csv/FooCsvGeneratorTest.php
index 0fb42fed3d7110079898e446cd5c6e44871490fb..0d9297680376d0217cf327d07fda142ac3ee95cc 100644
--- a/tests/Domain/Reporting/Generator/Csv/FooCsvGeneratorTest.php
+++ b/tests/Domain/Reporting/Generator/Csv/FooCsvGeneratorTest.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Generator/LogJournalLinkGeneratorTest.php b/tests/Domain/Reporting/Generator/LogJournalLinkGeneratorTest.php
index 18cdeb697edae518988c283425e522da91a12073..13fad128d60d5cd072329c832a9df4c4e6d90170 100644
--- a/tests/Domain/Reporting/Generator/LogJournalLinkGeneratorTest.php
+++ b/tests/Domain/Reporting/Generator/LogJournalLinkGeneratorTest.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Handler/ExportCsvHandlerTest.php b/tests/Domain/Reporting/Handler/ExportCsvHandlerTest.php
index 64ccac9f154c49c907964ba5544cb88b4fd48e51..2029085094aeeff7b1cc6d23e0ffb0773bf0310d 100644
--- a/tests/Domain/Reporting/Handler/ExportCsvHandlerTest.php
+++ b/tests/Domain/Reporting/Handler/ExportCsvHandlerTest.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Handler/MetricsHandlerTest.php b/tests/Domain/Reporting/Handler/MetricsHandlerTest.php
index e4def327904f8ed89229e1fd657507dc74fcafc5..dbb779f9ecdde76aa3b691cacd354d99812e1815 100644
--- a/tests/Domain/Reporting/Handler/MetricsHandlerTest.php
+++ b/tests/Domain/Reporting/Handler/MetricsHandlerTest.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Handler/WordHandlerTest.php b/tests/Domain/Reporting/Handler/WordHandlerTest.php
index 1660ee315a7e495e58ab86adc8a801c4c63a715d..82a865ff8dd791727960b17e54926bd928d8bc6c 100644
--- a/tests/Domain/Reporting/Handler/WordHandlerTest.php
+++ b/tests/Domain/Reporting/Handler/WordHandlerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Metrics/AdminMetricTest.php b/tests/Domain/Reporting/Metrics/AdminMetricTest.php
index 1683e74bf4da1bbe33398ecf49180a0962d6385a..f590fe8d3f8829f638bc29113e5829c7bfbfcaec 100644
--- a/tests/Domain/Reporting/Metrics/AdminMetricTest.php
+++ b/tests/Domain/Reporting/Metrics/AdminMetricTest.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/Reporting/Metrics/UserMetricTest.php b/tests/Domain/Reporting/Metrics/UserMetricTest.php
index e4d7e1054e4255298f9bdae4640cfe251e32bd92..163f2e4cbf536dac8e1ad6dcda3a5ceaeb6cea19 100644
--- a/tests/Domain/Reporting/Metrics/UserMetricTest.php
+++ b/tests/Domain/Reporting/Metrics/UserMetricTest.php
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Component/MailerTest.php b/tests/Domain/User/Component/MailerTest.php
index 8bd200d0eec2edb851f3a46077fe0337aa9d4f0f..e3bbee1b675ca375340e3268e22ed3c8b32fc626 100644
--- a/tests/Domain/User/Component/MailerTest.php
+++ b/tests/Domain/User/Component/MailerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Component/TokenGeneratorTest.php b/tests/Domain/User/Component/TokenGeneratorTest.php
index f18c79e4a00790f2cf4f9e247cf972901bcda1b5..89999de3d6c47a733c13a5ec7870491c656a29f1 100644
--- a/tests/Domain/User/Component/TokenGeneratorTest.php
+++ b/tests/Domain/User/Component/TokenGeneratorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Controller/CollectivityControllerTest.php b/tests/Domain/User/Controller/CollectivityControllerTest.php
index 258af7613d525cd09d1aa17c74a7e5106b79bf60..dc9519adc5bc08cce8e98f9135c23c50fae8c6b5 100644
--- a/tests/Domain/User/Controller/CollectivityControllerTest.php
+++ b/tests/Domain/User/Controller/CollectivityControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Controller/ProfileControllerTest.php b/tests/Domain/User/Controller/ProfileControllerTest.php
index 77c73628e32e3670337c21bac4c359f75e9c2ef0..d292570fe3874148e8cebd1f029ae4ed4fc9e5d9 100644
--- a/tests/Domain/User/Controller/ProfileControllerTest.php
+++ b/tests/Domain/User/Controller/ProfileControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Controller/SecurityControllerTest.php b/tests/Domain/User/Controller/SecurityControllerTest.php
index fd31b8ab375790d5de90c28da64ac96a1589f11a..c1f822be3c511fe55688e9c0a3145b3e1b582c50 100644
--- a/tests/Domain/User/Controller/SecurityControllerTest.php
+++ b/tests/Domain/User/Controller/SecurityControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Controller/UserControllerTest.php b/tests/Domain/User/Controller/UserControllerTest.php
index 056be8561fe29afe12e3f68137c4cbf6abee00d7..399fa0eab839cd9fbbf20ad59aeac998e6b78589 100644
--- a/tests/Domain/User/Controller/UserControllerTest.php
+++ b/tests/Domain/User/Controller/UserControllerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Dictionary/CollectivityTypeDictionaryTest.php b/tests/Domain/User/Dictionary/CollectivityTypeDictionaryTest.php
index 90404edf0cc0cad36b7eef74861fe092211c9470..6fa95e7e2c553d703cf26169954d9184ab7b6dd5 100644
--- a/tests/Domain/User/Dictionary/CollectivityTypeDictionaryTest.php
+++ b/tests/Domain/User/Dictionary/CollectivityTypeDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Dictionary/ContactCivilityDictionaryTest.php b/tests/Domain/User/Dictionary/ContactCivilityDictionaryTest.php
index ef376b81c577cbdcc57cb04927e2e1fc9ba4f61e..fb3bffcdbd7c4a2298a482204b140390a521a925 100644
--- a/tests/Domain/User/Dictionary/ContactCivilityDictionaryTest.php
+++ b/tests/Domain/User/Dictionary/ContactCivilityDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Dictionary/UserRoleDictionaryTest.php b/tests/Domain/User/Dictionary/UserRoleDictionaryTest.php
index 47941beba3541005fbc384b74556e5810eda56d1..dcd604ef97e420fc0f4a97d6129f7897e1ee09b4 100644
--- a/tests/Domain/User/Dictionary/UserRoleDictionaryTest.php
+++ b/tests/Domain/User/Dictionary/UserRoleDictionaryTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Form/DataTransformer/RoleTransformerTest.php b/tests/Domain/User/Form/DataTransformer/RoleTransformerTest.php
index 3bb13aceb0724a324aa20b9862d594d1bb581f2c..9052bf9727cf2ab9c23537c755ca7f86cac6c4bb 100644
--- a/tests/Domain/User/Form/DataTransformer/RoleTransformerTest.php
+++ b/tests/Domain/User/Form/DataTransformer/RoleTransformerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Form/Type/AddressTypeTest.php b/tests/Domain/User/Form/Type/AddressTypeTest.php
index 2586fc619861c50179e0a34c46fdc0a2a478a95e..498ce298e0a49ab2394a73d7c97997bcbbb57e34 100644
--- a/tests/Domain/User/Form/Type/AddressTypeTest.php
+++ b/tests/Domain/User/Form/Type/AddressTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Form/Type/CollectivityTypeTest.php b/tests/Domain/User/Form/Type/CollectivityTypeTest.php
index aaaf635c3b98b716c3eb911316ab20e391c7bcb6..dbbd399f91365acb120bf49996fbc5a5e042e450 100644
--- a/tests/Domain/User/Form/Type/CollectivityTypeTest.php
+++ b/tests/Domain/User/Form/Type/CollectivityTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Form/Type/ComiteIlContactTypeTest.php b/tests/Domain/User/Form/Type/ComiteIlContactTypeTest.php
index dbd2ea0c0c2ced29c0141e4f51bdf46a45b8e6ea..376c16c4ef0ecbc8d947e8b4853b76e5dd612abb 100644
--- a/tests/Domain/User/Form/Type/ComiteIlContactTypeTest.php
+++ b/tests/Domain/User/Form/Type/ComiteIlContactTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Form/Type/ContactTypeTest.php b/tests/Domain/User/Form/Type/ContactTypeTest.php
index 5a3bd00d3fc4d657a8898a59117716d89118b6c8..bf40c0fec211dabe9bb5a2c197ba8bf538cca5e0 100644
--- a/tests/Domain/User/Form/Type/ContactTypeTest.php
+++ b/tests/Domain/User/Form/Type/ContactTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Form/Type/ResetPasswordTypeTest.php b/tests/Domain/User/Form/Type/ResetPasswordTypeTest.php
index acf0839ed0510c28ede8da3bff491f22bd7a8480..c092abc8c3f7449ab13b8569f22e8d8fdf63d768 100644
--- a/tests/Domain/User/Form/Type/ResetPasswordTypeTest.php
+++ b/tests/Domain/User/Form/Type/ResetPasswordTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Form/Type/UserTypeTest.php b/tests/Domain/User/Form/Type/UserTypeTest.php
index cf3a0c0a5e839f5fa52af64b09aed51ff761d879..93b9e156d84df43b6524f469ebd17b9ae8ddf1c9 100644
--- a/tests/Domain/User/Form/Type/UserTypeTest.php
+++ b/tests/Domain/User/Form/Type/UserTypeTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Model/CollectivityTest.php b/tests/Domain/User/Model/CollectivityTest.php
index 102c6af219287e96d7e72d33acf594001e839c1c..b30ece43bbd3e687afb15f78a63c6211aad27de6 100644
--- a/tests/Domain/User/Model/CollectivityTest.php
+++ b/tests/Domain/User/Model/CollectivityTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Model/LoginAttemptTest.php b/tests/Domain/User/Model/LoginAttemptTest.php
index 5584eaa1b6bd226d331d937b5cc2071c947ece54..ea20d790a06da90c4ced4d898c7bca870d510245 100644
--- a/tests/Domain/User/Model/LoginAttemptTest.php
+++ b/tests/Domain/User/Model/LoginAttemptTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Model/UserTest.php b/tests/Domain/User/Model/UserTest.php
index 4f5c7f6b27949df5846a2b71d8bce86ad7d12478..81a2d0dfa8578fa06c9e099b17895e38401f7a49 100644
--- a/tests/Domain/User/Model/UserTest.php
+++ b/tests/Domain/User/Model/UserTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Repository/CollectivityTest.php b/tests/Domain/User/Repository/CollectivityTest.php
index 9b004bbb8ff1ff6213ec238356b389c559dddd98..1c87760245c00f6bcbf39c8a85d937875fbcc1f7 100644
--- a/tests/Domain/User/Repository/CollectivityTest.php
+++ b/tests/Domain/User/Repository/CollectivityTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriberTest.php b/tests/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriberTest.php
index 9369756b45d5e3171cb5704cb31d447b37141ede..7515f9ec01b1b4f1c60c5f0fc116e49805cb7a26 100644
--- a/tests/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriberTest.php
+++ b/tests/Domain/User/Symfony/EventSubscriber/Doctrine/DefinePasswordSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriberTest.php b/tests/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriberTest.php
index 1e24cac99485b426a6e643f6885ac18df83c2310..a639940526336c53e40512eed3964394ae91a280 100644
--- a/tests/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriberTest.php
+++ b/tests/Domain/User/Symfony/EventSubscriber/Doctrine/EncodePasswordSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriberTest.php b/tests/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriberTest.php
index a33cc284398efdc088805b696b7b593f8d085be1..43e95d304d75840eacec80077ad3c4ed28b3afc8 100644
--- a/tests/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriberTest.php
+++ b/tests/Domain/User/Symfony/EventSubscriber/Kernel/SwitchUserSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Symfony/EventSubscriber/Security/AuthentificationSubscriberTest.php b/tests/Domain/User/Symfony/EventSubscriber/Security/AuthentificationSubscriberTest.php
index 7d5e1ea0603e1a83992767207522409a3e23f42b..0c08560564cbe1ea565b605ba4554211e3a5fdd2 100644
--- a/tests/Domain/User/Symfony/EventSubscriber/Security/AuthentificationSubscriberTest.php
+++ b/tests/Domain/User/Symfony/EventSubscriber/Security/AuthentificationSubscriberTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Symfony/Security/Authorization/UserAuthorizationTest.php b/tests/Domain/User/Symfony/Security/Authorization/UserAuthorizationTest.php
index 5b06b7a5e137f8b561f0164df8b8c210c3bac8b2..890914211b9078169ba5d258f606296aa7cc15f6 100644
--- a/tests/Domain/User/Symfony/Security/Authorization/UserAuthorizationTest.php
+++ b/tests/Domain/User/Symfony/Security/Authorization/UserAuthorizationTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author ANODE <contact@agence-anode.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Symfony/Security/Checker/UserCheckerTest.php b/tests/Domain/User/Symfony/Security/Checker/UserCheckerTest.php
index 37022b4d5eaf78982e00efbca92a89e68ee3937e..9e983abe1db3046769fcf483854bd3e257d8fee7 100644
--- a/tests/Domain/User/Symfony/Security/Checker/UserCheckerTest.php
+++ b/tests/Domain/User/Symfony/Security/Checker/UserCheckerTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Domain/User/Validator/Constraints/CustomPasswordValidatorTest.php b/tests/Domain/User/Validator/Constraints/CustomPasswordValidatorTest.php
index fe87c305ec79166c2c95f6e134f2d014ad54a7c9..c7c35bb3c662545533f366a8bca758794ad287b4 100644
--- a/tests/Domain/User/Validator/Constraints/CustomPasswordValidatorTest.php
+++ b/tests/Domain/User/Validator/Constraints/CustomPasswordValidatorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Functional/Api/CollectivityTest.php b/tests/Functional/Api/CollectivityTest.php
index d141aaefe01c5af17f033e849545ae139fd01207..c63d7dec9edbfe4e476f6ca99935d940f5770cc5 100644
--- a/tests/Functional/Api/CollectivityTest.php
+++ b/tests/Functional/Api/CollectivityTest.php
@@ -17,7 +17,7 @@ class CollectivityTest extends ApiTestCase
         $client = static::createClient();
         self::populateDatabase();
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
         $client->loginUser($testUser, 'api');
 
         $url = '/api/collectivities';
diff --git a/tests/Functional/Api/RequestTest.php b/tests/Functional/Api/RequestTest.php
index 935166d2f288e25e8ec3b3d69eac06f0fc2a992a..863dff85a630e371681d4688525a48c110611d31 100644
--- a/tests/Functional/Api/RequestTest.php
+++ b/tests/Functional/Api/RequestTest.php
@@ -18,7 +18,7 @@ class RequestTest extends ApiTestCase
         $client = static::createClient();
         self::populateDatabase();
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
         $client->loginUser($testUser, 'api');
 
         $url = '/api/requests';
diff --git a/tests/Functional/Api/TreatmentTest.php b/tests/Functional/Api/TreatmentTest.php
index 0afd6372ab2c610f441af3f7585cf868a2c05390..a049898a9375c46259ca825a6cd2c95992276611 100644
--- a/tests/Functional/Api/TreatmentTest.php
+++ b/tests/Functional/Api/TreatmentTest.php
@@ -17,7 +17,7 @@ class TreatmentTest extends ApiTestCase
         $client = static::createClient();
         self::populateDatabase();
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
         $client->loginUser($testUser, 'api');
 
         $url = '/api/treatments';
diff --git a/tests/Functional/Domain/Notification/NotificationGenerationTest.php b/tests/Functional/Domain/Notification/NotificationGenerationTest.php
index 58d6c9ff1107dce45ff27a389b20c2a23aff54df..4f30e07ecaa329b3ea054e47f7fe9dffa90c98ff 100644
--- a/tests/Functional/Domain/Notification/NotificationGenerationTest.php
+++ b/tests/Functional/Domain/Notification/NotificationGenerationTest.php
@@ -30,7 +30,7 @@ class NotificationGenerationTest extends WebTestCase
         $client = static::createClient();
         self::populateDatabase();
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
         $client->loginUser($testUser);
         $url = $client->getContainer()->get('router')->generate('documentation_document_create', [], UrlGeneratorInterface::RELATIVE_PATH);
 
@@ -85,7 +85,7 @@ class NotificationGenerationTest extends WebTestCase
         $client = static::createClient();
         self::populateDatabase();
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
         $client->loginUser($testUser);
 
         /**
@@ -161,7 +161,7 @@ class NotificationGenerationTest extends WebTestCase
         $client = static::createClient();
         self::populateDatabase();
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
         $client->loginUser($testUser);
 
         /**
@@ -244,7 +244,7 @@ class NotificationGenerationTest extends WebTestCase
         $client = static::createClient();
         self::populateDatabase();
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
         $client->loginUser($testUser);
 
         /**
diff --git a/tests/Functional/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriberTest.php b/tests/Functional/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriberTest.php
index 519a1c4e7d3fc9d53a51e6ee81adee86178d02f9..ea51bec6a6998353d2c8e630c69ada8b6460fead 100644
--- a/tests/Functional/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriberTest.php
+++ b/tests/Functional/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriberTest.php
@@ -19,7 +19,7 @@ class AccessModuleConformiteSubscriberTest extends WebTestCase
         self::populateDatabase();
 
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('lecteur@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('lecteur@nomail.soluris.fr');
 
         $client->loginUser($testUser);
         $url = $client->getContainer()->get('router')->generate('registry_conformite_traitement_list', [], UrlGeneratorInterface::RELATIVE_PATH);
@@ -34,7 +34,7 @@ class AccessModuleConformiteSubscriberTest extends WebTestCase
         self::populateDatabase();
 
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('reader-awkan@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('reader-soluris@nomail.soluris.fr');
 
         $client->loginUser($testUser);
         $url = $client->getContainer()->get('router')->generate('registry_conformite_traitement_list', [], UrlGeneratorInterface::RELATIVE_PATH);
@@ -49,7 +49,7 @@ class AccessModuleConformiteSubscriberTest extends WebTestCase
         self::populateDatabase();
 
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('admin@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('admin@nomail.soluris.fr');
 
         $client->loginUser($testUser);
         $url = $client->getContainer()->get('router')->generate('registry_conformite_traitement_list', [], UrlGeneratorInterface::RELATIVE_PATH);
diff --git a/tests/Functional/Symfony/EventSubscriber/Kernel/LoginSubscriberTest.php b/tests/Functional/Symfony/EventSubscriber/Kernel/LoginSubscriberTest.php
index 134df9847e930e77b41d7686ccd1e4ee4b7d9a27..47d863c43ffb2e491b5a79b259b7b427eeeee4b6 100644
--- a/tests/Functional/Symfony/EventSubscriber/Kernel/LoginSubscriberTest.php
+++ b/tests/Functional/Symfony/EventSubscriber/Kernel/LoginSubscriberTest.php
@@ -56,7 +56,7 @@ class LoginSubscriberTest extends WebTestCase
         // get or create the user somehow (e.g. creating some users only
         // for tests while loading the test fixtures)
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('lecteur@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('lecteur@nomail.soluris.fr');
         $email          = $testUser->getEmail();
 
         $url = $client->getContainer()->get('router')->generate('login', [], UrlGeneratorInterface::RELATIVE_PATH);
@@ -77,7 +77,7 @@ class LoginSubscriberTest extends WebTestCase
 
         $ljr            = static::getContainer()->get(LogJournalRepository::class);
         $userRepository = static::getContainer()->get(UserRepository::class);
-        $testUser       = $userRepository->findOneOrNullByEmail('lecteur@awkan.fr');
+        $testUser       = $userRepository->findOneOrNullByEmail('lecteur@nomail.soluris.fr');
 
         $logs = $ljr->findAll();
 
diff --git a/tests/Infrastructure/ORM/Admin/Repository/DuplicationTest.php b/tests/Infrastructure/ORM/Admin/Repository/DuplicationTest.php
index b6ab56b9a775c35675257beddfa4f9582ebb304c..974c18f7736830dbc7045bb5bfda4dfa59b1e618 100644
--- a/tests/Infrastructure/ORM/Admin/Repository/DuplicationTest.php
+++ b/tests/Infrastructure/ORM/Admin/Repository/DuplicationTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Maturity/Repository/QuestionTest.php b/tests/Infrastructure/ORM/Maturity/Repository/QuestionTest.php
index 4060539c9622644f4b82db26d5e68484b0617903..6dc3e8cb9c8e3f44c7055feffb648a14e86a2610 100644
--- a/tests/Infrastructure/ORM/Maturity/Repository/QuestionTest.php
+++ b/tests/Infrastructure/ORM/Maturity/Repository/QuestionTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Maturity/Repository/SurveyTest.php b/tests/Infrastructure/ORM/Maturity/Repository/SurveyTest.php
index 0192213e74b720ce911d992e86340e45d0059483..8c4fa5e7ac28556864aa4f717243898f3c84321e 100644
--- a/tests/Infrastructure/ORM/Maturity/Repository/SurveyTest.php
+++ b/tests/Infrastructure/ORM/Maturity/Repository/SurveyTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Registry/Repository/ContractorTest.php b/tests/Infrastructure/ORM/Registry/Repository/ContractorTest.php
index 174a2e180be9500bb56ce54d042a280a9f608f9e..2576550b7dcc0c181aba18b0df34eb13926c9bad 100644
--- a/tests/Infrastructure/ORM/Registry/Repository/ContractorTest.php
+++ b/tests/Infrastructure/ORM/Registry/Repository/ContractorTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Registry/Repository/MesurementTest.php b/tests/Infrastructure/ORM/Registry/Repository/MesurementTest.php
index c03a2e966cb3f3f8b38672c7d4beeab4f01c31ab..ebdcf6f25bd2b0ebe6d9b59db376b5fc960bce15 100644
--- a/tests/Infrastructure/ORM/Registry/Repository/MesurementTest.php
+++ b/tests/Infrastructure/ORM/Registry/Repository/MesurementTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Registry/Repository/ProofTest.php b/tests/Infrastructure/ORM/Registry/Repository/ProofTest.php
index a4a342c5c5548fd9d0c59954247ba6f9b8a3d6df..b42c5aa9299113f15fdfc461dae39fffe10c5faa 100644
--- a/tests/Infrastructure/ORM/Registry/Repository/ProofTest.php
+++ b/tests/Infrastructure/ORM/Registry/Repository/ProofTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Registry/Repository/RequestTest.php b/tests/Infrastructure/ORM/Registry/Repository/RequestTest.php
index 37ccd2006431c57150a13b7715534ed88925828b..8d5d78cc22812ffc750de24963a1a2dc18fb9486 100644
--- a/tests/Infrastructure/ORM/Registry/Repository/RequestTest.php
+++ b/tests/Infrastructure/ORM/Registry/Repository/RequestTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Registry/Repository/TreatmentTest.php b/tests/Infrastructure/ORM/Registry/Repository/TreatmentTest.php
index 5bba1aac798236cbc8db1367284ffd51322b846f..9970627eab7f23295cd92f4ea26812ce9f7258e8 100644
--- a/tests/Infrastructure/ORM/Registry/Repository/TreatmentTest.php
+++ b/tests/Infrastructure/ORM/Registry/Repository/TreatmentTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/Registry/Repository/ViolationTest.php b/tests/Infrastructure/ORM/Registry/Repository/ViolationTest.php
index 519b6728fb51b1fc1e597bf96378aa71ce82ee66..53f975f1a045b9977145eca28122d01d5714534d 100644
--- a/tests/Infrastructure/ORM/Registry/Repository/ViolationTest.php
+++ b/tests/Infrastructure/ORM/Registry/Repository/ViolationTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/User/Repository/CollectivityTest.php b/tests/Infrastructure/ORM/User/Repository/CollectivityTest.php
index 9c6687f553c3bbde6ebdd2a5681fe486750c99e7..02c7f2a8e4fed4d9b7aea4bf6c06e8b4e6ca95f9 100644
--- a/tests/Infrastructure/ORM/User/Repository/CollectivityTest.php
+++ b/tests/Infrastructure/ORM/User/Repository/CollectivityTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/User/Repository/LoginAttemptTest.php b/tests/Infrastructure/ORM/User/Repository/LoginAttemptTest.php
index 2f874666e7a1c7a7cf3aa9cb406d4d333f012e58..bf8ac3d0623845a6847ed90c65457b282de1e6c5 100644
--- a/tests/Infrastructure/ORM/User/Repository/LoginAttemptTest.php
+++ b/tests/Infrastructure/ORM/User/Repository/LoginAttemptTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Infrastructure/ORM/User/Repository/UserTest.php b/tests/Infrastructure/ORM/User/Repository/UserTest.php
index 77711fb5ebc5ef170cebc7e3e208a7e0ba79bbf5..fb97f2b52e806613c09f1c0fac1b89b9f465ec05 100644
--- a/tests/Infrastructure/ORM/User/Repository/UserTest.php
+++ b/tests/Infrastructure/ORM/User/Repository/UserTest.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Utils/FormTypeHelper.php b/tests/Utils/FormTypeHelper.php
index a0c8b21c73aa19e037bb193f6642dd34d9909ffe..d957ab43a08491799cbdb208d4b6f91020856bd4 100644
--- a/tests/Utils/FormTypeHelper.php
+++ b/tests/Utils/FormTypeHelper.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Utils/ReflectionTrait.php b/tests/Utils/ReflectionTrait.php
index 5eff93c4ecd03fdc93f03e0558ccde6430215fde..fe1ebae2b2f0b70a58896ca35d9c8eb867d4a72f 100644
--- a/tests/Utils/ReflectionTrait.php
+++ b/tests/Utils/ReflectionTrait.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/tests/Utils/RepositoryTrait.php b/tests/Utils/RepositoryTrait.php
index 6b5da59bc484161f10e034b83fccbef1405bb969..34c2fff39d82420cdeb9aa35391af4d8c610dde1 100644
--- a/tests/Utils/RepositoryTrait.php
+++ b/tests/Utils/RepositoryTrait.php
@@ -4,7 +4,6 @@
  * This file is part of the MADIS - RGPD Management application.
  *
  * @copyright Copyright (c) 2018-2019 Soluris - Solutions Numériques Territoriales Innovantes
- * @author Donovan Bourlard <donovan@awkan.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -13,11 +12,11 @@
  *
  * This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml
index 4c72327a75e331e3ef4d9064d1eaea50398c247d..7415ed5fb73e71b5bc3e98db1c5487732847f02a 100644
--- a/translations/messages.fr.yaml
+++ b/translations/messages.fr.yaml
@@ -39,6 +39,8 @@ global:
         archived: Archivé
         not_archived: Non archivé
         organization: Structure
+        organization_list: Liste des structures
+        organization_type: Type de structure
         service: Service
         created_at: Date de création
         created_by : Créé par