diff --git a/apps/maarch_entreprise/index.php b/apps/maarch_entreprise/index.php
index dd02461d2c1c113dcd6d607dd344d5fcd6acb9a9..1e834620d366895250263a027637d6284a30d90a 100755
--- a/apps/maarch_entreprise/index.php
+++ b/apps/maarch_entreprise/index.php
@@ -360,21 +360,22 @@ if (!empty($_REQUEST['page']) && empty($_REQUEST['triggerAngular'])) {
 
     //INIT ANGULAR MODE
     if (!empty($_REQUEST['triggerAngular']) && $_REQUEST['triggerAngular'] == 'changePass') {
-        ?><script>triggerAngular('#/password-modification')</script><?php
+        ?>
+<script>
+    triggerAngular('#/password-modification')
+</script><?php
     } elseif (!empty($_REQUEST['triggerAngular']) && $_REQUEST['triggerAngular'] == 'activateUser') {
-        ?><script>triggerAngular('#/activate-user')</script><?php
+        ?><script>
+    triggerAngular('#/activate-user')
+</script><?php
     } elseif ($cookie['userId'] == 'superadmin' && !empty($_REQUEST['administration'])) {
-        ?><script>triggerAngular('#/administration')</script><?php
+        ?><script>
+    triggerAngular('#/administration')
+</script><?php
     } elseif (!empty($_REQUEST['scanGroupId']) && !empty($_REQUEST['tmpfilename'])) {
-        ?><script>triggerAngular('#/indexing/<?php echo $_REQUEST['scanGroupId']?>?tmpfilename=<?php echo $_REQUEST['tmpfilename']?>')</script><?php
-    } elseif (!empty($_REQUEST['linkToDoc'])) {
         ?><script>
-    location.href = "../../rest/resources/<?php echo $_REQUEST['linkToDoc']?>/content?mode=view"
+    triggerAngular('#/indexing/<?php echo $_REQUEST['scanGroupId']?>?tmpfilename=<?php echo $_REQUEST['tmpfilename']?>')
 </script><?php
-    } elseif (!empty($_REQUEST['linkToDetail'])) {
-        ?><script>triggerAngular('#/resources/<?php echo $_REQUEST['linkToDetail']?>')</script><?php
-    } elseif (!empty($_REQUEST['linkToProcess']) && !empty($_REQUEST['userId']) && !empty($_REQUEST['groupId']) && !empty($_REQUEST['basketId'])) {
-        ?><script>triggerAngular('#/process/users/<?php echo $_REQUEST['userId']?>/groups/<?php echo $_REQUEST['groupId']?>/baskets/<?php echo $_REQUEST['basketId']?>/resId/<?php echo $_REQUEST['linkToProcess']?>')</script><?php
     } elseif (empty($_REQUEST['page'])) {
         ?>
             <script>
diff --git a/package.json b/package.json
index 14b9b20c457dc5b57728c7eb5beccb18d67ed603..c0eef20ce2b200796f9891a53eb2b30dae5c26d2 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MaarchCourrier",
-  "version": "20.03.1",
+  "version": "20.10.1",
   "description": "MaarchCourrier",
   "scripts": {
     "build-css": "node-sass --include-path scss src/frontend/css/maarch-material.scss   src/frontend/css/maarch-material.css --output-style compressed",
diff --git a/src/app/template/controllers/DatasourceController.php b/src/app/template/controllers/DatasourceController.php
index d8b14daa58c70b234c446fdeb9340f576554197c..b0e7281b311a886804f710a5745afa8fcb9d6840 100755
--- a/src/app/template/controllers/DatasourceController.php
+++ b/src/app/template/controllers/DatasourceController.php
@@ -47,8 +47,6 @@ class DatasourceController
         $datasources['res_letterbox'] = [];
         $datasources['contact']       = [];
         
-        $urlToApp = trim($aArgs['params']['maarchUrl'], '/').'/apps/maarch_entreprise/index.php?';
-        
         $basket = BasketModel::getByBasketId(['select' => ['id'], 'basketId' => 'MyBasket']);
         $preferenceBasket = UserBasketPreferenceModel::get([
             'select'  => ['group_serial_id'],
@@ -94,10 +92,10 @@ class DatasourceController
             ])[0];
         
             // Lien vers la page detail
-            $res['linktodoc']     = $urlToApp . 'linkToDoc='.$res['res_id'];
-            $res['linktodetail']  = $urlToApp . 'linkToDetail='.$res['res_id'];
-            if (!empty($res['res_id']) && !empty($preferenceBasket[0]['group_serial_id']) && !empty($basket['id']) && !empty($aArgs['params']['recipient']['user_id'])) {
-                $res['linktoprocess'] = $urlToApp . 'linkToProcess='.$res['res_id'].'&groupId='.$preferenceBasket[0]['group_serial_id'].'&basketId='.$basket['id'].'&userId='.$aArgs['params']['recipient']['user_id'];
+            $res['linktodoc']     = trim($aArgs['params']['maarchUrl'], '/') . '/rest/resources/'.$res['res_id'].'/content?mode=view';
+            $res['linktodetail']  = trim($aArgs['params']['maarchUrl'], '/') . '/dist/index.html#/resources/'.$res['res_id'];
+            if (!empty($res['res_id']) && !empty($preferenceBasket[0]['group_serial_id']) && !empty($basket['id']) && !empty($aArgs['params']['recipient']['id'])) {
+                $res['linktoprocess'] = trim($aArgs['params']['maarchUrl'], '/') . '/dist/index.html#/process/users/'.$aArgs['params']['recipient']['id'].'/groups/'.$preferenceBasket[0]['group_serial_id'].'/baskets/'.$basket['id'].'/resId/'.$res['res_id'];
             }
         
             if (!empty($res['initiator'])) {
@@ -135,9 +133,6 @@ class DatasourceController
         $datasources['recipient'][0] = $aArgs['params']['recipient'];
         $datasources['notes']        = array();
         
-        // Link to detail page
-        $urlToApp = trim($aArgs['params']['maarchUrl'], '/').'/apps/maarch_entreprise/index.php?';
-        
         $basket = BasketModel::getByBasketId(['select' => ['id'], 'basketId' => 'MyBasket']);
         $preferenceBasket = UserBasketPreferenceModel::get([
             'select'  => ['group_serial_id'],
@@ -164,11 +159,11 @@ class DatasourceController
                 $datasources['res_letterbox'][] = $resLetterbox;
             }
         
-            $note['linktodoc']     = $urlToApp . 'linkToDoc='.$resId;
-            $note['linktodetail']  = $urlToApp . 'linkToDetail='.$resId;
+            $note['linktodoc']     = trim($aArgs['params']['maarchUrl'], '/') . '/rest/resources/'.$resId.'/content?mode=view';
+            $note['linktodetail']  = trim($aArgs['params']['maarchUrl'], '/') . '/dist/index.html#/resources/'.$resId;
         
-            if (!empty($resId) && !empty($preferenceBasket[0]['group_serial_id']) && !empty($basket['id']) && !empty($aArgs['params']['recipient']['user_id'])) {
-                $note['linktoprocess'] = $urlToApp . 'linkToProcess='.$resId.'&groupId='.$preferenceBasket[0]['group_serial_id'].'&basketId='.$basket['id'].'&userId='.$aArgs['params']['recipient']['user_id'];
+            if (!empty($resId) && !empty($preferenceBasket[0]['group_serial_id']) && !empty($basket['id']) && !empty($aArgs['params']['recipient']['id'])) {
+                $note['linktoprocess'] = trim($aArgs['params']['maarchUrl'], '/') . '/dist/index.html#/process/users/'.$aArgs['params']['recipient']['id'].'/groups/'.$preferenceBasket[0]['group_serial_id'].'/baskets/'.$basket['id'].'/resId/'.$resId;
             }
         
             $resourceContacts = ResourceContactModel::get([