diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-13 10:52:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-13 10:52:59 +0200 |
| commit | 424209f99939fc535ad62588d7e1056fef2ee98c (patch) | |
| tree | ae9edf29c5f2b32f652edc89dbaf9faab2d2d39f | |
| parent | 7f1feb8890c9d8543f6ce468cd0462ee05e43113 (diff) | |
| parent | 056947701cf49777695b379089fe134bef9678f7 (diff) | |
| download | Ishtar-424209f99939fc535ad62588d7e1056fef2ee98c.tar.bz2 Ishtar-424209f99939fc535ad62588d7e1056fef2ee98c.zip | |
Merge branch 'stable'
| -rw-r--r-- | Makefile.example | 1 | ||||
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/Makefile.example b/Makefile.example index be9dbdedf..c18917319 100644 --- a/Makefile.example +++ b/Makefile.example @@ -110,6 +110,7 @@ fixtures_common: fixtures_common_importers fixtures_common_importers: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ ishtar_common.importertype \ + ishtar_common.regexp \ ishtar_common.importerdefault \ ishtar_common.importerdefaultvalues \ ishtar_common.importercolumn \ diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 77935731f..1d33a49fd 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -34,6 +34,24 @@ }, { "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": { + "regexp": "([0-9]*)", + "name": "Num\u00e9ro INSEE", + "description": "" + } + }, + { + "pk": 1, "model": "ishtar_common.importerdefault", "fields": { "importer_type": 1, |