diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 14:39:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 14:39:13 +0200 |
| commit | eb1585c1ea526d2f0979d6a91b33ed1023f4d8e0 (patch) | |
| tree | 8b9cef16c3dc1077b81465029b102391fa6106fa /archaeological_finds/fixtures/initial_data-fr.json | |
| parent | 073e8c59195863fcd70ca0723fd110fc2f908758 (diff) | |
| parent | cdec41e1a2af5fc2a3ab9ca8d3d4ad6fcab848c3 (diff) | |
| download | Ishtar-eb1585c1ea526d2f0979d6a91b33ed1023f4d8e0.tar.bz2 Ishtar-eb1585c1ea526d2f0979d6a91b33ed1023f4d8e0.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_finds/fixtures/initial_data-fr.json')
| -rw-r--r-- | archaeological_finds/fixtures/initial_data-fr.json | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/archaeological_finds/fixtures/initial_data-fr.json b/archaeological_finds/fixtures/initial_data-fr.json index b8f233f88..c7f0699b1 100644 --- a/archaeological_finds/fixtures/initial_data-fr.json +++ b/archaeological_finds/fixtures/initial_data-fr.json @@ -857,6 +857,21 @@ } }, { + "pk": 20, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Remontage virtuel : on sait que les \u00e9l\u00e9ments remontent ensemble, mais il n'y a pas eu de remontage physique p\u00e9renne.", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": true, + "label": "Remontage virtuel", + "upstream_is_many": true, + "order": 10, + "txt_idx": "virtual-reassembly" + } + }, + { "pk": 6, "model": "archaeological_finds.treatmentstate", "fields": { |