Merge branch 'stable'

1 files changed, 60 insertions, 25 deletions

diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 238636de4..cd8e2e611 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -96,22 +96,13 @@
         }
     }, 
     {
-        "pk": 1, 
-        "model": "ishtar_common.importercolumn", 
-        "fields": {
-            "col_number": 1, 
-            "required": true, 
-            "importer_type": 1, 
-            "regexp_pre_filter": null
-        }
-    }, 
-    {
         "pk": 2, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 3, 
             "required": true, 
             "importer_type": 1, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -122,16 +113,7 @@
             "col_number": 4, 
             "required": true, 
             "importer_type": 1, 
-            "regexp_pre_filter": null
-        }
-    }, 
-    {
-        "pk": 5, 
-        "model": "ishtar_common.importercolumn", 
-        "fields": {
-            "col_number": 6, 
-            "required": true, 
-            "importer_type": 1, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -142,6 +124,7 @@
             "col_number": 9, 
             "required": false, 
             "importer_type": 1, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -152,6 +135,7 @@
             "col_number": 5, 
             "required": true, 
             "importer_type": 1, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -162,6 +146,7 @@
             "col_number": 7, 
             "required": true, 
             "importer_type": 1, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -172,6 +157,7 @@
             "col_number": 8, 
             "required": true, 
             "importer_type": 1, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -182,6 +168,7 @@
             "col_number": 1, 
             "required": true, 
             "importer_type": 2, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -192,6 +179,7 @@
             "col_number": 2, 
             "required": true, 
             "importer_type": 2, 
+            "description": null, 
             "regexp_pre_filter": 1
         }
     }, 
@@ -202,6 +190,7 @@
             "col_number": 5, 
             "required": false, 
             "importer_type": 2, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -212,6 +201,7 @@
             "col_number": 7, 
             "required": false, 
             "importer_type": 2, 
+            "description": null, 
             "regexp_pre_filter": 2
         }
     }, 
@@ -222,6 +212,7 @@
             "col_number": 9, 
             "required": false, 
             "importer_type": 2, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -232,6 +223,7 @@
             "col_number": 1, 
             "required": true, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -242,6 +234,7 @@
             "col_number": 2, 
             "required": true, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -252,6 +245,7 @@
             "col_number": 4, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -262,6 +256,7 @@
             "col_number": 5, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -272,6 +267,7 @@
             "col_number": 6, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -282,6 +278,7 @@
             "col_number": 7, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -292,6 +289,7 @@
             "col_number": 8, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -302,6 +300,7 @@
             "col_number": 9, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -312,6 +311,7 @@
             "col_number": 12, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -322,6 +322,7 @@
             "col_number": 13, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -332,6 +333,7 @@
             "col_number": 16, 
             "required": false, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -342,6 +344,7 @@
             "col_number": 1, 
             "required": true, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -352,6 +355,7 @@
             "col_number": 2, 
             "required": true, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -362,6 +366,7 @@
             "col_number": 3, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -372,6 +377,7 @@
             "col_number": 4, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -382,6 +388,7 @@
             "col_number": 5, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -392,6 +399,7 @@
             "col_number": 6, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -402,6 +410,7 @@
             "col_number": 7, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -412,6 +421,7 @@
             "col_number": 9, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -422,6 +432,7 @@
             "col_number": 10, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -432,6 +443,7 @@
             "col_number": 11, 
             "required": false, 
             "importer_type": 4, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
@@ -442,17 +454,30 @@
             "col_number": 3, 
             "required": true, 
             "importer_type": 3, 
+            "description": null, 
             "regexp_pre_filter": null
         }
     }, 
     {
         "pk": 1, 
-        "model": "ishtar_common.importtarget", 
+        "model": "ishtar_common.importercolumn", 
         "fields": {
-            "column": 1, 
-            "formater_type": 1, 
-            "target": "operation_code", 
-            "regexp_filter": null
+            "col_number": 1, 
+            "required": true, 
+            "importer_type": 1, 
+            "description": null, 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
+        "pk": 5, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 6, 
+            "required": true, 
+            "importer_type": 1, 
+            "description": null, 
+            "regexp_pre_filter": null
         }
     }, 
     {
@@ -806,6 +831,16 @@
         }
     }, 
     {
+        "pk": 1, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "column": 1, 
+            "formater_type": 1, 
+            "target": "code_patriarche", 
+            "regexp_filter": null
+        }
+    }, 
+    {
         "pk": 5, 
         "model": "ishtar_common.formatertype", 
         "fields": {