diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 16:53:10 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 16:53:10 +0100 |
| commit | 67208dbd830ce4eb75d77f59d1ffd31c63b19d80 (patch) | |
| tree | cff73359a85d362bd3b24f853fb6d461a583b91b /archaeological_finds/models.py | |
| parent | 161d29195cb9719b9c6ae4903c2c526f797bdf5f (diff) | |
| parent | ad5d9f7c0d5b0ca5a0ba76e279fc5d6e2683216a (diff) | |
| download | Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.tar.bz2 Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_finds/models.py')
| -rw-r--r-- | archaeological_finds/models.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 1a1ef063d..eb209461f 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -1,6 +1,7 @@ from archaeological_finds.models_finds import MaterialType, ConservatoryState,\ PreservationType, IntegrityType, RemarkabilityType, ObjectType, BaseFind, \ - FindBasket, Find, FindSource, Property, CHECK_CHOICES, BatchType + FindBasket, Find, FindSource, Property, CHECK_CHOICES, BatchType, \ + BFBulkView, FBulkView, FirstBaseFindView from archaeological_finds.models_treatments import TreatmentType, Treatment, \ AbsFindTreatments, FindUpstreamTreatments, FindDownstreamTreatments, \ FindTreatments, TreatmentSource, TreatmentFile, TreatmentFileType, \ @@ -9,6 +10,7 @@ from archaeological_finds.models_treatments import TreatmentType, Treatment, \ __all__ = ['MaterialType', 'ConservatoryState', 'PreservationType', 'IntegrityType', 'RemarkabilityType', 'ObjectType', 'BaseFind', 'FindBasket', 'Find', 'FindSource', 'Property', + 'BFBulkView', 'FBulkView', 'FirstBaseFindView', 'CHECK_CHOICES', 'BatchType', 'TreatmentType', 'TreatmentState', 'Treatment', 'AbsFindTreatments', 'FindUpstreamTreatments', 'FindDownstreamTreatments', 'FindTreatments', 'TreatmentSource', |