diff options
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 793 | ||||
| -rw-r--r-- | ishtar_common/models.py | 1 |
2 files changed, 1 insertions, 793 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 20711c43f..9aedc7753 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -4463,799 +4463,6 @@ }, { "fields": { - "column": [ - "mcc-mobilier", - 5 - ], - "concat_str": null, - "field_name": "label", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 5 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-operations", - 6 - ], - "concat_str": null, - "field_name": "scientist__name", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-ue", - 4 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-parcelles", - 1 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-parcelles", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-ue", - 1 - ], - "concat_str": "-", - "field_name": "parcel__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-ue", - 1 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-ue", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-ue", - 3 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 1 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 2 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 3 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 4 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 5 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 4 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 3 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "mcc-mobilier", - 1 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-context-record", - 1 - ], - "concat_str": "-", - "field_name": "parcel__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-context-record", - 1 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-parcels", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-parcels", - 1 - ], - "concat_str": "", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-context-record", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-context-record", - 3 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-context-record", - 5 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 1 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 1 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 2 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 3 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 3 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 4 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 4 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 5 - ], - "concat_str": "", - "field_name": "label", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 5 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 5 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 36 - ], - "concat_str": "", - "field_name": "container__location__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 36 - ], - "concat_str": "-", - "field_name": "container__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-finds", - 37 - ], - "concat_str": "-", - "field_name": "container__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-operations-sources", - 1 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar-operations-sources", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 1 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 1 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 2 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 2 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 3 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 3 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 4 - ], - "concat_str": "", - "field_name": "external_id", - "concat": true, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 4 - ], - "concat_str": "", - "field_name": "base_finds__external_id", - "concat": true, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 5 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 5 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 6 - ], - "concat_str": "-", - "field_name": "external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 6 - ], - "concat_str": "-", - "field_name": "base_finds__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 6 - ], - "concat_str": "", - "field_name": "base_finds__label", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 2 - ], - "concat_str": "-", - "field_name": "base_finds__context_record__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 1 - ], - "concat_str": "-", - "field_name": "base_finds__context_record__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 3 - ], - "concat_str": "-", - "field_name": "base_finds__context_record__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 4 - ], - "concat_str": "", - "field_name": "base_finds__context_record__external_id", - "concat": true, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 5 - ], - "concat_str": "-", - "field_name": "base_finds__context_record__external_id", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { - "column": [ - "ishtar_finds_parcels_and_cr", - 1 - ], - "concat_str": "", - "field_name": "base_finds__context_record__parcel__operation__code_patriarche", - "concat": false, - "force_new": false - }, - "model": "ishtar_common.importerduplicatefield" -}, -{ - "fields": { "comment": null, "target": "code_patriarche", "column": [ diff --git a/ishtar_common/models.py b/ishtar_common/models.py index c2f75aba3..dd8204f21 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2233,6 +2233,7 @@ class ImporterDuplicateField(models.Model): class Meta: verbose_name = _(u"Importer - Duplicate field") verbose_name_plural = _(u"Importer - Duplicate fields") + ordering = ('column', 'field_name') def natural_key(self): return self.column.importer_type, self.column.col_number, \ |