diff --git a/admin/migration/MigrationStatutAutres.php b/admin/migration/MigrationStatutAutres.php
index 2a662928062cd15aecc023f8deffd59b685988d5..7b7f115c916e5729710e7be01020ebed28903840 100644
--- a/admin/migration/MigrationStatutAutres.php
+++ b/admin/migration/MigrationStatutAutres.php
@@ -30,7 +30,6 @@ class MigrationStatutAutres extends AbstractMigration
$statutAutres = current($bdd->select($sqlStatutAutres));
return ($statutAutres['DOSSIER_ADRESSE'] ||
- $statutAutres['DOSSIER_EMPLOYEUR'] ||
$statutAutres['DOSSIER_CONTACT'] ||
$statutAutres['DOSSIER_IBAN'] ||
$statutAutres['DOSSIER_IDENTITE_COMP'] ||
diff --git a/module/Application/view/application/intervenant-dossier/index.phtml b/module/Application/view/application/intervenant-dossier/index.phtml
index 3ad62b87f165d82eca2bbbbb796872f234504522..c3de6851b25a1dbf86dd028557391c4861098acc 100755
--- a/module/Application/view/application/intervenant-dossier/index.phtml
+++ b/module/Application/view/application/intervenant-dossier/index.phtml
@@ -1,10 +1,18 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $role \UnicaenAuth\Entity\Db\Role
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $intervenantDossierValidation \Application\Entity\Db\Validation
+ * @var $intervenantDossierStatut \Application\Entity\Db\StatutIntervenant
+ * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $fieldsetRules Array
+ * @var $champsAutres \Application\Entity\Collection
*/
+
use Application\Assertion\IntervenantDossierAssertion;
use Application\Entity\Db\WfEtape;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formAdresse.phtml b/module/Application/view/application/intervenant-dossier/partial/formAdresse.phtml
index 767458d84bc0ff3b7c9924a463007f103901054e..323d2a29d2e4d3a4baa8da15164c1b1ce5c9f61e 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formAdresse.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formAdresse.phtml
@@ -1,10 +1,12 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
-
$form->prepare();
$dossierAdresse = $form->get('DossierAdresse');
?>
diff --git a/module/Application/view/application/intervenant-dossier/partial/formAdresseView.phtml b/module/Application/view/application/intervenant-dossier/partial/formAdresseView.phtml
index 788a4857ad6aa0a28fc9be1c5599cbde9fcd7283..e1c3f83f06d1a451553e6e26576193bfcae01f9a 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formAdresseView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formAdresseView.phtml
@@ -1,9 +1,11 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formAutres.phtml b/module/Application/view/application/intervenant-dossier/partial/formAutres.phtml
index dab1c5561b2ddb378c94ee951191da2eecee6a38..8a9ac94ce0e6b75ae8c082d1aa5382cf465fdca7 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formAutres.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formAutres.phtml
@@ -1,14 +1,13 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $form \Application\Form\Intervenant\Dossier
- * @var $canValider boolean
- * @var $canDevalider boolean
- * @var $canSupprimer boolean
- * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $champsAutres \Application\Entity\Collection
*/
-
$form->prepare();
$dossierAutres = $form->get('DossierAutres');
?>
diff --git a/module/Application/view/application/intervenant-dossier/partial/formBancaire.phtml b/module/Application/view/application/intervenant-dossier/partial/formBancaire.phtml
index ca74040c1e63b70d56ea4255e2b975bf7272490f..9509d7bdb82610062bed550580767fa9063a4935 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formBancaire.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formBancaire.phtml
@@ -1,7 +1,10 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
$form->prepare();
diff --git a/module/Application/view/application/intervenant-dossier/partial/formBancaireView.phtml b/module/Application/view/application/intervenant-dossier/partial/formBancaireView.phtml
index bc16c377b00b2cab15e8768a29529ec695825644..017a9c71f29ea26debf1e3142f15809b00a2bb0e 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formBancaireView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formBancaireView.phtml
@@ -1,6 +1,10 @@
<?php
/**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formContact.phtml b/module/Application/view/application/intervenant-dossier/partial/formContact.phtml
index e828c99dfebf59be8a10104848dd7835b843426f..5622cb16224b099c7975547f51282c4dfae1ae75 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formContact.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formContact.phtml
@@ -1,13 +1,11 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $form \Application\Form\Intervenant\Dossier
- * @var $canValider boolean
- * @var $canDevalider boolean
- * @var $canSupprimer boolean
- * @var $dossier Dossier
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
//$Dossier = $dossier;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formContactView.phtml b/module/Application/view/application/intervenant-dossier/partial/formContactView.phtml
index 1feb10902a4af54ce1d092efc32bc234c7e3ec33..f7a381a7e1e7c93719988349d89c6b614de901f9 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formContactView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formContactView.phtml
@@ -1,5 +1,12 @@
<?php
+/**
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
+ */
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formEmployeur.phtml b/module/Application/view/application/intervenant-dossier/partial/formEmployeur.phtml
index d0eceedf02e57b650327eda2b19ef26dd22f7899..71c3c0125ba0337c7afa808707fbb828a9997d88 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formEmployeur.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formEmployeur.phtml
@@ -1,14 +1,12 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $form \Application\Form\Intervenant\Dossier
- * @var $canValider boolean
- * @var $canDevalider boolean
- * @var $canSupprimer boolean
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
-
//$Dossier = $dossier;
$form->prepare();
diff --git a/module/Application/view/application/intervenant-dossier/partial/formEmployeurView.phtml b/module/Application/view/application/intervenant-dossier/partial/formEmployeurView.phtml
index 13951792af9be9aad166df28f508ec026449326d..76dd56b08e90a98e836c6f16d32772185266b934 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formEmployeurView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formEmployeurView.phtml
@@ -1,8 +1,10 @@
<?php
-
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formIdentite.phtml b/module/Application/view/application/intervenant-dossier/partial/formIdentite.phtml
index 51728769c2249876ffa131557d44914c7f0742a9..bc846ad72d2ed12676543ac7ac12880ea91a6d72 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formIdentite.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formIdentite.phtml
@@ -1,8 +1,11 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaire.phtml b/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaire.phtml
index ff84e5f3d68e70eb039bfe9af387d1951264523d..ccdf397e4029b5b1f7fc4e560e4e8502657e9181 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaire.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaire.phtml
@@ -1,8 +1,11 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaireView.phtml b/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaireView.phtml
index f14a164a56b3b7d32ca02db0eee3ebd89bfe6a10..7fc4895f8b0a30c25419b9d0111b9fc0f01a79c8 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaireView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formIdentiteComplementaireView.phtml
@@ -1,7 +1,11 @@
<?php
/**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formIdentiteView.phtml b/module/Application/view/application/intervenant-dossier/partial/formIdentiteView.phtml
index 867ee128fdc73cb0d067e7515a27d120e5802edf..028350a0afb55f0935db6525b6a648700c368c40 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formIdentiteView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formIdentiteView.phtml
@@ -1,7 +1,11 @@
<?php
/**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formInsee.phtml b/module/Application/view/application/intervenant-dossier/partial/formInsee.phtml
index e1a999ef6cf186aab9393b2ada994514f969606b..621d24e60a46d377c3482b4716b8d4b6f01cbf07 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formInsee.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formInsee.phtml
@@ -1,8 +1,11 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
$form->prepare();
diff --git a/module/Application/view/application/intervenant-dossier/partial/formInseeView.phtml b/module/Application/view/application/intervenant-dossier/partial/formInseeView.phtml
index eec9a8f3e22b7c741e0469b58cf792e1ac772a29..84369c9b422350d33212ecebd35fd3679d52a373 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formInseeView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formInseeView.phtml
@@ -1,7 +1,11 @@
<?php
/**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
use Application\Assertion\IntervenantDossierAssertion;
diff --git a/module/Application/view/application/intervenant-dossier/partial/formStatut.phtml b/module/Application/view/application/intervenant-dossier/partial/formStatut.phtml
index e86beca64e87c8e0cb09f4717c6c93abaaee51e3..82bae55a62cbcc55da1070a17e67df42a2b88183 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formStatut.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formStatut.phtml
@@ -1,10 +1,12 @@
<?php
/**
- * @var $this \Application\View\Renderer\PhpRenderer
- * @var $tblDossier \Application\Entity\Db\TblDossier
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
*/
-
$form->prepare();
$dossierStatut = $form->get('DossierStatut');
?>
diff --git a/module/Application/view/application/intervenant-dossier/partial/formStatutView.phtml b/module/Application/view/application/intervenant-dossier/partial/formStatutView.phtml
index 730fdce2fdd38bc6266b07005bed9034a3785757..21ed0245fe20b70dc893625126320c0cce64743c 100755
--- a/module/Application/view/application/intervenant-dossier/partial/formStatutView.phtml
+++ b/module/Application/view/application/intervenant-dossier/partial/formStatutView.phtml
@@ -1,5 +1,12 @@
<?php
+/**
+ * @var $this \Application\View\Renderer\PhpRenderer
+ * @var $form \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier \Application\Entity\Db\TblDossier
+ */
$form->prepare();
$dossierStatut = $form->get('DossierStatut');