diff --git a/.changes/unreleased/Feature-20230817-131059.yaml b/.changes/unreleased/Feature-20230817-131059.yaml
new file mode 100644
index 000000000..29de8ec34
--- /dev/null
+++ b/.changes/unreleased/Feature-20230817-131059.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Add locations in Aside Activity. By default, suggest user location, otherwise
+  a select with all locations.
+time: 2023-08-17T13:10:59.152278661+02:00
+custom:
+  Issue: "133"
diff --git a/.changes/unreleased/Feature-20230817-131152.yaml b/.changes/unreleased/Feature-20230817-131152.yaml
new file mode 100644
index 000000000..bf9a165bf
--- /dev/null
+++ b/.changes/unreleased/Feature-20230817-131152.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: 'Adapt Aside Activity exports: display location, filter by location, group by
+  location'
+time: 2023-08-17T13:11:52.911356021+02:00
+custom:
+  Issue: "133"
diff --git a/.changes/unreleased/Fixed-20230817-131239.yaml b/.changes/unreleased/Fixed-20230817-131239.yaml
new file mode 100644
index 000000000..6fc62f433
--- /dev/null
+++ b/.changes/unreleased/Fixed-20230817-131239.yaml
@@ -0,0 +1,5 @@
+kind: Fixed
+body: Missing translation in Work Actions exports
+time: 2023-08-17T13:12:39.159627128+02:00
+custom:
+  Issue: ""
diff --git a/docs/source/_static/code/exports/CountPerson.php b/docs/source/_static/code/exports/CountPerson.php
index be800e52c..5d9cb2c2f 100644
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -94,7 +94,7 @@ class CountPerson implements ExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         // we gather all center the user choose.
-        $centers = array_map(static fn($el) => $el['center'], $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
index 9eca0ae76..cdad6b42b 100644
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -56,7 +56,7 @@ class ChillMainConfiguration implements ConfigurationInterface
             ->end() // end of widgets
             ->end() // end of root/children
             ->end() // end of root
-;
+        ;
 
         return $treeBuilder;
     }
diff --git a/rector.php b/rector.php
index c2e752c32..b8975b970 100644
--- a/rector.php
+++ b/rector.php
@@ -2,6 +2,13 @@
 
 declare(strict_types=1);
 
+/*
+ * 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.
+ */
+
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\LevelSetList;
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 1e911ff08..17545c1af 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -320,7 +320,6 @@ final class ActivityController extends AbstractController
 
     private function buildFilterOrder(AccompanyingPeriod|Person $associated): FilterOrderHelper
     {
-
         $filterBuilder = $this->filterOrderHelperFactory->create(self::class);
         $types = $this->activityACLAwareRepository->findActivityTypeByAssociated($associated);
         $jobs = $this->activityACLAwareRepository->findUserJobByAssociated($associated);
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index 1544dd764..7925f861b 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -322,7 +322,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
             $counter++;
         }
 
-        foreach  ($person->getAccompanyingPeriodParticipations() as $participation) {
+        foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
             if (!$this->security->isGranted(ActivityVoter::SEE, $participation->getAccompanyingPeriod())) {
                 continue;
             }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
index ce4f318e3..74f1d2bd0 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
@@ -122,5 +122,4 @@ class ActivityDocumentACLAwareRepositoryTest extends KernelTestCase
         yield [$person, $scopes, true, null, new \DateTimeImmutable("1 week ago"), "content"];
         yield [$person, [], true, new \DateTimeImmutable("1 month ago"), new \DateTimeImmutable("1 week ago"), "content"];
     }
-
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index 8481f24eb..25cb2a557 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -33,6 +33,7 @@ final class AsideActivityController extends CRUDController
         $asideActivity = new AsideActivity();
 
         $asideActivity->setAgent($this->getUser());
+        $asideActivity->setLocation($this->getUser()->getCurrentLocation());
 
         $duration = $request->query->get('duration', '300');
         $duration = DateTime::createFromFormat('U', $duration);
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index 3dc205f09..412bb873e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -14,6 +14,7 @@ namespace Chill\AsideActivityBundle\Entity;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Location;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -60,9 +61,10 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     private ?int $id = null;
 
     /**
-     * @ORM\Column(type="string", length=100, nullable=true)
+     * @ORM\ManyToOne(targetEntity=Location::class)
+     * @ORM\JoinColumn(nullable=true)
      */
-    private $location;
+    private ?Location $location = null;
 
     /**
      * @ORM\Column(type="text", nullable=true)
@@ -115,7 +117,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->id;
     }
 
-    public function getLocation(): ?string
+    public function getLocation(): ?Location
     {
         return $this->location;
     }
@@ -175,7 +177,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setLocation(?string $location): self
+    public function setLocation(?Location $location): self
     {
         $this->location = $location;
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
new file mode 100644
index 000000000..c6a35e3d7
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * 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.
+ */
+
+namespace Chill\AsideActivityBundle\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\LocationRepository;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByLocationAggregator implements AggregatorInterface
+{
+    public function __construct(private LocationRepository $locationRepository)
+    {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // no form
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.Aside activity localisation';
+            }
+            if (null === $value || '' === $value || null === $l = $this->locationRepository->find($value)) {
+                return '';
+            }
+
+            return $l->getName();
+        };
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryKeys($data): array
+    {
+        return ['by_aside_activity_location_aggregator'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return 'export.aggregator.Group by aside activity location';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $qb->addSelect('IDENTITY(aside.location) AS by_aside_activity_location_aggregator')
+            ->addGroupBy('by_aside_activity_location_aggregator');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function applyOn(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
index b46e120b5..93b0c495d 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
@@ -23,6 +23,7 @@ use Chill\MainBundle\Export\Helper\DateTimeHelper;
 use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use DateTimeInterface;
@@ -58,6 +59,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
         CenterRepositoryInterface $centerRepository,
         AsideActivityCategoryRepository $asideActivityCategoryRepository,
         CategoryRender $categoryRender,
+        private LocationRepository $locationRepository,
         TranslatableStringHelperInterface $translatableStringHelper
     ) {
         $this->em = $em;
@@ -73,6 +75,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
     public function buildForm(FormBuilderInterface $builder)
     {
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -145,6 +148,19 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
                     return $this->categoryRender->renderString($c, []);
                 };
 
+            case 'location':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'export.aside_activity.location';
+                    }
+
+                    if (null === $value || '' === $value || null === $l = $this->locationRepository->find($value)) {
+                        return '';
+                    }
+
+                    return $l->getName();
+                };
+
             case 'main_scope':
                 return function ($value) {
                     if ('_header' === $value) {
@@ -191,6 +207,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
             'date',
             'duration',
             'note',
+            'location',
         ];
     }
 
@@ -226,6 +243,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
             ->addSelect('IDENTITY(aside.type) AS aside_activity_type')
             ->addSelect('aside.date')
             ->addSelect('aside.duration')
+            ->addSelect('IDENTITY(aside.location) AS location')
             ->addSelect('aside.note');
 
         return $qb;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
new file mode 100644
index 000000000..f2808eca1
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * 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.
+ */
+
+namespace Chill\AsideActivityBundle\Export\Filter;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserLocationType;
+use Chill\MainBundle\Repository\LocationRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class ByLocationFilter implements FilterInterface
+{
+    public function __construct(
+        private Security $security
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return 'export.filter.Filter by aside activity location';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('locations', PickUserLocationType::class);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormDefaultData(): array
+    {
+        $user = $this->security->getUser();
+
+        if ($user instanceof User) {
+            return [
+                'locations' => $user->getCurrentLocation(),
+            ];
+        }
+
+        return [
+            'locations' => null,
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function describeAction($data, $format = 'string'): array
+    {
+        $locations = $data['locations']->map(fn (Location $l): string => $l->getName());
+
+        return ['export.filter.Filtered by aside activity location: only %location%', [
+            '%location%' => implode(', ', $locations),
+        ]];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $clause = $qb->expr()->in('aside.location', ':locations');
+
+        $qb->andWhere($clause);
+        $qb->setParameter('locations', $data['locations']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function applyOn(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 727287972..2a6068424 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -13,13 +13,16 @@ namespace Chill\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Form\Type\PickAsideActivityCategoryType;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Form\Type\PickUserLocationType;
 use DateInterval;
 use DateTime;
 use DateTimeImmutable;
 use DateTimeZone;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
@@ -77,7 +80,9 @@ final class AsideActivityFormType extends AbstractType
             ->add('note', ChillTextareaType::class, [
                 'label' => 'Note',
                 'required' => false,
-            ]);
+            ])
+            ->add('location', PickUserLocationType::class)
+        ;
 
         foreach (['duration'] as $fieldName) {
             $builder->get($fieldName)
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
index 5ffc73684..1e2711bfe 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -39,6 +39,9 @@
 										</span>
 									{% endif %}
 								</div>
+                                {%- if entity.location.name is defined -%}
+                                    <div><i class="fa fa-fw fa-map-marker"></i>{{ entity.location.name }}</div>
+                                {%- endif -%}
 							</div>
 							<div class="item-col" style="justify-content: flex-end;">
 								<div class="box">
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
index 75da9a444..8fb487d31 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -22,6 +22,13 @@
 
 				<dt class="inline">{{ 'Created for'|trans }}</dt>
 				<dd>{{ entity.agent }}</dd>
+                
+                <dt class="inline">{{ 'Asideactivity location'|trans }}</dt>
+                {%- if entity.location.name is defined -%}
+                    <dd>{{ entity.location.name }}</dd>
+                {%- else -%}
+                    <dd><span class="chill-no-data-statement">{{ 'No data given'|trans }}</span></dd>
+                {%- endif -%}
 
 				<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
index a29413e15..40cb120da 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
@@ -46,19 +46,27 @@ services:
       tags:
           - { name: chill.export_filter, alias: 'aside_activity_user_filter' }
 
+  Chill\AsideActivityBundle\Export\Filter\ByLocationFilter:
+      tags:
+          - { name: chill.export_filter, alias: 'aside_activity_location_filter' }
+
   ## Aggregators
 
   chill.aside_activity.export.type_aggregator:
     class: Chill\AsideActivityBundle\Export\Aggregator\ByActivityTypeAggregator
     tags:
-      - { name: chill.export_aggregator, alias: activity_type_aggregator }
+      - { name: chill.export_aggregator, alias: 'activity_type_aggregator' }
 
   chill.aside_activity.export.user_job_aggregator:
       class: Chill\AsideActivityBundle\Export\Aggregator\ByUserJobAggregator
       tags:
-          - { name: chill.export_aggregator, alias: aside_activity_user_job_aggregator }
+          - { name: chill.export_aggregator, alias: 'aside_activity_user_job_aggregator' }
 
   chill.aside_activity.export.user_scope_aggregator:
       class: Chill\AsideActivityBundle\Export\Aggregator\ByUserScopeAggregator
       tags:
-          - { name: chill.export_aggregator, alias: aside_activity_user_scope_aggregator }
+          - { name: chill.export_aggregator, alias: 'aside_activity_user_scope_aggregator' }
+
+  Chill\AsideActivityBundle\Export\Aggregator\ByLocationAggregator:
+      tags:
+          - { name: chill.export_aggregator, alias: 'aside_activity_location_aggregator' }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20230816112809.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20230816112809.php
new file mode 100644
index 000000000..bde8af1e3
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20230816112809.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * 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.
+ */
+
+namespace Chill\Migrations\AsideActivity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230816112809 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Update location attribute in asideactivity';
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX chill_asideactivity.IDX_A866DA0E64D218E');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP CONSTRAINT FK_A866DA0E64D218E');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP location_id');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ADD location VARCHAR(100) DEFAULT NULL');
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD location_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity DROP location');
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD CONSTRAINT FK_A866DA0E64D218E FOREIGN KEY (location_id) REFERENCES chill_main_location (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_A866DA0E64D218E ON chill_asideactivity.asideactivity (location_id)');
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 25d07bd22..6028193db 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -26,6 +26,7 @@ Users: Utilisateurs
 Emergency: Urgent
 by: "Par "
 location: Lieu
+Asideactivity location: Localisation de l'activité
 
 # Crud
 crud:
@@ -182,6 +183,7 @@ export:
         duration: Durée
         note: Note
         id: Identifiant
+        location: Localisation
 
     Exports of aside activities: Exports des activités annexes
     Count aside activities: Nombre d'activités annexes
@@ -202,11 +204,16 @@ export:
         Filter by user jobs: Filtrer les activités annexes par métier des utilisateurs
         'Filtered aside activities by user scope: only %scopes%': "Filtré par service des utilisateur: uniquement %scopes%"
         Filter by user scope: Filtrer les activités annexes par service d'utilisateur
+        Filter by aside activity location: Filtrer les activités annexes par localisation
+        'Filtered by aside activity location: only %location%': "Filtré par localisation: uniquement %location%"
     aggregator:
         Group by aside activity type: Grouper les activités annexes par type d'activité
         Aside activity type: Type d'activité annexe
         Aggregate by user job: Grouper les activités annexes par métier des utilisateurs
         Aggregate by user scope: Grouper les activités annexes par service des utilisateurs
+        Aside activity location: Localisation des activités annexe
+        Group by aside activity location: Grouper les activités annexes par localisation
+        Aside activity localisation: Localisation
 
 # ROLES
 CHILL_ASIDE_ACTIVITY_STATS: Statistiques pour les activités annexes
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
index c70072a47..c3632d2db 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
@@ -65,5 +65,4 @@ final readonly class MSUserAbsenceReader implements MSUserAbsenceReaderInterface
             default => throw new UserAbsenceSyncException("this status is not documented by Microsoft")
         };
     }
-
 }
diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
index 6675f7c7e..1040f9f0a 100644
--- a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
@@ -190,6 +190,4 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
 
         return $query;
     }
-
-
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
index 089477fda..2ceab8b1f 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
@@ -172,5 +172,4 @@ class MSUserAbsenceReaderTest extends TestCase
             "User is absent: absence is always enabled"
         ];
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
index 70c41db50..9a0650b2d 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
@@ -94,5 +94,4 @@ final readonly class GenericDocForAccompanyingPeriodController
             ]
         ));
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
index 3484e0904..e010c41c5 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
@@ -91,5 +91,4 @@ final readonly class GenericDocForPerson
             ]
         ));
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
index 30e07a841..b1631bb24 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
@@ -82,7 +82,6 @@ class FetchQuery implements FetchQueryInterface
         }
 
         unset($this->wheres[$index], $this->whereParams[$index], $this->whereTypes[$index]);
-
     }
 
     public function removeJoinClause(int $index): void
@@ -92,7 +91,6 @@ class FetchQuery implements FetchQueryInterface
         }
 
         unset($this->joins[$index], $this->joinParams[$index], $this->joinTypes[$index]);
-
     }
 
     public function getSelectKeyString(): string
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
index 0d3cb1c32..bffa19b53 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
@@ -27,5 +27,4 @@ interface GenericDocForAccompanyingPeriodProviderInterface
      * Return true if the user is allowed to see some documents for this provider.
      */
     public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool;
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
index fd36f7976..fe03a8b00 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
@@ -143,5 +143,4 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
 
         return $query;
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
index 2dee0ed0b..8bb97a9b9 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
@@ -46,5 +46,4 @@ final readonly class GenericDocExtensionRuntime implements RuntimeExtensionInter
 
         throw new \LogicException("no renderer found");
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocRendererInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocRendererInterface.php
index 940001f4a..cdd28ac70 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocRendererInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocRendererInterface.php
@@ -20,5 +20,4 @@ interface GenericDocRendererInterface
     public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string;
 
     public function getTemplateData(GenericDocDTO $genericDocDTO, $options = []): array;
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
index 26a42b894..12506581c 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
@@ -98,7 +98,6 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
                 continue;
             }
             $orPersonId[] = $participation->getPerson()->getId();
-
         }
 
         if ([] === $orPersonId) {
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
index 02be9460f..f55b889a9 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
@@ -54,9 +54,6 @@ class FetchQueryToSqlBuilderTest extends KernelTestCase
         );
         self::assertEquals(['foo', 'bar_baz', 'baz'], $params);
         self::assertEquals([Types::STRING, Types::STRING, Types::STRING], $types);
-
-
-
     }
 
     public function testToSqlWithoutWhere(): void
@@ -85,5 +82,4 @@ class FetchQueryToSqlBuilderTest extends KernelTestCase
         self::assertEquals([], $params);
         self::assertEquals([], $types);
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
index fd611042c..bb372a150 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
@@ -142,7 +142,6 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
         yield [$period, new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), null];
         yield [$period, null, null, 'test'];
         yield [$period, new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), 'test'];
-
     }
 
     public function provideDataBuildFetchQueryForPerson(): iterable
@@ -154,5 +153,4 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
         yield [null, null, 'test'];
         yield [new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), 'test'];
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Cron/CronManager.php b/src/Bundle/ChillMainBundle/Cron/CronManager.php
index a3e82a170..322000cb3 100644
--- a/src/Bundle/ChillMainBundle/Cron/CronManager.php
+++ b/src/Bundle/ChillMainBundle/Cron/CronManager.php
@@ -88,7 +88,6 @@ class CronManager implements CronManagerInterface
         foreach ($orderedJobs as $job) {
             if ($job->canRun($lasts[$job->getKey()] ?? null)) {
                 if (array_key_exists($job->getKey(), $lasts)) {
-
                     $executionData = $lasts[$job->getKey()]->getLastExecutionData();
 
                     $this->entityManager
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
index 51d1b3974..b0d80176b 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -122,7 +122,6 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
             foreach ($helper->getUserPickers() as $name => [
                 'label' => $label, 'options' => $opts
             ]) {
-
                 $userPickersBuilder->add(
                     $name,
                     PickUserDynamicType::class,
@@ -136,7 +135,6 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
 
             $builder->add($userPickersBuilder);
         }
-
     }
 
     public static function buildCheckboxChoices(array $choices, array $trans = []): array
diff --git a/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php b/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
index 0b80730fe..c8ab200fc 100644
--- a/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
@@ -65,7 +65,6 @@ class CronJobDatabaseInteractionTest extends KernelTestCase
         // run a second time
         $manager->run();
     }
-
 }
 
 class JobWithReturn implements CronJobInterface
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
index 69eeca2da..9e83f2e7e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
@@ -64,5 +64,4 @@ class CollateAddressWithReferenceOrPostalCodeCronJobTest extends TestCase
         yield [new \DateTimeImmutable('2023-07-10T12:00:00'), new \DateTimeImmutable('2023-07-01T12:00:00'), true];
         yield [new \DateTimeImmutable('2023-07-10T12:00:00'), null, true];
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
index 5b1038287..f8538cd09 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
@@ -47,11 +47,9 @@ class RelationshipNoDuplicateValidator extends ConstraintValidator
 
         foreach ($relationships as $r) {
             if (spl_object_hash($r) !== spl_object_hash($value)
-                and
-                (
+                and (
                     ($r->getFromPerson() === $fromPerson and $r->getToPerson() === $toPerson)
-                    ||
-                    ($r->getFromPerson() === $toPerson and $r->getToPerson() === $fromPerson)
+                    || ($r->getFromPerson() === $toPerson and $r->getToPerson() === $fromPerson)
                 )
             ) {
                 $this->context->buildViolation($constraint->message)
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 892bb0dfd..12ec6ea29 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -1225,6 +1225,7 @@ export:
         acpw:
             List of accompanying period works: Liste des actions
             List description: Génère une liste des actions d'accompagnement, filtrée sur différents paramètres.
+            Date of calculation for associated elements: Date de calcul des éléments associés
             help_description: L'agent traitant de l'action sera valide à cette date
             id: Identifiant de l'action
             startDate: Date de début
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
index 2d64c69a0..c0d596e09 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
@@ -43,5 +43,4 @@ class SingleTaskStateRepository
 
         return $states;
     }
-
 }