diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0992dcfa..af1105275 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
+* [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
+* [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
 * [search] enforce limit of results for fetching rsults by search api https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/576
 * [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
 * [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
@@ -35,7 +38,8 @@ and this project adheres to
 * [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
 * [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463)
 * [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441)
-* [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
+* [budget]: budget enabled for persons and households (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/469)
+*  [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
 * [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
 * [documents] Improve flex-table item-col placement when long buttons and long metadata
 * [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482)
@@ -52,13 +56,18 @@ and this project adheres to
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 * [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
+* [thirdparty] For contacts show current civility/profession in edit form + fix saving of edited information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/491)
+* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
+* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [thirdparty] add firstname field to thirdparty 'child' or 'contact' types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/508)
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 * [parcours] List of parcours for a specific user so they can be reassigned in case of absence (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/509)
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 * [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
+* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
 * [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
-* [person_resource] bugfix when adding thirdparty or freetext resource (no issue)
+* [person_resource] bugfix when adding thirdparty or freetext resource + prevent personOwner themselves to be added. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/526)
 * [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
 
 ## Test releases
diff --git a/docs/source/development/pagination.rst b/docs/source/development/pagination.rst
index 1a2c91ff0..a9df72805 100644
--- a/docs/source/development/pagination.rst
+++ b/docs/source/development/pagination.rst
@@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function.
 
    {% block title 'Item list'|trans %}
 
-   {% block personcontent %}
+   {% block content %}
 
    <table>
 
diff --git a/docs/source/development/user-interface/layout-template-usage.rst b/docs/source/development/user-interface/layout-template-usage.rst
index 69848c650..1ddbacafd 100644
--- a/docs/source/development/user-interface/layout-template-usage.rst
+++ b/docs/source/development/user-interface/layout-template-usage.rst
@@ -156,7 +156,7 @@ This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the p
 
 It proposes 1 new block :
 
-* personcontent
+* content
 
   * where to display the information of the person
 
diff --git a/phpstan-deprecations.neon b/phpstan-deprecations.neon
index 1e80ab775..2de8b8bc8 100644
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@@ -222,33 +222,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
 
-		-
-			message:
-				"""
-					#^Class Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\AbstractElementController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
-					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
-				"""
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
-
-		-
-			message:
-				"""
-					#^Class Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\ElementController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
-					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
-				"""
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message:
-				"""
-					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-				"""
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
-
 		-
 			message:
 				"""
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 891eb8577..3a772d878 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -125,7 +125,9 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
-            $builder->add('socialIssues', HiddenType::class);
+            $builder->add('socialIssues', HiddenType::class, [
+                'required' => $activityType->getSocialIssuesVisible() === 2
+            ]);
             $builder->get('socialIssues')
                 ->addModelTransformer(new CallbackTransformer(
                     static function (iterable $socialIssuesAsIterable): string {
@@ -151,7 +153,9 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
-            $builder->add('socialActions', HiddenType::class);
+            $builder->add('socialActions', HiddenType::class, [
+                'required' => $activityType->getSocialActionsVisible() === 2
+            ]);
             $builder->get('socialActions')
                 ->addModelTransformer(new CallbackTransformer(
                     static function (iterable $socialActionsAsIterable): string {
@@ -339,7 +343,9 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('location')) {
-            $builder->add('location', HiddenType::class)
+            $builder->add('location', HiddenType::class, [
+                    'required' => $activityType->getLocationVisible() === 2
+                ])
                 ->get('location')
                 ->addModelTransformer(new CallbackTransformer(
                     static function (?Location $location): string {
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
index 91c5db839..42a69e4c5 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -1,7 +1,7 @@
 <template>
     <teleport to="#location">
         <div class="mb-3 row">
-            <label class="col-form-label col-sm-4">
+            <label :class="locationClassList">
                 {{ $t("activity.location") }}
             </label>
             <div class="col-sm-8">
@@ -41,6 +41,12 @@ export default {
         NewLocation,
         VueMultiselect,
     },
+    data() {
+        return {
+            locationClassList:
+               `col-form-label col-sm-4 ${document.querySelector('input#chill_activitybundle_activity_location').getAttribute('required') ? 'required' : ''}`,
+        }
+    },
     computed: {
         ...mapState(["activity", "availableLocations"]),
         ...mapGetters(["suggestedEntities"]),
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index c9a1c233c..6a6289875 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -18,6 +18,12 @@
                 </template>
                 <template v-slot:body>
                     <form>
+                        <div class="alert alert-warning" v-if="errors.length">
+                            <ul>
+                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
+                            </ul>
+                        </div>
+
                         <div class="form-floating mb-3">
                             <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                 <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
@@ -54,11 +60,6 @@
                             <label for="email">{{ $t('activity.location_fields.email') }}</label>
                         </div>
 
-                        <div class="alert alert-warning" v-if="errors.length">
-                            <ul>
-                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
-                            </ul>
-                        </div>
                     </form>
                 </template>
                 <template v-slot:footer>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index e585200c0..51957b010 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -3,7 +3,7 @@
 
       <div class="mb-3 row">
          <div class="col-4">
-            <label class="col-form-label">{{ $t('activity.social_issues') }}</label>
+            <label :class="socialIssuesClassList">{{ $t('activity.social_issues') }}</label>
          </div>
          <div class="col-8">
 
@@ -42,7 +42,7 @@
 
       <div class="mb-3 row">
          <div class="col-4">
-            <label class="col-form-label">{{ $t('activity.social_actions') }}</label>
+            <label :class="socialActionsClassList">{{ $t('activity.social_actions') }}</label>
          </div>
          <div class="col-8">
 
@@ -94,6 +94,10 @@ export default {
          issueIsLoading: false,
          actionIsLoading: false,
          actionAreLoaded: false,
+         socialIssuesClassList:
+            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialIssues').getAttribute('required') ? 'required' : ''}`,
+         socialActionsClassList:
+            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialActions').getAttribute('required') ? 'required' : ''}`,
       }
    },
    computed: {
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
index 9f8172bb4..43c2157fa 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
@@ -5,7 +5,7 @@
 
 {% block title  'Remove activity'|trans %}
 
-{% block personcontent %}
+{% block content %}
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove activity'|trans,
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index 3da97efd6..218dc37b0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -35,7 +35,7 @@
     {{ form_row(edit_form.socialActions) }}
 {% endif %}
 
-{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
+{%- if edit_form.socialIssues is defined or edit_form.socialActions is defined -%}
 <div id="social-issues-acc"></div>
 {% endif %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
index 82c7403c6..91b3867c1 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -20,7 +20,7 @@
 
 {% block title  'Update activity'|trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="activity-edit">
 
     <div id="activity"></div> {# <=== vue component #}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index 8b30bc6c7..f55c68fcc 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -30,7 +30,7 @@
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
     {% set person_id = null %}
     {% if person %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 755e2e151..a7751cd5a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -35,7 +35,7 @@
     {{ form_row(form.socialActions) }}
 {% endif %}
 
-{%- if form.socialIssues is defined or form.socialIssues is defined -%}
+{%- if form.socialIssues is defined or form.socialActions is defined -%}
     <div id="social-issues-acc"></div>
 {% endif %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
index 962aee806..d57fc3412 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -4,7 +4,7 @@
 
 {% block title 'Activity creation' |trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="activity-new">
 
     <div id="activity"></div> {# <=== vue component #}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
index da9b561d0..f616012e4 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
@@ -4,6 +4,6 @@
 
 {% block title 'Activity creation'|trans %}
 
-{% block personcontent %}
+{% block content %}
     {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index e593b0131..5776eddb5 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -18,11 +18,11 @@
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
-{% block personcontent -%}
+{% block content -%}
 <div class="activity-show">
     {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 </div>
-{% endblock personcontent %}
+{% endblock %}
 
 {% block block_post_menu %}
     <div class="post-menu pt-4">
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
index bf658e505..940389ca1 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Activity configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
index 3f44e432d..c328d2030 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
@@ -6,7 +6,7 @@
 
 {% block layout_wvm_content %}
 	{% block admin_content %}
-		<!-- block personcontent empty -->
+		<!-- block content empty -->
 		<h1>{{ 'Aside activity configuration'|trans }}</h1>
 	{% endblock %}
 {% endblock  %}
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
index 707ae0221..88bd5cf23 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
@@ -9,9 +9,9 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Calculator;
+namespace Chill\BudgetBundle\Calculator;
 
-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\AbstractElement;
 
 interface CalculatorInterface
 {
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
index 0916b703c..21c9e18ca 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
@@ -9,9 +9,9 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Calculator;
+namespace Chill\BudgetBundle\Calculator;
 
-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\AbstractElement;
 use OutOfBoundsException;
 
 use function array_key_exists;
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
index 7de147ffb..c3cc40008 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Calculator;
+namespace Chill\BudgetBundle\Calculator;
 
 class CalculatorResult
 {
diff --git a/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
similarity index 75%
rename from src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php
rename to src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
index add60c5df..ce8214604 100644
--- a/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php
+++ b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
@@ -9,12 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle;
+namespace Chill\BudgetBundle;
 
-use Chill\AMLI\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
+use Chill\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillAMLIBudgetBundle extends Bundle
+class ChillBudgetBundle extends Bundle
 {
     public function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
index dc3ffe20d..73f6fb355 100644
--- a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Config;
+namespace Chill\BudgetBundle\Config;
 
 class ConfigRepository
 {
@@ -29,6 +29,11 @@ class ConfigRepository
         $this->charges = $charges;
     }
 
+    public function getChargesKeys(): array
+    {
+        return array_map(static function ($element) { return $element['key']; }, $this->charges);
+    }
+
     /**
      * @return array where keys are the resource'key and label the ressource label
      */
@@ -43,6 +48,11 @@ class ConfigRepository
         return $charges;
     }
 
+    public function getResourcesKeys(): array
+    {
+        return array_map(static function ($element) { return $element['key']; }, $this->resources);
+    }
+
     /**
      * @return array where keys are the resource'key and label the ressource label
      */
diff --git a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
index c8652e2e9..94cb9255a 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
@@ -9,37 +9,29 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;
 
-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function get_class;
 
-abstract class AbstractElementController extends Controller
+abstract class AbstractElementController extends AbstractController
 {
-    /**
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
+    protected LoggerInterface $chillMainLogger;
 
-    /**
-     * @var EntityManagerInterface
-     */
-    protected $em;
+    protected EntityManagerInterface $em;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(
         EntityManagerInterface $em,
@@ -59,16 +51,22 @@ abstract class AbstractElementController extends Controller
      *
      * @param mixed $template
      * @param mixed $flashMessage
-     *
-     * @return \Symfony\Component\BrowserKit\Response
      */
-    protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage)
+    protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage): Response
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
-             . 'allowed to delete this family membership');
+            . 'allowed to delete this item');
 
         $form = $this->createDeleteForm();
 
+        if (null !== $element->getPerson()) {
+            $entity = $element->getPerson();
+            $indexPage = 'chill_budget_elements_index';
+        } else {
+            $entity = $element->getHousehold();
+            $indexPage = 'chill_budget_elements_household_index';
+        }
+
         if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
 
@@ -88,8 +86,8 @@ abstract class AbstractElementController extends Controller
                 $this->addFlash('success', $this->translator
                     ->trans($flashMessage));
 
-                return $this->redirectToRoute('chill_budget_elements_index', [
-                    'id' => $element->getPerson()->getId(),
+                return $this->redirectToRoute($indexPage, [
+                    'id' => $entity->getId(),
                 ]);
             }
         }
@@ -103,13 +101,23 @@ abstract class AbstractElementController extends Controller
     /**
      * @param string $template
      * @param string $flashOnSuccess
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
+    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess): Response
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);
 
+        if (null !== $element->getPerson()) {
+            $entity = $element->getPerson();
+            $entityStr = 'person';
+            $indexPage = 'chill_budget_elements_index';
+        } else {
+            $entity = $element->getHousehold();
+            $entityStr = 'household';
+            $indexPage = 'chill_budget_elements_household_index';
+        }
+
+        $entity = null !== $element->getPerson() ? $element->getPerson() : $element->getHousehold();
+
         $form = $this->createForm($this->getType(), $element);
         $form->add('submit', SubmitType::class);
 
@@ -121,29 +129,39 @@ abstract class AbstractElementController extends Controller
 
             $this->addFlash('success', $this->translator->trans($flashOnSuccess));
 
-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $element->getPerson()->getId(),
+            return $this->redirectToRoute($indexPage, [
+                'id' => $entity->getId(),
             ]);
         }
 
         return $this->render($template, [
             'element' => $element,
             'form' => $form->createView(),
-            'person' => $element->getPerson(),
+            $entityStr => $entity,
         ]);
     }
 
     /**
      * @param mixed $template
      * @param mixed $flashMessageOnSuccess
+     * @param mixed $entity
      */
-    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
+    protected function _new($entity, Request $request, $template, $flashMessageOnSuccess)
     {
-        /** @var \Chill\AMLI\BudgetBundle\Entity\AbstractElement $element */
-        $element = $this->createNewElement()
-            ->setPerson($person);
+        /** @var AbstractElement $element */
+        $element = $this->createNewElement();
 
-        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
+        if ($entity instanceof Person) {
+            $element->setPerson($entity);
+            $entityStr = 'person';
+            $indexPage = 'chill_budget_elements_index';
+        } else {
+            $element->setHousehold($entity);
+            $entityStr = 'household';
+            $indexPage = 'chill_budget_elements_household_index';
+        }
+
+        // $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $entity);
 
         $form = $this->createForm($this->getType(), $element);
         $form->add('submit', SubmitType::class);
@@ -157,8 +175,8 @@ abstract class AbstractElementController extends Controller
 
             $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));
 
-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $person->getId(),
+            return $this->redirectToRoute($indexPage, [
+                'id' => $entity->getId(),
             ]);
         }
 
@@ -168,7 +186,7 @@ abstract class AbstractElementController extends Controller
 
         return $this->render($template, [
             'form' => $form->createView(),
-            'person' => $person,
+            $entityStr => $entity,
             'element' => $element,
         ]);
     }
@@ -183,7 +201,7 @@ abstract class AbstractElementController extends Controller
      */
     protected function _view(AbstractElement $element, $template)
     {
-        $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $element);
+        $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $element);
 
         return $this->render($template, [
             'element' => $element,
@@ -199,10 +217,8 @@ abstract class AbstractElementController extends Controller
 
     /**
      * Creates a form to delete a help request entity by id.
-     *
-     * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteForm()
+    private function createDeleteForm(): Form
     {
         return $this->createFormBuilder()
             ->setMethod(Request::METHOD_DELETE)
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
index b06773609..ec556ffed 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
@@ -9,10 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;
 
-use Chill\AMLI\BudgetBundle\Entity\Charge;
-use Chill\AMLI\BudgetBundle\Form\ChargeType;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Form\ChargeType;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
@@ -32,7 +33,7 @@ class ChargeController extends AbstractElementController
         return $this->_delete(
             $charge,
             $request,
-            '@ChillAMLIBudget/Charge/confirm_delete.html.twig',
+            '@ChillBudget/Charge/confirm_delete.html.twig',
             'Charge deleted'
         );
     }
@@ -50,7 +51,7 @@ class ChargeController extends AbstractElementController
         return $this->_edit(
             $charge,
             $request,
-            '@ChillAMLIBudget/Charge/edit.html.twig',
+            '@ChillBudget/Charge/edit.html.twig',
             'Charge updated'
         );
     }
@@ -68,7 +69,25 @@ class ChargeController extends AbstractElementController
         return $this->_new(
             $person,
             $request,
-            '@ChillAMLIBudget/Charge/new.html.twig',
+            '@ChillBudget/Charge/new.html.twig',
+            'Charge created'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/by-household/{id}/new",
+     *     name="chill_budget_charge_household_new"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function newHouseholdAction(Request $request, Household $household)
+    {
+        return $this->_new(
+            $household,
+            $request,
+            '@ChillBudget/Charge/new.html.twig',
             'Charge created'
         );
     }
@@ -83,7 +102,7 @@ class ChargeController extends AbstractElementController
      */
     public function viewAction(Charge $charge)
     {
-        return $this->_view($charge, '@ChillAMLIBudget/Charge/view.html.twig');
+        return $this->_view($charge, '@ChillBudget/Charge/view.html.twig');
     }
 
     protected function createNewElement()
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
index 3a22e321f..0230f53b9 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -9,44 +9,33 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;
 
-use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
-use Chill\AMLI\BudgetBundle\Entity\Charge;
-use Chill\AMLI\BudgetBundle\Entity\Resource;
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Calculator\CalculatorManager;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_merge;
 use function count;
 
-class ElementController extends Controller
+class ElementController extends AbstractController
 {
-    /**
-     * @var CalculatorManager
-     */
-    protected $calculator;
+    protected CalculatorManager $calculator;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
+    protected LoggerInterface $chillMainLogger;
 
-    /**
-     * @var EntityManagerInterface
-     */
-    protected $em;
+    protected EntityManagerInterface $em;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(
         EntityManagerInterface $em,
@@ -68,11 +57,12 @@ class ElementController extends Controller
      */
     public function indexAction(Person $person)
     {
-        $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $person);
+        $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $person);
 
         $charges = $this->em
             ->getRepository(Charge::class)
             ->findByPerson($person);
+
         $ressources = $this->em
             ->getRepository(Resource::class)
             ->findByPerson($person);
@@ -81,10 +71,10 @@ class ElementController extends Controller
 
         $actualCharges = $this->em
             ->getRepository(Charge::class)
-            ->findByPersonAndDate($person, $now);
+            ->findByEntityAndDate($person, $now);
         $actualResources = $this->em
             ->getRepository(Resource::class)
-            ->findByPersonAndDate($person, $now);
+            ->findByEntityAndDate($person, $now);
 
         $elements = array_merge($actualCharges, $actualResources);
 
@@ -92,11 +82,79 @@ class ElementController extends Controller
             $results = $this->calculator->calculateDefault($elements);
         }
 
-        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', [
+        return $this->render('ChillBudgetBundle:Person:index.html.twig', [
             'person' => $person,
             'charges' => $charges,
             'resources' => $ressources,
             'results' => $results ?? [],
         ]);
     }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/elements/by-household/{id}",
+     *     name="chill_budget_elements_household_index"
+     * )
+     */
+    public function indexHouseholdAction(Household $household)
+    {
+        $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $household);
+
+        $charges = $this->em
+            ->getRepository(Charge::class)
+            ->findByHousehold($household);
+
+        $ressources = $this->em
+            ->getRepository(Resource::class)
+            ->findByHousehold($household);
+
+        $now = new DateTime('now');
+
+        $actualCharges = $this->em
+            ->getRepository(Charge::class)
+            ->findByEntityAndDate($household, $now);
+        $actualResources = $this->em
+            ->getRepository(Resource::class)
+            ->findByEntityAndDate($household, $now);
+
+        $elements = array_merge($actualCharges, $actualResources);
+
+        if (count($elements) > 0) {
+            $results = $this->calculator->calculateDefault($elements);
+        }
+
+        // quick solution to calculate the sum, difference and amount from
+        // controller. This should be done from the calculators
+        // TODO replace this by calculators
+        $wholeCharges = $actualCharges;
+        $wholeResources = $actualResources;
+
+        foreach ($household->getCurrentPersons() as $person) {
+            $wholeCharges = array_merge(
+                $wholeCharges,
+                $this->em
+                    ->getRepository(Charge::class)
+                    ->findByEntityAndDate($person, $now)
+            );
+            $wholeResources = array_merge(
+                $wholeResources,
+                $this->em
+                    ->getRepository(Resource::class)
+                    ->findByEntityAndDate($person, $now)
+            );
+        }
+
+        return $this->render('ChillBudgetBundle:Household:index.html.twig', [
+            'household' => $household,
+            'charges' => $charges,
+            'resources' => $ressources,
+            'wholeResources' => array_filter($wholeResources, static function (Resource $r) use ($now) {
+                return $r->getStartDate() <= $now && ($r->getEndDate() === null || $r->getEndDate() >= $now);
+            }),
+            'wholeCharges' => array_filter($wholeCharges, static function (Charge $c) use ($now) {
+                return $c->getStartDate() <= $now && ($c->getEndDate() === null || $c->getEndDate() >= $now);
+            }),
+            'results' => $results ?? [],
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
index 4ee8bd082..3ecd53097 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
@@ -9,13 +9,15 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;
 
-use Chill\AMLI\BudgetBundle\Entity\Resource;
-use Chill\AMLI\BudgetBundle\Form\ResourceType;
+use Chill\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Form\ResourceType;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 class ResourceController extends AbstractElementController
 {
@@ -24,15 +26,13 @@ class ResourceController extends AbstractElementController
      *     "{_locale}/budget/resource/{id}/delete",
      *     name="chill_budget_resource_delete"
      * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function deleteAction(Request $request, Resource $resource)
     {
         return $this->_delete(
             $resource,
             $request,
-            '@ChillAMLIBudget/Resource/confirm_delete.html.twig',
+            '@ChillBudget/Resource/confirm_delete.html.twig',
             'Resource deleted'
         );
     }
@@ -42,33 +42,49 @@ class ResourceController extends AbstractElementController
      *     "{_locale}/budget/resource/{id}/edit",
      *     name="chill_budget_resource_edit"
      * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function editAction(Request $request, Resource $resource)
+    public function editAction(Request $request, Resource $resource): Response
     {
         return $this->_edit(
             $resource,
             $request,
-            '@ChillAMLIBudget/Resource/edit.html.twig',
+            '@ChillBudget/Resource/edit.html.twig',
             'Resource updated'
         );
     }
 
     /**
+     * Create a new budget element for a person.
+     *
      * @Route(
      *     "{_locale}/budget/resource/by-person/{id}/new",
      *     name="chill_budget_resource_new"
      * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function newAction(Request $request, Person $person)
+    public function newAction(Request $request, Person $person): Response
     {
         return $this->_new(
             $person,
             $request,
-            '@ChillAMLIBudget/Resource/new.html.twig',
+            '@ChillBudget/Resource/new.html.twig',
+            'Resource created'
+        );
+    }
+
+    /**
+     * Create new budget element for a household.
+     *
+     * @Route(
+     *     "{_locale}/budget/resource/by-household/{id}/new",
+     *     name="chill_budget_resource_household_new"
+     * )
+     */
+    public function newHouseholdAction(Request $request, Household $household): Response
+    {
+        return $this->_new(
+            $household,
+            $request,
+            '@ChillBudget/Resource/new.html.twig',
             'Resource created'
         );
     }
@@ -78,12 +94,10 @@ class ResourceController extends AbstractElementController
      *     "{_locale}/budget/resource/{id}/view",
      *     name="chill_budget_resource_view"
      * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function viewAction(Resource $resource)
+    public function viewAction(Resource $resource): Response
     {
-        return $this->_view($resource, '@ChillAMLIBudget/Resource/view.html.twig');
+        return $this->_view($resource, '@ChillBudget/Resource/view.html.twig');
     }
 
     protected function createNewElement()
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
similarity index 86%
rename from src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php
rename to src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
index bea107131..cf7e4fad2 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
@@ -9,9 +9,9 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\DependencyInjection;
+namespace Chill\BudgetBundle\DependencyInjection;
 
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -23,11 +23,11 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
  *
  * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
-class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInterface
+class ChillBudgetExtension extends Extension implements PrependExtensionInterface
 {
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
+        $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
@@ -38,6 +38,7 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
         $loader->load('services/templating.yaml');
         $loader->load('services/menu.yaml');
         $loader->load('services/calculator.yaml');
+        $loader->load('services/services.yaml');
 
         $this->storeConfig('resources', $config, $container);
         $this->storeConfig('charges', $config, $container);
@@ -58,7 +59,7 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
-                    '@ChillAMLIBudgetBundle/config/routing.yaml',
+                    '@ChillBudgetBundle/config/routing.yaml',
                 ],
             ],
         ]);
@@ -68,8 +69,8 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
     {
         $container->prependExtensionConfig('security', [
             'role_hierarchy' => [
-                BudgetElementVoter::UPDATE => [BudgetElementVoter::SHOW],
-                BudgetElementVoter::CREATE => [BudgetElementVoter::SHOW],
+                BudgetElementVoter::UPDATE => [BudgetElementVoter::SEE],
+                BudgetElementVoter::CREATE => [BudgetElementVoter::SEE],
             ],
         ]);
     }
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
index 0a53e5160..ec47d5faa 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\DependencyInjection\Compiler;
+namespace Chill\BudgetBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -19,7 +19,7 @@ class CalculatorCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $manager = $container->getDefinition('Chill\AMLI\BudgetBundle\Calculator\CalculatorManager');
+        $manager = $container->getDefinition('Chill\BudgetBundle\Calculator\CalculatorManager');
 
         foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
             foreach ($tags as $tag) {
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
index 407be6bff..a18e17ae6 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\DependencyInjection;
+namespace Chill\BudgetBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -23,14 +23,14 @@ class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder('chill_amli_budget');
-        $rootNode = $treeBuilder->getRootNode('chill_amli_budget');
+        $treeBuilder = new TreeBuilder('chill_budget');
+        $rootNode = $treeBuilder->getRootNode('chill_budget');
 
         $rootNode
             ->children()
 
                 // ressources
-            ->arrayNode('resources')->isRequired()->requiresAtLeastOneElement()
+            ->arrayNode('resources')->defaultValue([])
             ->arrayPrototype()
             ->children()
             ->scalarNode('key')->isRequired()->cannotBeEmpty()
@@ -52,7 +52,7 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
-            ->arrayNode('charges')->isRequired()->requiresAtLeastOneElement()
+            ->arrayNode('charges')->defaultValue([])
             ->arrayPrototype()
             ->children()
             ->scalarNode('key')->isRequired()->cannotBeEmpty()
diff --git a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
index 5f43c4262..747e6f4b4 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
@@ -9,13 +9,15 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Entity;
+namespace Chill\BudgetBundle\Entity;
 
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
+use Ramsey\Uuid\Type\Decimal;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -26,8 +28,6 @@ use Symfony\Component\Validator\Constraints as Assert;
 abstract class AbstractElement
 {
     /**
-     * @var decimal
-     *
      * @ORM\Column(name="amount", type="decimal", precision=10, scale=2)
      * @Assert\GreaterThan(
      *     value=0
@@ -36,100 +36,80 @@ abstract class AbstractElement
      *     message="The amount cannot be empty"
      * )
      */
-    private $amount;
+    private string $amount;
 
     /**
-     * @var string|null
-     *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    private ?string $comment;
 
     /**
-     * @var DateTimeImmutable|null
-     *
      * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
      * @Assert\GreaterThan(
      *     propertyPath="startDate",
      *     message="The budget element's end date must be after the start date"
      * )
      */
-    private $endDate;
+    private ?DateTimeImmutable $endDate;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\Household\Household"
+     * )
+     */
+    private ?Household $household = null;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Person"
      * )
      */
-    private $person;
+    private ?Person $person = null;
 
     /**
-     * @var DateTimeImmutable
-     *
      * @ORM\Column(name="startDate", type="datetime_immutable")
      * @Assert\Date
      */
-    private $startDate;
+    private DateTimeImmutable $startDate;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="type", type="string", length=255)
      */
-    private $type;
+    private string $type;
 
-    /**
-     * Get amount.
-     *
-     * @return float
-     */
-    public function getAmount()
+    /*Getters and Setters */
+
+    public function getAmount(): float
     {
         return (float) $this->amount;
     }
 
-    /**
-     * Get comment.
-     *
-     * @return string|null
-     */
-    public function getComment()
+    public function getComment(): ?string
     {
         return $this->comment;
     }
 
-    /**
-     * Get endDate.
-     *
-     * @return DateTimeImmutable|null
-     */
-    public function getEndDate()
+    public function getEndDate(): ?DateTimeImmutable
     {
         return $this->endDate;
     }
 
-    public function getPerson(): Person
+    public function getHousehold(): ?Household
+    {
+        return $this->household;
+    }
+
+    public function getPerson(): ?Person
     {
         return $this->person;
     }
 
-    /**
-     * Get startDate.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getStartDate()
+    public function getStartDate(): DateTimeImmutable
     {
         return $this->startDate;
     }
 
-    /**
-     * Get type.
-     *
-     * @return string
-     */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
@@ -143,40 +123,21 @@ abstract class AbstractElement
 
     abstract public function isResource(): bool;
 
-    /**
-     * Set amount.
-     *
-     * @param string $amount
-     *
-     * @return AbstractElement
-     */
-    public function setAmount($amount)
+    public function setAmount(string $amount): self
     {
         $this->amount = $amount;
 
         return $this;
     }
 
-    /**
-     * Set comment.
-     *
-     * @param string|null $comment
-     *
-     * @return AbstractElement
-     */
-    public function setComment($comment = null)
+    public function setComment(?string $comment = null): self
     {
         $this->comment = $comment;
 
         return $this;
     }
 
-    /**
-     * Set endDate.
-     *
-     * @return AbstractElement
-     */
-    public function setEndDate(?DateTimeInterface $endDate = null)
+    public function setEndDate(?DateTimeInterface $endDate = null): self
     {
         if ($endDate instanceof DateTime) {
             $this->endDate = DateTimeImmutable::createFromMutable($endDate);
@@ -189,19 +150,21 @@ abstract class AbstractElement
         return $this;
     }
 
-    public function setPerson(Person $person)
+    public function setHousehold(Household $household): self
+    {
+        $this->household = $household;
+
+        return $this;
+    }
+
+    public function setPerson(Person $person): self
     {
         $this->person = $person;
 
         return $this;
     }
 
-    /**
-     * Set startDate.
-     *
-     * @return AbstractElement
-     */
-    public function setStartDate(DateTimeInterface $startDate)
+    public function setStartDate(DateTimeInterface $startDate): self
     {
         if ($startDate instanceof DateTime) {
             $this->startDate = DateTimeImmutable::createFromMutable($startDate);
@@ -214,14 +177,7 @@ abstract class AbstractElement
         return $this;
     }
 
-    /**
-     * Set type.
-     *
-     * @param string $type
-     *
-     * @return AbstractElement
-     */
-    public function setType($type)
+    public function setType(string $type): self
     {
         $this->type = $type;
 
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
index e893f99af..4acc6e855 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -9,8 +9,9 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Entity;
+namespace Chill\BudgetBundle\Entity;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
@@ -19,7 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
  * Charge.
  *
  * @ORM\Table(name="chill_budget.charge")
- * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ChargeRepository")
+ * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ChargeRepository")
  */
 class Charge extends AbstractElement implements HasCenterInterface
 {
@@ -58,7 +59,7 @@ class Charge extends AbstractElement implements HasCenterInterface
         $this->setStartDate(new DateTimeImmutable('today'));
     }
 
-    public function getCenter(): \Chill\MainBundle\Entity\Center
+    public function getCenter(): ?Center
     {
         return $this->getPerson()->getCenter();
     }
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Resource.php b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
index bd13e0dd0..6100e90a0 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
@@ -9,8 +9,9 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Entity;
+namespace Chill\BudgetBundle\Entity;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
@@ -19,7 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
  * Resource.
  *
  * @ORM\Table(name="chill_budget.resource")
- * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ResourceRepository")
+ * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ResourceRepository")
  */
 class Resource extends AbstractElement implements HasCenterInterface
 {
@@ -37,7 +38,7 @@ class Resource extends AbstractElement implements HasCenterInterface
         $this->setStartDate(new DateTimeImmutable('today'));
     }
 
-    public function getCenter(): \Chill\MainBundle\Entity\Center
+    public function getCenter(): ?Center
     {
         return $this->getPerson()->getCenter();
     }
diff --git a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
index 96aea3ea4..1e054d86b 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
@@ -9,10 +9,10 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Form;
+namespace Chill\BudgetBundle\Form;
 
-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
-use Chill\AMLI\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Config\ConfigRepository;
+use Chill\BudgetBundle\Entity\Charge;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
@@ -45,6 +45,7 @@ class ChargeType extends AbstractType
             ->add('type', ChoiceType::class, [
                 'choices' => $this->getTypes(),
                 'placeholder' => 'Choose a charge type',
+                'attr' => ['class' => ' select2 '],
             ])
             ->add('amount', MoneyType::class)
             ->add('comment', TextareaType::class, [
@@ -96,7 +97,7 @@ class ChargeType extends AbstractType
 
     public function getBlockPrefix()
     {
-        return 'chill_amli_budgetbundle_charge';
+        return 'chill_budgetbundle_charge';
     }
 
     private function getTypes()
diff --git a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
index 9f772648d..51e3f6799 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
@@ -9,10 +9,10 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Form;
+namespace Chill\BudgetBundle\Form;
 
-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
-use Chill\AMLI\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Config\ConfigRepository;
+use Chill\BudgetBundle\Entity\Resource;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
@@ -45,6 +45,7 @@ class ResourceType extends AbstractType
                 'choices' => $this->getTypes(),
                 'placeholder' => 'Choose a resource type',
                 'label' => 'Resource element type',
+                'attr' => ['class' => ' select2 '],
             ])
             ->add('amount', MoneyType::class)
             ->add('comment', TextareaType::class, [
@@ -80,7 +81,7 @@ class ResourceType extends AbstractType
 
     public function getBlockPrefix()
     {
-        return 'chill_amli_budgetbundle_resource';
+        return 'chill_budgetbundle_resource';
     }
 
     private function getTypes()
diff --git a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
new file mode 100644
index 000000000..e983ddebb
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\BudgetBundle\Menu;
+
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class HouseholdMenuBuilder implements LocalMenuBuilderInterface
+{
+    protected AuthorizationCheckerInterface $authorizationChecker;
+
+    protected TranslatorInterface $translator;
+
+    public function __construct(
+        AuthorizationCheckerInterface $authorizationChecker,
+        TranslatorInterface $translator
+    ) {
+        $this->authorizationChecker = $authorizationChecker;
+        $this->translator = $translator;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        /** @var Household $household */
+        $household = $parameters['household'];
+
+        // if ($this->authorizationChecker->isGranted(BudgetElementVoter::SHOW, $household)) {
+        $menu->addChild($this->translator->trans('household.Budget'), [
+            'route' => 'chill_budget_elements_household_index',
+            'routeParameters' => [
+                'id' => $household->getId(),
+            ], ])
+            ->setExtras(['order' => 50]);
+        // }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['household'];
+    }
+}
diff --git a/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
similarity index 72%
rename from src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
rename to src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
index f5dc02266..047185b18 100644
--- a/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
@@ -9,25 +9,19 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Menu;
+namespace Chill\BudgetBundle\Menu;
 
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class UserMenuBuilder implements LocalMenuBuilderInterface
+class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
@@ -39,10 +33,10 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /** @var \Chill\PersonBundle\Entity\Person $person */
+        /** @var Person $person */
         $person = $parameters['person'];
 
-        if ($this->authorizationChecker->isGranted(BudgetElementVoter::SHOW, $person)) {
+        if ($this->authorizationChecker->isGranted(BudgetElementVoter::SEE, $person)) {
             $menu->addChild(
                 $this->translator->trans('Budget'),
                 [
@@ -50,7 +44,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'routeParameters' => ['id' => $person->getId()],
                 ]
             )
-                ->setExtra('order', 460);
+                ->setExtra('order', 4000);
         }
     }
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
index 56f21b6fb..62aa9eea6 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
@@ -9,10 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Repository;
+namespace Chill\BudgetBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * ChargeRepository.
@@ -20,13 +21,15 @@ use DateTime;
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class ChargeRepository extends \Doctrine\ORM\EntityRepository
+class ChargeRepository extends EntityRepository
 {
-    public function findByPersonAndDate(Person $person, DateTime $date, $sort = null)
+    public function findByEntityAndDate($entity, DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
-        $qb->where('c.person = :person')
+        $entityStr = $entity instanceof Person ? 'person' : 'household';
+
+        $qb->where("c.{$entityStr} = :{$entityStr}")
             ->andWhere('c.startDate < :date')
             ->andWhere('c.startDate < :date OR c.startDate IS NULL');
 
@@ -35,7 +38,7 @@ class ChargeRepository extends \Doctrine\ORM\EntityRepository
         }
 
         $qb->setParameters([
-            'person' => $person,
+            $entityStr => $entity,
             'date' => $date,
         ]);
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
index f7440a281..23cc5ca54 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
@@ -9,10 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Repository;
+namespace Chill\BudgetBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * ResourceRepository.
@@ -20,23 +21,28 @@ use DateTime;
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class ResourceRepository extends \Doctrine\ORM\EntityRepository
+class ResourceRepository extends EntityRepository
 {
-    public function findByPersonAndDate(Person $person, DateTime $date, $sort = null)
+    public function findByEntityAndDate($entity, DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
-        $qb->where('c.person = :person')
-            ->andWhere('c.startDate < :date')
-            ->andWhere('c.startDate < :date OR c.startDate IS NULL');
+        $entityStr = $entity instanceof Person ? 'person' : 'household';
+
+        $qb->where("c.{$entityStr} = :{$entityStr}")
+            // TODO: in controller, the budget and charges asked are also for future and actual
+            //->andWhere('c.startDate < :date')
+            // TODO: there is a misconception here, the end date must be lower or null. startDate are never null
+            //->andWhere('c.startDate < :date OR c.startDate IS NULL');
+;
 
         if (null !== $sort) {
             $qb->orderBy($sort);
         }
 
         $qb->setParameters([
-            'person' => $person,
-            'date' => $date,
+            $entityStr => $entity,
+            //'date' => $date,
         ]);
 
         return $qb->getQuery()->getResult();
diff --git a/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss b/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
new file mode 100644
index 000000000..20a87cce2
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
@@ -0,0 +1,61 @@
+.subtitle {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    padding: 1rem;
+}
+.family-title {
+    margin-bottom: 1rem !important;
+}
+.budget-table th {
+    th {
+        color: white;
+    }
+}
+.budget-table {
+    th.charge {
+        background-color: #e03851d7;
+    }
+}
+.budget-table {
+    th.resource {
+        background-color: #6d9e63d8;
+    }
+}
+.budget-table {
+    th, td {
+        padding: 10px;
+        text-align: right;
+    }
+    td.column-wide {
+        width: 20%;
+    }
+    td.column-small {
+        width: 15%;
+        &.right {
+            align-items: right;
+        }
+    }
+}
+
+.btn-budget {
+    margin-right: 1rem !important;
+}
+
+.el-type {
+    font-weight: 600;
+    text-align: left !important;
+}
+
+.total {
+    margin-top: 1rem;
+    border-top: 1px dashed black;
+}
+
+.accordion-item {
+    margin-bottom: 1rem;
+}
+
+button[aria-expanded="true"] > span.folded,
+button[aria-expanded="false"] > span.unfolded { display: none; }
+button[aria-expanded="false"] > span.folded,
+button[aria-expanded="true"] > span.unfolded { display: inline; }
\ No newline at end of file
diff --git a/src/Bundle/ChillBudgetBundle/Resources/public/page/index.js b/src/Bundle/ChillBudgetBundle/Resources/public/page/index.js
new file mode 100644
index 000000000..ad7eba2d9
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/public/page/index.js
@@ -0,0 +1 @@
+require('./chillbudget.scss');
\ No newline at end of file
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
new file mode 100644
index 000000000..6e248bf0c
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
@@ -0,0 +1,74 @@
+{% set entity = person is defined ? person :  household %}
+
+{% set actualResources = [] %}
+{% set futureResources = [] %}
+{% set pastResources   = [] %}
+
+{% for r in resources %}
+    {% if r.startDate|date('U') <= 'now'|date('U') %}
+        {% if r.endDate is null or r.endDate|date('U') >= 'now'|date('U') %}
+            {% set actualResources = actualResources|merge([ r ]) %}
+        {% else %}
+            {% set pastResources = pastResources|merge([ r ]) %}
+        {% endif %}
+    {% else %}
+        {% set futureResources = futureResources|merge([ r ]) %}
+    {% endif %}
+{% endfor %}
+
+{% set actualCharges = [] %}
+{% set futureCharges = [] %}
+{% set pastCharges   = [] %}
+
+{% for c in charges %}
+    {% if c.startDate|date('U') <= 'now'|date('U') %}
+        {% if c.endDate is null or c.endDate|date('U') >= 'now'|date('U') %}
+            {% set actualCharges = actualCharges|merge([ c ]) %}
+        {% else %}
+            {% set pastCharges = pastCharges|merge([ c ]) %}
+        {% endif %}
+    {% else %}
+        {% set futureCharges = futureCharges|merge([ c ]) %}
+    {% endif %}
+{% endfor %}
+
+
+<h3 class="subtitle">{{ 'Actual budget'|trans }}</h3>
+
+{% if actualCharges|length > 0 or actualResources|length > 0 %}
+    {% include 'ChillBudgetBundle:Budget:_current_budget.html.twig' with {
+        'actualResources': actualResources,
+        'actualCharges': actualCharges,
+        'results': results,
+        'entity': entity
+    } %}
+{% else %}
+    <div class="flex-table">
+        <div class="item-bloc">
+            <p><span class="chill-no-data-statement">{{ "There isn't any element recorded"|trans }}</span></p>
+        </div>
+    </div>
+{% endif %}
+
+{% if pastCharges|length > 0 or pastResources|length > 0 %}
+    <h2 class="subtitle">{{ 'Past budget'|trans }}</h2>
+
+    {% include 'ChillBudgetBundle:Budget:_past_budget.html.twig' with {
+        'pastCharges': pastCharges,
+        'pastResources': pastResources,
+        'entity': entity
+    } %}
+{% endif %}
+
+{% if futureCharges|length > 0 or futureResources|length > 0 %}
+    <h2 class="subtitle">{{ 'Future budget'|trans }}</h2>
+
+    {% include 'ChillBudgetBundle:Budget:_future_budget.html.twig' with {
+        'futureResources': futureResources,
+        'futureCharges': futureCharges,
+        'entity': entity
+    } %}
+{% endif %}
+
+
+
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
new file mode 100644
index 000000000..b996da211
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
@@ -0,0 +1,30 @@
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+{# <h2 class="subtitle">{{ 'Actual budget'|trans }}</h2> #}
+
+<div class="flex-table">
+    <h4 class="family-title">{{ 'Actual resources'|trans }}</h4>
+
+    {% if actualResources|length > 0 %}
+    <div class="item-bloc">
+        {{ table_elements(actualResources, 'resource') }}
+    </div>
+    {% else %}
+    <div class="item-bloc">
+        <span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span>
+    </div>
+    {% endif %}
+</div>
+
+<div class="flex-table">
+    <h4 class="family-title">{{ 'Actual charges'|trans }}</h4>
+    {% if actualCharges|length > 0 %}
+    <div class="item-bloc">
+        {{ table_elements(actualCharges, 'charge') }}
+    </div>
+    {% else %}
+    <div class="item-bloc">
+        <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
+    </div>
+    {% endif %}
+</div>
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
new file mode 100644
index 000000000..1547d8749
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
@@ -0,0 +1,51 @@
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+<div class="accordion" id="future_{{ entity.id }}">
+    <div class="accordion-item">
+        <h2 class="accordion-header" id="heading_future_{{ entity.id }}">
+            <button
+                class="accordion-button collapsed"
+                type="button"
+                data-bs-toggle="collapse"
+                data-bs-target="#collapse_future_{{ entity.id }}"
+                aria-expanded="false"
+                aria-controls="collapse_future_{{ entity.id }}">
+                <span class="folded">{{ 'Show future budget'|trans }}</span>
+                <span class="unfolded text-secondary">{{ 'Hide budget'|trans }}</span>
+            </button>
+        </h2>
+
+        <div id="collapse_future_{{ entity.id }}"
+            class="accordion-collapse collapse"
+            aria-labelledby="heading_future_{{ entity.id }}"
+            data-bs-parent="#future_{{ entity.id }}">
+
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Future resources'|trans }}</h3>
+
+                {% if futureResources|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(futureResources, 'resource') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Future charges'|trans }}</h3>
+
+                {% if futureCharges|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(futureCharges, 'charge') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
new file mode 100644
index 000000000..41b6f36df
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
@@ -0,0 +1,97 @@
+{% macro table_elements(elements, family) %}
+<table class="budget-table">
+    <thead>
+        <tr>
+            <th class="{{ family }} el-type">{{ 'Budget element type'|trans }}</th>
+            <th class="{{ family }}">{{ 'Amount'|trans }}</th>
+            <th class="{{ family }}">{{ 'Validity period'|trans }}</th>
+            <th class="{{ family }}">&nbsp;</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% set total = 0 %}
+        {% for f in elements %}
+        {% set total = total + f.amount %}
+        <tr>
+            <td class="column-wide el-type">
+                <span class="badge-title">
+                    <span class="title_label title_label_{{ family }}"></span>
+                    <span class="title_action">{{ f.type|budget_element_type_display(family) }}<span>
+                </span>
+            </td>
+            <td class="column-small">{{ f.amount|format_currency('EUR') }}</td>
+            <td class="column-wide">
+                {% if f.endDate is not null %}
+                    {{ f.startDate|format_date('short') ~ ' - ' ~ f.endDate|format_date('short') }}
+                {% else %}
+                    {{ f.startDate|format_date('short') ~ ' - ...' }}
+                {% endif %}
+            </td>
+            <td class="column-small">
+                <ul class="record_actions">
+                    {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %}
+                        <li>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', f) %}
+                        <li>
+                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_BUDGET_ELEMENT_DELETE', f) %}
+                        <li>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
+                        </li>
+                    {% endif %}
+                </ul>
+            </td>
+        </tr>
+        {% endfor %}
+        <tr class="total">
+            <td class="el-type">
+                {{ 'Total'|trans }}
+            </td>
+            <td>
+                {{ total|format_currency('EUR') }}
+            </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+        </tr>
+    </tbody>
+</table>
+{% endmacro %}
+
+{% macro table_results(actualCharges, actualResources) %}
+
+{% set totalCharges = 0 %}
+{% for c in actualCharges %}
+    {% set totalCharges = totalCharges + c.amount %}
+{% endfor %}
+
+{% set totalResources = 0 %}
+{% for r in actualResources %}
+    {% set totalResources = totalResources + r.amount %}
+{% endfor %}
+
+{% set result = (totalResources - totalCharges) %}
+
+<table>
+    <thead>
+        <tr>
+            <th>&nbsp;</th>
+            <th>&nbsp;</th>
+            <th>{{ 'Budget calculator result'|trans }}</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{ 'The balance'|trans }}</td>
+            <td>&nbsp;</td>
+            <td>
+                {{ result|format_currency('EUR') }}
+            </td>
+        </tr>
+    </tbody>
+</table>
+{% endmacro %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
new file mode 100644
index 000000000..14573048e
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
@@ -0,0 +1,53 @@
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+<div class="accordion" id="past_{{ entity.id }}">
+    <div class="accordion-item">
+        <h2 class="accordion-header" id="heading_past_{{ entity.id }}">
+            <button
+                class="accordion-button collapsed"
+                type="button"
+                data-bs-toggle="collapse"
+                data-bs-target="#collapse_past_{{ entity.id }}"
+                aria-expanded="false"
+                aria-controls="collapse_past_{{ entity.id }}">
+                <span class="folded">{{ 'Show past budget'|trans }}</span>
+                <span class="unfolded text-secondary">{{ 'Hide budget'|trans }}</span>
+            </button>
+        </h2>
+
+        <div id="collapse_past_{{ entity.id }}"
+            class="accordion-collapse collapse"
+            aria-labelledby="heading_past_{{ entity.id }}"
+            data-bs-parent="#past_{{ entity.id }}">
+
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Past resources'|trans }}</h3>
+
+                {% if pastResources|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(pastResources, 'resource') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Past charges'|trans }}</h3>
+
+                {% if pastCharges|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(pastCharges, 'charge') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
index 1f191eafd..f64184d6f 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
@@ -1,18 +1,29 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set confirm_question = 'Are you sure you want to remove the charge "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('charge') } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set confirm_question = 'Are you sure you want to remove the charge "%type%" associated to household "%household%" ?'|trans({ '%household%' : household.id, '%type%': element.type|budget_element_type_display('charge') } ) %}
+{% endif %}
 
-{% set activeRouteKey = '' %}
-{% set person = element.person %}
+{% extends template %}
 
-{% block title  'Remove resource'|trans %}
+{% block title  'Remove charge'|trans %}
 
-{% block personcontent %}
+{% block content %}
 
 {{ include('ChillMainBundle:Util:confirmation_template.html.twig',
     {
         'title'             : 'Remove charge'|trans,
-        'confirm_question'  : 'Are you sure you want to remove the charge "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('charge') } ),
-        'cancel_route'      : 'chill_budget_elements_index',
-        'cancel_parameters' : { 'id' : element.person.id },
+        'confirm_question'  : confirm_question,
+        'cancel_route'      : indexPage,
+        'cancel_parameters' : { 'id': person is defined ? person.id : household.id },
         'form'              : delete_form
     } ) }}
 
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
index 5b1bc538a..fed80a5c0 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
@@ -1,31 +1,43 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}
+
+{% set title = 'Edit charge'|trans %}
+
+{% extends template %}
 
-{% set activeRouteKey = '' %}
-{% set title = 'Edit Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}
 
 {{ form_row(form.type) }}
 {{ form_row(form.amount) }}
-{{ form_row(form.help) }} 
+{{ form_row(form.help) }}
 {{ form_row(form.comment) }}
 {{ form_row(form.startDate) }}
 {{ form_row(form.endDate) }}
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-edit' }, 'label': 'Edit' } ) }}
     </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
index e784b5bf7..817d501ca 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
@@ -1,31 +1,42 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}
 
-{% set activeRouteKey = '' %}
-{% set title = 'New Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% set title = 'New charge'|trans %}
+
+{% extends template %}
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}
 
 {{ form_row(form.type) }}
 {{ form_row(form.amount) }}
-{{ form_row(form.help) }} 
+{{ form_row(form.help) }}
 {{ form_row(form.comment) }}
 {{ form_row(form.startDate) }}
 {{ form_row(form.endDate) }}
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
         {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
index d939fe81a..d3b9ef71b 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
@@ -1,49 +1,68 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}
 
-{% set activeRouteKey = '' %}
-{% set person = element.person %}
-{% set title = 'Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% set title = 'Charge' %}
+
+{% extends template %}
 
 {% block title title %}
 
-{% block personcontent %}
-<h1>{{ title }}</h1>
+{% block content %}
+<div class="budget-show">
+    <h1>{{ title }}</h1>
 
-<dl class="chill_view_data">
-    <dt>{{ 'Type'|trans }}</dt>
-    <dd>{{ element.type|budget_element_type_display('charge') }}</dd>
-
-    <dt>{{ 'Amount'|trans }}</dt>
-    <dd>{{ element.amount|localizedcurrency('EUR') }}</dd>
-
-    <dt>{{ 'Validity period'|trans }}</dt>
-    <dd>
-        {% if element.endDate is not null %}
-            {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|localizeddate('long', 'none'), '%endDate%': familyMember.endDate|localizeddate('long', 'none') } ) }}
-        {% else %}
-            {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|localizeddate('long', 'none') } ) }}
-        {% endif %}
-    </dd>
-
-    <dt>{{ 'Comment'|trans }}</dt>
-    <dd>
-        {%- if element.comment is not empty -%}
-        <blockquote class="chill-user-quote">
-            {{ element.comment }}
-        </blockquote>
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-</dl>
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <h2 class="badge-title">
+                    <span class="title_label title_label_charge"></span>
+                    <span class="title_action">{{ element.type|budget_element_type_display('charge') }}</span>
+                </h2>
+            </div>
+            <div class="item-row separator">
+                <dl class="chill_view_data">
+                    <dt>{{ 'Amount'|trans }}</dt>
+                    <dd>{{ element.amount|format_currency('EUR') }}</dd>
+                    <dt>{{ 'Validity period'|trans }}</dt>
+                    <dd>
+                        {% if element.endDate is not null %}
+                            {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': element.endDate|format_date('long') } ) }}
+                        {% else %}
+                            {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
+                        {% endif %}
+                    </dd>
+                    <dt>{{ 'Comment'|trans }}</dt>
+                    <dd>
+                        {%- if element.comment is not empty -%}
+                        <blockquote class="chill-user-quote">
+                            {{ element.comment }}
+                        </blockquote>
+                        {%- else -%}
+                        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                        {%- endif -%}
+                    </dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+</div>
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
         </a>
     </li>
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
+    {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', element) %}
         <li>
             <a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
deleted file mode 100644
index aaca4c7ac..000000000
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
+++ /dev/null
@@ -1,228 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
-
-{% set activeRouteKey = '' %}
-{% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
-{% block title title %}
-    
-    
-{% set actualResources = [] %}
-{% set futureResources = [] %}
-{% set pastResources   = [] %}
-
-{% for r in resources %}
-    {% if r.startDate|date('U') <= 'now'|date('U') %}
-        {% if r.endDate is null or r.endDate|date('U') >= 'now'|date('U') %}
-            {% set actualResources = actualResources|merge([ r ]) %}
-        {% else %}
-            {% set pastResources = pastResources|merge([ r ]) %}
-        {% endif %}
-    {% else %}
-        {% set futureResources = futureResources|merge([ r ]) %}
-    {% endif %}
-{% endfor %}
-
-{% set actualCharges = [] %}
-{% set futureCharges = [] %}
-{% set pastCharges   = [] %}
-
-{% for c in charges %}
-    {% if c.startDate|date('U') <= 'now'|date('U') %}
-        {% if c.endDate is null or c.endDate|date('U') >= 'now'|date('U') %}
-            {% set actualCharges = actualCharges|merge([ c ]) %}
-        {% else %}
-            {% set pastCharges = pastCharges|merge([ c ]) %}
-        {% endif %}
-    {% else %}
-        {% set futureCharges = futureCharges|merge([ c ]) %}
-    {% endif %}
-{% endfor %}
-
-
-{% macro table_elements(elements, family) %}
-<table>
-    <thead>
-        <tr>
-            <th>{{ 'Budget element type'|trans }}</th>
-            <th>{{ 'Amount'|trans }}</th>
-            <th>{{ 'Validity period'|trans }}</th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% set total = 0 %}
-        {% for f in elements %}
-        {% set total = total + f.amount %}
-        <tr>
-            <td>
-                {{ f.type|budget_element_type_display(family) }}
-            </td>
-            <td>{{ f.amount|format_currency('EUR') }}</td>
-            <td>
-                {% if f.endDate is not null %}
-                    {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': f.startDate|format_date('long'), '%endDate%': f.endDate|format_date('long') } ) }}
-                {% else %}
-                    {{ 'Valid since %startDate%'|trans( { '%startDate%': f.startDate|format_date('long') } ) }}
-                {% endif %}
-            </td>
-            <td>
-                <ul class="record_actions">
-                    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::SHOW'), f) %}
-                        <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
-                        </li>
-                    {% endif %}
-                    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), f) %}
-                        <li>
-                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
-                        </li>
-                    {% endif %}
-                    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::DELETE'), f) %}
-                        <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </td>
-        </tr>
-        {% endfor %}
-        <tr>
-            <td>
-                {{ 'Total'|trans }}
-            </td>
-            <td>
-                {{ total|format_currency('EUR') }}
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-        </tr>
-    </tbody>
-</table>
-{% endmacro %}
-
-{% macro table_results(results) %}
-<table>
-    <thead>
-        <tr>
-            <th>&nbsp;</th>
-            <th>{{ 'Budget calculator result'|trans }}</th>
-        </tr>
-    </thead>
-    <tbody>
-    {% for result in results %}
-        <tr>
-            <td>{{ result.label }}</td>
-            <td>
-                {% if result.type == constant('CHILL\\AMLI\\BudgetBundle\\Calculator\\CalculatorResult::TYPE_CURRENCY') %}
-                    {{ result.result|format_currency('EUR') }}
-                {% elseif result.type == constant('CHILL\\AMLI\\BudgetBundle\\Calculator\\CalculatorResult::TYPE_PERCENTAGE') %}
-                    {{ result.result|round(2, 'ceil') ~ '%' }}
-                {% else %}
-                    {{ result.result|round(2, 'common') }}
-                {% endif %}
-            </td>
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>
-{% endmacro %}
-
-{% import _self as m %}
-
-{% block personcontent %}
-<h1>{{ title }}</h1>
-
-<h2>{{ 'Actual budget'|trans }}</h2>
-
-{% if resources|length == 0 and charges|length == 0 %}
-    <p><span class="chill-no-data-statement">{{ "There isn't any element recorded"|trans }}</span></p>
-{% else %}
-    <h3>{{ 'Actual resources'|trans }}</h3>
-        
-    {% if actualResources|length > 0 %}
-        {{ m.table_elements(actualResources, 'resource') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span>
-    {% endif %}
-    
-    <h3>{{ 'Actual charges'|trans }}</h3>
-    
-    {% if actualCharges|length > 0 %}
-        {{ m.table_elements(actualCharges, 'charge') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
-    {% endif %} 
-    
-    {% if results|length > 0 %}
-        <h2>{{ 'Budget calculator'|trans }}</h2>
-        
-        {{ m.table_results(results) }}
-    {% endif %}
-    
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
-    <ul class="record_actions">
-        <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
-        </li>
-        <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
-        </li>
-    </ul>
-    {% endif %}
-
-{% endif %}
-
-{% if pastCharges|length > 0 or pastResources|length > 0 %}
-    <h2>{{ 'Past budget'|trans }}</h2>
-    
-    <h3>{{ 'Past resources'|trans }}</h3>
-        
-    {% if pastResources|length > 0 %}
-        {{ m.table_elements(pastResources, 'resource') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
-    {% endif %}
-    
-    <h3>{{ 'Past charges'|trans }}</h3>
-    
-    {% if pastCharges|length > 0 %}
-        {{ m.table_elements(pastCharges, 'charge') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
-    {% endif %} 
-{% endif %}
-
-{% if futureCharges|length > 0 or futureResources|length > 0 %}
-    <h2>{{ 'Future budget'|trans }}</h2>
-    
-    <h3>{{ 'Future resources'|trans }}</h3>
-        
-    {% if futureResources|length > 0 %}
-        {{ m.table_elements(futureResources, 'resource') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
-    {% endif %}
-    
-    <h3>{{ 'Future charges'|trans }}</h3>
-    
-    {% if futureCharges|length > 0 %}
-        {{ m.table_elements(futureCharges, 'charge') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
-    {% endif %} 
-{% endif %}
-
-{% if (resources|length + charges|length) == 0 or futureCharges|length > 0 or futureResources|length > 0 or pastCharges|length > 0 or pastResources|length > 0 %}
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
-        <ul class="record_actions">
-            <li>
-                <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
-            </li>
-            <li>
-                <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
-            </li>
-        </ul>
-    {% endif %}
-{% endif %}
-
-{% endblock %}
-
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
new file mode 100644
index 000000000..c2533e4c0
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -0,0 +1,92 @@
+{% extends "@ChillPerson/Household/layout.html.twig" %}
+
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+{% set activeRouteKey = '' %}
+{% set title = 'Budget for household %household%'|trans({ '%household%' : household.id } ) %}
+{% block title title %}
+
+{% block js %}
+{{ encore_entry_script_tags('page_budget') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_budget') }}
+{% endblock %}
+
+{% block content %}
+<h1>{{ title }}</h1>
+
+{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+    'resources': resources,
+    'charges': charges,
+    'household': household
+} %}
+
+    {#
+<div class="flex-table">
+    <h3 class="family-title">{{ 'Budget calculator'|trans }}</h3>
+    <div class="item-bloc">
+        {{ table_results(wholeCharges, wholeResources) }}
+    </div>
+</div>
+#}
+
+{% if household.getCurrentMembers|length > 0 %}
+    <h2 class="subtitle">{{ 'Current budget household members'|trans }}</h2>
+
+    {% for hm in household.getCurrentMembers %}
+        {% set member = hm.person %}
+        <div class="accordion" id="member_{{ member.id }}">
+            <div class="accordion-item">
+                <h2 class="accordion-header" id="heading_{{ member.id }}">
+                    <button
+                        class="accordion-button collapsed"
+                        type="button"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#collapse_{{ member.id }}"
+                        aria-expanded="false"
+                        aria-controls="collapse_{{ member.id }}">
+                        <span class="folded">{{ 'Show budget of %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }} ({{ 'budget.number of elements'|trans({ 'nb_items': member.getBudgetResources|length + member.getBudgetResources|length }) }})</span>
+                        <span class="unfolded text-secondary">{{ 'Hide budget of %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }}</span>
+                    </button>
+                </h2>
+
+                <div id="collapse_{{ member.id }}"
+                    class="accordion-collapse collapse"
+                    aria-labelledby="heading_{{ member.id }}"
+                    data-bs-parent="#nonCurrent">
+
+                        {% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+                            'resources': member.getBudgetResources,
+                            'charges': member.getBudgetCharges,
+                            'person': member
+                        } %}
+
+                    <ul class="record_actions">
+                        {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', member) %}
+                            <li class="btn-budget">
+                                <a class="btn btn-edit" title={{ 'Edit budget'|trans }} href="{{ path('chill_budget_elements_index', { 'id': member.id } ) }}"></a>
+                            </li>
+                        {% endif %}
+                    </ul>
+                </div>
+            </div>
+        </div>
+    {% endfor %}
+{% endif %}
+
+{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', household) %}
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_resource_household_new', { 'id': household.id} ) }}">{{ 'Create new resource'|trans }}</a>
+        </li>
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_charge_household_new', { 'id': household.id} ) }}">{{ 'Create new charge'|trans }}</a>
+        </li>
+    </ul>
+{% endif %}
+
+
+{% endblock %}
+
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
new file mode 100644
index 000000000..959df3d62
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -0,0 +1,46 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_results %}
+
+{% set activeRouteKey = '' %}
+{% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% block title title %}
+
+{% block js %}
+{{ encore_entry_script_tags('page_budget') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_budget') }}
+{% endblock %}
+
+{% block content %}
+<h1>{{ title }}</h1>
+
+{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+    'resources': resources,
+    'charges': charges,
+    'person': person
+} %}
+
+<div class="flex-table">
+    <h3 class="family-title">{{ 'Budget calculator'|trans }}</h2>
+    <div class="item-bloc">
+        {{ table_results(charges, resources) }}
+    </div>
+</div>
+
+{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
+        </li>
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
+        </li>
+    </ul>
+{% endif %}
+
+
+{% endblock %}
+
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
index fb5a95f91..73ae173ff 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
@@ -1,18 +1,29 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set confirm_question = 'Are you sure you want to remove the ressource "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('resource') } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set confirm_question = 'Are you sure you want to remove the ressource "%type%" associated to household "%household%" ?'|trans({ '%household%' : household.id, '%type%': element.type|budget_element_type_display('resource') } ) %}
+{% endif %}
 
-{% set activeRouteKey = '' %}
-{% set person = element.person %}
+{% extends template %}
 
 {% block title  'Remove resource'|trans %}
 
-{% block personcontent %}
+{% block content %}
 
 {{ include('ChillMainBundle:Util:confirmation_template.html.twig',
     {
         'title'             : 'Remove resource'|trans,
-        'confirm_question'  : 'Are you sure you want to remove the ressource "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('resource') } ),
-        'cancel_route'      : 'chill_budget_elements_index',
-        'cancel_parameters' : { 'id' : element.person.id },
+        'confirm_question'  : confirm_question,
+        'cancel_route'      : indexPage,
+        'cancel_parameters' : { 'id': person is defined ? person.id : household.id },
         'form'              : delete_form
     } ) }}
 
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
index 2afe5bf89..8b051eeaf 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
@@ -1,10 +1,24 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set title = 'Edit resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set title = 'Edit resource for household %household%'|trans({ '%household%' : household.id } ) %}
+{% endif %}
+
+{% set title = 'Edit resource'|trans %}
+
+{% extends template %}
 
-{% set activeRouteKey = '' %}
-{% set title = 'Edit Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}
@@ -17,14 +31,14 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-edit' }, 'label': 'Edit' } ) }}
     </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
index 62f7f3c3d..4ea71f4de 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
@@ -1,10 +1,24 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set title = 'New Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set title = 'New Resource for household %household%'|trans({ '%household%' : household.id } ) %}
+{% endif %}
+
+{% set title = 'New resource'|trans %}
+
+{% extends template %}
 
-{% set activeRouteKey = '' %}
-{% set title = 'New Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}
@@ -17,14 +31,14 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
         {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
index 6f45aad84..110aed9fe 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
@@ -1,49 +1,68 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}
 
-{% set activeRouteKey = '' %}
-{% set person = element.person %}
-{% set title = 'Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% set title = 'Resource' %}
+
+{% extends template %}
 
 {% block title title %}
 
-{% block personcontent %}
-<h1>{{ title }}</h1>
+{% block content %}
+<div class="budget-show">
+    <h1>{{ title }}</h1>
 
-<dl class="chill_view_data">
-    <dt>{{ 'Type'|trans }}</dt>
-    <dd>{{ element.type|budget_element_type_display('resource') }}</dd>
-
-    <dt>{{ 'Amount'|trans }}</dt>
-    <dd>{{ element.amount|format_currency('EUR') }}</dd>
-
-    <dt>{{ 'Validity period'|trans }}</dt>
-    <dd>
-        {% if element.endDate is not null %}
-            {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': familyMember.endDate|format_date('long') } ) }}
-        {% else %}
-            {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
-        {% endif %}
-    </dd>
-
-    <dt>{{ 'Comment'|trans }}</dt>
-    <dd>
-        {%- if element.comment is not empty -%}
-        <blockquote class="chill-user-quote">
-            {{ element.comment }}
-        </blockquote>
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-</dl>
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <h2 class="badge-title">
+                    <span class="title_label title_label_resource"></span>
+                    <span class="title_action title_action">{{ element.type|budget_element_type_display('resource') }}</span>
+                </h2>
+            </div>
+            <div class="item-row separator">
+                <dl class="chill_view_data">
+                        <dt class="inline">{{ 'Amount'|trans }}</dt>
+                        <dd>{{ element.amount|format_currency('EUR') }}</dd>
+                        <dt class="inline">{{ 'Validity period'|trans }}</dt>
+                        <dd>
+                            {% if element.endDate is not null %}
+                                {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': element.endDate|format_date('long') } ) }}
+                            {% else %}
+                                {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
+                            {% endif %}
+                        </dd>
+                        <dt class="inline">{{ 'Comment'|trans }}</dt>
+                        <dd>
+                            {%- if element.comment is not empty -%}
+                            <blockquote class="chill-user-quote">
+                                {{ element.comment }}
+                            </blockquote>
+                            {%- else -%}
+                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                            {%- endif -%}
+                        </dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+</div>
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
         </a>
     </li>
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
+    {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', element) %}
         <li>
             <a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
diff --git a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
index e0d9e9266..18232f246 100644
--- a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+++ b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
@@ -9,15 +9,16 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Security\Authorization;
+namespace Chill\BudgetBundle\Security\Authorization;
 
-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
-use Chill\MainBundle\Entity\User;
+use Chill\BudgetBundle\Entity\AbstractElement;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 use function in_array;
 
@@ -30,22 +31,24 @@ class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierar
     public const ROLES = [
         self::CREATE,
         self::DELETE,
-        self::SHOW,
+        self::SEE,
         self::UPDATE,
     ];
 
-    public const SHOW = 'CHILL_BUDGET_ELEMENT_SHOW';
+    public const SEE = 'CHILL_BUDGET_ELEMENT_SEE';
 
     public const UPDATE = 'CHILL_BUDGET_ELEMENT_UPDATE';
 
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected VoterHelperInterface $voter;
 
-    public function __construct(AuthorizationHelper $authorizationHelper)
+    public function __construct(VoterHelperFactoryInterface $voterFactory)
     {
-        $this->authorizationHelper = $authorizationHelper;
+        $this->voter = $voterFactory
+            ->generate(self::class)
+            ->addCheckFor(AbstractElement::class, self::ROLES)
+            ->addCheckFor(Person::class, [self::CREATE, self::SEE])
+            ->addCheckFor(Household::class, [self::CREATE, self::SEE])
+            ->build();
     }
 
     public function getRoles(): array
@@ -66,18 +69,11 @@ class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierar
     protected function supports($attribute, $subject)
     {
         return (in_array($attribute, self::ROLES, true) && $subject instanceof AbstractElement)
-                || ($subject instanceof Person && in_array($attribute, [self::SHOW, self::CREATE], true));
+                || (($subject instanceof Person || $subject instanceof Household) && in_array($attribute, [self::SEE, self::CREATE], true));
     }
 
-    protected function voteOnAttribute($attribute, $subject, \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $token)
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        $user = $token->getUser();
-
-        if (false === $user instanceof User) {
-            return false;
-        }
-
-        return $this->authorizationHelper
-            ->userHasAccess($user, $subject, new Role($attribute));
+        return $this->voter->voteOnAttribute($attribute, $subject, $token);
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
new file mode 100644
index 000000000..08a0fec77
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\BudgetBundle\Service\Summary;
+
+use Chill\BudgetBundle\Config\ConfigRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\ResultSetMapping;
+use LogicException;
+use function count;
+
+/**
+ * Helps to find a summary of the budget: the sum of resources and charges.
+ */
+class SummaryBudget
+{
+    private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, type FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, type FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, type FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, type FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private array $chargeLabels;
+
+    private ConfigRepository $configRepository;
+
+    private EntityManagerInterface $em;
+
+    private array $resourcesLabels;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(EntityManagerInterface $em, ConfigRepository $configRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->em = $em;
+        $this->configRepository = $configRepository;
+        $this->chargeLabels = $configRepository->getChargesLabels();
+        $this->resourcesLabels = $configRepository->getResourcesLabels();
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function getEmptyChargeArray(): array
+    {
+        $keys = $this->configRepository->getChargesKeys();
+        $labels = $this->chargeLabels;
+
+        return array_combine($keys, array_map(function ($i) use ($labels) {
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i])];
+        }, $keys));
+    }
+
+    public function getEmptyResourceArray(): array
+    {
+        $keys = $this->configRepository->getResourcesKeys();
+        $labels = $this->resourcesLabels;
+
+        return array_combine($keys, array_map(function ($i) use ($labels) {
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i])];
+        }, $keys));
+    }
+
+    public function getSummaryForHousehold(?Household $household): array
+    {
+        if (null === $household) {
+            return [
+                'resources' => $this->getEmptyResourceArray(),
+                'charges' => $this->getEmptyChargeArray(),
+            ];
+        }
+
+        $personIds = $household->getCurrentPersons()->map(static function (Person $p) { return $p->getId(); });
+        $ids = implode(', ', array_fill(0, count($personIds), '?'));
+
+        $parameters = [...$personIds, $household->getId()];
+
+        $rsm = $this->buildRsm();
+
+        $resources = $this->em->createNativeQuery(strtr(self::QUERY_RESOURCE_BY_HOUSEHOLD, ['_ids_' => $ids]), $rsm)
+            ->setParameters($parameters)
+            ->getResult();
+        $charges = $this->em->createNativeQuery(strtr(self::QUERY_CHARGE_BY_HOUSEHOLD, ['_ids_' => $ids]), $rsm)
+            ->setParameters($parameters)
+            ->getResult();
+
+        return [
+            'resources' => array_merge($this->getEmptyResourceArray(), $this->rowToArray($resources, 'resource')),
+            'charges' => array_merge($this->getEmptyChargeArray(), $this->rowToArray($charges, 'charge')),
+        ];
+    }
+
+    public function getSummaryForPerson(Person $person): array
+    {
+        $rsm = $this->buildRsm();
+
+        $resources = $this->em->createNativeQuery(self::QUERY_RESOURCE_BY_PERSON, $rsm)
+            ->setParameters([$person->getId()])
+            ->getResult();
+        $charges = $this->em->createNativeQuery(self::QUERY_CHARGE_BY_PERSON, $rsm)
+            ->setParameters([$person->getId()])
+            ->getResult();
+
+        return [
+            'resources' => array_merge($this->getEmptyResourceArray(), $this->rowToArray($resources, 'resource')),
+            'charges' => array_merge($this->getEmptyChargeArray(), $this->rowToArray($charges, 'charge')),
+        ];
+    }
+
+    private function buildRsm(): ResultSetMapping
+    {
+        $rsm = new ResultSetMapping();
+        $rsm
+            ->addScalarResult('sum', 'sum')
+            ->addScalarResult('type', 'type');
+
+        return $rsm;
+    }
+
+    private function rowToArray(array $rows, string $kind): array
+    {
+        switch ($kind) {
+            case 'charge':
+                $label = $this->chargeLabels;
+
+                break;
+
+            case 'resource':
+                $label = $this->resourcesLabels;
+
+                break;
+
+            default:
+                throw new LogicException();
+        }
+
+        $result = [];
+
+        foreach ($rows as $row) {
+            $result[$row['type']] = [
+                'sum' => (float) $row['sum'],
+                'label' => $this->translatableStringHelper->localize($label[$row['type']]),
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Bundle/ChillBudgetBundle/Templating/Twig.php b/src/Bundle/ChillBudgetBundle/Templating/Twig.php
index b477e9a14..1f4e4098b 100644
--- a/src/Bundle/ChillBudgetBundle/Templating/Twig.php
+++ b/src/Bundle/ChillBudgetBundle/Templating/Twig.php
@@ -9,9 +9,9 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Templating;
+namespace Chill\BudgetBundle\Templating;
 
-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
+use Chill\BudgetBundle\Config\ConfigRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
index b82539150..92784909b 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\AMLI\BudgetBundle\Tests\Controller;
+namespace Chill\BudgetBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/src/Bundle/ChillBudgetBundle/chill.webpack.config.js b/src/Bundle/ChillBudgetBundle/chill.webpack.config.js
new file mode 100644
index 000000000..f7346dfcf
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/chill.webpack.config.js
@@ -0,0 +1,9 @@
+// this file loads all assets from the Chill budget bundle
+module.exports = function(encore, entries)
+{
+    encore.addAliases({
+        ChillBudgetAssets: __dirname + '/Resources/public'
+    });
+
+    encore.addEntry('page_budget', __dirname + '/Resources/public/page/index.js');
+};
diff --git a/src/Bundle/ChillBudgetBundle/composer.json b/src/Bundle/ChillBudgetBundle/composer.json
index dadcb77b6..95e9d6710 100644
--- a/src/Bundle/ChillBudgetBundle/composer.json
+++ b/src/Bundle/ChillBudgetBundle/composer.json
@@ -6,7 +6,7 @@
     "keywords" : ["chill", "social work"],
     "homepage" : "https://framagit.org/Chill-project/BudgetBundle",
     "autoload": {
-        "psr-4": { "Chill\\AMLI\\BudgetBundle\\": "" }
+        "psr-4": { "Chill\\BudgetBundle\\": "" }
     },
     "autoload-dev": {
         "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
diff --git a/src/Bundle/ChillBudgetBundle/config/routing.yaml b/src/Bundle/ChillBudgetBundle/config/routing.yaml
index a771dd748..e65561db0 100644
--- a/src/Bundle/ChillBudgetBundle/config/routing.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/routing.yaml
@@ -1,3 +1,3 @@
-chill_amli_budget_controllers:
-    resource: "@ChillAMLIBudgetBundle/Controller"
+chill_budget_controllers:
+    resource: "@ChillBudgetBundle/Controller"
     type: annotation
diff --git a/src/Bundle/ChillBudgetBundle/config/services/calculator.yaml b/src/Bundle/ChillBudgetBundle/config/services/calculator.yaml
index 7022f400e..e8d807362 100644
--- a/src/Bundle/ChillBudgetBundle/config/services/calculator.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/services/calculator.yaml
@@ -1,2 +1,2 @@
 services:
-    Chill\AMLI\BudgetBundle\Calculator\CalculatorManager: ~
+    Chill\BudgetBundle\Calculator\CalculatorManager: ~
diff --git a/src/Bundle/ChillBudgetBundle/config/services/config.yaml b/src/Bundle/ChillBudgetBundle/config/services/config.yaml
index a03bd1db2..21136db2f 100644
--- a/src/Bundle/ChillBudgetBundle/config/services/config.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/services/config.yaml
@@ -1,5 +1,5 @@
 services:
-    Chill\AMLI\BudgetBundle\Config\ConfigRepository:
+    Chill\BudgetBundle\Config\ConfigRepository:
         arguments:
             $resources: '%chill_budget.resources%'
             $charges: '%chill_budget.charges%'
diff --git a/src/Bundle/ChillBudgetBundle/config/services/controller.yaml b/src/Bundle/ChillBudgetBundle/config/services/controller.yaml
index 6c554dcb0..82c683536 100644
--- a/src/Bundle/ChillBudgetBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/services/controller.yaml
@@ -1,5 +1,5 @@
 services:
-    Chill\AMLI\BudgetBundle\Controller\:
+    Chill\BudgetBundle\Controller\:
         autowire: true
         resource: '../../Controller'
         tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillBudgetBundle/config/services/form.yaml b/src/Bundle/ChillBudgetBundle/config/services/form.yaml
index 0a4f451fd..63862ce94 100644
--- a/src/Bundle/ChillBudgetBundle/config/services/form.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/services/form.yaml
@@ -1,14 +1,14 @@
 services:
-    Chill\AMLI\BudgetBundle\Form\ResourceType:
+    Chill\BudgetBundle\Form\ResourceType:
         arguments:
-            $configRepository: '@Chill\AMLI\BudgetBundle\Config\ConfigRepository'
+            $configRepository: '@Chill\BudgetBundle\Config\ConfigRepository'
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
         tags:
             - { name: 'form.type' }
-            
-    Chill\AMLI\BudgetBundle\Form\ChargeType:
+
+    Chill\BudgetBundle\Form\ChargeType:
         arguments:
-            $configRepository: '@Chill\AMLI\BudgetBundle\Config\ConfigRepository'
+            $configRepository: '@Chill\BudgetBundle\Config\ConfigRepository'
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
         tags:
             - { name: 'form.type' }
diff --git a/src/Bundle/ChillBudgetBundle/config/services/menu.yaml b/src/Bundle/ChillBudgetBundle/config/services/menu.yaml
index a0fdac61e..34128519b 100644
--- a/src/Bundle/ChillBudgetBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/services/menu.yaml
@@ -1,7 +1,8 @@
 services:
-    Chill\AMLI\BudgetBundle\Menu\UserMenuBuilder:
-        arguments:
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
+    Chill\BudgetBundle\Menu\PersonMenuBuilder:
+        autowire: true
+        autoconfigure: true
+
+    Chill\BudgetBundle\Menu\HouseholdMenuBuilder:
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillBudgetBundle/config/services/security.yaml b/src/Bundle/ChillBudgetBundle/config/services/security.yaml
index 128f65f1f..c8f9e5cae 100644
--- a/src/Bundle/ChillBudgetBundle/config/services/security.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/services/security.yaml
@@ -1,7 +1,6 @@
 services:
-    Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter:
-        arguments:
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+    Chill\BudgetBundle\Security\Authorization\BudgetElementVoter:
+        autowire: true
         tags:
             - { name: chill.role }
             - { name: security.voter }
diff --git a/src/Bundle/ChillBudgetBundle/config/services/services.yaml b/src/Bundle/ChillBudgetBundle/config/services/services.yaml
new file mode 100644
index 000000000..5a49c9ff3
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/config/services/services.yaml
@@ -0,0 +1,6 @@
+services:
+    Chill\BudgetBundle\Service\:
+        resource: './../Service'
+        autowire: true
+        autoconfigure: true
+
diff --git a/src/Bundle/ChillBudgetBundle/config/services/templating.yaml b/src/Bundle/ChillBudgetBundle/config/services/templating.yaml
index 49ee3f8c5..903db5d67 100644
--- a/src/Bundle/ChillBudgetBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillBudgetBundle/config/services/templating.yaml
@@ -1,7 +1,7 @@
 services:
-    Chill\AMLI\BudgetBundle\Templating\Twig:
+    Chill\BudgetBundle\Templating\Twig:
         arguments:
-            $configRepository: '@Chill\AMLI\BudgetBundle\Config\ConfigRepository'
+            $configRepository: '@Chill\BudgetBundle\Config\ConfigRepository'
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
         tags:
             - { name: 'twig.extension' }
\ No newline at end of file
diff --git a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php b/src/Bundle/ChillBudgetBundle/migrations/Version20180522080432.php
similarity index 79%
rename from src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php
rename to src/Bundle/ChillBudgetBundle/migrations/Version20180522080432.php
index e2842b1e1..001506c0e 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20180522080432.php
@@ -9,29 +9,29 @@
 
 declare(strict_types=1);
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Budget;
 
-use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * create schema for chill budget.
  */
 final class Version20180522080432 extends AbstractMigration
 {
-    public function down(Schema $schema)
+    public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA chill_budget CASCADE');
+        $this->addSql('DROP SCHEMA chill_budget CASCADE');
     }
 
-    public function up(Schema $schema)
+    public function getDescription(): string
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        return 'Creation of necessary tables for budget bundle';
+    }
 
+    public function up(Schema $schema): void
+    {
         $this->addSql('CREATE SCHEMA chill_budget');
-        $this->addSql('DROP SEQUENCE report_id_seq CASCADE');
         $this->addSql('CREATE SEQUENCE chill_budget.resource_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_budget.charge_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_budget.resource (id INT NOT NULL, person_id INT DEFAULT NULL, type VARCHAR(255) NOT NULL, amount NUMERIC(10, 2) NOT NULL, comment TEXT DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20181219145631.php b/src/Bundle/ChillBudgetBundle/migrations/Version20181219145631.php
similarity index 66%
rename from src/Bundle/ChillBudgetBundle/Resources/migrations/Version20181219145631.php
rename to src/Bundle/ChillBudgetBundle/migrations/Version20181219145631.php
index 059d7f2c1..87ab85f90 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20181219145631.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20181219145631.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Budget;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
@@ -21,15 +21,11 @@ final class Version20181219145631 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
         $this->addSql('ALTER TABLE chill_budget.charge ALTER help SET NOT NULL');
     }
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
         $this->addSql('ALTER TABLE chill_budget.charge ALTER help DROP NOT NULL');
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20220224090319.php b/src/Bundle/ChillBudgetBundle/migrations/Version20220224090319.php
new file mode 100644
index 000000000..9711cbc6d
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20220224090319.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Budget;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220224090319 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_budget.charge DROP CONSTRAINT FK_5C99D2C3E79FF843');
+        $this->addSql('ALTER TABLE chill_budget.charge DROP household_id');
+        $this->addSql('ALTER TABLE chill_budget.resource DROP CONSTRAINT FK_5E0A5E97E79FF843');
+        $this->addSql('ALTER TABLE chill_budget.resource DROP household_id');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add household to budget AbstractElement';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_budget.charge ADD household_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_budget.charge ADD CONSTRAINT FK_5C99D2C3E79FF843 FOREIGN KEY (household_id) REFERENCES chill_person_household (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_5C99D2C3E79FF843 ON chill_budget.charge (household_id)');
+        $this->addSql('ALTER TABLE chill_budget.resource ADD household_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_budget.resource ADD CONSTRAINT FK_5E0A5E97E79FF843 FOREIGN KEY (household_id) REFERENCES chill_person_household (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_5E0A5E97E79FF843 ON chill_budget.resource (household_id)');
+    }
+}
diff --git a/src/Bundle/ChillBudgetBundle/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillBudgetBundle/translations/messages+intl-icu.fr.yml
new file mode 100644
index 000000000..4ab002e02
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/translations/messages+intl-icu.fr.yml
@@ -0,0 +1,8 @@
+budget:
+    number of elements: >-
+        {nb_items, plural,
+            =0 {Aucun élément}
+            one {Un élément}
+            many {# éléments}
+            other {# éléments}
+        }
diff --git a/src/Bundle/ChillBudgetBundle/Resources/translations/messages.fr.yml b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
similarity index 66%
rename from src/Bundle/ChillBudgetBundle/Resources/translations/messages.fr.yml
rename to src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
index 30188907a..1ccdcf1e6 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/translations/messages.fr.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
@@ -1,12 +1,24 @@
 Budget: Budget
+Resource: Ressource
+Charge: Charge
 Budget for %name%: Budget de %name%
+Budget for household %household%: Budget du ménage
+Current budget household members: Budget actuel des membres du ménage
+Show budget of %name%: Montrer budget de %name%
+See complete budget: Voir budget complet
+Hide budget: Masquer
+Hide budget of %name%: Masquer budget de %name%
 Resource element type: Nature de la ressource
-Actual budget: Budget actuel
+Actual budget: Éléments actuels du budget
 Actual resources: Ressources actuelles
+Actual resources for %name%: Ressources actuelles de %name%
+Actual charges for %name%: Charges actuelles de %name%
 Actual charges: Charges actuelles
 Past budget: Éléments du budget passé
+Show past budget: Montrer budget passé
+Show future budget: Montrer budget future
 Past resources: Ressources passées
-Past charges: Chargées passées
+Past charges: Charges passées
 Future budget: Futurs éléments du budget
 Future resources: Ressources futures
 Future charges: Charges futures
@@ -17,6 +29,7 @@ End of validity period: Fin de la période de validité
 Total: Total
 Create new resource: Créer une nouvelle ressource
 Create new charge: Créer une nouvelle charge
+See person: Voir personne
 
 There isn't any element recorded: Aucun élément enregistré
 No resources registered: Aucune ressource enregistrée
@@ -25,11 +38,13 @@ No past resources registered: Aucune ressource passée
 No past charges registered: Aucune charge passée
 No future resources registered: Aucune ressource future enregistrée
 No future charges registered: Aucune ressource future enregistrée
+No current budget element registered: Pas des éléments de budget actuelles enregistrés
 
-New Resource for %name%: Nouvelle ressource pour %name%
-New Charge for %name%: Nouvelle charge pour %name%
-Edit Resource for %name%: Modifier une ressource de %name%
-Edit Charge for %name%: Modifier une charge de %name%
+New resource: Nouvelle ressource
+New charge: Nouvelle charge
+Edit resource: Modifier une ressource
+Edit: Modifier
+Edit charge: Modifier une charge
 Remove resource: Supprimer la ressource
 Remove charge: Supprimer la charge
 Are you sure you want to remove the ressource "%type%" associated to "%name%" ?: Êtes-vous sûr·e de vouloir supprimer la ressource de nature "%type%" associée à %name% ?
@@ -54,7 +69,8 @@ charge.help.yes: Oui
 charge.help.not-concerned: Non concerné
 
 Budget calculator: Calculs et indices sur le budget
-Budget calculator result: Résultats 
+Budget calculator result: Résultats
+The balance: Différence entre ressources et charges
 
-'Valid since %startDate% until %endDate%': Valide depuis le %startDate% jusqu'au %endDate%
-'Valid since %startDate%': Valide depuis le %startDate%
\ No newline at end of file
+Valid since %startDate% until %endDate%: Valide depuis le %startDate% jusqu'au %endDate%
+Valid since %startDate%: Valide depuis le %startDate%
diff --git a/src/Bundle/ChillBudgetBundle/Resources/translations/validators.fr.yml b/src/Bundle/ChillBudgetBundle/translations/validators.fr.yml
similarity index 100%
rename from src/Bundle/ChillBudgetBundle/Resources/translations/validators.fr.yml
rename to src/Bundle/ChillBudgetBundle/translations/validators.fr.yml
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig
index 3fd306c2d..3e12173fc 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'CustomFields configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index 000fcb03a..8913951e6 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -28,6 +28,7 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -211,14 +212,14 @@ final class DocGeneratorTemplateController extends AbstractController
                 $builder = $this->createFormBuilder(
                     array_merge(
                         $context->getFormData($template, $entity),
-                        $isTest ? ['test_file' => null] : []
+                        $isTest ? ['test_file' => null, 'show_data' => false] : []
                     )
                 );
 
                 $context->buildPublicForm($builder, $template, $entity);
             } else {
                 $builder = $this->createFormBuilder(
-                    ['test_file' => null]
+                    ['test_file' => null, 'show_data' => false]
                 );
             }
 
@@ -227,6 +228,10 @@ final class DocGeneratorTemplateController extends AbstractController
                     'label' => 'Template file',
                     'required' => false,
                 ]);
+                $builder->add('show_data', CheckboxType::class, [
+                    'label' => 'Show data instead of generating',
+                    'required' => false,
+                ]);
             }
 
             $form = $builder->getForm()->handleRequest($request);
@@ -278,6 +283,11 @@ final class DocGeneratorTemplateController extends AbstractController
         }
         $datas = $context->getData($template, $entity, $contextGenerationData);
 
+        if ($isTest && $form['show_data']->getData()) {
+            // very ugly hack...
+            dd($datas);
+        }
+
         try {
             $generatedResource = $this->driver->generateFromResource($templateResource, $template->getFile()->getType(), $datas, $template->getFile()->getFilename());
         } catch (TemplateException $e) {
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
index 8d59384d8..fe888f587 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
@@ -24,22 +24,15 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
 {
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
-     *
-     * @var Person
      */
-    private $person;
+    private Person $person;
 
     public function getCenter()
     {
         return $this->getPerson()->getCenter();
     }
 
-    /**
-     * Get person.
-     *
-     * @return \Chill\MainBundle\Entity\Person
-     */
-    public function getPerson()
+    public function getPerson(): Person
     {
         return $this->person;
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
index eecfb1751..03be4e6b9 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Documents configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
index e3f6687fd..bfdd87dc3 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
@@ -30,7 +30,7 @@
     </dl>
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Delete document ?'|trans,
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
index 4a9eab8e3..416a35e35 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
@@ -20,7 +20,7 @@
 {% set activeRouteKey = '' %}
 
 {% block title %}{{ 'Editing document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
-{% block personcontent %}
+{% block content %}
     <h1>{{ 'Edit Document' | trans }}</h1>
 
     {{ form_errors(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
index e63538c22..5dc359fa8 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
@@ -39,7 +39,7 @@
     {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
 <div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
index 357120a4e..df947c933 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
@@ -22,7 +22,7 @@
 	{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 	<h1>{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
 
 	{{ form_errors(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
index a29dc0c04..b26aa4b8b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
@@ -27,7 +27,7 @@
     {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
     <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
 
     {{ mm.mimeIcon(document.object.type) }}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig
index 160b488eb..827f4610e 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Events configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
index e9f9a0270..53e97c3c4 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
@@ -21,7 +21,7 @@
 
 {% block title %}{{ 'Events participation' |trans }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
 <h2>{{ 'Events participation' |trans }}</h2>
 
 <table class="table table-striped table-bordered mt-3 events">
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
index 67b491ef4..2137cf54f 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
@@ -5,7 +5,7 @@
 
 {% block title  'Remove family membership'|trans %}
 
-{% block personcontent %}
+{% block content %}
 
 {{ include('ChillMainBundle:Util:confirmation_template.html.twig',
     {
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
index 31f106b92..b084e293a 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
@@ -4,7 +4,7 @@
 {% set title = 'Edit family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
index d50be4b27..2e339c0d1 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
@@ -88,7 +88,7 @@
 
 {% import _self as m %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {% if familyMembers|length == 0 %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
index 5a035a79c..fef2b0051 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
@@ -4,7 +4,7 @@
 {% set title = 'New family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
index e6e6b12f4..1c60b491c 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
@@ -6,7 +6,7 @@
 
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 <dl class="chill_view_data">
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
index 61d975b42..2f113f45b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
@@ -11,3 +11,7 @@ $chill-household-context: #929d69;
 $social-issue-color: #4bafe8;
 $social-action-color: $orange;
 $activity-color: yellowgreen;
+
+// budget colors
+$budget-resource-color: #6d9e63;
+$budget-charge-color: #e03851;
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
index 75f1a21c8..80e59005f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
@@ -21,14 +21,12 @@ const makeFetch = (method, url, body, options) => {
         }
 
         if (response.status === 422) {
-            console.log('422 error')
             return response.json().then(response => {
                 throw ValidationException(response)
             });
         }
 
         if (response.status === 403) {
-            console.log('403 error')
             throw AccessException(response);
         }
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 5528d563e..979f53d74 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -223,23 +223,26 @@ export default {
 
             default:
                if (typeof this.type === 'undefined') { // action=create or addContact
-                   console.log('will rewrite data');
+                  // console.log('will rewrite data');
                   if (this.action === 'addContact') {
                      type = 'thirdparty'
                      data = this.$refs.castThirdparty.$data.thirdparty;
-                     console.log('data original', data);
+                     // console.log('data original', data);
                      data.parent = {type: "thirdparty", id: this.parent.id};
+                     data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
+                     data.profession = data.profession !== null ? {type: 'third_party_profession', id:  data.profession.id} : null;
                   } else {
                      type = this.$refs.castNew.radioType;
                      data = this.$refs.castNew.castDataByType();
-                     console.log(data)
+                     // console.log('type', type);
+                     data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
+                     data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
+                     // console.log('onthefly data', data);
                   }
                } else {
                   throw 'error with object type';
                }
          }
-         console.log('type', type);
-         console.log('data', data);
          // pass datas to parent
          this.$emit('saveFormOnTheFly', { type: type, data: data });
       },
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
index a7f121a87..2e88bc1cb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -89,11 +89,9 @@ export default {
          return this.isMultiline === true ? "div" : "span";
       },
       multiline() {
-         //console.log(this.isMultiline, typeof this.isMultiline);
          return this.isMultiline === true ? "multiline" : "";
       },
       isConfidential() {
-         console.log(this.address.confidential)
          return this.address.confidential;
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
index bf487b089..0107bba4e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <div class="container-fluid">
             <div class="col-10 push-1">
                 <h2>{{ 'Welcome to the admin section !'|trans }}</h2>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
index dfb5139d3..55883069f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Permissions management of your chill installation' |trans }}</h1>
     {% endblock %}
 {% endblock  %}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 081ddc488..880c2bd11 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Entity;
 
 use ArrayIterator;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Entity\Resource;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\Address;
@@ -158,6 +160,22 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private $birthdate;
 
+    /**
+     * @ORM\OneToMany(
+     *     targetEntity=Charge::class,
+     *     mappedBy="person"
+     * )
+     */
+    private Collection $budgetCharges;
+
+    /**
+     * @ORM\OneToMany(
+     *     targetEntity=Resource::class,
+     *     mappedBy="person"
+     * )
+     */
+    private Collection $budgetResources;
+
     /**
      * The person's center.
      *
@@ -501,6 +519,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->maritalStatusComment = new CommentEmbeddable();
         $this->periodLocatedOn = new ArrayCollection();
         $this->accompanyingPeriodRequested = new ArrayCollection();
+        $this->budgetResources = new ArrayCollection();
+        $this->budgetCharges = new ArrayCollection();
         $this->resources = new ArrayCollection();
     }
 
@@ -525,20 +545,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @return $this
-     */
-    public function addAddress(Address $address)
+    public function addAddress(Address $address): self
     {
         $this->addresses[] = $address;
 
         return $this;
     }
 
-    /**
-     * @return $this
-     */
-    public function addAltName(PersonAltName $altName)
+    public function addAltName(PersonAltName $altName): self
     {
         if (false === $this->altNames->contains($altName)) {
             $this->altNames->add($altName);
@@ -548,6 +562,20 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
+    public function addBudgetCharge(Charge $budgetCharge): self
+    {
+        $this->budgetCharges[] = $budgetCharge;
+
+        return $this;
+    }
+
+    public function addBudgetResource(Resource $budgetResource): self
+    {
+        $this->budgetResources[] = $budgetResource;
+
+        return $this;
+    }
+
     public function addHouseholdParticipation(HouseholdMember $member): self
     {
         $this->householdParticipations[] = $member;
@@ -639,8 +667,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * Used in template, to find the participation when iterating on a list
      * of period.
-     *
-     * @return AccompanyingPeriodParticipation
      */
     public function findParticipationForPeriod(AccompanyingPeriod $period): ?AccompanyingPeriodParticipation
     {
@@ -847,32 +873,33 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->altNames;
     }
 
-    /**
-     * Get birthdate.
-     *
-     * @return DateTime
-     */
-    public function getBirthdate()
+    public function getBirthdate(): ?DateTime
     {
         return $this->birthdate;
     }
 
     /**
-     * Get center.
-     *
-     * @return Center
+     * @return Collection|BudgetCharges[]
      */
-    public function getCenter()
+    public function getBudgetCharges(): Collection
+    {
+        return $this->budgetCharges;
+    }
+
+    /**
+     * @return Collection|BudgetResources[]
+     */
+    public function getBudgetResources(): Collection
+    {
+        return $this->budgetResources;
+    }
+
+    public function getCenter(): ?Center
     {
         return $this->center;
     }
 
-    /**
-     * Get cFData.
-     *
-     * @return array
-     */
-    public function getCFData()
+    public function getCFData(): ?array
     {
         if (null === $this->cFData) {
             $this->cFData = [];
@@ -881,32 +908,17 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->cFData;
     }
 
-    /**
-     * Get civility.
-     *
-     * @return Civility
-     */
-    public function getCivility()
+    public function getCivility(): ?Civility
     {
         return $this->civility;
     }
 
-    /**
-     * Get contactInfo.
-     *
-     * @return string
-     */
-    public function getcontactInfo()
+    public function getcontactInfo(): ?string
     {
         return $this->contactInfo;
     }
 
-    /**
-     * Get countryOfBirth.
-     *
-     * @return Chill\MainBundle\Entity\Country
-     */
-    public function getCountryOfBirth()
+    public function getCountryOfBirth(): ?Country
     {
         return $this->countryOfBirth;
     }
@@ -1050,22 +1062,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->deathdate;
     }
 
-    /**
-     * Get email.
-     *
-     * @return string
-     */
-    public function getEmail()
+    public function getEmail(): ?string
     {
         return $this->email;
     }
 
-    /**
-     * Get firstName.
-     *
-     * @return string
-     */
-    public function getFirstName()
+    public function getFirstName(): string
     {
         return $this->firstName;
     }
@@ -1075,17 +1077,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->fullnameCanonical;
     }
 
-    /**
-     * Get gender.
-     *
-     * @return string
-     */
-    public function getGender()
+    public function getGender(): ?string
     {
         return $this->gender;
     }
 
-    public function getGenderComment(): CommentEmbeddable
+    public function getGenderComment(): ?CommentEmbeddable
     {
         return $this->genderComment;
     }
@@ -1190,22 +1187,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->getCurrentPersonAddress();
     }
 
-    /**
-     * Get lastName.
-     *
-     * @return string
-     */
-    public function getLastName()
+    public function getLastName(): string
     {
         return $this->lastName;
     }
 
-    /**
-     * Get maritalStatus.
-     *
-     * @return MaritalStatus
-     */
-    public function getMaritalStatus()
+    public function getMaritalStatus(): ?MaritalStatus
     {
         return $this->maritalStatus;
     }
@@ -1220,12 +1207,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->maritalStatusDate;
     }
 
-    /**
-     * Get memo.
-     *
-     * @return string
-     */
-    public function getMemo()
+    public function getMemo(): ?string
     {
         return $this->memo;
     }
@@ -1235,11 +1217,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->mobilenumber;
     }
 
-    /**
-     * Get nationality.
-     *
-     * @return Country
-     */
     public function getNationality(): ?Country
     {
         return $this->nationality;
@@ -1300,12 +1277,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->phonenumber;
     }
 
-    /**
-     * Get placeOfBirth.
-     *
-     * @return string
-     */
-    public function getPlaceOfBirth()
+    public function getPlaceOfBirth(): ?string
     {
         return $this->placeOfBirth;
     }
@@ -1464,10 +1436,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->addresses->removeElement($address);
     }
 
-    /**
-     * @return $this
-     */
-    public function removeAltName(PersonAltName $altName)
+    public function removeAltName(PersonAltName $altName): self
     {
         if ($this->altNames->contains($altName)) {
             $altName->setPerson(null);
@@ -1477,10 +1446,21 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @return $this
-     */
-    public function removeOtherPhoneNumber(PersonPhone $otherPhoneNumber)
+    public function removeBudgetCharge(Charge $budgetCharge): self
+    {
+        $this->budgetCharges->removeElement($budgetCharge);
+
+        return $this;
+    }
+
+    public function removeBudgetResource(Resource $budgetResource): self
+    {
+        $this->budgetResources->removeElement($budgetResource);
+
+        return $this;
+    }
+
+    public function removeOtherPhoneNumber(PersonPhone $otherPhoneNumber): self
     {
         if ($this->otherPhoneNumbers->contains($otherPhoneNumber)) {
             $this->otherPhoneNumbers->removeElement($otherPhoneNumber);
@@ -1503,10 +1483,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @return $this
-     */
-    public function setAltNames(Collection $altNames)
+    public function setAltNames(Collection $altNames): self
     {
         $this->altNames = $altNames;
 
@@ -1514,25 +1491,16 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * Set birthdate.
-     *
      * @param DateTime $birthdate
-     *
-     * @return Person
      */
-    public function setBirthdate($birthdate)
+    public function setBirthdate($birthdate): self
     {
         $this->birthdate = $birthdate;
 
         return $this;
     }
 
-    /**
-     * Set the center.
-     *
-     * @return \Chill\PersonBundle\Entity\Person
-     */
-    public function setCenter(Center $center)
+    public function setCenter(Center $center): self
     {
         $this->center = $center;
 
@@ -1540,41 +1508,23 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * Set cFData.
-     *
-     * @param array $cFData
-     *
      * @return Report
      */
-    public function setCFData($cFData)
+    public function setCFData(?array $cFData)
     {
         $this->cFData = $cFData;
 
         return $this;
     }
 
-    /**
-     * Set civility.
-     *
-     * @param Civility $civility
-     *
-     * @return Person
-     */
-    public function setCivility(?Civility $civility = null)
+    public function setCivility(?Civility $civility = null): self
     {
         $this->civility = $civility;
 
         return $this;
     }
 
-    /**
-     * Set contactInfo.
-     *
-     * @param string $contactInfo
-     *
-     * @return Person
-     */
-    public function setcontactInfo($contactInfo)
+    public function setcontactInfo($contactInfo): self
     {
         if (null === $contactInfo) {
             $contactInfo = '';
@@ -1585,14 +1535,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * Set countryOfBirth.
-     *
-     * @param Chill\MainBundle\Entity\Country $countryOfBirth
-     *
-     * @return Person
-     */
-    public function setCountryOfBirth(?Country $countryOfBirth = null)
+    public function setCountryOfBirth(?Country $countryOfBirth = null): self
     {
         $this->countryOfBirth = $countryOfBirth;
 
@@ -1620,14 +1563,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * Set email.
-     *
-     * @param string $email
-     *
-     * @return Person
-     */
-    public function setEmail($email)
+    public function setEmail(?string $email): self
     {
         if (null === $email) {
             $email = '';
@@ -1638,35 +1574,21 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * Set firstName.
-     *
-     * @param string $firstName
-     *
-     * @return Person
-     */
-    public function setFirstName($firstName)
+    public function setFirstName(string $firstName): self
     {
         $this->firstName = $firstName;
 
         return $this;
     }
 
-    public function setFullnameCanonical($fullnameCanonical): Person
+    public function setFullnameCanonical($fullnameCanonical): self
     {
         $this->fullnameCanonical = $fullnameCanonical;
 
         return $this;
     }
 
-    /**
-     * Set gender.
-     *
-     * @param string $gender
-     *
-     * @return Person
-     */
-    public function setGender($gender)
+    public function setGender(?string $gender): self
     {
         $this->gender = $gender;
 
@@ -1680,28 +1602,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * Set lastName.
-     *
-     * @param string $lastName
-     *
-     * @return Person
-     */
-    public function setLastName($lastName)
+    public function setLastName(string $lastName): self
     {
         $this->lastName = $lastName;
 
         return $this;
     }
 
-    /**
-     * Set maritalStatus.
-     *
-     * @param MaritalStatus $maritalStatus
-     *
-     * @return Person
-     */
-    public function setMaritalStatus(?MaritalStatus $maritalStatus = null)
+    public function setMaritalStatus(?MaritalStatus $maritalStatus = null): self
     {
         $this->maritalStatus = $maritalStatus;
 
@@ -1722,14 +1630,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * Set memo.
-     *
-     * @param string $memo
-     *
-     * @return Person
-     */
-    public function setMemo($memo)
+    public function setMemo(?string $memo): self
     {
         if (null === $memo) {
             $memo = '';
@@ -1742,21 +1643,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setMobilenumber(?PhoneNumber $mobilenumber)
+    public function setMobilenumber(?PhoneNumber $mobilenumber): self
     {
         $this->mobilenumber = $mobilenumber;
 
         return $this;
     }
 
-    /**
-     * Set nationality.
-     *
-     * @param Chill\MainBundle\Entity\Country $nationality
-     *
-     * @return Person
-     */
-    public function setNationality(?Country $nationality = null)
+    public function setNationality(?Country $nationality = null): self
     {
         $this->nationality = $nationality;
 
@@ -1770,31 +1664,21 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @return $this
-     */
-    public function setOtherPhoneNumbers(Collection $otherPhoneNumbers)
+    public function setOtherPhoneNumbers(Collection $otherPhoneNumbers): self
     {
         $this->otherPhoneNumbers = $otherPhoneNumbers;
 
         return $this;
     }
 
-    public function setPhonenumber(?PhoneNumber $phonenumber)
+    public function setPhonenumber(?PhoneNumber $phonenumber): self
     {
         $this->phonenumber = $phonenumber;
 
         return $this;
     }
 
-    /**
-     * Set placeOfBirth.
-     *
-     * @param string $placeOfBirth
-     *
-     * @return Person
-     */
-    public function setPlaceOfBirth($placeOfBirth)
+    public function setPlaceOfBirth(?string $placeOfBirth): self
     {
         if (null === $placeOfBirth) {
             $placeOfBirth = '';
@@ -1806,13 +1690,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * Set spokenLanguages.
-     *
      * @param type $spokenLanguages
-     *
-     * @return Person
      */
-    public function setSpokenLanguages($spokenLanguages)
+    public function setSpokenLanguages($spokenLanguages): self
     {
         $this->spokenLanguages = $spokenLanguages;
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index c540c133c..80da956c4 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -33,10 +33,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $showAccompanyingPeriod;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     private Security $security;
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index e458b049d..c95c5caf5 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Doctrine\ORM\Query\Parameter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -26,10 +25,10 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
     protected AuthorizationCheckerInterface $authorizationChecker;
 
-    protected TranslatorInterface $translator;
-
     protected ParameterBagInterface $parameterBag;
 
+    protected TranslatorInterface $translator;
+
     /**
      * SectionMenuBuilder constructor.
      */
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 365074d05..b359f84d6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -176,6 +176,47 @@ div[class*='activity-'] {
     }
 }
 
+div[class*='budget-'] {
+    div.dashboard,
+    h4.badge-title,
+    h3.badge-title,
+    h2.badge-title {
+        span.title_label {
+            // Calculate same color then border:groove
+            &_resource {
+                background-color: shade-color($budget-resource-color, 34%);
+            }
+            &_charge {
+                background-color: shade-color($budget-charge-color, 34%);
+            }
+            h3 {
+                color: $white;
+            }
+        }
+        span.title_action {
+            &_resource {
+                @include dashboard_like_badge($budget-resource-color);
+            }
+            &_charge {
+                @include dashboard_like_badge($budget-charge-color);
+            }
+        }
+        span.title_label {
+            div.duration {
+                font-size: 70%;
+                font-weight: 500;
+                p {
+                    margin-bottom: 0;
+                    text-align: right;
+                    abbr {
+                        text-decoration: none;
+                    }
+                }
+            }
+        }
+    }
+}
+
 /*
 * Pill badge by entity
 */
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 37321e0bb..df2bd0c35 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -137,7 +137,7 @@ export default {
    },
    methods: {
       saveFormOnTheFly(payload) {
-         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
          payload.target = 'resource';
 
          let body = { type: payload.type };
@@ -167,13 +167,19 @@ export default {
                })
          }
          else if (payload.type === 'thirdparty') {
-            console.log('data', payload.data)
+            // console.log('data', payload.data)
+            body.firstname = payload.data.firstname;
             body.name = payload.data.name;
             body.email = payload.data.email;
             body.telephone = payload.data.telephone;
-            body.civility = payload.data.civility;
-            body.profession = payload.data.profession;
             body.address = payload.data.address ? { id: payload.data.address.address_id } :  null;
+            if (null !== payload.data.civility) {
+               body.civility = {type: 'chill_main_civility', id: payload.data.civility.id};
+            }
+            if (null !== payload.data.profession) {
+               body.profession = {type: 'third_party_profession', id: payload.data.profession.id};
+            }
+            // console.log('body', body);
 
             makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index d8e2cc660..ca3d8b397 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -67,17 +67,14 @@
        <div class="flex-table">
          <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
            <div class="item-row">
-               <div class="input-group input-group-lg mb-3">
-                  <div>
-                     <input
-                         class="form-control"
-                         style="font-weight: bold;"
-                         type="text"
-                         :value="d.title"
-                         :id="d.id"
-                         :data-key="i"
-                         @input="onInputDocumentTitle"/>
-                  </div>
+            <div class="input-group input-group-lg mb-3">
+                  <input
+                     class="form-control document-title"
+                     type="text"
+                     :value="d.title"
+                     :id="d.id"
+                     :data-key="i"
+                     @input="onInputDocumentTitle"/>
                </div>
            </div>
            <div class="item-row">
@@ -337,3 +334,10 @@ export default {
    },
 }
 </script>
+
+<style lang="scss" scoped>
+   input.document-title{
+      font-weight: bold;
+      font-size: 1rem;
+   }
+</style>
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index 812d2e5fd..f5db187b9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -113,7 +113,18 @@
          </template>
       </modal>
    </teleport>
-
+   <ul class="record_actions sticky-form-buttons">
+     <li>
+       <add-persons
+           buttonTitle="visgraph.add_person"
+           modalTitle="visgraph.add_person"
+           v-bind:key="addPersons.key"
+           v-bind:options="addPersons.options"
+           @addNewPersons="addNewPersons"
+           ref="addPersons">
+       </add-persons>
+     </li>
+   </ul>
 </template>
 
 <script>
@@ -124,12 +135,14 @@ import VueMultiselect from 'vue-multiselect'
 import { getRelationsList, postRelationship, patchRelationship, deleteRelationship } from "./api"
 import { splitId, getAge } from "./vis-network"
 import { visMessages } from "./i18n";
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 
 export default {
    name: "App",
    components: {
       Modal,
-      VueMultiselect
+      VueMultiselect,
+      AddPersons
    },
    props: ['household_id'],
    data() {
@@ -159,6 +172,14 @@ export default {
          },
          canvas: null,
          link: null,
+         addPersons: {
+            key: 'filiation',
+            options: {
+               type: ['person'],
+               priority: null,
+               uniq: false,
+            }
+         }
       }
    },
    computed: {
@@ -235,12 +256,28 @@ export default {
       this.initGraph()
       this.listenOnGraph()
       this.getRelationsList()
+      console.log(this.persons);
 
       this.canvas = document.getElementById('visgraph').querySelector('canvas')
       this.link = document.getElementById('exportCanvasBtn')
    },
    methods: {
-
+      addNewPersons({ selected, modal }) {
+         // console.log('@@@ CLICK button addNewPersons', selected);
+         selected.forEach(function(item) {
+               this.$store.dispatch('addMorePerson', item.result)
+                  .catch(({name, violations}) => {
+                     if (name === 'ValidationException' || name === 'AccessException') {
+                        violations.forEach((violation) => this.$toast.open({message: violation}));
+                     } else {
+                        this.$toast.open({message: violations})
+                     }
+                  });
+            }, this
+         );
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+      },
       initGraph() {
          this.container = document.getElementById('visgraph')
          // Instanciate vis objects in separate window variables, see vis-network.js
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index f0eb331a6..cee841d0c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -1,5 +1,11 @@
 const visMessages = {
     fr: {
+        add_persons: {
+            title: "Ajouter des usagers",
+            suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
+            selected_counter: " 1 sélectionné | {count} sélectionnés",
+            search_some_persons: "Rechercher des personnes..",
+        },
         visgraph: {
             Course: 'Parcours',
             Household: 'Ménage',
@@ -21,12 +27,48 @@ const visMessages = {
             between: "entre",
             and: "et",
             add_link: "Créer un lien de filiation",
+            add_person: "Ajouter une personne",
             create_link_help: "Pour créer un lien de filiation, cliquez d'abord sur un usager, puis sur un second ; précisez ensuite la nature du lien dans le formulaire d'édition.",
             refresh: "Rafraîchir",
             screenshot: "Prendre une photo",
             choose_relation: "Choisissez le lien de parenté",
             relationship_household: "Filiation du ménage",
         },
+        item: {
+            type_person: "Usager",
+            type_user: "TMS",
+            type_thirdparty: "Tiers professionnel",
+            type_household: "Ménage"
+        },
+        person: {
+            firstname: "Prénom",
+            lastname: "Nom",
+            born: (ctx) => {
+                if (ctx.gender === 'man') {
+                    return 'Né le';
+                } else if (ctx.gender === 'woman') {
+                    return 'Née le';
+                } else {
+                    return 'Né·e le';
+                }
+            },
+            center_id: "Identifiant du centre",
+            center_type: "Type de centre",
+            center_name: "Territoire", // vendée
+            phonenumber: "Téléphone",
+            mobilenumber: "Mobile",
+            altnames: "Autres noms",
+            email: "Courriel",
+            gender: {
+                title: "Genre",
+                placeholder: "Choisissez le genre de l'usager",
+                woman: "Féminin",
+                man: "Masculin",
+                neuter: "Neutre, non binaire",
+                undefined: "Non renseigné"
+            }
+        },
+        error_only_one_person: "Une seule personne peut être sélectionnée !",
         edit: 'Éditer',
         del: 'Supprimer',
         back: 'Revenir en arrière',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
index 023faa679..32aa5bbc9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
@@ -117,10 +117,27 @@ const store = createStore({
             return group
         },
 
+        getPersonById: (state) => (person_id) => {
+            return state.persons.find(p => p._id === person_id);
+        }
+
 
     },
     mutations: {
         addPerson(state, [person, options]) {
+            if (!'_id' in person) {
+                person._id = person.id
+                person.id = `person_${person.id}`
+            }
+
+            let existing = state.persons.find(p => p._id === person._id);
+
+            if (typeof existing !== 'undefined') {
+                if (!options.folded && person.folded) {
+                    // unfold
+                }
+               return;
+            }
             let age = getAge(person)
             age = (age === '')? '' : ' - ' + age
 
@@ -232,6 +249,9 @@ const store = createStore({
 
         //// unfold
         unfoldPerson(state, person) {
+            if (!person.folded) {
+                return;
+            }
             //console.log('unfoldPerson', person)
             person.label = person._label
             delete person._label
@@ -261,6 +281,31 @@ const store = createStore({
             dispatch('fetchInfoForPerson', person)
         },
 
+        /**
+         * Add a person manually
+         *
+         * @param commit
+         * @param dispatch
+         * @param person
+         */
+        addMorePerson({ commit, dispatch, getters }, person) {
+            let nodeId = `person_${person.id}`;
+            if (getters.isPersonLoaded(person.id)) {
+                if (getters.isExcludedNode(nodeId)) {
+                    commit('removeExcludedNode', nodeId);
+                    let p = getters.getPersonById(person.id);
+                    if (typeof p !== 'undefined') {
+                        commit('unfoldPerson', p);
+                    } else {
+                        throw 'a person loaded was not found';
+                    }
+                    commit('updateHack');
+                }
+            } else {
+                return dispatch('addPerson', person);
+            }
+        },
+
         /**
          *  2) Fetch infos for this person (hub)
          *  @param object
@@ -287,7 +332,7 @@ const store = createStore({
             //console.log('  isHouseholdLoading ?', getters.isHouseholdLoading(person.current_household_id))
             if (! getters.isHouseholdLoading(person.current_household_id)) {
                 commit('markHouseholdLoading', person.current_household_id)
-                getHouseholdByPerson(person)
+                return getHouseholdByPerson(person)
                     .then(household => new Promise(resolve => {
                         commit('addHousehold', household)
                             // DISABLED: in init or expand loop, layer is uncheck when added
@@ -295,7 +340,7 @@ const store = createStore({
                             //commit('updateHack')
                         dispatch('addLinkFromPersonsToHousehold', household)
                         commit('updateHack')
-                        resolve()
+                        resolve();
                         })
                     ).catch( () => {
                         commit('unmarkHouseholdLoading', person.current_household_id)
@@ -335,7 +380,7 @@ const store = createStore({
          *  @param person
          */
         fetchCoursesByPerson({ commit, dispatch }, person) {
-            getCoursesByPerson(person)
+            return getCoursesByPerson(person)
                 .then(courses => new Promise(resolve => {
                     dispatch('addCourses', courses)
                     resolve()
@@ -383,6 +428,8 @@ const store = createStore({
                     dispatch('addMissingPerson', [p.person, course])
                 }
             })
+
+            return Promise.resolve();
         },
 
         /**
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
index ef87cb779..6f9a2ac16 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
@@ -164,14 +164,8 @@ const getGender = (gender) => {
  * @returns {string|null}
  */
 const getAge = (person) => {
-    if (person.birthdate) {
-        let birthdate = new Date(person.birthdate.datetime)
-        if (person.deathdate) {
-            let deathdate = new Date(person.deathdate.datetime)
-            return (deathdate.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
-        }
-        let now = new Date()
-        return (now.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
+    if (person.age) {
+        return person.age + ' ' + visMessages.fr.visgraph.years;
     }
     return ''
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 366ecd6b7..e6fa85902 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -24,11 +24,11 @@
 
    <div class="form-floating mb-3">
       <input
-          class="form-control form-control-lg"
-          id="lastname"
-          v-model="lastName"
-          :placeholder="$t('person.lastname')"
-          @change="checkErrors"
+         class="form-control form-control-lg"
+         id="lastname"
+         v-model="lastName"
+         :placeholder="$t('person.lastname')"
+         @change="checkErrors"
       />
       <label for="lastname">{{ $t('person.lastname') }}</label>
    </div>
@@ -43,11 +43,11 @@
 
    <div class="form-floating mb-3">
       <input
-          class="form-control form-control-lg"
-          id="firstname"
-          v-model="firstName"
-          :placeholder="$t('person.firstname')"
-          @change="checkErrors"
+         class="form-control form-control-lg"
+         id="firstname"
+         v-model="firstName"
+         :placeholder="$t('person.firstname')"
+         @change="checkErrors"
       />
       <label for="firstname">{{ $t('person.firstname') }}</label>
    </div>
@@ -62,10 +62,10 @@
 
    <div v-for="(a, i) in config.altNames" :key="a.key" class="form-floating mb-3">
       <input
-          class="form-control form-control-lg"
-          :id="a.key"
-          :value="personAltNamesLabels[i]"
-          @input="onAltNameInput"
+         class="form-control form-control-lg"
+         :id="a.key"
+         :value="personAltNamesLabels[i]"
+         @input="onAltNameInput"
       />
       <label :for="a.key">{{ a.labels.fr }}</label>
    </div>
@@ -125,9 +125,9 @@
    </div>
 
    <div class="alert alert-warning" v-if="errors.length">
-     <ul>
-       <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
-     </ul>
+      <ul>
+         <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
+      </ul>
    </div>
 
 </div>
@@ -238,13 +238,13 @@ export default {
       checkErrors(e) {
          this.errors = [];
          if (!this.person.lastName) {
-             this.errors.push("Le nom ne doit pas être vide.");
+            this.errors.push("Le nom ne doit pas être vide.");
          }
          if (!this.person.firstName) {
-             this.errors.push("Le prénom ne doit pas être vide.");
+            this.errors.push("Le prénom ne doit pas être vide.");
          }
          if (!this.person.gender) {
-             this.errors.push("Le genre doit être renseigné");
+            this.errors.push("Le genre doit être renseigné");
          }
       },
       loadData() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig
index 1fb97c0b6..1edf075e1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig
@@ -18,7 +18,7 @@
 {% block title page_title  %}
 
 
-{% block personcontent %}
+{% block content %}
     
 <h1>{{ page_title }}</h1>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
index eb2cbe0cb..f30bfc45a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -4,7 +4,7 @@
 
 {% block title %}{{ 'Accompanying period list for person'|trans }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-accompanyingperiods">
 
     <h1>{{ 'Accompanying period list'|trans }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig
index b75dcee5d..397e4fd9e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig
@@ -4,7 +4,7 @@
 
 {% block title 'Re-Open a period'|trans  %}
 
-{% block personcontent %}
+{% block content %}
     
     <h1>{{ 'Re-Open a period'|trans }}</h1>
     
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 75994729c..e51e0180b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -20,7 +20,7 @@
 
 {% block title 'Edit an address'|trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-edit">
 
     {% block content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index 622a8a348..d47d9a8e2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Addresses history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-address">
 
     <h1>{{ 'Addresses history'|trans }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 91c384103..7790b67ec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'New address'|trans }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-new">
 
     {% block content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig
index 51eae1c29..75390a8e3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig
@@ -3,7 +3,7 @@
 {% set person = entity.person %}
 {% set activeRouteKey = '' %}
 
-{% block personcontent %}
+{% block content %}
 {% embed '@ChillMain/CRUD/_delete_content.html.twig' %}
 {% endembed %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig
index 2ea43a3ff..49157533d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig
@@ -7,7 +7,7 @@
 {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock title %}
 
-{% block personcontent %}
+{% block content %}
 {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
 {% endembed %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig
index 9356c0e7a..f3be478f5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig
@@ -4,7 +4,7 @@
 
 {% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
     {% embed '@ChillPerson/CRUD/_index.html.twig' %}
         {% block add_new %}
             <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig
index fbb9f5492..2c5ca4f2a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig
@@ -7,7 +7,7 @@
 {% embed('@ChillPerson/CRUD/_new_title.html.twig') %}{% endembed %}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 {% embed '@ChillPerson/CRUD/_new_content.html.twig' %}
     {% block crud_content_header %}
         <h1>{{ ('crud.'~crud_name~'.title_new')|trans({'%person%': person|chill_entity_render_string }) }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig
index 762d5e4b0..c0a250993 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig
@@ -7,7 +7,7 @@
 {% include('@ChillPerson/CRUD/_view_title.html.twig') %}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 {% embed '@ChillPerson/CRUD/_view_content.html.twig' %}
     {% block crud_content_header %}
         <h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%person%': person|chill_entity_render_string }) }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index dc71d9981..6ffbe8430 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Update details for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-edit">
 
     <h1>{{ block('title') }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index ed3b3020b..1ff91de15 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@@ -84,7 +84,7 @@
     </div>
 {% endmacro %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-household">
     <h1>{{ 'household.Household history'|trans }}</h1>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
index f04f9d702..6dcdf9dde 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
@@ -25,7 +25,7 @@
 {% block layout_wvm_content %}
     <div class="row justify-content-center">
         <div class="col-md-10 col-xxl">
-            {% block personcontent %}{# block personcontent empty #}{% endblock %}
+            {% block content %}{# block content empty #}{% endblock %}
         </div>
     </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index 788229e61..ceff2137d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -32,7 +32,7 @@ This view should receive those arguments:
 {% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
       'form_path_key' : 'chill_person_general_edit' } %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-view">
 
     <div class="row">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
index 0c257c0ea..8769ae6da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
@@ -6,7 +6,7 @@
 ' ' ~ person.lastName }}{% endblock %}
 
 
-{% block personcontent %}
+{% block content %}
 <div class="person-duplicate">
             
             <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
index 5cef17c13..e81d27448 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
@@ -5,7 +5,7 @@
 {% block title %}{{ 'Person duplicate'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~
     ' ' ~ person.lastName }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-duplicate">
                         
             <h1>{{ title|default('Person duplicate')|trans }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index e64d76362..2c36ae141 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -14,7 +14,7 @@
     {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
 <h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
 
@@ -22,4 +22,4 @@
         <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
         {% include "@ChillPerson/PersonResource/form.html.twig" %}
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig
index 57acaa634..a068ee5b2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig
@@ -5,7 +5,7 @@
 
 {% block title  'Remove resource'|trans %}
 
-{% block personcontent %}
+{% block content %}
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove resource'|trans,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
index 652c00ff0..cbd461c9a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
@@ -14,7 +14,7 @@
 
 {% block title %}{{ 'edit resource'|trans|capitalize }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
 <h1 style="margin-bottom: 2rem;">{{ 'edit resource'|trans }}</h1>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 48773c236..9374962e7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -14,7 +14,7 @@
     {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
 <h1>{{ 'List of resources'|trans }}</h1>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig
index 3171af58d..28ffbdfa3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig
@@ -4,7 +4,7 @@
 
 {% block title %}{{ 'Delete residential address'|trans }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-new">
 
     <h1>{{ block('title') }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
index b84bd2543..042deb1e2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
@@ -4,10 +4,9 @@
 
 {% block title 'Edit a residential address'|trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-edit">
 
-    {% block content %}
         <h1>{{ block('title') }}</h1>
 
         {{ form_start(form) }}
@@ -45,7 +44,6 @@
 
         {{ form_end(form) }}
 
-    {% endblock %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
index b568703da..7d6e6d24a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
@@ -4,7 +4,7 @@
 
 {% block title %}{{ 'Residential addresses history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-address">
 
     <h1>{{ 'Residential addresses history'|trans }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
index dd4b1cbe0..5edbbb995 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
@@ -4,10 +4,9 @@
 
 {% block title %}{{ 'New residential address'|trans }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-new">
 
-    {% block content %}
         <h1>{{ block('title') }}</h1>
 
         {# TODO #}
@@ -15,8 +14,6 @@
             {% include '@ChillPerson/ResidentialAddress/_form.html.twig' %}
         {% endblock %}
 
-    {% endblock %}
-
 </div>
 {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig
index a154972c0..0cd7f9f03 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig
@@ -26,7 +26,7 @@ This view should receive those arguments:
 {% block title %}{{ 'Timeline for %name%'|trans({'%name%': person }) }}{% endblock %}
 
 
-{% block personcontent %}
+{% block content %}
 <div class="timeline">
             
             {{ timeline|raw }}
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index bf6e6c287..a1166da25 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -130,6 +130,14 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
                 return false;
             }
 
+            if (in_array($attribute, [
+                self::SEE, self::SEE_DETAILS, self::EDIT
+            ])) {
+                if ($subject->getUser() === $token->getUser()) {
+                    return true;
+                }
+            }
+
             if (self::TOGGLE_CONFIDENTIAL === $attribute) {
                 if (null !== $subject->getUser() && ($subject->getUser() === $token->getUser())) {
                     return true;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index 0e146b5c0..28216f368 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
+use Chill\BudgetBundle\Service\Summary\SummaryBudget;
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Civility;
@@ -44,6 +45,8 @@ class PersonDocGenNormalizer implements
 
     private RelationshipRepository $relationshipRepository;
 
+    private SummaryBudget $summaryBudget;
+
     private TranslatableStringHelper $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -52,12 +55,14 @@ class PersonDocGenNormalizer implements
         PersonRenderInterface $personRender,
         RelationshipRepository $relationshipRepository,
         TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper
+        TranslatableStringHelper $translatableStringHelper,
+        SummaryBudget $summaryBudget
     ) {
         $this->personRender = $personRender;
         $this->relationshipRepository = $relationshipRepository;
         $this->translator = $translator;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->summaryBudget = $summaryBudget;
     }
 
     public function normalize($person, $format = null, array $context = [])
@@ -127,6 +132,7 @@ class PersonDocGenNormalizer implements
                     'docgen:expects' => Household::class,
                     'docgen:person:with-household' => false,
                     'docgen:person:with-relations' => false,
+                    'docgen:person:with-budget' => false,
                 ])
             );
         }
@@ -139,10 +145,19 @@ class PersonDocGenNormalizer implements
                     'docgen:person:with-household' => false,
                     'docgen:person:with-relation' => false,
                     'docgen:relationship:counterpart' => $person,
+                    'docgen:person:with-budget' => false,
                 ])
             );
         }
 
+        if ($context['docgen:person:with-budget'] ?? false) {
+            $data['budget']['person'] = $this->summaryBudget->getSummaryForPerson($person);
+
+            if ($context['docgen:person:with-household'] ?? false) {
+                $data['budget']['household'] = $this->summaryBudget->getSummaryForHousehold($person->getCurrentHousehold());
+            }
+        }
+
         return $data;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 45057038f..495989b29 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -191,6 +191,7 @@ class AccompanyingPeriodContext implements
                     'groups' => 'docgen:read',
                     'docgen:person:with-household' => true,
                     'docgen:person:with-relations' => true,
+                    'docgen:person:with-budget' => true,
                 ]);
             }
         }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 85ca1c161..1561f0735 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -114,7 +114,10 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
         $data = array_merge($data, $this->baseContextData->getData());
         $data['person'] = $this->normalizer->normalize($entity, 'docgen', [
             'docgen:expects' => Person::class,
-            'groups' => ['docgen:read', 'docgen:person:with-household', 'docgen:person:with-relations'],
+            'groups' => ['docgen:read'],
+            'docgen:person:with-household' => true,
+            'docgen:person:with-relations' => true,
+            'docgen:person:with-budget' => true,
         ]);
 
         return $data;
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index aded38b4a..44f69b4c2 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -67,6 +67,7 @@ household:
     Accompanying period: Parcours d'accompagnement
     Addresses: Historique adresse
     Relationship: Filiation
+    Budget: Budget
     Household relationships: Filiations dans le ménage
     Current address: Adresse actuelle
     Household does not have any address currently: Le ménage n'a pas d'adresse renseignée actuellement
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 06e4ac06e..6311e4d58 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -496,6 +496,7 @@ Remove household composition: Supprimer composition familiale
 Are you sure you want to remove this composition?: Etes-vous sûr de vouloir supprimer cette composition familiale ?
 Concerns household n°%id%: Concerne le ménage n°%id%
 Composition: Composition
+Budget: Budget
 The composition has been successfully removed.: La composition a été supprimée.
 
 # accompanying course work
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
index 8282ec74a..ec205c2fb 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Report edit' |trans }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
     {{ form_start(edit_form) }}
 
     {{ form_row(edit_form.user) }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
index 6f0e07948..a012f8fe7 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Report list' |trans }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
     
     <h1>{{ 'Report list'|trans }}</h1>
     
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
index 5edc39414..aa232d341 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Add a report'|trans }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
     {{ form_start(form) }}
 
     {{ form_row(form.user) }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
index 34fefc443..d78fcd51b 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Add a report'|trans() }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
 
 {{ form_start(form) }}
     {{ form_widget(form.cFGroup) }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
index f2490964d..2b5ec498b 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Report view' |trans() }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
     
     <h1>{{ 'Report view : %name%' | trans({ '%name%' : entity.cFGroup.getName|localize_translatable_string } ) }}</h1>
 
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig
index 3b194e244..61e7c38aa 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig
@@ -5,7 +5,7 @@
 
 {% block title  'Remove task'|trans %}
 
-{% block personcontent %}
+{% block content %}
 
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig
index 6188bd859..3ce9a3490 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig
@@ -23,7 +23,7 @@
 	{{ 'Edit task'|trans }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
 	{% include '@ChillTask/SingleTask/_edit.html.twig' %}
 
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
index ee236b644..0763dd8f3 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
@@ -4,7 +4,7 @@
 
 {% block title 'Tasks for {{ name }}'|trans({ '{{ name }}' : person|chill_entity_render_string }) %}
 
-{% block personcontent %}
+{% block content %}
     <div class="col-md-10 col-xxl">
 
         <h1>{{ block('title') }}</h1>
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig
index 226956aec..1d2967ce1 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig
@@ -24,7 +24,7 @@
 {% endblock %}
 
 
-{% block personcontent %}
+{% block content %}
 	{% include '@ChillTask/SingleTask/_new.html.twig' %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig
index 3ac97f0f3..39a024713 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}
 
 
-{% block personcontent %}
+{% block content %}
 
 	{% include '@ChillTask/SingleTask/_show.html.twig' %}
 
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig
index 05009a2f0..d91a9007a 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig
@@ -5,7 +5,7 @@
 
 {% block title  'Remove task'|trans %}
 
-{% block personcontent %}
+{% block content %}
 
 {% include '@ChillTask/SingleTask/_transition.html.twig' %}
 
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
index 3cd2a1971..02ab79664 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
@@ -29,7 +29,7 @@
 
 {% block filtertasks %}
 	{% if person is not null %}
-		{% block personcontent %}
+		{% block content %}
 			<div class="tasks">
 				{% include '@ChillTask/SingleTask/Person/list.html.twig' %}
 
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 124f5b7f3..d2023fae5 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -46,6 +46,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $loader->load('services/fixtures.yaml');
         $loader->load('services/serializer.yaml');
         $loader->load('services/repository.yaml');
+        $loader->load('services/doctrineEventListener.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 678084045..d7efce10c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -197,6 +197,12 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      */
     private ?string $email = null;
 
+    /**
+     * @ORM\Column(name="firstname", type="text", options={"default":""})
+     * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
+     */
+    private string $firstname = '';
+
     /**
      * @var int
      * @ORM\Column(name="id", type="integer")
@@ -454,12 +460,12 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this->email;
     }
 
-    /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
+    public function getFirstname(): string
+    {
+        return $this->firstname;
+    }
+
+    public function getId(): ?int
     {
         return $this->id;
     }
@@ -469,12 +475,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this->kind;
     }
 
-    /**
-     * Get name.
-     *
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -766,6 +767,13 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
+    public function setFirstname(string $firstname): self
+    {
+        $this->firstname = $firstname;
+
+        return $this;
+    }
+
     public function setKind(?string $kind): ThirdParty
     {
         $this->kind = $kind;
@@ -773,14 +781,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * Set name.
-     *
-     * @param string $name
-     *
-     * @return ThirdParty
-     */
-    public function setName($name)
+    public function setName($name): self
     {
         $this->name = $name;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
new file mode 100644
index 000000000..bdeed8866
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\EventListener;
+
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+
+use const MB_CASE_TITLE;
+
+class ThirdPartyEventListener
+{
+    public function prePersistThirdParty(ThirdParty $thirdparty): void
+    {
+        if ($thirdparty->getKind() !== 'company') {
+            $firstnameCaps = mb_convert_case(mb_strtolower($thirdparty->getFirstname()), MB_CASE_TITLE, 'UTF-8');
+            $firstnameCaps = ucwords(strtolower($firstnameCaps), " \t\r\n\f\v'-");
+            $thirdparty->setFirstName($firstnameCaps);
+
+            $lastnameCaps = mb_strtoupper($thirdparty->getName(), 'UTF-8');
+            $thirdparty->setName($lastnameCaps);
+        }
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index cf34c8919..242fa997b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -102,6 +102,10 @@ class ThirdPartyType extends AbstractType
         // Contact Person ThirdParty (child)
         if (ThirdParty::KIND_CONTACT === $options['kind'] || ThirdParty::KIND_CHILD === $options['kind']) {
             $builder
+                ->add('firstname', TextType::class, [
+                    'label' => 'firstname',
+                    'required' => false,
+                ])
                 ->add('civility', PickCivilityType::class, [
                     'label' => 'thirdparty.Civility',
                     'placeholder' => 'thirdparty.choose civility',
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 8de41b989..85f09a9ed 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -65,34 +65,64 @@
       </div>
 
       <div v-if="thirdparty.kind === 'child' || thirdparty.kind === 'contact'">
-         <div id="child-info">
-            <div class="input-group mb-3">
-               <select class="form-select form-select-lg" id="profession"
+         <div class="child-info">
+            <div class="input-group mb-3 input-section">
+               <select class="form-select form-select-lg" id="civility"
                   v-model="thirdparty.civility">
                   <option selected disabled :value="null" >{{ $t('thirdparty.civility') }}</option>
-                  <option v-for="civility in civilities" :key="civility.id" :value="{type: 'chill_main_civility', id: civility.id }">{{ civility.name.fr }}</option>
+                  <option v-for="civility in civilities" :key="civility.id" :value="civility">{{ civility.name.fr }}</option>
                </select>
             </div>
-            <div class="input-group mb-3">
-               <select class="form-select form-select-lg" id="civility"
+            <div class="input-group mb-3 input-section">
+               <select class="form-select form-select-lg" id="profession"
                   v-model="thirdparty.profession">
                   <option selected disabled :value="null">{{ $t('thirdparty.profession') }}</option>
-                  <option v-for="profession in professions" :key="profession.id" :value="{type: 'third_party_profession', id: profession.id }">{{ profession.name.fr }}</option>
+                  <option v-for="profession in professions" :key="profession.id" :value="profession">{{ profession.name.fr }}</option>
                </select>
             </div>
          </div>
+         <div class="child-info">
+            <div class="input-section">
+               <div class="form-floating mb-3">
+                  <input class="form-control form-control-lg" id="firstname" v-model="thirdparty.firstname" v-bind:placeholder="$t('thirdparty.firstname')" />
+                  <label for="firstname">{{ $t('thirdparty.firstname') }}</label>
+               </div>
+               <div v-if="queryItems">
+                  <ul class="list-suggest add-items inline">
+                     <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('firstName', qi)">
+                        <span class="person-text">{{ qi }}</span>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="input-section">
+               <div class="form-floating mb-3">
+                  <input class="form-control form-control-lg" id="name" v-model="thirdparty.name" v-bind:placeholder="$t('thirdparty.lastname')" />
+                  <label for="name">{{ $t('thirdparty.lastname') }}</label>
+               </div>
+               <div v-if="queryItems">
+                  <ul class="list-suggest add-items inline">
+                     <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('name', qi)">
+                        <span class="person-text">{{ qi }}</span>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+         </div>
       </div>
 
-      <div class="form-floating mb-3">
-         <input class="form-control form-control-lg" id="name" v-model="thirdparty.name" v-bind:placeholder="$t('thirdparty.name')" />
-         <label for="name">{{ $t('thirdparty.name') }}</label>
-      </div>
-      <div v-if="query">
-         <ul class="list-suggest add-items inline">
-            <li @click="addQuery(query)">
-               <span class="person-text">{{ query }}</span>
-            </li>
-         </ul>
+      <div v-if="thirdparty.kind === 'company'">
+         <div class="form-floating mb-3">
+            <input class="form-control form-control-lg" id="name" v-model="thirdparty.name" v-bind:placeholder="$t('thirdparty.name')" />
+            <label for="name">{{ $t('thirdparty.name') }}</label>
+         </div>
+         <div v-if="query">
+            <ul class="list-suggest add-items inline">
+               <li @click="addQuery(query)">
+                  <span class="person-text">{{ query }}</span>
+               </li>
+            </ul>
+         </div>
       </div>
 
       <template
@@ -158,6 +188,7 @@ export default {
             type: 'thirdparty',
             address: null,
             kind: 'company',
+            firstname: '',
             name: '',
             telephone: '',
             civility: null,
@@ -209,17 +240,18 @@ export default {
             context.addressId = this.thirdparty.address.address_id;
             context.edit = true;
          }
-         console.log('context', context);
          //this.context = context; <--
          return context;
       },
+      queryItems() {
+         return this.query ? this.query.split(' ') : null;
+      },
    },
    methods: {
       loadData(){
          return getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
             this.thirdparty = thirdparty;
             this.thirdparty.kind = thirdparty.kind;
-            console.log('get thirdparty', thirdparty);
             if (this.action !== 'show') {
                if (thirdparty.address !== null) {
                   // bof! we force getInitialAddress because addressId not available when mounted
@@ -262,14 +294,24 @@ export default {
             console.log('switch address to edit mode', this.context);
          }
       },
+      addQueryItem(field, queryItem) {
+         switch (field) {
+            case 'name':
+               this.thirdparty.name = queryItem;
+               break;
+            case 'firstName':
+               this.thirdparty.firstname = queryItem;
+               break;
+         }
+      },
       addQuery(query) {
          this.thirdparty.name = query;
       },
    },
-    mounted() {
-       let dependencies = [];
-       dependencies.push(this.loadProfessions());
-       dependencies.push(this.loadCivilities());
+   mounted() {
+      let dependencies = [];
+      dependencies.push(this.loadProfessions());
+      dependencies.push(this.loadCivilities());
       if (this.action !== 'create') {
          if (this.id) {
             dependencies.push(this.loadData());
@@ -307,12 +349,13 @@ dl {
    margin-bottom: 1rem;
 }
 
-#child-info {
+.child-info {
    display: flex;
    justify-content: space-between;
-   div {
+   .input-section {
       width: 49%;
    }
 }
+
 </style>
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
index 76f01e3f4..04cfc0cf4 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
@@ -1,6 +1,8 @@
 const thirdpartyMessages = {
     fr: {
         thirdparty: {
+            firstname: "Prénom",
+            lastname: "Nom",
             name: "Dénomination",
             email: "Courriel",
             phonenumber: "Téléphone",
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig
index 4827ba19c..34da002f0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig
@@ -5,6 +5,11 @@
 
 {{ form_row(form.name) }}
 
+{% if form.firstname is defined %}
+{{ form_row(form.firstname) }}
+{% endif %}
+
+
 {% if form.nameCompany is defined %}
     {{ form_row(form.nameCompany) }}
     {{ form_row(form.acronym) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form_thirdparty_children.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form_thirdparty_children.html.twig
index eac5c2a98..81dd4997f 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form_thirdparty_children.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form_thirdparty_children.html.twig
@@ -2,20 +2,25 @@
 {% block _third_party_active_children_entry_widget %}
     <div class="container">
         <div class="row">
-            <div class="form-group col-md-3 mb-3">
+            <div class="form-group col-md-6 mb-3">
                 {{ form_widget(form.civility) }}
                 {{ form_errors(form.civility) }}
                 {{ form_label(form.civility) }}
             </div>
-            <div class="form-group col-md-5 mb-3">
+            <div class="form-group col-md-6 mb-3">
+                {{ form_widget(form.profession) }}
+                {{ form_errors(form.profession) }}
+                {{ form_label(form.profession) }}
+            </div>
+            <div class="form-group col-md-6 mb-3">
                 {{ form_widget(form.name) }}
                 {{ form_errors(form.name) }}
                 {{ form_label(form.name) }}
             </div>
-            <div class="form-group col-md-4 mb-3">
-                {{ form_widget(form.profession) }}
-                {{ form_errors(form.profession) }}
-                {{ form_label(form.profession) }}
+            <div class="form-group col-md-6 mb-3">
+                {{ form_widget(form.firstname) }}
+                {{ form_errors(form.firstname) }}
+                {{ form_label(form.firstname) }}
             </div>
         </div>
         <div class="row">
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index cff7d3a72..f330246fc 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -1,7 +1,8 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
 {% set thirdParty = entity %}
-{% set title_ = 'Show third party %name%'|trans({'%name%' : thirdParty.name }) %}
+{% set name = thirdParty.firstname is not empty ? thirdParty.firstname ~ ' ' ~ thirdParty.name : thirdParty.name %}
+{% set title_ = 'Show third party %name%'|trans({'%name%' : name }) %}
 
 {% block title title_ %}
 
@@ -25,7 +26,7 @@
                     <dt>{{ 'Name'|trans }}</dt>
                     <dd>
                         {% if thirdParty.isLeaf == true %}{{ thirdParty.civility }}{% endif %}
-                        {{ thirdParty.name }}
+                        {{ thirdParty.firstname ~ ' ' ~ thirdParty.name }}
                     </dd>
 
                     {% if thirdParty.kind == 'company' %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 8e4775aad..87bfb6995 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -43,6 +43,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
     {
         return [
             'type' => 'thirdparty',
+            'firstname' => $thirdParty->getFirstname(),
             'name' => $thirdParty->getName(),
             'text' => $this->thirdPartyRender->renderString($thirdParty, []),
             'id' => $thirdParty->getId(),
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index 8cfa95f80..cec9dee7d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -77,7 +77,9 @@ class ThirdPartyRender extends AbstractChillEntityRender
             $acronym = '';
         }
 
-        return $civility . $entity->getName() . $acronym;
+        $firstname = empty($entity->getFirstname()) ? '' : $entity->getFirstname();
+
+        return $civility . $firstname . ' ' . $entity->getName() . $acronym;
     }
 
     public function supports($entity, array $options): bool
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
index eb303a4f0..035185181 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -20,6 +20,8 @@ components:
           type: string
           enum:
             - "thirdparty"
+        firstname:
+          type: string
         name:
           type: string
         email:
diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/doctrineEventListener.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/doctrineEventListener.yaml
new file mode 100644
index 000000000..8c48e125e
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/doctrineEventListener.yaml
@@ -0,0 +1,9 @@
+services:
+  Chill\ThirdPartyBundle\EventListener\ThirdPartyEventListener:
+    autoconfigure: true
+    tags:
+      -
+        name: 'doctrine.orm.entity_listener'
+        event: 'prePersist'
+        entity: 'Chill\ThirdPartyBundle\Entity\ThirdParty'
+        method: 'prePersistThirdParty'
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
index 2d33bbeb4..90ae37391 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
@@ -39,15 +39,15 @@ final class Version20211007165001 extends AbstractMigration
         $this->addSql("
             UPDATE chill_3party.third_party
                 SET canonicalized =
-                   UNACCENT(
-                           LOWER(
-                                               name ||
-                                               CASE WHEN COALESCE(name_company, '') <> '' THEN ' ' ELSE '' END ||
-                                               COALESCE(name_company, '') ||
-                                               CASE WHEN COALESCE(acronym, '') <> '' THEN ' ' ELSE '' END ||
-                                               COALESCE(acronym, '')
-                               )
-                       )
+                    UNACCENT(
+                            LOWER(
+                                name ||
+                                CASE WHEN COALESCE(name_company, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(name_company, '') ||
+                                CASE WHEN COALESCE(acronym, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(acronym, '')
+                                )
+                        )
         ");
         $this->addSql("
             CREATE OR REPLACE FUNCTION chill_3party.canonicalize() RETURNS TRIGGER
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220322095659.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220322095659.php
new file mode 100644
index 000000000..140539d1e
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220322095659.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\ThirdParty;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220322095659 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP firstname');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add firstname to thirdparty';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD firstname TEXT DEFAULT \'\'');
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php
new file mode 100644
index 000000000..e31b950d4
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php
@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\ThirdParty;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220324175549 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'indexing of firstname on third parties';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("
+            UPDATE chill_3party.third_party
+                SET canonicalized =
+                    UNACCENT(
+                            LOWER(
+                                name ||
+                                CASE WHEN firstname <> '' THEN ' ' ELSE '' END ||
+                                firstname ||
+                                CASE WHEN COALESCE(name_company, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(name_company, '') ||
+                                CASE WHEN COALESCE(acronym, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(acronym, '')
+                                )
+                        )
+        ");
+        $this->addSql("
+            CREATE OR REPLACE FUNCTION chill_3party.canonicalize() RETURNS TRIGGER
+                LANGUAGE plpgsql
+            AS
+                $$
+                BEGIN
+                    NEW.canonicalized =
+                        UNACCENT(
+                            LOWER(
+                                NEW.name ||
+                                CASE WHEN NEW.firstname <> '' THEN ' ' ELSE '' END ||
+                                NEW.firstname ||
+                                CASE WHEN COALESCE(NEW.name_company, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(NEW.name_company, '') ||
+                                CASE WHEN COALESCE(NEW.acronym, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(NEW.acronym, '')
+                                )
+                            )
+                    ;
+
+                    return NEW;
+                END
+                $$
+        ");
+
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql("
+            CREATE OR REPLACE FUNCTION chill_3party.canonicalize() RETURNS TRIGGER
+                LANGUAGE plpgsql
+            AS
+                $$
+                BEGIN
+                    NEW.canonicalized =
+                        UNACCENT(
+                            LOWER(
+                                NEW.name ||
+                                CASE WHEN COALESCE(NEW.name_company, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(NEW.name_company, '') ||
+                                CASE WHEN COALESCE(NEW.acronym, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(NEW.acronym, '')
+                                )
+                            )
+                    ;
+
+                    return NEW;
+                END
+                $$
+        ");
+        $this->addSql("
+            UPDATE chill_3party.third_party
+                SET canonicalized =
+                    UNACCENT(
+                            LOWER(
+                                name ||
+                                CASE WHEN COALESCE(name_company, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(name_company, '') ||
+                                CASE WHEN COALESCE(acronym, '') <> '' THEN ' ' ELSE '' END ||
+                                COALESCE(acronym, '')
+                                )
+                        )
+        ");
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index d0edb22bb..e1962b94a 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -1,6 +1,7 @@
 Third party: Tiers
 Third parties: Tiers
 third parties: tiers
+firstname: Prénom
 name: Nom
 telephone: Téléphone
 adress: Adresse
diff --git a/tests/app b/tests/app
index 3961348aa..8694ad7c4 160000
--- a/tests/app
+++ b/tests/app
@@ -1 +1 @@
-Subproject commit 3961348aa322b98fff625c09d79f8d2f3cd4d6ae
+Subproject commit 8694ad7c4de306f9d5e35af966d24fb2e3e1c2ff