diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-16 15:44:31 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-16 15:44:31 +0200 |
| commit | 00d6408e1542fd4f2d4a9db468a0b1ca429c20ff (patch) | |
| tree | e74c90a5bd347980900cb6a8b79888e5a7f4dba4 | |
| parent | 870c380d9b8b975c16b8a164420114812614a111 (diff) | |
| parent | ff26df85f5f325e63378b81f9cc89fe4f7a8f9c6 (diff) | |
| download | Ishtar-00d6408e1542fd4f2d4a9db468a0b1ca429c20ff.tar.bz2 Ishtar-00d6408e1542fd4f2d4a9db468a0b1ca429c20ff.zip | |
Merge branch 'stable'
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 111 |
1 files changed, 63 insertions, 48 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 92a0c10d7..0a8814274 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -55,15 +55,6 @@ } }, { - "pk": 1, - "model": "ishtar_common.regexp", - "fields": { - "regexp": "([A-Za-z]*)([0-9]*)", - "name": "Parcelle : secteur et num\u00e9ro", - "description": "" - } - }, - { "pk": 2, "model": "ishtar_common.regexp", "fields": { @@ -107,6 +98,39 @@ } }, { + "pk": 51, + "model": "ishtar_common.importercolumn", + "fields": { + "col_number": 3, + "required": false, + "importer_type": 2, + "description": "Num\u00e9ro", + "regexp_pre_filter": null + } + }, + { + "pk": 52, + "model": "ishtar_common.importercolumn", + "fields": { + "col_number": 4, + "required": false, + "importer_type": 2, + "description": "Section", + "regexp_pre_filter": null + } + }, + { + "pk": 53, + "model": "ishtar_common.importercolumn", + "fields": { + "col_number": 2, + "required": true, + "importer_type": 2, + "description": "Identifiant externe", + "regexp_pre_filter": null + } + }, + { "pk": 44, "model": "ishtar_common.importercolumn", "fields": { @@ -239,17 +263,6 @@ } }, { - "pk": 10, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "required": true, - "importer_type": 2, - "description": "Section et num\u00e9ro de parcelle", - "regexp_pre_filter": 1 - } - }, - { "pk": 11, "model": "ishtar_common.importercolumn", "fields": { @@ -1027,26 +1040,6 @@ } }, { - "pk": 10, - "model": "ishtar_common.importtarget", - "fields": { - "column": 10, - "formater_type": 7, - "target": "section", - "regexp_filter": null - } - }, - { - "pk": 11, - "model": "ishtar_common.importtarget", - "fields": { - "column": 10, - "formater_type": 8, - "target": "parcel_number", - "regexp_filter": null - } - }, - { "pk": 12, "model": "ishtar_common.importtarget", "fields": { @@ -1167,6 +1160,36 @@ } }, { + "pk": 53, + "model": "ishtar_common.importtarget", + "fields": { + "column": 51, + "formater_type": 8, + "target": "parcel_number", + "regexp_filter": null + } + }, + { + "pk": 54, + "model": "ishtar_common.importtarget", + "fields": { + "column": 52, + "formater_type": 7, + "target": "section", + "regexp_filter": null + } + }, + { + "pk": 55, + "model": "ishtar_common.importtarget", + "fields": { + "column": 53, + "formater_type": 11, + "target": "external_id", + "regexp_filter": null + } + }, + { "pk": 5, "model": "ishtar_common.formatertype", "fields": { @@ -1396,13 +1419,5 @@ "column": 37, "field_name": "find__label" } - }, - { - "pk": 4, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 10, - "field_name": "external_id" - } } ]
\ No newline at end of file |