diff --git a/CHANGELOG.md b/CHANGELOG.md
index c82ed46d..fb85b29a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# [2.20.0](https://github.com/AgenceBio/cartobio-front/compare/v2.19.0...v2.20.0) (2023-02-?)
+
+* import de parcellaire depuis Geofolia
+* le statut d'une dérogation de conversion est par défaut "en cours"
+
 # [2.19.0](https://github.com/AgenceBio/cartobio-front/compare/v2.18.4...v2.19.0) (2023-02-10)
 
 * nouvelle page d'accueil
diff --git a/src/components/OperatorSetup/Flow.test.js b/src/components/OperatorSetup/Flow.test.js
index ba81ff14..71f19a80 100644
--- a/src/components/OperatorSetup/Flow.test.js
+++ b/src/components/OperatorSetup/Flow.test.js
@@ -100,7 +100,7 @@ describe("OperatorSetupFlow", () => {
     expect(wrapper.text()).toContain('Sélectionner ma dernière déclaration PAC')
   })
 
-  it("should render tab content for Geofolia when selected", async () => {
+  it("should import successfully a Geofolia archive", async () => {
     const wrapper = mount(OperatorSetupFlow, {
       props: {
         actions: operatorSetupActions,
@@ -112,6 +112,38 @@ describe("OperatorSetupFlow", () => {
     // Click on geofolia tab
     await wrapper.find('ul').find('.import-source-tab--geofolia').trigger('click')
     expect(wrapper.text()).toContain(`Sélectionner mon fichier de parcelles et d'interventions`)
+
+    axios.__createMock.post.mockResolvedValueOnce({
+      data: featureCollectionFixture
+    })
+
+    await wrapper.find('input[type="file"]').setValue('')
+    await flushPromises()
+
+    // it is now called during preview
+    const confirmBtn = await wrapper.find('.fr-btn')
+    expect(confirmBtn.text()).toEqual('Importer ces données')
+  })
+
+  it("should fail on invalid Geofolia archive", async () => {
+    const wrapper = mount(OperatorSetupFlow, {
+      props: {
+        actions: [ ...operatorSetupActions ],
+        flowId: 'source',
+        operator: record.operator
+      }
+    })
+
+    const error = new AxiosError('Fichier invalide')
+    error.response = { status : 400 }
+
+    axios.__createMock.post.mockRejectedValueOnce(error)
+
+    await wrapper.find('ul').find('.import-source-tab--geofolia').trigger('click')
+    await wrapper.find('input[type="file"]').setValue('')
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('Votre fichier n\'est pas reconnu comme un export Geofolia.')
   })
 
   it("should render tab content for RPG when selected", async () => {
diff --git a/src/components/OperatorSetup/Sources/Geofolia.vue b/src/components/OperatorSetup/Sources/Geofolia.vue
index 9443a20a..737f9e8b 100644
--- a/src/components/OperatorSetup/Sources/Geofolia.vue
+++ b/src/components/OperatorSetup/Sources/Geofolia.vue
@@ -27,11 +27,11 @@
 <script setup>
 import { ref } from 'vue'
 import { convertGeofoliaArchiveToGeoJSON } from '@/cartobio-api.js'
+import { sources } from "@/referentiels/imports.js"
 
 const fileInput = ref(null)
 
 const emit = defineEmits(['upload:start', 'upload:complete'])
-const source = 'geofolia'
 const erreur = ref('')
 
 async function handleFileUpload () {
@@ -41,12 +41,12 @@ async function handleFileUpload () {
   try {
     const geojson = await convertGeofoliaArchiveToGeoJSON(archive)
 
-    emit('upload:complete', { geojson, source, warnings: [], metadata: {} })
+    emit('upload:complete', { geojson, source: sources.GEOFOLIA, warnings: [], metadata: {} })
   } catch (error) {
     if (error.response?.status >= 400 && error.response?.status <= 500) {
-      erreur.value = 'votre fichier ne semble pas être valide.'
+      erreur.value = 'Votre fichier n\'est pas reconnu comme un export Geofolia.'
     } else {
-      erreur.value = 'erreur inconnue, merci de réessayer plus tard.'
+      erreur.value = 'Erreur inconnue, merci de réessayer plus tard.'
       throw error
     }
   }
diff --git a/src/pages/exploitations/[numeroBio]/index.vue b/src/pages/exploitations/[numeroBio]/index.vue
index 3ddc9a7f..a36c1932 100644
--- a/src/pages/exploitations/[numeroBio]/index.vue
+++ b/src/pages/exploitations/[numeroBio]/index.vue
@@ -133,7 +133,7 @@ const operatorSetupActions = [
     selector: markRaw(ActionFromSource),
     wizzard: defineAsyncComponent(() => import('@/components/OperatorSetup/Flows/MultiSources.vue')),
     extraProps: {
-      sources: [sources.TELEPAC, ...(permissions.isOc ? [sources.RPG] : []), sources.CVI]
+      sources: [sources.GEOFOLIA, sources.TELEPAC, ...(permissions.isOc ? [sources.RPG] : []), sources.CVI]
     }
   },
   { id: 'manual', selector: markRaw(ActionFromScratch) },
diff --git a/widget/Notification.ce.vue b/widget/Notification.ce.vue
index 612a4036..a3ed2a21 100644
--- a/widget/Notification.ce.vue
+++ b/widget/Notification.ce.vue
@@ -44,7 +44,7 @@ const operatorSetupActions = [
     selector: null,
     wizzard: markRaw(FlowMultiSources),
     extraProps: {
-      sources: [sources.TELEPAC, sources.CVI]
+      sources: [sources.GEOFOLIA, sources.TELEPAC, sources.CVI]
     }
   },
 ]