Fix tests and fixtures for new document management (refs #4107)

11 files changed, 119 insertions, 1930 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 1636c7897..82c7cc34e 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -455,7 +455,7 @@ class FindSelect(TableSelect):
     base_finds__batch = forms.ChoiceField(
         label=_(u"Batch/object"), choices=[])
     checked = forms.ChoiceField(label=_("Check"))
-    images__pk__isnull = forms.NullBooleanField(label=_(u"Has an image?"))
+    documents__image__isnull = forms.NullBooleanField(label=_(u"Has an image?"))
 
     def __init__(self, *args, **kwargs):
         super(FindSelect, self).__init__(*args, **kwargs)
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index a217eb079..b269c0135 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -647,7 +647,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
     ATTRS_EQUIV = {'get_first_base_find': 'base_finds'}
 
     # search parameters
-    REVERSED_BOOL_FIELDS = ['images__pk__isnull']
+    REVERSED_BOOL_FIELDS = ['documents__image__isnull']
     RELATION_TYPES_PREFIX = {
         'ope_relation_types':
             'base_finds__context_record__operation__',
@@ -687,7 +687,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
         'base_finds__batch': 'base_finds__batch',
         'basket': 'basket',
         'cached_label': 'cached_label__icontains',
-        'images__pk__isnull': 'images__pk__isnull',
+        'documents__image__isnull': 'documents__image__isnull',
         'container__location': 'container__location__pk',
         'container__responsible': 'container__responsible__pk',
         'container__index': 'container__index',
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 1843ff094..a4a1ad471 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -29,7 +29,7 @@ from ishtar_common.models import ImporterType, IshtarUser, ImporterColumn,\
     FormaterType, ImportTarget, IshtarSiteProfile, ProfileType
 
 from ishtar_common.models import Person, get_current_profile, UserProfile, \
-    Town, Area, IshtarImage
+    Town, Area, Document
 from archaeological_context_records.models import Period, Dating, ContextRecord
 from archaeological_finds import models, views
 from archaeological_warehouse.models import Warehouse, WarehouseType
@@ -277,7 +277,7 @@ class ImportFindTest(ImportTest, TestCase):
                                             importer_type_id=MCC.pk)
         formater = FormaterType.objects.filter(
             formater_type='FileFormater').all()[0]
-        ImportTarget.objects.create(target='images__image',
+        ImportTarget.objects.create(target='documents__image',
                                     formater_type_id=formater.pk,
                                     column_id=col.pk)
         mcc_file = open(
@@ -636,21 +636,18 @@ class FindSearchTest(FindInit, TestCase):
     def test_image_search(self):
         c = Client()
         c.login(username=self.username, password=self.password)
-        search = {'images__pk__isnull': 2}  # 2 for nullboolfield is None
+        search = {'documents__image__isnull': 2}  # 2 for nullboolfield is None
         response = c.get(reverse('get-find'), search)
         self.assertEqual(response.status_code, 200)
         res = json.loads(response.content)
         self.assertEqual(res['recordsTotal'], 0)
 
         # add an image to the first find
-        image = IshtarImage.objects.create(name="Image!")
+        image = Document.objects.create(title="Image!")
         img = settings.ROOT_PATH + \
               '../ishtar_common/static/media/images/ishtar-bg.jpg'
         image.image.save('ishtar-bg.jpg', File(open(img)))
-        models.FindImage.objects.create(
-            item=self.finds[0],
-            image=image
-        )
+        self.finds[0].documents.add(image)
         self.finds[0].save()
         response = c.get(reverse('get-find'), search)
         self.assertEqual(response.status_code, 200)
@@ -738,12 +735,9 @@ class PackagingTest(FindInit, TestCase):
 
         self.create_finds(data_base={"label": u"Find 1"}, force=True)
         self.create_finds(data_base={"label": u"Find 2"}, force=True)
-        image = IshtarImage.objects.create(name="Image!")
+        image = Document.objects.create(title="Image!")
         image.image.save('ishtar-bg.jpg', File(open(img)))
-        models.FindImage.objects.create(
-            item=self.finds[0],
-            image=image
-        )
+        self.finds[0].documents.add(image)
         self.finds[0].save()
 
         self.basket = models.FindBasket.objects.create(
@@ -776,8 +770,8 @@ class PackagingTest(FindInit, TestCase):
 
         # image names used to be altered on save: check for this bug
         self.assertEqual(
-            resulting_find.images.all()[0].name,
-            models.Find.objects.get(pk=first_find.pk).images.all()[0].name
+            resulting_find.documents.all()[0].title,
+            models.Find.objects.get(pk=first_find.pk).documents.all()[0].title
         )
 
         # new version of the find is in the basket
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py
deleted file mode 100644
index 5155e9fc6..000000000
--- a/archaeological_operations/import_from_csv.py
+++ /dev/null
@@ -1,439 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2012-2013  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# See the file COPYING for details.
-
-"""
-Utils: import archaeological operation from a CSV file
-"""
-
-DELIMITER = ";"
-QUOTECHAR = '"'
-
-import datetime
-import csv, codecs
-import re
-
-from django.conf import settings
-from django.db import transaction
-from django.template.defaultfilters import slugify
-
-from archaeological_operations.utils import *
-
-from django.contrib.auth.models import User
-from ishtar_common.models import Town, Person, PersonType, OrganizationType, \
-    Organization, SourceType
-from archaeological_files.models import PermitType, File, FileType
-from archaeological_operations.models import Operation, OperationType, Period, \
-                            AdministrativeAct, ActType, OperationSource, Parcel
-
-class Column:
-    def __init__(self, col_models, format, associated_cols=None, multi=False):
-        self.col_models, self.format = col_models, format
-        self.associated_cols, self.multi = associated_cols, multi
-
-def unicode_csv_reader(unicode_csv_data, dialect=csv.excel, **kwargs):
-    # csv.py doesn't do Unicode; encode temporarily as UTF-8:
-
-    csv_reader = csv.reader(utf_8_encoder(unicode_csv_data),
-                            dialect=dialect, **kwargs)
-    for row in csv_reader:
-        # decode UTF-8 back to Unicode, cell by cell:
-        yield [unicode(cell, 'utf-8') for cell in row]
-
-def utf_8_encoder(unicode_csv_data):
-    for line in unicode_csv_data:
-        yield line.encode('utf-8')
-
-# attrs, convert
-DEFAULT_OPE_COLS = [
- [], # numéro de dossier ?
- (('operation_type',), parse_operationtype),
- (('common_name',), unicode),
- (('in_charge', 'name'), unicode),
- (('in_charge', 'surname'), unicode),
- [], # État ?
- [], # Adresse ?
- [], # origine ?
- (('periods',), parse_period),
- [], # Programme ?
- [], # Rattach PC ?
- [], # vide
- (('administrative_act', 'ref_sra'), unicode),
- (('administrative_act', 'signature_date'), parse_date),
- (('start_date',), parse_date),
- (('excavation_end_date',), parse_date),
- (('year',), parse_year),
- [], # identification
- (('code_patriarche',), unicode),
- [], # X degré
- [], # Y degré
- [], # X saisi ?
- [], # Y saisi ?
- [], # georef
- [], # geometrie
- (('surface',), parse_surface),
-]
-
-_OPE_COLS = settings.ISHTAR_OPE_COL_FORMAT if settings.ISHTAR_OPE_COL_FORMAT \
-                                          else DEFAULT_OPE_COLS
-
-OPE_COLS = []
-for cols in _OPE_COLS:
-    if cols:
-        OPE_COLS.append(Column(*cols))
-    else:
-        OPE_COLS.append(None)
-
-def ope_postimportfix(ope, dct):
-    changed = False
-    if not ope.year:
-        sd = dct.get('start_date')
-        ed = dct.get('end_date')
-        if sd:
-            ope.year = sd.year
-            changed = True
-        elif ed:
-            ope.year = ed.year
-            changed = True
-    if changed:
-        ope.save()
-    return ope
-
-class BreakIt(Exception):
-    pass
-
-class RelatedClass:
-    def __init__(self, key, cls, default_data={}, reverse_key=False,
-                 unique_keys=[], extra_data=[], mandatory_fields=[],
-                 multi=None):
-        self.key, self.cls, self.default_data = key, cls, default_data
-        self.reverse_key, self.unique_keys = reverse_key, unique_keys
-        self.extra_data, self.multi = extra_data, multi
-        self.mandatory_fields = mandatory_fields
-
-    def create_object(self, data):
-        for mandatory_field in self.mandatory_fields:
-            if not data.get(mandatory_field):
-                return None
-        if self.unique_keys:
-            unique_data = {}
-            for k in self.unique_keys:
-                unique_data[k] = data.pop(k)
-            created = False
-            filtr = unique_data.copy()
-            q = None
-            # check if all condition have a value
-            if not [k for k in filtr if not filtr[k]]:
-                q = self.cls.objects.filter(**unique_data)
-            if q and q.count() > 1:
-                obj = q.all()[0]
-            else:
-                unique_data['defaults'] = data
-                try:
-                    obj, created = self.cls.objects.get_or_create(**unique_data)
-                except ValueError:
-                    return None
-            if not created:
-                for k in unique_data['defaults']:
-                    try:
-                        setattr(obj, k, unique_data['defaults'][k])
-                    except ValueError:
-                        continue
-                obj.save()
-        else:
-            obj = self.cls.objects.create(**data)
-        return obj
-
-    def create(self, item, data, attr=None):
-        datas = data
-        if not self.multi:
-            datas = [data]
-        objs = []
-        for data in datas:
-            if self.reverse_key:
-                data[self.reverse_key] = item
-                if self.reverse_key not in self.unique_keys:
-                    self.unique_keys.append(self.reverse_key)
-                obj = self.create_object(data)
-            else:
-                obj = getattr(item, attr)
-                if not obj:
-                    obj = self.create_object(data)
-                    setattr(item, attr, obj)
-                    item.save()
-                else:
-                    for k in data:
-                        setattr(obj, k, data[k])
-                    obj.save()
-            objs.append(obj)
-        if not self.multi:
-            return objs[0]
-        return objs
-
-#@transaction.commit_manually
-def import_operations_csv(values, col_defs=OPE_COLS, update=True, person=None,
-                      stdout=None, lines=None):
-    default_person = person or User.objects.order_by('pk').all()[0]
-    RELATED_CLASSES = [
-        RelatedClass('administrative_act', AdministrativeAct,
-                     default_data={'history_modifier':default_person,
-                                     'act_type':ActType.objects.get(
-                                            txt_idx='excavation_order')
-                                     },
-                     reverse_key='operation',
-                     unique_keys=['ref_sra']),
-        #RelatedClass('associated_file', File,
-        #             extra_data=['year'],
-        #             default_data={'history_modifier':default_person,
-        #                           'file_type':FileType.objects.get(
-        #                                        txt_idx='undefined')},
-        #             unique_keys=['internal_reference', 'year']),
-        RelatedClass('source', OperationSource, reverse_key='operation',
-                     unique_keys=['index']),
-        RelatedClass('parcels', Parcel, reverse_key='operation',
-                     unique_keys=['operation', 'town', 'section',
-                                  'parcel_number'],
-                     multi=True),
-    ]
-    RELATED_CLASSES_KEYS = dict([(rel_cls.key, rel_cls)
-                                   for rel_cls in RELATED_CLASSES])
-    related_classes = RELATED_CLASSES_KEYS
-    _prepare_ope_types()
-
-    ope_default = {'history_modifier':default_person}
-    new_ops = 0
-    error_ope, error_reversed, error_multis = [], [], []
-    multi_keys = set([column.col_models[0]
-                      for column in col_defs if column and column.multi])
-
-    restrict_lines = []
-    start_line, end_line = None, None
-    if lines:
-        if '-' not in lines:
-            restrict_lines = [int(line) for line in lines.split(',')]
-        else:
-            start_line, end_line = lines.split('-')
-            start_line, end_line = int(start_line), int(end_line)+1
-    if start_line:
-        values = list(values)[start_line:]
-    if end_line:
-        values = list(values)[:end_line+1]
-    for line_idx, vals in enumerate(values):
-        if restrict_lines:
-            if line_idx > max(restrict_lines):
-                break
-            if line_idx not in restrict_lines:
-                continue
-        if start_line:
-            line_idx = line_idx + start_line
-        if stdout:
-            stdout.write("\r* line %d" % (line_idx))
-        if not line_idx:
-            continue # remove header
-        args = {}
-        for col_idx, val in enumerate(vals):
-            if len(col_defs) <= col_idx or not col_defs[col_idx]:
-                continue
-            col_def = col_defs[col_idx]
-            attrs, typ = col_def.col_models, col_def.format
-            extra_cols = col_def.associated_cols
-            if not callable(typ):
-                if typ.startswith('parse_string_'):
-                    typ = _get_parse_string(int(typ.split('_')[-1]))
-                else:
-                    typ = globals()[typ]
-            c_args = args
-            for attr in attrs:
-                if attr not in c_args:
-                    c_args[attr] = {}
-                c_args = c_args[attr]
-            try:
-                if not extra_cols:
-                        v = typ(val)
-                else:
-                    arguments = [vals[col_number] for col_number in extra_cols]
-                    if not [arg for arg in arguments if arg]:
-                        continue
-                    arguments += [default_person]
-                    v = typ(val, *arguments)
-            except:
-                v = None
-            if len(attrs) == 1:
-                args[attrs[0]] = v
-            elif len(attrs) == 2:
-                args[attrs[0]][attrs[1]] = v
-            elif len(attrs) == 3:
-                args[attrs[0]][attrs[1]][attrs[2]] = v
-        # manage exploded dates
-        for k in args.keys():
-            if '__year' in k:
-                key = k[:-len('__year')]
-                try:
-                    v = datetime.datetime(args[k], args[key+'__month'],
-                                          args[key+'__day'])
-                    args[key] = v
-                except:
-                    pass
-                args.pop(k)
-                args.pop(key+'__month')
-                args.pop(key+'__day')
-        related_items = []
-        multis = []
-        attached_models = {}
-        for k in args.keys():
-            try:
-                if k in related_classes:
-                    rel_cls = related_classes[k]
-                    cls, default = rel_cls.cls, rel_cls.default_data
-                    reverse_key = rel_cls.reverse_key
-                    values = None
-                    if rel_cls.multi:
-                        values = []
-                        for v in args[k]:
-                            v.update(default)
-                            values.append(v)
-                    else:
-                        values = default.copy()
-                        values.update(args[k])
-                    exited = False
-                    for extra in rel_cls.extra_data:
-                        if not args.get(extra):
-                            raise BreakIt
-                        values[extra] = args[extra]
-                    args.pop(k)
-                    related_items.append((rel_cls, values, k))
-                elif k in multi_keys:
-                    multis.append((k, args[k]))
-                    args.pop(k)
-                elif '__' in k:
-                    mod, value = k.split('__')
-                    attached_models[(mod, value)] = args.pop(k)
-            except BreakIt:
-                args.pop(k)
-                continue
-        op = None
-        if not args.get('operation_type'):
-            #print "Pas d'operation_type"
-            continue
-        #transaction.commit()
-        try:
-            int(args['code_patriarche'])
-        except ValueError:
-            continue
-        q = Operation.objects.filter(code_patriarche=args['code_patriarche'])
-        if q.count():
-            if not update:
-                #print "Code patriarche existant"
-                continue
-            op = q.all()[0]
-        # check
-        if not args.get('year') and args.get('start_date'):
-            args['year'] = args['start_date'].year
-        # creation
-        """
-        print "args", args
-        print "multis", multis
-        print "attached_models", attached_models
-        """
-        if not op:
-            args.update(ope_default)
-            #if not args.get('operation_code'):
-            #    args['operation_code'] = Operation.get_available_operation_code(
-            #                                                    args['year'])
-            #try:
-            op = Operation.objects.create(**args)
-            #op.save()
-            new_ops += 1
-            #except:
-            #    error_ope.append((line_idx, args))
-            #    transaction.rollback()
-            #    continue
-            #transaction.commit()
-        else: # mise à jour
-            try:
-                for k in args:
-                    if getattr(op, k):
-                        continue
-                    setattr(op, k, args[k])
-                op.save()
-            except:
-                #transaction.rollback()
-                continue
-            #transaction.commit()
-        try:
-            for k, vals in multis:
-                if not vals:
-                    continue
-                for v in vals:
-                    getattr(op, k).add(v)
-                    op.save()
-        except:
-            #transaction.rollback()
-            error_multis.append((line_idx, multis))
-        for attr, attached_attr in attached_models:
-            field = getattr(op, attr)
-            if field:
-                setattr(field, attached_attr, attached_models[(attr,
-                                                               attached_attr)])
-                field.save()
-        #transaction.commit()
-        for rel_cls, data, attr in related_items:
-            rel_cls.create(op, data, attr)
-            #try:
-            #    rel_cls.create(op, data, attr)
-            #except:
-            #    error_reversed.append((line_idx, data))
-        ope_postimportfix(op, args)
-        #transaction.commit()
-
-    errors = []
-    if error_ope:
-        error = "Error while recording these operations:\n"
-        for line_idx, args in error_ope:
-            error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
-        errors.append(error)
-    if error_multis:
-        error = "Error while recording these multiples items attached to "\
-                "operation:"
-        for line_idx, args in error_multis:
-            error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
-        errors.append(error)
-    if error_reversed:
-        error = "Error while recording these items that depend to operation:"
-        for line_idx, args in error_reversed:
-            error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
-        errors.append(error)
-    #transaction.commit()
-    return new_ops, errors
-
-def import_from_csv(filename, update=True, col_defs=OPE_COLS,
-                    person=None, stdout=None, lines=None):
-    """
-    Import from a CSV file.
-    Return number of operation treated and errors.
-    """
-    try:
-        values = unicode_csv_reader(codecs.open(filename, 'rb', "utf-8"),
-                        delimiter=DELIMITER, quotechar=QUOTECHAR)
-    except (IOError):
-        return 0, [u"Incorrect CSV file."]
-
-    new_ops, errors = import_operations_csv(values, col_defs=col_defs,
-                                    update=update, person=person, stdout=stdout,
-                                    lines=lines)
-    return new_ops, errors
diff --git a/archaeological_operations/management/commands/import_operations_old.py b/archaeological_operations/management/commands/import_operations_old.py
deleted file mode 100755
index 4ad229e9a..000000000
--- a/archaeological_operations/management/commands/import_operations_old.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2012-2013  Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# See the file COPYING for details.
-
-from django.core.management.base import BaseCommand, CommandError
-from archaeological_operations.import_from_csv import import_from_csv
-from archaeological_operations.import_from_dbf import import_from_dbf
-
-IMPORTERS = {'csv':import_from_csv,
-             'dbf':import_from_dbf,
-             'db3':import_from_dbf,
-             'fp':import_from_dbf,
-             'vfp':import_from_dbf}
-
-class Command(BaseCommand):
-    args = '<filename> [<lines>]'
-    help = "Import archaeological operations"
-
-    def handle(self, *args, **options):
-        if not args or not args[0]:
-            raise CommandError("No file provided.")
-        filename = args[0]
-        update = True
-        file_type = None
-        lines = len(args) > 1 and args[1]
-        if not file_type:
-            suffix = filename.split('.')[-1].lower()
-            if suffix in IMPORTERS.keys():
-                file_type = suffix
-            else:
-                raise CommandError("This file extension is not managed. "\
-                                    "Specify manualy the file type.")
-        elif file_type not in IMPORTERS.keys():
-            raise CommandError("This file type is not managed.")
-        nb_ops, errors = IMPORTERS[file_type](filename,
-                                              update=update,
-                                              stdout=self.stdout,
-                                              lines=lines)
-        self.stdout.write('\n* %d operation treated\n' % nb_ops)
-        if errors:
-            self.stderr.write('\n'.join(errors))
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index e2e3422fa..b180d333e 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1592,8 +1592,8 @@ class OperationDashboard:
             'effective': {'scientist__isnull': False},
             'active': {'scientist__isnull': False, 'end_date__isnull': True},
             'field': {'excavation_end_date__isnull': True},
-            'documented': {'source__isnull': False},
-            'documented_closed': {'source__isnull': False,
+            'documented': {'documents__isnull': False},
+            'documented_closed': {'documents__isnull': False,
                                   'end_date__isnull': False},
             'closed': {'end_date__isnull': False}
         }
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 40e50f42b..d1c4892bf 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -25,6 +25,7 @@ import tempfile
 import zipfile
 
 from django.conf import settings
+from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.urlresolvers import reverse
@@ -583,7 +584,7 @@ class ParcelTest(ImportTest, TestCase):
 
     def test_parse_parcels(self):
         # the database needs to be initialised before importing
-        from archaeological_operations.import_from_csv import parse_parcels
+        from archaeological_operations.utils import parse_parcels
         # default_town = Town.objects.create(numero_insee="12345",
         #                                    name="default_town")
         test_values = (
@@ -1138,27 +1139,26 @@ class OperationTest(TestCase, OperationInitTest):
 
     def test_show(self):
         operation = self.operations[0]
-        source = models.OperationSource.objects.create(
-            operation=operation, title="Source title",
+        source = models.Document.objects.create(
+            title="Source title",
             source_type=models.SourceType.objects.all()[0]
         )
+        operation.documents.add(source)
         c = Client()
 
         response = c.get(reverse('show-operation', kwargs={'pk': operation.pk}))
         self.assertEqual(response.status_code, 200)
         # empty content when not allowed
         self.assertEqual(response.content, "")
-        response = c.get(reverse('show-operationsource',
+        response = c.get(reverse('show-document',
                                  kwargs={'pk': source.pk}))
-        self.assertEqual(response.status_code, 200)
-        # empty content when not allowed
-        self.assertEqual(response.content, "")
+        self.assertRedirects(response, "/")
 
         c.login(username=self.username, password=self.password)
         response = c.get(reverse('show-operation', kwargs={'pk': operation.pk}))
         self.assertEqual(response.status_code, 200)
         self.assertIn('class="card sheet"', response.content)
-        response = c.get(reverse('show-operationsource',
+        response = c.get(reverse('show-document',
                                  kwargs={'pk': source.pk}))
         self.assertEqual(response.status_code, 200)
         self.assertIn('class="card sheet"', response.content)
@@ -1582,8 +1582,9 @@ class OperationPermissionTest(TestCase, OperationInitTest):
         self.alt_username2, self.alt_password2, self.alt_user2 = create_user(
             username='luke', password='iamyourfather'
         )
+        profile_type = ProfileType.objects.get(txt_idx='collaborator')
         profile = UserProfile.objects.create(
-            profile_type=ProfileType.objects.get(txt_idx='collaborator'),
+            profile_type=profile_type,
             person=self.alt_user2.ishtaruser.person,
             current=True
         )
@@ -1630,13 +1631,13 @@ class OperationPermissionTest(TestCase, OperationInitTest):
         operation_pk1 = self.operations[0].pk
         operation_pk2 = self.operations[1].pk
 
+        modif_url = '/operation_modification/general-operation_modification'
+
         # no result when no authentification
         c = Client()
         response = c.get(reverse('operation_modify', args=[operation_pk2]))
         self.assertRedirects(response, "/")
 
-        modif_url = '/operation_modification/general-operation_modification'
-
         # possession
         c = Client()
         c.login(username=self.alt_username, password=self.alt_password)
@@ -1649,6 +1650,12 @@ class OperationPermissionTest(TestCase, OperationInitTest):
                          follow=True)
         self.assertRedirects(response, "/")
 
+        profile_type = ProfileType.objects.get(txt_idx='collaborator')
+        profile_type.groups.add(
+            Group.objects.get(name=u"Opérations rattachées : "
+                                   u"modification/suppression")
+        )
+
         # area filter
         c = Client()
         c.login(username=self.alt_username2, password=self.alt_password2)
@@ -2193,6 +2200,7 @@ class OperationAdminActWizardCreationTest(WizardTest, OperationInitTest,
                          self.number + 1)
 
 
+"""
 class OperationSourceWizardModificationTest(WizardTest, OperationInitTest,
                                             TestCase):
     fixtures = FILE_FIXTURES
@@ -2239,6 +2247,7 @@ class OperationSourceWizardModificationTest(WizardTest, OperationInitTest,
     def post_wizard(self):
         source = models.OperationSource.objects.get(pk=self.source.pk)
         self.assertEqual(source.authors.count(), 0)
+"""
 
 
 class SiteTest(TestCase, OperationInitTest):
diff --git a/fixtures/initial_data-auth-fr.json b/fixtures/initial_data-auth-fr.json
index 073ef4012..feecf1e8a 100644
--- a/fixtures/initial_data-auth-fr.json
+++ b/fixtures/initial_data-auth-fr.json
@@ -2081,89 +2081,89 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add Operation documentation",
+        "name": "Can add Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "add_operationsource"
+        "codename": "add_document"
     }
 },
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can change Operation documentation",
+        "name": "Can change Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "change_operationsource"
+        "codename": "change_document"
     }
 },
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can delete Operation documentation",
+        "name": "Can delete Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "delete_operationsource"
+        "codename": "delete_document"
     }
 },
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can view all Operation sources",
+        "name": "Can view all Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "view_operationsource"
+        "codename": "view_document"
     }
 },
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can view own Operation source",
+        "name": "Can view own Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "view_own_operationsource"
+        "codename": "view_own_document"
     }
 },
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add own Operation source",
+        "name": "Can add own Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "add_own_operationsource"
+        "codename": "add_own_document"
     }
 },
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can change own Operation source",
+        "name": "Can change own Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "change_own_operationsource"
+        "codename": "change_own_document"
     }
 },
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can delete own Operation source",
+        "name": "Can delete own Document",
         "content_type": [
-            "archaeological_operations",
-            "operationsource"
+            "ishtar_common",
+            "document"
         ],
-        "codename": "delete_own_operationsource"
+        "codename": "delete_own_document"
     }
 },
 {
@@ -2807,39 +2807,6 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add Context record documentation",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "add_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Context record documentation",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "change_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Context record documentation",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "delete_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
         "name": "Can add Warehouse type",
         "content_type": [
             "archaeological_warehouse",
@@ -3434,39 +3401,6 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add Find documentation",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "add_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Find documentation",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "change_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Find documentation",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "delete_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
         "name": "Can add Treatment type",
         "content_type": [
             "archaeological_finds",
@@ -3621,39 +3555,6 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add Treatment documentation",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "add_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Treatment documentation",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "change_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Treatment documentation",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "delete_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
         "name": "Can add Property",
         "content_type": [
             "archaeological_finds",
@@ -3984,39 +3885,6 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add Treatment file documentation",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "add_treatmentfilesource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Treatment file documentation",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "change_treatmentfilesource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Treatment file documentation",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "delete_treatmentfilesource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
         "name": "Can add Warehouse division",
         "content_type": [
             "archaeological_warehouse",
@@ -4523,226 +4391,6 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can view all Context record sources",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "view_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can view own Context record source",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "view_own_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add own Context record source",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "add_own_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change own Context record source",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "change_own_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete own Context record source",
-        "content_type": [
-            "archaeological_context_records",
-            "contextrecordsource"
-        ],
-        "codename": "delete_own_contextrecordsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can view all Find sources",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "view_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can view own Find source",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "view_own_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add own Find source",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "add_own_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change own Find source",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "change_own_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete own Find source",
-        "content_type": [
-            "archaeological_finds",
-            "findsource"
-        ],
-        "codename": "delete_own_findsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can view all Treatment source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "view_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can view own Treatment source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "view_own_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add own Treatment source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "add_own_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change own Treatment source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "change_own_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete own Treatment source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentsource"
-        ],
-        "codename": "delete_own_treatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can view all Treatment request source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "view_filetreatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can view own Treatment request source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "view_own_filetreatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add own Treatment request source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "add_own_filetreatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change own Treatment request source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "change_own_filetreatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete own Treatment request source",
-        "content_type": [
-            "archaeological_finds",
-            "treatmentfilesource"
-        ],
-        "codename": "delete_own_filetreatmentsource"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
         "name": "Can add Administration script",
         "content_type": [
             "ishtar_common",
@@ -5128,39 +4776,6 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add Image",
-        "content_type": [
-            "ishtar_common",
-            "ishtarimage"
-        ],
-        "codename": "add_ishtarimage"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Image",
-        "content_type": [
-            "ishtar_common",
-            "ishtarimage"
-        ],
-        "codename": "change_ishtarimage"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Image",
-        "content_type": [
-            "ishtar_common",
-            "ishtarimage"
-        ],
-        "codename": "delete_ishtarimage"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
         "name": "Can add License type",
         "content_type": [
             "ishtar_common",
@@ -5227,39 +4842,6 @@
 {
     "model": "auth.permission",
     "fields": {
-        "name": "Can add Image type",
-        "content_type": [
-            "ishtar_common",
-            "imagetype"
-        ],
-        "codename": "add_imagetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Image type",
-        "content_type": [
-            "ishtar_common",
-            "imagetype"
-        ],
-        "codename": "change_imagetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Image type",
-        "content_type": [
-            "ishtar_common",
-            "imagetype"
-        ],
-        "codename": "delete_imagetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
         "name": "Can add Communicability type",
         "content_type": [
             "archaeological_finds",
@@ -5357,336 +4939,6 @@
     }
 },
 {
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Json data - Field",
-        "content_type": [
-            "ishtar_common",
-            "jsondatafield"
-        ],
-        "codename": "add_jsondatafield"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Json data - Field",
-        "content_type": [
-            "ishtar_common",
-            "jsondatafield"
-        ],
-        "codename": "change_jsondatafield"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Json data - Field",
-        "content_type": [
-            "ishtar_common",
-            "jsondatafield"
-        ],
-        "codename": "delete_jsondatafield"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Json data - Menu",
-        "content_type": [
-            "ishtar_common",
-            "jsondatasection"
-        ],
-        "codename": "add_jsondatasection"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Json data - Menu",
-        "content_type": [
-            "ishtar_common",
-            "jsondatasection"
-        ],
-        "codename": "change_jsondatasection"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Json data - Menu",
-        "content_type": [
-            "ishtar_common",
-            "jsondatasection"
-        ],
-        "codename": "delete_jsondatasection"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Custom form",
-        "content_type": [
-            "ishtar_common",
-            "customform"
-        ],
-        "codename": "add_customform"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Custom form",
-        "content_type": [
-            "ishtar_common",
-            "customform"
-        ],
-        "codename": "change_customform"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Custom form",
-        "content_type": [
-            "ishtar_common",
-            "customform"
-        ],
-        "codename": "delete_customform"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Image",
-        "content_type": [
-            "ishtar_common",
-            "ishtarimage"
-        ],
-        "codename": "add_ishtarimage"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Image",
-        "content_type": [
-            "ishtar_common",
-            "ishtarimage"
-        ],
-        "codename": "change_ishtarimage"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Image",
-        "content_type": [
-            "ishtar_common",
-            "ishtarimage"
-        ],
-        "codename": "delete_ishtarimage"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add License type",
-        "content_type": [
-            "ishtar_common",
-            "licensetype"
-        ],
-        "codename": "add_licensetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change License type",
-        "content_type": [
-            "ishtar_common",
-            "licensetype"
-        ],
-        "codename": "change_licensetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete License type",
-        "content_type": [
-            "ishtar_common",
-            "licensetype"
-        ],
-        "codename": "delete_licensetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Excluded field",
-        "content_type": [
-            "ishtar_common",
-            "excludedfield"
-        ],
-        "codename": "add_excludedfield"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Excluded field",
-        "content_type": [
-            "ishtar_common",
-            "excludedfield"
-        ],
-        "codename": "change_excludedfield"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Excluded field",
-        "content_type": [
-            "ishtar_common",
-            "excludedfield"
-        ],
-        "codename": "delete_excludedfield"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Image type",
-        "content_type": [
-            "ishtar_common",
-            "imagetype"
-        ],
-        "codename": "add_imagetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Image type",
-        "content_type": [
-            "ishtar_common",
-            "imagetype"
-        ],
-        "codename": "change_imagetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Image type",
-        "content_type": [
-            "ishtar_common",
-            "imagetype"
-        ],
-        "codename": "delete_imagetype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Communicability type",
-        "content_type": [
-            "archaeological_finds",
-            "communicabilitytype"
-        ],
-        "codename": "add_communicabilitytype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Communicability type",
-        "content_type": [
-            "archaeological_finds",
-            "communicabilitytype"
-        ],
-        "codename": "change_communicabilitytype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Communicability type",
-        "content_type": [
-            "archaeological_finds",
-            "communicabilitytype"
-        ],
-        "codename": "delete_communicabilitytype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add Profile type",
-        "content_type": [
-            "ishtar_common",
-            "profiletype"
-        ],
-        "codename": "add_profiletype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change Profile type",
-        "content_type": [
-            "ishtar_common",
-            "profiletype"
-        ],
-        "codename": "change_profiletype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete Profile type",
-        "content_type": [
-            "ishtar_common",
-            "profiletype"
-        ],
-        "codename": "delete_profiletype"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can add User profile",
-        "content_type": [
-            "ishtar_common",
-            "userprofile"
-        ],
-        "codename": "add_userprofile"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can change User profile",
-        "content_type": [
-            "ishtar_common",
-            "userprofile"
-        ],
-        "codename": "change_userprofile"
-    }
-},
-{
-    "model": "auth.permission",
-    "fields": {
-        "name": "Can delete User profile",
-        "content_type": [
-            "ishtar_common",
-            "userprofile"
-        ],
-        "codename": "delete_userprofile"
-    }
-},
-{
     "model": "auth.group",
     "fields": {
         "name": "Op\u00e9rations : lecture",
@@ -6163,12 +5415,12 @@
 {
     "model": "auth.group",
     "fields": {
-        "name": "Documents op\u00e9ration : lecture",
+        "name": "Documents : lecture",
         "permissions": [
             [
-                "view_operationsource",
-                "archaeological_operations",
-                "operationsource"
+                "view_document",
+                "ishtar_common",
+                "document"
             ]
         ]
     }
@@ -6176,17 +5428,17 @@
 {
     "model": "auth.group",
     "fields": {
-        "name": "Documents op\u00e9ration : modification/suppression",
+        "name": "Documents : modification/suppression",
         "permissions": [
             [
-                "change_operation",
-                "archaeological_operations",
-                "operation"
+                "change_document",
+                "ishtar_common",
+                "document"
             ],
             [
-                "delete_operation",
-                "archaeological_operations",
-                "operation"
+                "delete_document",
+                "ishtar_common",
+                "document"
             ]
         ]
     }
@@ -6194,12 +5446,12 @@
 {
     "model": "auth.group",
     "fields": {
-        "name": "Documents op\u00e9ration : ajout",
+        "name": "Documents : ajout",
         "permissions": [
             [
-                "add_operation",
-                "archaeological_operations",
-                "operation"
+                "add_document",
+                "ishtar_common",
+                "document"
             ]
         ]
     }
@@ -6308,12 +5560,12 @@
 {
     "model": "auth.group",
     "fields": {
-        "name": "Documents op\u00e9ration rattach\u00e9s : ajout",
+        "name": "Documents rattach\u00e9s : ajout",
         "permissions": [
             [
-                "add_own_operation",
-                "archaeological_operations",
-                "operation"
+                "add_own_document",
+                "ishtar_common",
+                "document"
             ]
         ]
     }
@@ -6321,17 +5573,17 @@
 {
     "model": "auth.group",
     "fields": {
-        "name": "Documents op\u00e9ration rattach\u00e9s : modification/suppression",
+        "name": "Documents rattach\u00e9s : modification/suppression",
         "permissions": [
             [
-                "change_own_operation",
-                "archaeological_operations",
-                "operation"
+                "change_own_document",
+                "ishtar_common",
+                "document"
             ],
             [
-                "delete_own_operation",
-                "archaeological_operations",
-                "operation"
+                "delete_own_document",
+                "ishtar_common",
+                "document"
             ]
         ]
     }
@@ -6339,12 +5591,12 @@
 {
     "model": "auth.group",
     "fields": {
-        "name": "Documents op\u00e9ration rattach\u00e9s : lecture",
+        "name": "Documents rattach\u00e9s : lecture",
         "permissions": [
             [
-                "view_own_operationsource",
-                "archaeological_operations",
-                "operationsource"
+                "view_own_document",
+                "ishtar_common",
+                "document"
             ]
         ]
     }
@@ -6812,358 +6064,6 @@
 {
     "model": "auth.group",
     "fields": {
-        "name": "Documents UE : lecture",
-        "permissions": [
-            [
-                "view_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents UE rattach\u00e9s : lecture",
-        "permissions": [
-            [
-                "view_own_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents UE : ajout",
-        "permissions": [
-            [
-                "add_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents UE : modification/suppression",
-        "permissions": [
-            [
-                "change_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ],
-            [
-                "delete_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents UE rattach\u00e9s : modification/suppression",
-        "permissions": [
-            [
-                "change_own_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ],
-            [
-                "delete_own_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents UE rattach\u00e9s : ajout",
-        "permissions": [
-            [
-                "add_own_contextrecordsource",
-                "archaeological_context_records",
-                "contextrecordsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents mobilier : lecture",
-        "permissions": [
-            [
-                "view_findsource",
-                "archaeological_finds",
-                "findsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents mobilier : ajout",
-        "permissions": [
-            [
-                "add_findsource",
-                "archaeological_finds",
-                "findsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents mobilier : modification/suppression",
-        "permissions": [
-            [
-                "change_findsource",
-                "archaeological_finds",
-                "findsource"
-            ],
-            [
-                "delete_findsource",
-                "archaeological_finds",
-                "findsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents mobilier rattach\u00e9s : ajout",
-        "permissions": [
-            [
-                "add_own_findsource",
-                "archaeological_finds",
-                "findsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents mobilier rattach\u00e9s : lecture",
-        "permissions": [
-            [
-                "view_own_findsource",
-                "archaeological_finds",
-                "findsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents mobilier rattach\u00e9s : modification/suppression",
-        "permissions": [
-            [
-                "change_own_findsource",
-                "archaeological_finds",
-                "findsource"
-            ],
-            [
-                "delete_own_findsource",
-                "archaeological_finds",
-                "findsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de traitement : lecture",
-        "permissions": [
-            [
-                "view_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de traitement : ajout",
-        "permissions": [
-            [
-                "add_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de traitement : modification/suppression",
-        "permissions": [
-            [
-                "change_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ],
-            [
-                "delete_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de traitement rattach\u00e9s : lecture",
-        "permissions": [
-            [
-                "view_own_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de traitement rattach\u00e9s : ajout",
-        "permissions": [
-            [
-                "add_own_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de traitement rattach\u00e9s : modification/suppression",
-        "permissions": [
-            [
-                "change_own_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ],
-            [
-                "delete_own_treatmentsource",
-                "archaeological_finds",
-                "treatmentsource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de demande de traitement : lecture",
-        "permissions": [
-            [
-                "view_filetreatmentsource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de demande de traitement : ajout",
-        "permissions": [
-            [
-                "add_treatmentfilesource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de demande de traitement : modification/suppression",
-        "permissions": [
-            [
-                "change_treatmentfilesource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ],
-            [
-                "delete_treatmentfilesource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de demande de traitement rattach\u00e9s : lecture",
-        "permissions": [
-            [
-                "view_own_filetreatmentsource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de demande de traitement rattach\u00e9s : ajout",
-        "permissions": [
-            [
-                "add_own_filetreatmentsource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Documents de demande de traitement rattach\u00e9s : modification/suppression",
-        "permissions": [
-            [
-                "change_own_filetreatmentsource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ],
-            [
-                "delete_own_filetreatmentsource",
-                "archaeological_finds",
-                "treatmentfilesource"
-            ]
-        ]
-    }
-},
-{
-    "model": "auth.group",
-    "fields": {
         "name": "Contenants : ajout",
         "permissions": [
             [
@@ -7315,28 +6215,5 @@
             ]
         ]
     }
-},
-{
-    "model": "auth.group",
-    "fields": {
-        "name": "Import : ajout/modification/suppression",
-        "permissions": [
-            [
-                "add_import",
-                "ishtar_common",
-                "import"
-            ],
-            [
-                "change_import",
-                "ishtar_common",
-                "import"
-            ],
-            [
-                "delete_import",
-                "ishtar_common",
-                "import"
-            ]
-        ]
-    }
 }
 ]
diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json
index b7d9f245a..f1ebe4c71 100644
--- a/ishtar_common/fixtures/initial_data-fr.json
+++ b/ishtar_common/fixtures/initial_data-fr.json
@@ -59,7 +59,7 @@
                 "Actes administratifs : lecture"
             ],
             [
-                "Documents UE : lecture"
+                "Documents : lecture"
             ],
             [
                 "Traitements : lecture"
@@ -68,24 +68,12 @@
                 "Dossiers : lecture"
             ],
             [
-                "Documents mobilier : lecture"
-            ],
-            [
                 "Auteurs : lecture"
             ],
             [
-                "Documents de traitement : lecture"
-            ],
-            [
                 "Organisations : lecture"
             ],
             [
-                "Documents de demande de traitement : lecture"
-            ],
-            [
-                "Documents op\u00e9ration : lecture"
-            ],
-            [
                 "Contenants : lecture"
             ]
         ]
@@ -184,13 +172,13 @@
                 "Dossiers : cl\u00f4ture"
             ],
             [
-                "Documents op\u00e9ration : lecture"
+                "Documents : lecture"
             ],
             [
-                "Documents op\u00e9ration : modification/suppression"
+                "Documents : modification/suppression"
             ],
             [
-                "Documents op\u00e9ration : ajout"
+                "Documents : ajout"
             ],
             [
                 "Personnes : lecture"
@@ -214,13 +202,13 @@
                 "D\u00e9p\u00f4ts rattach\u00e9s : lecture"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : ajout"
+                "Documents rattach\u00e9s : ajout"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : modification/suppression"
+                "Documents rattach\u00e9s : modification/suppression"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : lecture"
+                "Documents rattach\u00e9s : lecture"
             ],
             [
                 "Dossiers rattach\u00e9s : ajout"
@@ -313,78 +301,6 @@
                 "Auteurs : lecture"
             ],
             [
-                "Documents UE : lecture"
-            ],
-            [
-                "Documents UE rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents UE : ajout"
-            ],
-            [
-                "Documents UE : modification/suppression"
-            ],
-            [
-                "Documents UE rattach\u00e9s : modification/suppression"
-            ],
-            [
-                "Documents UE rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents mobilier : lecture"
-            ],
-            [
-                "Documents mobilier : ajout"
-            ],
-            [
-                "Documents mobilier : modification/suppression"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : modification/suppression"
-            ],
-            [
-                "Documents de traitement : lecture"
-            ],
-            [
-                "Documents de traitement : ajout"
-            ],
-            [
-                "Documents de traitement : modification/suppression"
-            ],
-            [
-                "Documents de traitement rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents de traitement rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents de traitement rattach\u00e9s : modification/suppression"
-            ],
-            [
-                "Documents de demande de traitement : lecture"
-            ],
-            [
-                "Documents de demande de traitement : ajout"
-            ],
-            [
-                "Documents de demande de traitement : modification/suppression"
-            ],
-            [
-                "Documents de demande de traitement rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents de demande de traitement rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents de demande de traitement rattach\u00e9s : modification/suppression"
-            ],
-            [
                 "Import : ajout/modification/suppression"
             ]
         ]
@@ -428,13 +344,13 @@
                 "D\u00e9p\u00f4ts rattach\u00e9s : lecture"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : ajout"
+                "Documents rattach\u00e9s : ajout"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : modification/suppression"
+                "Documents rattach\u00e9s : modification/suppression"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : lecture"
+                "Documents rattach\u00e9s : lecture"
             ],
             [
                 "Mobilier rattach\u00e9 : ajout"
@@ -477,30 +393,6 @@
             ],
             [
                 "Auteurs : lecture"
-            ],
-            [
-                "Documents UE rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents UE rattach\u00e9s : modification/suppression"
-            ],
-            [
-                "Documents UE rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : modification/suppression"
-            ],
-            [
-                "Documents de traitement rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents de demande de traitement rattach\u00e9s : lecture"
             ]
         ]
     }
@@ -566,7 +458,7 @@
                 "Organisations : lecture"
             ],
             [
-                "Documents op\u00e9ration : lecture"
+                "Documents : lecture"
             ],
             [
                 "Personnes : lecture"
@@ -588,36 +480,6 @@
             ],
             [
                 "Auteurs : lecture"
-            ],
-            [
-                "Documents UE : lecture"
-            ],
-            [
-                "Documents mobilier : lecture"
-            ],
-            [
-                "Documents mobilier : ajout"
-            ],
-            [
-                "Documents mobilier : modification/suppression"
-            ],
-            [
-                "Documents de traitement : lecture"
-            ],
-            [
-                "Documents de traitement : ajout"
-            ],
-            [
-                "Documents de traitement : modification/suppression"
-            ],
-            [
-                "Documents de demande de traitement : lecture"
-            ],
-            [
-                "Documents de demande de traitement : ajout"
-            ],
-            [
-                "Documents de demande de traitement : modification/suppression"
             ]
         ]
     }
@@ -703,13 +565,13 @@
                 "Dossiers : cl\u00f4ture"
             ],
             [
-                "Documents op\u00e9ration : lecture"
+                "Documents : lecture"
             ],
             [
-                "Documents op\u00e9ration : modification/suppression"
+                "Documents : modification/suppression"
             ],
             [
-                "Documents op\u00e9ration : ajout"
+                "Documents : ajout"
             ],
             [
                 "Personnes : lecture"
@@ -725,30 +587,6 @@
             ],
             [
                 "Auteurs : lecture"
-            ],
-            [
-                "Documents UE : lecture"
-            ],
-            [
-                "Documents UE : ajout"
-            ],
-            [
-                "Documents UE : modification/suppression"
-            ],
-            [
-                "Documents mobilier : lecture"
-            ],
-            [
-                "Documents mobilier : ajout"
-            ],
-            [
-                "Documents mobilier : modification/suppression"
-            ],
-            [
-                "Documents de traitement : lecture"
-            ],
-            [
-                "Documents de demande de traitement : lecture"
             ]
         ]
     }
@@ -774,13 +612,13 @@
                 "D\u00e9p\u00f4ts rattach\u00e9s : lecture"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : ajout"
+                "Documents rattach\u00e9s : ajout"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : modification/suppression"
+                "Documents rattach\u00e9s : modification/suppression"
             ],
             [
-                "Documents op\u00e9ration rattach\u00e9s : lecture"
+                "Documents rattach\u00e9s : lecture"
             ],
             [
                 "Dossiers rattach\u00e9s : lecture"
@@ -829,30 +667,6 @@
             ],
             [
                 "Auteurs : lecture"
-            ],
-            [
-                "Documents UE rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents UE rattach\u00e9s : modification/suppression"
-            ],
-            [
-                "Documents UE rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : ajout"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents mobilier rattach\u00e9s : modification/suppression"
-            ],
-            [
-                "Documents de traitement rattach\u00e9s : lecture"
-            ],
-            [
-                "Documents de demande de traitement rattach\u00e9s : lecture"
             ]
         ]
     }
@@ -926,13 +740,13 @@
                 "Dossiers : cl\u00f4ture"
             ],
             [
-                "Documents op\u00e9ration : lecture"
+                "Documents : lecture"
             ],
             [
-                "Documents op\u00e9ration : modification/suppression"
+                "Documents : modification/suppression"
             ],
             [
-                "Documents op\u00e9ration : ajout"
+                "Documents : ajout"
             ],
             [
                 "Personnes : lecture"
@@ -948,18 +762,6 @@
             ],
             [
                 "Auteurs : lecture"
-            ],
-            [
-                "Documents UE : lecture"
-            ],
-            [
-                "Documents mobilier : lecture"
-            ],
-            [
-                "Documents de traitement : lecture"
-            ],
-            [
-                "Documents de demande de traitement : lecture"
             ]
         ]
     }
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index d13def4c7..758596279 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1212,6 +1212,8 @@ class FixAssociated(object):
 class DocumentItem(object):
     @property
     def images(self):
+        if not hasattr(self, 'documents'):
+            return Document.objects.none()
         return self.documents.filter(image__isnull=False).exclude(image="")
 
 
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index b28dde5ec..8d85e3cba 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -1220,7 +1220,7 @@ class ShortMenuTest(TestCase):
         session.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        response = c.get(reverse('get-findsource'))
+        response = c.get(reverse('get-document'))
         self.assertEqual(response.status_code, 200)