Fix null -> "" errors - fix tests

2 files changed, 49 insertions, 49 deletions

diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json
index 7e6b8446c..214fa4327 100644
--- a/ishtar_common/fixtures/initial_data-fr.json
+++ b/ishtar_common/fixtures/initial_data-fr.json
@@ -1267,7 +1267,7 @@
     "fields": {
         "label": "Sauvetage urgent",
         "txt_idx": "emergency_excavation",
-        "comment": null,
+        "comment": "",
         "available": true,
         "order": 1,
         "preventive": true
@@ -1278,7 +1278,7 @@
     "fields": {
         "label": "Fouille ancienne",
         "txt_idx": "ancient_excavation",
-        "comment": null,
+        "comment": "",
         "available": true,
         "order": 1,
         "preventive": true
@@ -1322,7 +1322,7 @@
     "fields": {
         "label": "Prospection d\u00e9tecteur de m\u00e9taux",
         "txt_idx": "metal_detector_prospection",
-        "comment": null,
+        "comment": "",
         "available": true,
         "order": 1,
         "preventive": false
@@ -1333,7 +1333,7 @@
     "fields": {
         "label": "Relev\u00e9 d'art rupestre",
         "txt_idx": "cave_art_record",
-        "comment": null,
+        "comment": "",
         "available": true,
         "order": 1,
         "preventive": false
@@ -1388,7 +1388,7 @@
     "fields": {
         "label": "Diagnostic arch\u00e9ologique (programm\u00e9)",
         "txt_idx": "arch_diagnostic_research",
-        "comment": null,
+        "comment": "",
         "available": true,
         "order": 1,
         "preventive": false
@@ -1421,7 +1421,7 @@
     "fields": {
         "label": "M.",
         "txt_idx": "mr",
-        "comment": null,
+        "comment": "",
         "available": true
     }
 },
@@ -1457,7 +1457,7 @@
     "fields": {
         "label": "Dr.",
         "txt_idx": "dr",
-        "comment": null,
+        "comment": "",
         "available": true
     }
 },
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 374b5ccbc..bf897ebda 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -5569,7 +5569,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5588,7 +5588,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5607,7 +5607,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5626,7 +5626,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5645,7 +5645,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5664,7 +5664,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5683,7 +5683,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5702,7 +5702,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5740,7 +5740,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5759,7 +5759,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5778,7 +5778,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5797,7 +5797,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5816,7 +5816,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5835,7 +5835,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5854,7 +5854,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5873,7 +5873,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5892,7 +5892,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5911,7 +5911,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5930,7 +5930,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5949,7 +5949,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5968,7 +5968,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -5987,7 +5987,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6044,7 +6044,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6063,7 +6063,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6082,7 +6082,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6101,7 +6101,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6120,7 +6120,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6158,7 +6158,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6177,7 +6177,7 @@
         "force_new": true,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6234,7 +6234,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6253,7 +6253,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6272,7 +6272,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6291,7 +6291,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6329,7 +6329,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6348,7 +6348,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6405,7 +6405,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6424,7 +6424,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6443,7 +6443,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6462,7 +6462,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6481,7 +6481,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6519,7 +6519,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {
@@ -6538,7 +6538,7 @@
         "force_new": false,
         "concat": false,
         "concat_str": null,
-        "comment": null
+        "comment": ""
     }
 },
 {