summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-06-11 03:37:37 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-06-11 03:37:37 +0200
commitadfad74f8ad345629397b0b702d5aa84a85a1bfc (patch)
tree4bc8d2ac38d1e2bd52536b06a8e49ace3b774430 /ishtar_common
parent34bc80f07d84ee72b60604742a323ef93b53f6bc (diff)
parent855939d5bbb466214bdafe677ce4c0b7b15fd332 (diff)
downloadIshtar-adfad74f8ad345629397b0b702d5aa84a85a1bfc.tar.bz2
Ishtar-adfad74f8ad345629397b0b702d5aa84a85a1bfc.zip
Merge branch 'stable'
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/fixtures/initial_importtypes-fr.json32
1 files changed, 32 insertions, 0 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 4cb490128..92a0c10d7 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -1372,5 +1372,37 @@
"many_split": "",
"options": "%Y"
}
+ },
+ {
+ "pk": 1,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 37,
+ "field_name": "find__external_id"
+ }
+ },
+ {
+ "pk": 2,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 37,
+ "field_name": "label"
+ }
+ },
+ {
+ "pk": 3,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "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