summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-06-18 02:32:00 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-06-18 02:32:00 +0200
commit02e253f47d40d9a0e97302b1101ec382c4bcf704 (patch)
tree5ad7d6084ad9ea05c3a98beb793cc2d0148cd627
parentf47d6fa9562571d6bf3c552eae26fb0b7c6c364b (diff)
parent1770e38eb5cba8d8f3959d2a67384b49c9292f5f (diff)
downloadIshtar-02e253f47d40d9a0e97302b1101ec382c4bcf704.tar.bz2
Ishtar-02e253f47d40d9a0e97302b1101ec382c4bcf704.zip
Merge branch 'stable'
-rw-r--r--ishtar_common/fixtures/initial_importtypes-fr.json8
1 files changed, 8 insertions, 0 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 0a8814274..f7c67fe6d 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -1419,5 +1419,13 @@
"column": 37,
"field_name": "find__label"
}
+ },
+ {
+ "pk": 4,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 5,
+ "field_name": "in_charge__name"
+ }
}
] \ No newline at end of file