Damien Moulard · @DamienM · Yvon Kerdoncuff · Damien Moulard · Yvon Kerdoncuff · Damien Moulard
--- a/src/Admin/AdherentAdmin.php
+++ b/src/Admin/AdherentAdmin.php
                        'required' => true,
                        'with_geoloc' => false,
                        'with_latlon' => false,
-                        'with_subterritory' => $tav_env && $household_based_allowance,
+                        'with_subterritory' =>
--- a/src/Admin/AdherentAdmin.php
+++ b/src/Admin/AdherentAdmin.php
-                                'by_reference' => false,
-                                'label' => "Enfant(s) à charge (pour calculer l'allocation)"
-                            ])
-                        ->end()
-                    ->end();
+                if ($simplified_household_based_allowance) {
+                    $formMapper
+                        ->tab('General')
+                            ->with('Foyer', ['class' => 'col-md-7'])
+                                ->add('householdComposition',ChoiceType::class, [
+                                    'choices' => [
+                                        "Personne seule" => "Personne seule",
+                                        "Famille mono-parentale" => "Famille mono-parentale",
+                                        "Couple" => "Couple",
+                                        "Couple avec enfant(s)" => "Couple avec enfant(s)",
+                                        "Colocation" => "Colocation"
--- a/src/Admin/AdherentAdmin.php
+++ b/src/Admin/AdherentAdmin.php
+                                        "Famille mono-parentale" => "Famille mono-parentale",
+                                        "Couple avec enfant(s) à charge" => "Couple avec enfant(s) à charge",
+                                        "Autre" => "Autre"
+                                    ],
+                                    'label' => "Composition du foyer (pour information)",
+                                    'required' => true,
+                                    'placeholder' => "Choix de la composition du foyer",
+                                ])
+                                ->add('householdAdultCount',IntegerType::class, [
+                                    'label' => "Nombre total d'adultes dans le foyer (pour calculer l'allocation)",
+                                    'constraints' => [
+                                        new GreaterThanOrEqual(['value' => 0]),
+                                    ],
+                                    'required' => true,
+                                    'attr' => [
+                                        'autocomplete' => 'off'
--- a/src/Admin/AdherentAdmin.php
+++ b/src/Admin/AdherentAdmin.php
+                                    ],
+                                    'label' => "Composition du foyer (pour information)",
+                                    'required' => true,
+                                    'attr' => [
+                                        'autocomplete' => 'off'
+                                    ],
+                                    'placeholder' => "Choix de la composition du foyer",
+                                ])
+                                ->add('householdCount',IntegerType::class, [
+                                    'label' => "Nombre total de personnes que vous souhaitez engager dans l'expérimentation",
+                                    'constraints' => [
+                                        new GreaterThanOrEqual(['value' => 0]),
+                                    ],
+                                    'required' => true,
+                                    'attr' => [
+                                        'autocomplete' => 'off'
--- a/src/Admin/AdherentAdmin.php
+++ b/src/Admin/AdherentAdmin.php
+                if ($simplified_household_based_allowance) {
+                    $formMapper
+                        ->tab('General')
+                            ->with('Foyer', ['class' => 'col-md-7'])
+                                ->add('householdComposition',ChoiceType::class, [
+                                    'choices' => [
+                                        "Personne seule" => "Personne seule",
+                                        "Famille mono-parentale" => "Famille mono-parentale",
+                                        "Couple" => "Couple",
+                                        "Couple avec enfant(s)" => "Couple avec enfant(s)",
+                                        "Colocation" => "Colocation"
+                                    ],
+                                    'label' => "Composition du foyer (pour information)",
+                                    'required' => true,
+                                    'attr' => [
+                                        'autocomplete' => 'off'
--- a/src/Controller/UserComptoirController.php
+++ b/src/Controller/UserComptoirController.php
+            // Some code duplication between household_based_allowance && simplified_household_based_allowance, for better readability
+            if ($allocationMethod == 'simplified_household_based_allowance') {
+                /* Process: simplified allowance based on household */
+                $cotisationAmount = $destinataire->getCotisationAmount();
+
+                // Verifications
+                if (is_null($cotisationAmount) || is_null($destinataire->getHouseholdCount()) ) {
+                    $this->addFlash(
+                        'error',
+                        $this->translator->trans("Opération impossible : le profil de l'habitant.e est incomplet, veuillez le compléter dans l'interface d'administration.")
+                    );
+
+                    return $this->redirectToRoute('index');
+                }
+
+                if (is_null($destinataire->getAllocationAmount())) {
--- a/src/Controller/UserAdherentController.php
+++ b/src/Controller/UserAdherentController.php
    private function paiementCotisTavValidation($flux) {

        $destinataire = $flux->getDestinataire();
-        if($reason = $this->tavCotisationsUtils->preventCotisationDuplication($destinataire)) {
+        if($reason = $this->tavCotisationUtils->preventCotisationDuplication($destinataire)) {
            return $reason;
        }

        // Look for cotisation data depending on active process
-        if (true == $this->getParameter('household_based_allowance')) {
--- a/src/Utils/TAVCotisationUtils.php
+++ b/src/Utils/TAVCotisationUtils.php
        }
        $this->em->flush();
    }
+
+    /**
+     * Check parameters and Adherent data in order to detect the right allocation method to use.
+     * 
+     * Specific rule: if simplified_household_based_allowance is active BUT adherent's profile is incomplete for this method AND (s)he has a ProfilDeCotisation set, use ProfilDeCotisation
+     * (allows flowless transition from ProfilDeCotisation to simplified_household_based_allowance)
+     * 
+     * @param Adherent $adherent
+     * @return String 'cotisation_profile' | 'household_based_allowance' | 'simplified_household_based_allowance
+     */
+    public function getAppropriateAllocationMethod($adherent) {
+        if ($this->container->getParameter('simplified_household_based_allowance')) {
+            if (
--- a/templates/themes/kohinos/tav/block/admin_recalculate_allocations.html.twig 0 → 100644
+++ b/templates/themes/kohinos/tav/block/admin_recalculate_allocations.html.twig 0 → 100644
+
+<li>