Djangoization - Major refactoring (step 1)

123 files changed, 254 insertions, 374 deletions

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index 7cfa6c5d4..604e1fe15 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -17,35 +17,20 @@ Requirements
 ------------
 
  - `apache <http://www.apache.org/>`_ version 2.x
-
  - `python <http://www.python.org/>`_ versions 2.6 or superior
-
- - `django <http://www.djangoproject.com/>`_ version 1.2
-
- - `postgresql <http://www.postgresql.org/>`_ version 8.x or 9.x
-
+ - `django <http://www.djangoproject.com/>`_ version 1.4
+ - `postgresql <http://www.postgresql.org/>`_ 9.1
+ - `posgis <http://postgis.refractions.net/>`_
  - `gettext <http://www.gnu.org/software/gettext/>`_
-
  - `psycopg2 <http://freshmeat.net/projects/psycopg/>`_
-
  - `python-pisa <http://pypi.python.org/pypi/pisa/>`_
-
  - `django-registration <https://bitbucket.org/ubernostrum/django-registration/>`_
-
- - `django-formwizard <http://django-formwizard.readthedocs.org/en/latest/>`_
-
  - `django-simple-history <https://bitbucket.org/q/django-simple-history/src>`_ version 1.0
-
  - `jquery <http://jquery.com/>`_
-
  - `jquery-ui <http://jqueryui.com/>`_
-
  - `xhtml2odt <http://xhtml2odt.org/>`_
-
  - `python-utidylib <http://developer.berlios.de/projects/utidylib>`_
-
  - `python-lxml <http://lxml.de/>`_
-
  - `python-imaging <http://www.pythonware.com/products/pil/>`_
 
 Optionaly:
@@ -54,29 +39,24 @@ Optionaly:
 
 
 The easier way to obtain most these packages is to get them from your favorite Linux distribution repositories.
-For instance the packages for Debian squeeze are get with::
+For instance the packages for Debian wheezy are get with::
 
-    $ apt-get install apache2 python python-django python-psycopg2 gettext postgresql-8.4 libjs-jquery libjs-jquery-ui
-    $ apt-get install python-pisa python-django-registration python-utidylib python-lxml python-imaging
+    $ apt-get install apache2 python python-django python-psycopg2 gettext \
+          postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \
+          python-pisa python-django-registration python-utidylib python-lxml \
+          python-imaging
 
 If these packages do not exist in your distribution's repository, please refer to applications websites.
 
-django-simple-history, django-formwizard and xhtml2odt are usually not packaged.
+django-simple-history and xhtml2odt are usually not packaged.
 
-To install django-simple-history (mercurial package is needed)::
+To install django-simple-history (git package is needed)::
 
-    $ hg clone -r 1.0 http://bitbucket.org/q/django-simple-history
+    $ git clone https://github.com/treyhunner/django-simple-history.git
     $ cd django-simple-history
     $ python setup.py install
 
-To install django-formwizard (git package is needed)::
-
-    $ git clone https://github.com/stephrdev/django-formwizard.git
-    $ cd django-formwizard
-    $ git checkout 0.5
-    $ python setup.py install
-
-To install django-formwizard (git package is needed)::
+To install xhtml2odt (git package is needed)::
 
     $ git clone git://gitorious.org/xhtml2odt/xhtml2odt.git
 
@@ -95,7 +75,7 @@ Now that postgres is installed, you need to create a new user for your ishtar in
 Then, you have to create the database::
 
 
-    $ createdb --echo --owner ishtar-user --encoding UNICODE ishtar "My Ishtar database"
+    $ createdb --echo --owner ishtar-user --encoding UNICODE ishtar "My Ishtar database" -T 'template_postgis'
 
 Getting the sources
 -------------------
@@ -179,10 +159,14 @@ If a file "initial_data.json" exists copy it to a "fixtures" directory in the is
 
 Create the appropriate tables (still being in ishtar application directory)::
 
-    $ ./manage.py syncdb
+    ./manage.py syncdb --migrate --noinput
+
+
+Then you'll need to create an administrator account (administration can be found
+at: http://where_is_ishtar/admin)::
 
+    ./manage.py createsuperuser
 
-You will be prompted for the creation of an administrator account (administration can be found at: http://where_is_ishtar/admin).
 Then create database views (not automatically created by the admin)::
 
     $ cd $ISHTAR_DIR
diff --git a/ishtar/.gitignore b/example_project/.gitignore
index fce19e421..fce19e421 100644
--- a/ishtar/.gitignore
+++ b/example_project/.gitignore
diff --git a/ishtar/__init__.py b/example_project/__init__.py
index a23b98e09..a23b98e09 100644
--- a/ishtar/__init__.py
+++ b/example_project/__init__.py
diff --git a/ishtar/generate_fixture.sh b/example_project/generate_fixture.sh
index a69a9c836..a69a9c836 100755
--- a/ishtar/generate_fixture.sh
+++ b/example_project/generate_fixture.sh
diff --git a/ishtar/manage.py b/example_project/manage.py
index bcdd55e27..bcdd55e27 100755
--- a/ishtar/manage.py
+++ b/example_project/manage.py
diff --git a/ishtar/urls.py b/example_project/urls.py
index 2723eb1cf..ea54a61e1 100644
--- a/ishtar/urls.py
+++ b/example_project/urls.py
@@ -12,8 +12,8 @@ BASE_URL = r'^' + URL_PATH
 urlpatterns = patterns('',
      (BASE_URL + 'accounts/', include('registration.urls')),
      (BASE_URL + r'admin/', include(admin.site.urls)),
-     ('', include('ishtar.ishtar_base.urls')),
+     ('', include('ishtar_common.urls')),
 )
-urlpatterns += patterns('ishtar.ishtar_base.views',
+urlpatterns += patterns('ishtar_common.views',
      url(BASE_URL + '$', 'index', name='start'),
      )
diff --git a/ishtar/settings.py.example b/ishtar/settings.py.example
deleted file mode 100644
index e373faa6f..000000000
--- a/ishtar/settings.py.example
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2011 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
-# Django settings for ishtar project.
-
-# Ishtar custom
-SRID = 27572
-ENCODING = '' # specific encoding for CSV export - default to utf-8
-SURFACE_UNIT = 'square-metre'
-SURFACE_UNIT_LABEL = u'm²'
-
-ROOT_PATH = "/var/local/webapp/ishtar/ishtar/"
-URL_PATH = ""
-JQUERY_URL = "/javascript/jquery/jquery.js"
-JQUERY_UI_URL = "/javascript/jquery-ui/"
-XHTML2ODT_PATH = ROOT_PATH + "../xhtml2odt"
-ODT_TEMPLATE = ROOT_PATH + "../static/template.odt"
-
-LOGIN_REDIRECT_URL = "/" + URL_PATH
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-TEST_RUNNER='django.contrib.gis.tests.run_tests'
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-AUTH_PROFILE_MODULE = 'ishtar.furnitures.IshtarUser'
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.contrib.gis.db.backends.postgis', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'ishtar',                      # Or path to database file if using sqlite3.
-        'USER': 'user',                      # Not used with sqlite3.
-        'PASSWORD': 'pass',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'Europe/Paris'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'fr-fr'
-
-COUNTRY = "fr"
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '29jy!n#_!j*1h%m&9=0+&!my*ycctvs(-uodr0i*35ht(_8+s('
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'ishtar.ishtar_base.context_processors.get_base_context',
-    "django.core.context_processors.auth",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-)
-
-ROOT_URLCONF = 'ishtar.urls'
-
-TEMPLATE_DIRS = (
-    ROOT_PATH + 'templates',
-)
-
-AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',
-    'ishtar.ishtar_base.backend.ObjectOwnPermBackend',
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.admin',
-    'registration',
-    #'ishtar.scripts',
-    'ishtar.ishtar_base',
-)
diff --git a/ishtar/ishtar_base/__init__.py b/ishtar_common/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ishtar/ishtar_base/__init__.py
+++ b/ishtar_common/__init__.py
diff --git a/ishtar/ishtar_base/admin.py b/ishtar_common/admin.py
index ac110e9e5..6d22fbcfa 100644
--- a/ishtar/ishtar_base/admin.py
+++ b/ishtar_common/admin.py
@@ -22,11 +22,11 @@ Admin description
 """
 
 from django import forms
+from django.conf import settings
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import ugettext_lazy as _
 
-from ishtar import settings
 import models
 
 class HistorizedObjectAdmin(admin.ModelAdmin):
diff --git a/ishtar/ishtar_base/backend.py b/ishtar_common/backend.py
index f50edd708..f50edd708 100644
--- a/ishtar/ishtar_base/backend.py
+++ b/ishtar_common/backend.py
diff --git a/ishtar/ishtar_base/context_processors.py b/ishtar_common/context_processors.py
index 2dc06c6f8..5de5a6afd 100644
--- a/ishtar/ishtar_base/context_processors.py
+++ b/ishtar_common/context_processors.py
@@ -17,10 +17,10 @@
 
 # See the file COPYING for details.
 
-from django.utils.translation import ugettext, ugettext_lazy as _
+from django.conf import settings
 from django.contrib.sites.models import Site
+from django.utils.translation import ugettext, ugettext_lazy as _
 
-from ishtar import settings
 from menus import Menu
 import models
 
diff --git a/ishtar/ishtar_base/fixtures/initial_data.json b/ishtar_common/fixtures/initial_data.json
index 3397a2cd5..c4d235a3c 100644
--- a/ishtar/ishtar_base/fixtures/initial_data.json
+++ b/ishtar_common/fixtures/initial_data.json
@@ -1,7 +1,7 @@
 [
  {
   "pk": 1, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -11,7 +11,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "D\u00e9cret 2004\r\n\r\n\"Op\u00e9rateurs\" les personnes qui r\u00e9alisent les op\u00e9rations arch\u00e9ologiques.", 
    "available": true, 
@@ -21,7 +21,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "Laboratoire ayant sous sa responsabilit\u00e9 du mobilier arch\u00e9ologique de mani\u00e8re temporaire. C'est un type de d\u00e9p\u00f4t. C'est un lieu de traitement.", 
    "available": true, 
@@ -31,7 +31,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "Pour des entreprises, collectivit\u00e9s territoriales ou autres organisations", 
    "available": true, 
@@ -41,7 +41,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "Cette organisation et ses membres travaillent b\u00e9n\u00e9volement", 
    "available": true, 
@@ -51,7 +51,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "les services qui d\u00e9livrent les autorisations requises pour les diff\u00e9rents projets (DDE, services\r\nurbanisme des collectivit\u00e9s, pr\u00e9fectures, Drire, etc.)", 
    "available": true, 
@@ -61,7 +61,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -71,7 +71,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.organizationtype", 
+  "model": "ishtar_common.organizationtype", 
   "fields": {
    "comment": "Laboratoire de recherche du CNRS. Peut-\u00eatre une UMR et donc int\u00e9gr\u00e9 des chercheurs de l'universit\u00e9. n'inclus pas les \"laboratoires\" priv\u00e9s", 
    "available": true, 
@@ -81,7 +81,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.persontype", 
+  "model": "ishtar_common.persontype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -91,7 +91,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.persontype", 
+  "model": "ishtar_common.persontype", 
   "fields": {
    "comment": "Article 13 D\u00e9cret 2004\r\n\r\nLe pr\u00e9fet de r\u00e9gion \u00e9dicte les prescriptions arch\u00e9ologiques, d\u00e9livre l'autorisation de fouille et d\u00e9signe le responsable scientifique de toute op\u00e9ration d'arch\u00e9ologie pr\u00e9ventive.\r\n\r\nLe responsable scientifique est l'interlocuteur du pr\u00e9fet de r\u00e9gion et le garant de la qualit\u00e9 scientifique de l'op\u00e9ration arch\u00e9ologique. A ce titre, il prend, dans le cadre de la mise en oeuvre du projet d'intervention de l'op\u00e9rateur, les d\u00e9cisions relatives \u00e0 la conduite scientifique de l'op\u00e9ration et \u00e0 l'\u00e9laboration du rapport dont il dirige la r\u00e9daction. Il peut \u00eatre diff\u00e9rent pour la r\u00e9alisation du diagnostic et pour la r\u00e9alisation de la fouille.", 
    "available": true, 
@@ -101,7 +101,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.persontype", 
+  "model": "ishtar_common.persontype", 
   "fields": {
    "comment": "Responsables de dossiers d'arch\u00e9ologie", 
    "available": true, 
@@ -111,7 +111,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.persontype", 
+  "model": "ishtar_common.persontype", 
   "fields": {
    "comment": "Acc\u00e8s pour les secr\u00e9taires d'un SRA", 
    "available": true, 
@@ -121,7 +121,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.persontype", 
+  "model": "ishtar_common.persontype", 
   "fields": {
    "comment": "Cette personne peut g\u00e9rer du mobilier qu'il n'a pas cr\u00e9\u00e9\r\n\r\n", 
    "available": true, 
@@ -131,7 +131,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.persontype", 
+  "model": "ishtar_common.persontype", 
   "fields": {
    "comment": "Responsable de l'am\u00e9nagement", 
    "available": true, 
@@ -141,7 +141,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.persontype", 
+  "model": "ishtar_common.persontype", 
   "fields": {
    "comment": "Un acc\u00e8s limit\u00e9 \u00e0 la base, uniquement en lecture. Apr\u00e8s enregistrement.", 
    "available": true, 
@@ -151,7 +151,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.authortype", 
+  "model": "ishtar_common.authortype", 
   "fields": {
    "comment": "Il y a plusieurs \u00e0 une m\u00eame source. Au m\u00eame niveau de responsabilit\u00e9.", 
    "available": true, 
@@ -161,7 +161,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.authortype", 
+  "model": "ishtar_common.authortype", 
   "fields": {
    "comment": "Cette personne est l'auteur principal de la source. Les autres auteurs sont des collaborateurs.", 
    "available": true, 
@@ -171,7 +171,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.authortype", 
+  "model": "ishtar_common.authortype", 
   "fields": {
    "comment": "Cet auteur n'est pas l'auteur principal de la source mais un collaborateur. Il n'est pas auteur au m\u00eame niveau que l'auteur principal.", 
    "available": true, 
@@ -181,7 +181,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Photographie argentique sous une forme imprim\u00e9e", 
    "available": true, 
@@ -191,7 +191,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Rapport de fouille arch\u00e9ologique", 
    "available": true, 
@@ -201,7 +201,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Rapport li\u00e9 \u00e0 une autorisation de sondage.", 
    "available": true, 
@@ -211,7 +211,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Rapport li\u00e9 \u00e0 un arr\u00eat\u00e9 de prescription de diagnostic arch\u00e9ologique.", 
    "available": true, 
@@ -221,7 +221,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Source photographique num\u00e9rique", 
    "available": true, 
@@ -231,7 +231,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Rapport de laboratoire d'analyse", 
    "available": true, 
@@ -241,7 +241,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Rapport li\u00e9 \u00e0 la restauration ou la stabilisation d'un lot de mobilier ou d'un objet isol\u00e9", 
    "available": true, 
@@ -251,7 +251,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection inventaire", 
    "available": true, 
@@ -261,7 +261,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.sourcetype", 
+  "model": "ishtar_common.sourcetype", 
   "fields": {
    "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection th\u00e9matique. Ce type de rapport passe d'ordinaire en CIRA.", 
    "available": true, 
@@ -271,7 +271,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.filetype", 
+  "model": "ishtar_common.filetype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -281,7 +281,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.filetype", 
+  "model": "ishtar_common.filetype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -291,7 +291,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.permittype", 
+  "model": "ishtar_common.permittype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -301,7 +301,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.permittype", 
+  "model": "ishtar_common.permittype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -311,7 +311,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.permittype", 
+  "model": "ishtar_common.permittype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -321,7 +321,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.permittype", 
+  "model": "ishtar_common.permittype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -331,7 +331,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.permittype", 
+  "model": "ishtar_common.permittype", 
   "fields": {
    "comment": "Certificat d'urbanisme", 
    "available": true, 
@@ -341,7 +341,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.saisinetype", 
+  "model": "ishtar_common.saisinetype", 
   "fields": {
    "comment": " I. - Dans les cas mentionn\u00e9s aux 1\u00b0 \u00e0 5\u00b0 de l'article 4, le pr\u00e9fet de r\u00e9gion est saisi :\r\n\r\n1\u00b0 Pour les permis de construire, les permis d'am\u00e9nager et les permis de d\u00e9molir, par le pr\u00e9fet de d\u00e9partement qui lui adresse, d\u00e8s qu'il a re\u00e7u les \u00e9l\u00e9ments transmis par le maire en application des articles R. 423-7 \u00e0 R. 423-9 du code de l'urbanisme, les pi\u00e8ces pr\u00e9vues par le dernier alin\u00e9a de l'article R. 423-2, faisant notamment appara\u00eetre l'emplacement pr\u00e9vu des travaux sur le terrain d'assiette, leur superficie, leur impact sur le sous-sol ;\r\n\r\n2\u00b0 Pour les zones d'am\u00e9nagement concert\u00e9, par la personne publique ayant pris l'initiative de la cr\u00e9ation de la zone qui adresse au pr\u00e9fet de r\u00e9gion le dossier de r\u00e9alisation approuv\u00e9 pr\u00e9vu \u00e0 l'article R. 311-7 du code de l'urbanisme ;\r\n\r\n3\u00b0 Abrog\u00e9\r\n\r\n4\u00b0 Pour les am\u00e9nagements et ouvrages mentionn\u00e9s au 5\u00b0 de l'article 4 qui sont soumis \u00e0 une autorisation administrative autre qu'une autorisation d'urbanisme, par le service charg\u00e9 de recevoir la demande d'autorisation, qui adresse une copie du dossier de demande au pr\u00e9fet de r\u00e9gion ;\r\n\r\n5\u00b0 Pour les am\u00e9nagements et ouvrages mentionn\u00e9s au 5\u00b0 de l'article 4 qui ne sont pas soumis \u00e0 une autorisation administrative, par l'am\u00e9nageur. Celui-ci adresse au pr\u00e9fet de r\u00e9gion un dossier d\u00e9crivant les travaux projet\u00e9s, notamment leur emplacement pr\u00e9vu sur le terrain d'assiette, leur superficie, leur impact sur le sous-sol et indiquant la date \u00e0 laquelle ils ont \u00e9t\u00e9 arr\u00eat\u00e9s.\r\n\r\nII. - Pour les travaux sur des monuments historiques mentionn\u00e9s au 6\u00b0 de l'article 4, la saisine du pr\u00e9fet de r\u00e9gion au titre de l'autorisation exig\u00e9e par l'article L. 621-9 du code du patrimoine vaut saisine au titre du pr\u00e9sent d\u00e9cret.", 
    "available": true, 
@@ -352,7 +352,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.saisinetype", 
+  "model": "ishtar_common.saisinetype", 
   "fields": {
    "comment": " Les am\u00e9nageurs peuvent, avant de d\u00e9poser une demande pour obtenir les autorisations requises par les lois et r\u00e8glements ou avant d'engager toute autre proc\u00e9dure, saisir le pr\u00e9fet de r\u00e9gion afin qu'il examine si leur projet est susceptible de donner lieu \u00e0 des prescriptions arch\u00e9ologiques.\r\n\r\nA cette fin, ils produisent un dossier qui comporte un plan parcellaire et les r\u00e9f\u00e9rences cadastrales, le descriptif du projet et son emplacement sur le terrain d'assiette ainsi que, le cas \u00e9ch\u00e9ant, une notice pr\u00e9cisant les modalit\u00e9s techniques envisag\u00e9es pour l'ex\u00e9cution des travaux.\r\n\r\nSi le pr\u00e9fet de r\u00e9gion constate que le projet est susceptible d'affecter des \u00e9l\u00e9ments du patrimoine arch\u00e9ologique, il informe le demandeur, dans le d\u00e9lai de deux mois \u00e0 compter de la r\u00e9ception de la demande, que le projet qu'il lui a pr\u00e9sent\u00e9 donnera lieu \u00e0 des prescriptions de diagnostic arch\u00e9ologique.", 
    "available": true, 
@@ -363,7 +363,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.saisinetype", 
+  "model": "ishtar_common.saisinetype", 
   "fields": {
    "comment": " Si le pr\u00e9fet de r\u00e9gion a fait conna\u00eetre, en application de l'article 10, la n\u00e9cessit\u00e9 d'un diagnostic, l'am\u00e9nageur peut le saisir d'une demande anticip\u00e9e de prescription.\r\n\r\nLe pr\u00e9fet de r\u00e9gion prescrit alors, dans les conditions pr\u00e9vues par le pr\u00e9sent d\u00e9cret, la r\u00e9alisation d'un diagnostic arch\u00e9ologique et, si des \u00e9l\u00e9ments du patrimoine arch\u00e9ologique pr\u00e9sents sur le site sont d\u00e9j\u00e0 connus, prend les autres mesures pr\u00e9vues \u00e0 l'article 14.\r\n\r\nLa redevance d'arch\u00e9ologie pr\u00e9ventive correspondante est due par le demandeur, conform\u00e9ment au dernier alin\u00e9a de l'article L. 524-4 du code du patrimoine.", 
    "available": true, 
@@ -374,7 +374,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.saisinetype", 
+  "model": "ishtar_common.saisinetype", 
   "fields": {
    "comment": "Article 6\r\n\r\n Lorsqu'il dispose d'informations lui indiquant qu'un projet qui ne lui est pas transmis en application de l'arr\u00eat\u00e9 mentionn\u00e9 \u00e0 l'article 5 est n\u00e9anmoins susceptible d'affecter des \u00e9l\u00e9ments du patrimoine arch\u00e9ologique, le pr\u00e9fet de r\u00e9gion peut demander au maire de lui communiquer au cours de l'instruction, selon le cas, le dossier de demande de permis de construire, de permis d'am\u00e9nager, de permis de d\u00e9molir ou le dossier de r\u00e9alisation de zone d'am\u00e9nagement concert\u00e9 qui correspond \u00e0 ce projet.\r\n\r\nIl peut, pour le m\u00eame motif, demander au maire de lui communiquer le dossier d'une d\u00e9claration pr\u00e9alable d\u00e9pos\u00e9e en application de l'article L. 421-4 du code de l'urbanisme.", 
    "available": true, 
@@ -385,7 +385,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.operationtype", 
+  "model": "ishtar_common.operationtype", 
   "fields": {
    "comment": "Une op\u00e9ration arch\u00e9ologique visant \u00e0 qualifier et quantifier la pr\u00e9sence de vestiges sur une surface donn\u00e9e.", 
    "available": true, 
@@ -395,7 +395,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.operationtype", 
+  "model": "ishtar_common.operationtype", 
   "fields": {
    "comment": "A pr\u00e9ciser", 
    "available": true, 
@@ -405,7 +405,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.operationtype", 
+  "model": "ishtar_common.operationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -415,7 +415,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.operationtype", 
+  "model": "ishtar_common.operationtype", 
   "fields": {
    "comment": "Pas assez gros pour \u00eatre une fouille, mais porte n\u00e9anmoins atteinte au sous-sol.", 
    "available": true, 
@@ -425,7 +425,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.operationtype", 
+  "model": "ishtar_common.operationtype", 
   "fields": {
    "comment": "Une campagne de prospection sur un th\u00e8me particulier", 
    "available": true, 
@@ -435,7 +435,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.operationtype", 
+  "model": "ishtar_common.operationtype", 
   "fields": {
    "comment": "Prospection visant \u00e0 d\u00e9tecter tout type de vestiges  (ou presque) sur une surface donn\u00e9e. ", 
    "available": true, 
@@ -445,7 +445,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.remaintype", 
+  "model": "ishtar_common.remaintype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -455,7 +455,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.remaintype", 
+  "model": "ishtar_common.remaintype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -465,7 +465,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.remaintype", 
+  "model": "ishtar_common.remaintype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -475,7 +475,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.remaintype", 
+  "model": "ishtar_common.remaintype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -485,7 +485,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.remaintype", 
+  "model": "ishtar_common.remaintype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -495,7 +495,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.remaintype", 
+  "model": "ishtar_common.remaintype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -505,7 +505,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.remaintype", 
+  "model": "ishtar_common.remaintype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -515,7 +515,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -529,7 +529,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "1100, 'Pal\u00e9olithique ancien', , )", 
    "available": true, 
@@ -543,7 +543,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "1200, '', , ),", 
    "available": true, 
@@ -557,7 +557,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -571,7 +571,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -585,7 +585,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -599,7 +599,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -613,7 +613,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": false, 
@@ -627,7 +627,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -641,7 +641,7 @@
  }, 
  {
   "pk": 10, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -655,7 +655,7 @@
  }, 
  {
   "pk": 11, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -669,7 +669,7 @@
  }, 
  {
   "pk": 12, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -683,7 +683,7 @@
  }, 
  {
   "pk": 13, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -697,7 +697,7 @@
  }, 
  {
   "pk": 14, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -711,7 +711,7 @@
  }, 
  {
   "pk": 15, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -725,7 +725,7 @@
  }, 
  {
   "pk": 16, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -739,7 +739,7 @@
  }, 
  {
   "pk": 17, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -753,7 +753,7 @@
  }, 
  {
   "pk": 18, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -767,7 +767,7 @@
  }, 
  {
   "pk": 19, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -781,7 +781,7 @@
  }, 
  {
   "pk": 20, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -795,7 +795,7 @@
  }, 
  {
   "pk": 21, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -809,7 +809,7 @@
  }, 
  {
   "pk": 22, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -823,7 +823,7 @@
  }, 
  {
   "pk": 23, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -837,7 +837,7 @@
  }, 
  {
   "pk": 24, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -851,7 +851,7 @@
  }, 
  {
   "pk": 25, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -865,7 +865,7 @@
  }, 
  {
   "pk": 26, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -879,7 +879,7 @@
  }, 
  {
   "pk": 27, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -893,7 +893,7 @@
  }, 
  {
   "pk": 28, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -907,7 +907,7 @@
  }, 
  {
   "pk": 29, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -921,7 +921,7 @@
  }, 
  {
   "pk": 30, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -935,7 +935,7 @@
  }, 
  {
   "pk": 31, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -949,7 +949,7 @@
  }, 
  {
   "pk": 32, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -963,7 +963,7 @@
  }, 
  {
   "pk": 33, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -977,7 +977,7 @@
  }, 
  {
   "pk": 34, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -991,7 +991,7 @@
  }, 
  {
   "pk": 35, 
-  "model": "ishtar_base.period", 
+  "model": "ishtar_common.period", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1005,7 +1005,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.datingtype", 
+  "model": "ishtar_common.datingtype", 
   "fields": {
    "comment": "Une \u00e9tude du mobilier est la source de datation", 
    "available": true, 
@@ -1015,7 +1015,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.datingtype", 
+  "model": "ishtar_common.datingtype", 
   "fields": {
    "comment": "D'apr\u00e8s une datation de type C14, OSL, TL, arch\u00e9omagn\u00e9tisme, etc, forunissant une date en BPcal avec une marge.", 
    "available": true, 
@@ -1025,7 +1025,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.datingquality", 
+  "model": "ishtar_common.datingquality", 
   "fields": {
    "comment": "datation a v\u00e9rifier", 
    "available": true, 
@@ -1035,7 +1035,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.datingquality", 
+  "model": "ishtar_common.datingquality", 
   "fields": {
    "comment": "Datation fond\u00e9e sur des faits", 
    "available": true, 
@@ -1045,7 +1045,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "Cette unit\u00e9 n'a pas de volume", 
    "available": true, 
@@ -1057,7 +1057,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1069,7 +1069,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1081,7 +1081,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1093,7 +1093,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1105,7 +1105,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1117,7 +1117,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1129,7 +1129,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1141,7 +1141,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "Unit\u00e9 g\u00e9n\u00e9rale (d'ordinaire virtuelle) pouvant regrouper du mobilier trouver en dehors d'un contexte spatialis\u00e9 : mobilier trouver lors d'un d\u00e9capage, sous une semelle d'un fouilleur, dans les d\u00e9blais, etc.", 
    "available": true, 
@@ -1153,7 +1153,7 @@
  }, 
  {
   "pk": 10, 
-  "model": "ishtar_base.unit", 
+  "model": "ishtar_common.unit", 
   "fields": {
    "comment": "Unit\u00e9 repr\u00e9sentant une partie d'un niveau d\u00e9coup\u00e9 en carr\u00e9s r\u00e9f\u00e9renc\u00e9s.", 
    "available": true, 
@@ -1165,7 +1165,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.activitytype", 
+  "model": "ishtar_common.activitytype", 
   "fields": {
    "comment": "Unit\u00e9 enregistrement qui n'est pas directement d'origine anthropique. ", 
    "available": true, 
@@ -1176,7 +1176,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.activitytype", 
+  "model": "ishtar_common.activitytype", 
   "fields": {
    "comment": "Unit\u00e9 \u00e9labor\u00e9e par l'homme, comme une mur ou un sol am\u00e9nag\u00e9 par exemple", 
    "available": true, 
@@ -1187,7 +1187,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.activitytype", 
+  "model": "ishtar_common.activitytype", 
   "fields": {
    "comment": "Unit\u00e9 r\u00e9sultant de l'arr\u00eat d'anthropisation", 
    "available": true, 
@@ -1198,7 +1198,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.activitytype", 
+  "model": "ishtar_common.activitytype", 
   "fields": {
    "comment": "Unit\u00e9 li\u00e9e \u00e0 l'anthropisation elle-m\u00eame", 
    "available": true, 
@@ -1209,7 +1209,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "Niveau cultiv\u00e9 ou non, actuel.", 
    "available": true, 
@@ -1220,7 +1220,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1231,7 +1231,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1242,7 +1242,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1253,7 +1253,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1264,7 +1264,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1275,7 +1275,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1286,7 +1286,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1297,7 +1297,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1308,7 +1308,7 @@
  }, 
  {
   "pk": 10, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1319,7 +1319,7 @@
  }, 
  {
   "pk": 11, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1330,7 +1330,7 @@
  }, 
  {
   "pk": 12, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1341,7 +1341,7 @@
  }, 
  {
   "pk": 13, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1352,7 +1352,7 @@
  }, 
  {
   "pk": 14, 
-  "model": "ishtar_base.identificationtype", 
+  "model": "ishtar_common.identificationtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1363,7 +1363,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1375,7 +1375,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1387,7 +1387,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1399,7 +1399,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1411,7 +1411,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1423,7 +1423,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1435,7 +1435,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1447,7 +1447,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1459,7 +1459,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.materialtype", 
+  "model": "ishtar_common.materialtype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1471,7 +1471,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.warehousetype", 
+  "model": "ishtar_common.warehousetype", 
   "fields": {
    "comment": "Le mobilier arch\u00e9ologique reste dans ce d\u00e9p\u00f4t le temps d'un traitement puis part ailleurs...", 
    "available": true, 
@@ -1481,7 +1481,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.warehousetype", 
+  "model": "ishtar_common.warehousetype", 
   "fields": {
    "comment": "Ce d\u00e9p\u00f4t est un centre de conservation et d'\u00e9tude. Il est d'ordinaire en convention avec l'\u00e9tat.", 
    "available": true, 
@@ -1491,7 +1491,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.warehousetype", 
+  "model": "ishtar_common.warehousetype", 
   "fields": {
    "comment": "Ce d\u00e9p\u00f4t poss\u00e8de une convention avec l'\u00e9tat pour conserver du mobilier qui est sous sa garde.", 
    "available": true, 
@@ -1501,7 +1501,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.warehousetype", 
+  "model": "ishtar_common.warehousetype", 
   "fields": {
    "comment": "Mobilier pr\u00e9sent dans un lieu de mani\u00e8re ill\u00e9gale : pas de convention, voire de responsabilit\u00e9 exprim\u00e9e...", 
    "available": true, 
@@ -1511,7 +1511,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.warehousetype", 
+  "model": "ishtar_common.warehousetype", 
   "fields": {
    "comment": "Ce d\u00e9p\u00f4t est sous la responsabilit\u00e9 directe de l'Etat. Il peut en \u00eatre locataire ou propri\u00e9taire.", 
    "available": true, 
@@ -1521,7 +1521,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.warehousetype", 
+  "model": "ishtar_common.warehousetype", 
   "fields": {
    "comment": "Pour le stockage de documents papier, rapports la plus part du temps.", 
    "available": true, 
@@ -1531,7 +1531,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.warehousetype", 
+  "model": "ishtar_common.warehousetype", 
   "fields": {
    "comment": "Lieu de stockage de documents vari\u00e9s, photos, relev\u00e9s, jusqu'aux rapports.", 
    "available": true, 
@@ -1541,7 +1541,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "Suite \u00e0 une demande d'avis, les SRA \u00e9met un courrier signalant sa volont\u00e9 de prescrire un diagnostic ou une fouille sur l'emprise du projet en objet.", 
    "available": true, 
@@ -1552,7 +1552,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "Suite \u00e0 une demande d'avis, les SRA \u00e9met un courrier signalant sa volont\u00e9 de NE PAS prescrire un diagnostic ou une fouille sur l'emprise du projet en objet.", 
    "available": true, 
@@ -1563,7 +1563,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "Suite \u00e0 une Saisine (art.8), envoi d'une r\u00e9ponse de non prescription", 
    "available": true, 
@@ -1574,7 +1574,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "Arr\u00eat\u00e9 donnant l'autorisation \u00e0 une responsable scientifique de fouiller sur un terrain donn\u00e9.", 
    "available": true, 
@@ -1585,7 +1585,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "Arr\u00eat\u00e9 qui donne l'autorisation \u00e0 un Am\u00e9nageur de faire ex\u00e9cuter par un Op\u00e9rateur agr\u00e9e sous la responsabilit\u00e9 d'un Responsable scientifique, une op\u00e9ration.", 
    "available": true, 
@@ -1596,7 +1596,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "Un arr\u00eat\u00e9 prescrivant la r\u00e9alisation d'une fouille sur une surface donn\u00e9e", 
    "available": true, 
@@ -1607,7 +1607,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "Un arr\u00eat\u00e9 prescrivant la r\u00e9alisation d'un diagnostic sur une surface donn\u00e9e, SANS pr\u00e9cision du responsable scientifique, SANS pr\u00e9cision de l'op\u00e9rateur", 
    "available": true, 
@@ -1618,7 +1618,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1629,7 +1629,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "D\u00e9signation de l'op\u00e9rateur pour un diagnostic : utile dans le cas o\u00f9 un service territorial ET l'INRAP sont en m\u00eame temps comp\u00e9tents pour un territoire donn\u00e9.", 
    "available": true, 
@@ -1640,7 +1640,7 @@
  }, 
  {
   "pk": 10, 
-  "model": "ishtar_base.acttype", 
+  "model": "ishtar_common.acttype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1651,7 +1651,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.containertype", 
+  "model": "ishtar_common.containertype", 
   "fields": {
    "comment": "Type de caisse tr\u00e8s commun dans le nord de la France. Pas cher, pas trop gros donc pas trop lourd.\r\n\r\nR\u00e9f\u00e9rences pr\u00e9cises \u00e0 trouver !!!!!", 
    "available": true, 
@@ -1666,7 +1666,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.containertype", 
+  "model": "ishtar_common.containertype", 
   "fields": {
    "comment": "L'horrible caisse \u00e0 poisson ou du genre, a changer au plus vite", 
    "available": true, 
@@ -1681,7 +1681,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.containertype", 
+  "model": "ishtar_common.containertype", 
   "fields": {
    "comment": "Caisse Alibert grise standard, a pr\u00e9ciser et d\u00e9cliner en fonction des mod\u00e8les.", 
    "available": true, 
@@ -1696,7 +1696,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.containertype", 
+  "model": "ishtar_common.containertype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1711,7 +1711,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.containertype", 
+  "model": "ishtar_common.containertype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1726,7 +1726,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.containertype", 
+  "model": "ishtar_common.containertype", 
   "fields": {
    "comment": "", 
    "available": true, 
@@ -1741,7 +1741,7 @@
  }, 
  {
   "pk": 1, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Le fait de mettre du mobilier dans un contenant. Que cela soit le conditionnement initial ou un re-conditionnement. ", 
    "available": true, 
@@ -1752,7 +1752,7 @@
  }, 
  {
   "pk": 2, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Un lot mobilier ou un objet isol\u00e9 subit une radiographie (rayon X) qui produit un ou des films radio.", 
    "available": true, 
@@ -1763,7 +1763,7 @@
  }, 
  {
   "pk": 3, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Un lot mobilier ou un objet isol\u00e9 subit une radiographie (rayon X) qui produit un ou des fichiers num\u00e9riques.", 
    "available": true, 
@@ -1774,7 +1774,7 @@
  }, 
  {
   "pk": 4, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "D\u00e9placement de mobilier, entre deux d\u00e9p\u00f4ts : le mobilier ne peut pas \u00eatre stocker ailleurs que dans un lieu consid\u00e9r\u00e9 comme un d\u00e9p\u00f4t.", 
    "available": true, 
@@ -1785,7 +1785,7 @@
  }, 
  {
   "pk": 5, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Regroupement d'un ensemble de mobilier. Exemple : ensemble des outils provenant d'une fouille, Mobilier datant d'un site, tessonier virtuel, etc.", 
    "available": true, 
@@ -1796,7 +1796,7 @@
  }, 
  {
   "pk": 7, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Division d'un lot de mobilier en plusieurs lots", 
    "available": true, 
@@ -1807,7 +1807,7 @@
  }, 
  {
   "pk": 6, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "R\u00e9union de plusieurs objets ou lots mobiliers en un seul. Ce type de traitement peut impliquer ou non un reconditionnement.\r\n\r\nExemple : Remontage d'une c\u00e9ramique \u00e0 partir de tessons d\u00e9j\u00e0 pr\u00e9sents dans un contenant (pas de reconditionnement), regroupement d'une partie de la faune (os) d'une op\u00e9ration et cr\u00e9ation d'une nouvelle caisse dans ce but (reconditionnement \u00e0 faire)", 
    "available": true, 
@@ -1818,7 +1818,7 @@
  }, 
  {
   "pk": 8, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Prise de vue \u00e0 l'aide d'un appareil photo num\u00e9rique", 
    "available": true, 
@@ -1829,7 +1829,7 @@
  }, 
  {
   "pk": 9, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Photographie produisant un film (positif ou n\u00e9gatif)", 
    "available": true, 
@@ -1840,7 +1840,7 @@
  }, 
  {
   "pk": 10, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "Processus qui permet \u00e9liminer le sel qui impr\u00e8gne un objet arch\u00e9ologique ou lot d'objets.", 
    "available": true, 
@@ -1851,7 +1851,7 @@
  }, 
  {
   "pk": 11, 
-  "model": "ishtar_base.treatmenttype", 
+  "model": "ishtar_common.treatmenttype", 
   "fields": {
    "comment": "R\u00e9duction des oxydes d\u00e9velopp\u00e9s sur/dans un objet arch\u00e9ologique par l'usage de courant \u00e9lectrique.", 
    "available": true, 
@@ -1860,4 +1860,4 @@
    "label": "Electrolyse"
   }
  }
-]
\ No newline at end of file
+]
diff --git a/ishtar/ishtar_base/forms.py b/ishtar_common/forms.py
index 3d6f3f503..62f51fa08 100644
--- a/ishtar/ishtar_base/forms.py
+++ b/ishtar_common/forms.py
@@ -24,21 +24,22 @@ import datetime
 import re
 from itertools import groupby
 
+from django import forms
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
 from django.core import validators
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils import formats
-from django.utils.functional import lazy
-from django.utils.translation import ugettext_lazy as _
-from django.shortcuts import render_to_response
-from django.template import Context, RequestContext, loader
-from django.db.models import Max
-from django import forms
 from django.core.mail import send_mail
+from django.db.models import Max
 from django.forms.formsets import formset_factory, BaseFormSet, \
                                   DELETION_FIELD_NAME
-from django.contrib.auth.models import User
-from django.contrib.sites.models import Site
+from django.shortcuts import render_to_response
+from django.template import Context, RequestContext, loader
+from django.utils import formats
+from django.utils.functional import lazy
+from django.utils.translation import ugettext_lazy as _
 
 # from formwizard.forms import NamedUrlSessionFormWizard
 
@@ -55,7 +56,6 @@ class NamedUrlSessionFormWizard(forms.Form):
 
 import models
 import widgets
-from ishtar import settings
 
 reverse_lazy = lazy(reverse, unicode)
 
diff --git a/ishtar/ishtar_base/forms_common.py b/ishtar_common/forms_common.py
index 7ef1d4070..d034f6ddf 100644
--- a/ishtar/ishtar_base/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -23,18 +23,17 @@ Administrative forms definitions: manage accounts and persons
 import datetime
 
 from django import forms
-from django.template import Context, RequestContext, loader
-from django.shortcuts import render_to_response
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.core import validators
 from django.core.mail import send_mail
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.safestring import mark_safe
 from django.forms.formsets import formset_factory, DELETION_FIELD_NAME
+from django.template import Context, RequestContext, loader
+from django.shortcuts import render_to_response
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.models import User
-from django.contrib.sites.models import Site
-
-from ishtar import settings
 
 import models
 import widgets
diff --git a/ishtar/ishtar_base/forms_context_records.py b/ishtar_common/forms_context_records.py
index 816782bd8..816782bd8 100644
--- a/ishtar/ishtar_base/forms_context_records.py
+++ b/ishtar_common/forms_context_records.py
diff --git a/ishtar/ishtar_base/forms_files.py b/ishtar_common/forms_files.py
index c4c460cee..c4c460cee 100644
--- a/ishtar/ishtar_base/forms_files.py
+++ b/ishtar_common/forms_files.py
diff --git a/ishtar/ishtar_base/forms_items.py b/ishtar_common/forms_items.py
index b763d94b2..b763d94b2 100644
--- a/ishtar/ishtar_base/forms_items.py
+++ b/ishtar_common/forms_items.py
diff --git a/ishtar/ishtar_base/forms_main.py b/ishtar_common/forms_main.py
index 29253f284..29253f284 100644
--- a/ishtar/ishtar_base/forms_main.py
+++ b/ishtar_common/forms_main.py
diff --git a/ishtar/ishtar_base/forms_operations.py b/ishtar_common/forms_operations.py
index e163b5869..e163b5869 100644
--- a/ishtar/ishtar_base/forms_operations.py
+++ b/ishtar_common/forms_operations.py
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 417406b58..417406b58 100644
--- a/ishtar/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
diff --git a/ishtar/ishtar_base/management/__init__.py b/ishtar_common/management/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ishtar/ishtar_base/management/__init__.py
+++ b/ishtar_common/management/__init__.py
diff --git a/ishtar/ishtar_base/management/commands/__init__.py b/ishtar_common/management/commands/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ishtar/ishtar_base/management/commands/__init__.py
+++ b/ishtar_common/management/commands/__init__.py
diff --git a/ishtar/ishtar_base/management/commands/generate_rights.py b/ishtar_common/management/commands/generate_rights.py
index 75b1cf807..75b1cf807 100644
--- a/ishtar/ishtar_base/management/commands/generate_rights.py
+++ b/ishtar_common/management/commands/generate_rights.py
diff --git a/ishtar/ishtar_base/menus.py b/ishtar_common/menus.py
index 79355a6be..79355a6be 100644
--- a/ishtar/ishtar_base/menus.py
+++ b/ishtar_common/menus.py
diff --git a/ishtar/ishtar_base/models.py b/ishtar_common/models.py
index 41979129b..747643718 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar_common/models.py
@@ -22,6 +22,7 @@ Models description
 """
 import datetime
 
+from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import validate_slug
 from django.utils.translation import ugettext_lazy as _, ugettext
@@ -37,10 +38,16 @@ from django.contrib import admin
 
 from simple_history.models import HistoricalRecords as BaseHistoricalRecords
 
-from ishtar import settings
-
 JOINT = u" - "
 
+def post_save_user(sender, **kwargs):
+    if not kwargs['created']:
+        return
+    user = kwargs['instance']
+    if not IshtarUser.objects.filter(username=user.username).count():
+        IshtarUser.create_from_user(user)
+post_save.connect(post_save_user, sender=User)
+
 # HistoricalRecords enhancement: don't save identical versions
 class HistoricalRecords(BaseHistoricalRecords):
     def create_historical_record(self, instance, type):
@@ -1143,6 +1150,23 @@ class IshtarUser(User):
         verbose_name = _(u"Ishtar user")
         verbose_name_plural = _(u"Ishtar users")
 
+    @classmethod
+    def create_from_user(cls, user):
+        default = user.username
+        surname = user.first_name or default
+        name = user.last_name or default
+        email = user.email
+        person_type = None
+        if user.is_superuser:
+            person_type = PersonType.objects.get(txt_idx='administrator')
+        else:
+            person_type = PersonType.objects.get(txt_idx='public_access')
+        person = Person.objects.create(title='Mr', surname=surname,
+                                       name=name, email=email,
+                                       person_type=person_type,
+                                       history_modifier=user)
+        return IshtarUser.objects.create(user_ptr=user, person=person)
+
 class AuthorType(GeneralType):
     class Meta:
         verbose_name = _(u"Author type")
diff --git a/ishtar/scripts/__init__.py b/ishtar_common/scripts/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ishtar/scripts/__init__.py
+++ b/ishtar_common/scripts/__init__.py
diff --git a/ishtar/scripts/import_from_csv.py b/ishtar_common/scripts/import_from_csv.py
index de916be6f..de916be6f 100755
--- a/ishtar/scripts/import_from_csv.py
+++ b/ishtar_common/scripts/import_from_csv.py
diff --git a/ishtar/scripts/import_ope_from_csv.py b/ishtar_common/scripts/import_ope_from_csv.py
index fd29fd3f6..fd29fd3f6 100755
--- a/ishtar/scripts/import_ope_from_csv.py
+++ b/ishtar_common/scripts/import_ope_from_csv.py
diff --git a/ishtar/scripts/import_towns_from_osm.py b/ishtar_common/scripts/import_towns_from_osm.py
index fb301f09f..fb301f09f 100755
--- a/ishtar/scripts/import_towns_from_osm.py
+++ b/ishtar_common/scripts/import_towns_from_osm.py
diff --git a/static/js/i18n/grid.locale-bg.js b/ishtar_common/static/js/i18n/grid.locale-bg.js
index 00d9583df..00d9583df 100644
--- a/static/js/i18n/grid.locale-bg.js
+++ b/ishtar_common/static/js/i18n/grid.locale-bg.js
diff --git a/static/js/i18n/grid.locale-bg1251.js b/ishtar_common/static/js/i18n/grid.locale-bg1251.js
index 058950e62..058950e62 100644
--- a/static/js/i18n/grid.locale-bg1251.js
+++ b/ishtar_common/static/js/i18n/grid.locale-bg1251.js
diff --git a/static/js/i18n/grid.locale-cat.js b/ishtar_common/static/js/i18n/grid.locale-cat.js
index 76215f60f..76215f60f 100644
--- a/static/js/i18n/grid.locale-cat.js
+++ b/ishtar_common/static/js/i18n/grid.locale-cat.js
diff --git a/static/js/i18n/grid.locale-cn.js b/ishtar_common/static/js/i18n/grid.locale-cn.js
index e2f282c71..e2f282c71 100644
--- a/static/js/i18n/grid.locale-cn.js
+++ b/ishtar_common/static/js/i18n/grid.locale-cn.js
diff --git a/static/js/i18n/grid.locale-cs.js b/ishtar_common/static/js/i18n/grid.locale-cs.js
index ad3cfc310..ad3cfc310 100644
--- a/static/js/i18n/grid.locale-cs.js
+++ b/ishtar_common/static/js/i18n/grid.locale-cs.js
diff --git a/static/js/i18n/grid.locale-da.js b/ishtar_common/static/js/i18n/grid.locale-da.js
index 44e745f61..44e745f61 100644
--- a/static/js/i18n/grid.locale-da.js
+++ b/ishtar_common/static/js/i18n/grid.locale-da.js
diff --git a/static/js/i18n/grid.locale-de.js b/ishtar_common/static/js/i18n/grid.locale-de.js
index 106e8992a..106e8992a 100644
--- a/static/js/i18n/grid.locale-de.js
+++ b/ishtar_common/static/js/i18n/grid.locale-de.js
diff --git a/static/js/i18n/grid.locale-el.js b/ishtar_common/static/js/i18n/grid.locale-el.js
index d4f642328..d4f642328 100644
--- a/static/js/i18n/grid.locale-el.js
+++ b/ishtar_common/static/js/i18n/grid.locale-el.js
diff --git a/static/js/i18n/grid.locale-en.js b/ishtar_common/static/js/i18n/grid.locale-en.js
index 64dc885c9..64dc885c9 100644
--- a/static/js/i18n/grid.locale-en.js
+++ b/ishtar_common/static/js/i18n/grid.locale-en.js
diff --git a/static/js/i18n/grid.locale-es.js b/ishtar_common/static/js/i18n/grid.locale-es.js
index 3d997378b..3d997378b 100644
--- a/static/js/i18n/grid.locale-es.js
+++ b/ishtar_common/static/js/i18n/grid.locale-es.js
diff --git a/static/js/i18n/grid.locale-fa.js b/ishtar_common/static/js/i18n/grid.locale-fa.js
index 3c233de6b..3c233de6b 100644
--- a/static/js/i18n/grid.locale-fa.js
+++ b/ishtar_common/static/js/i18n/grid.locale-fa.js
diff --git a/static/js/i18n/grid.locale-fi.js b/ishtar_common/static/js/i18n/grid.locale-fi.js
index 9a07511d9..9a07511d9 100644
--- a/static/js/i18n/grid.locale-fi.js
+++ b/ishtar_common/static/js/i18n/grid.locale-fi.js
diff --git a/static/js/i18n/grid.locale-fr.js b/ishtar_common/static/js/i18n/grid.locale-fr.js
index a7d22abe7..a7d22abe7 100644
--- a/static/js/i18n/grid.locale-fr.js
+++ b/ishtar_common/static/js/i18n/grid.locale-fr.js
diff --git a/static/js/i18n/grid.locale-gl.js b/ishtar_common/static/js/i18n/grid.locale-gl.js
index a2faba2c0..a2faba2c0 100644
--- a/static/js/i18n/grid.locale-gl.js
+++ b/ishtar_common/static/js/i18n/grid.locale-gl.js
diff --git a/static/js/i18n/grid.locale-he.js b/ishtar_common/static/js/i18n/grid.locale-he.js
index e226083dd..e226083dd 100644
--- a/static/js/i18n/grid.locale-he.js
+++ b/ishtar_common/static/js/i18n/grid.locale-he.js
diff --git a/static/js/i18n/grid.locale-hu.js b/ishtar_common/static/js/i18n/grid.locale-hu.js
index 15ae3b60b..15ae3b60b 100644
--- a/static/js/i18n/grid.locale-hu.js
+++ b/ishtar_common/static/js/i18n/grid.locale-hu.js
diff --git a/static/js/i18n/grid.locale-is.js b/ishtar_common/static/js/i18n/grid.locale-is.js
index b586e11d8..b586e11d8 100644
--- a/static/js/i18n/grid.locale-is.js
+++ b/ishtar_common/static/js/i18n/grid.locale-is.js
diff --git a/static/js/i18n/grid.locale-it.js b/ishtar_common/static/js/i18n/grid.locale-it.js
index fec00456e..fec00456e 100644
--- a/static/js/i18n/grid.locale-it.js
+++ b/ishtar_common/static/js/i18n/grid.locale-it.js
diff --git a/static/js/i18n/grid.locale-ja.js b/ishtar_common/static/js/i18n/grid.locale-ja.js
index fd3b7371d..fd3b7371d 100644
--- a/static/js/i18n/grid.locale-ja.js
+++ b/ishtar_common/static/js/i18n/grid.locale-ja.js
diff --git a/static/js/i18n/grid.locale-nl.js b/ishtar_common/static/js/i18n/grid.locale-nl.js
index 093d1eec0..093d1eec0 100644
--- a/static/js/i18n/grid.locale-nl.js
+++ b/ishtar_common/static/js/i18n/grid.locale-nl.js
diff --git a/static/js/i18n/grid.locale-no.js b/ishtar_common/static/js/i18n/grid.locale-no.js
index a70ef6d79..a70ef6d79 100644
--- a/static/js/i18n/grid.locale-no.js
+++ b/ishtar_common/static/js/i18n/grid.locale-no.js
diff --git a/static/js/i18n/grid.locale-pl.js b/ishtar_common/static/js/i18n/grid.locale-pl.js
index 3e3f17855..3e3f17855 100644
--- a/static/js/i18n/grid.locale-pl.js
+++ b/ishtar_common/static/js/i18n/grid.locale-pl.js
diff --git a/static/js/i18n/grid.locale-pt-br.js b/ishtar_common/static/js/i18n/grid.locale-pt-br.js
index ae01258c5..ae01258c5 100644
--- a/static/js/i18n/grid.locale-pt-br.js
+++ b/ishtar_common/static/js/i18n/grid.locale-pt-br.js
diff --git a/static/js/i18n/grid.locale-pt.js b/ishtar_common/static/js/i18n/grid.locale-pt.js
index 737219db3..737219db3 100644
--- a/static/js/i18n/grid.locale-pt.js
+++ b/ishtar_common/static/js/i18n/grid.locale-pt.js
diff --git a/static/js/i18n/grid.locale-ro.js b/ishtar_common/static/js/i18n/grid.locale-ro.js
index d8513aff1..d8513aff1 100644
--- a/static/js/i18n/grid.locale-ro.js
+++ b/ishtar_common/static/js/i18n/grid.locale-ro.js
diff --git a/static/js/i18n/grid.locale-ru.js b/ishtar_common/static/js/i18n/grid.locale-ru.js
index 910b0d764..910b0d764 100644
--- a/static/js/i18n/grid.locale-ru.js
+++ b/ishtar_common/static/js/i18n/grid.locale-ru.js
diff --git a/static/js/i18n/grid.locale-sk.js b/ishtar_common/static/js/i18n/grid.locale-sk.js
index f08437f74..f08437f74 100644
--- a/static/js/i18n/grid.locale-sk.js
+++ b/ishtar_common/static/js/i18n/grid.locale-sk.js
diff --git a/static/js/i18n/grid.locale-sr.js b/ishtar_common/static/js/i18n/grid.locale-sr.js
index 305b17e2b..305b17e2b 100644
--- a/static/js/i18n/grid.locale-sr.js
+++ b/ishtar_common/static/js/i18n/grid.locale-sr.js
diff --git a/static/js/i18n/grid.locale-sv.js b/ishtar_common/static/js/i18n/grid.locale-sv.js
index fd28e6b87..fd28e6b87 100644
--- a/static/js/i18n/grid.locale-sv.js
+++ b/ishtar_common/static/js/i18n/grid.locale-sv.js
diff --git a/static/js/i18n/grid.locale-tr.js b/ishtar_common/static/js/i18n/grid.locale-tr.js
index 4cfa4ec12..4cfa4ec12 100644
--- a/static/js/i18n/grid.locale-tr.js
+++ b/ishtar_common/static/js/i18n/grid.locale-tr.js
diff --git a/static/js/i18n/grid.locale-ua.js b/ishtar_common/static/js/i18n/grid.locale-ua.js
index c9205f8c3..c9205f8c3 100644
--- a/static/js/i18n/grid.locale-ua.js
+++ b/ishtar_common/static/js/i18n/grid.locale-ua.js
diff --git a/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 25fc3c66a..25fc3c66a 100644
--- a/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
diff --git a/static/js/jquery.jqGrid.min.js b/ishtar_common/static/js/jquery.jqGrid.min.js
index 684aba850..684aba850 100644
--- a/static/js/jquery.jqGrid.min.js
+++ b/ishtar_common/static/js/jquery.jqGrid.min.js
diff --git a/static/media/images/favicon.png b/ishtar_common/static/media/images/favicon.png
index 49a143457..49a143457 100644
--- a/static/media/images/favicon.png
+++ b/ishtar_common/static/media/images/favicon.png
diff --git a/static/media/images/ishtar-bg.jpg b/ishtar_common/static/media/images/ishtar-bg.jpg
index f7802c576..f7802c576 100644
--- a/static/media/images/ishtar-bg.jpg
+++ b/ishtar_common/static/media/images/ishtar-bg.jpg
diff --git a/static/media/images/ishtar-text.png b/ishtar_common/static/media/images/ishtar-text.png
index 34f3270eb..34f3270eb 100644
--- a/static/media/images/ishtar-text.png
+++ b/ishtar_common/static/media/images/ishtar-text.png
diff --git a/static/media/images/logo.ico b/ishtar_common/static/media/images/logo.ico
index c6417a32e..c6417a32e 100644
--- a/static/media/images/logo.ico
+++ b/ishtar_common/static/media/images/logo.ico
diff --git a/static/media/images/logo.png b/ishtar_common/static/media/images/logo.png
index e150baa6c..e150baa6c 100644
--- a/static/media/images/logo.png
+++ b/ishtar_common/static/media/images/logo.png
diff --git a/static/media/images/red_flag.png b/ishtar_common/static/media/images/red_flag.png
index 20f50664e..20f50664e 100644
--- a/static/media/images/red_flag.png
+++ b/ishtar_common/static/media/images/red_flag.png
diff --git a/static/media/style.css b/ishtar_common/static/media/style.css
index ef58a1b0a..ef58a1b0a 100644
--- a/static/media/style.css
+++ b/ishtar_common/static/media/style.css
diff --git a/static/media/style_basic.css b/ishtar_common/static/media/style_basic.css
index d624ae09c..d624ae09c 100644
--- a/static/media/style_basic.css
+++ b/ishtar_common/static/media/style_basic.css
diff --git a/static/media/ui.jqgrid.css b/ishtar_common/static/media/ui.jqgrid.css
index e69018909..e69018909 100644
--- a/static/media/ui.jqgrid.css
+++ b/ishtar_common/static/media/ui.jqgrid.css
diff --git a/static/template.odt b/ishtar_common/static/template.odt
index d1d0515bf..d1d0515bf 100644
--- a/static/template.odt
+++ b/ishtar_common/static/template.odt
diff --git a/ishtar/templates/account_activation_email.txt b/ishtar_common/templates/account_activation_email.txt
index 2dcc77d3e..2dcc77d3e 100644
--- a/ishtar/templates/account_activation_email.txt
+++ b/ishtar_common/templates/account_activation_email.txt
diff --git a/ishtar/templates/admin/base_site.html b/ishtar_common/templates/admin/base_site.html
index 3282d4f5a..3282d4f5a 100644
--- a/ishtar/templates/admin/base_site.html
+++ b/ishtar_common/templates/admin/base_site.html
diff --git a/ishtar/templates/base.html b/ishtar_common/templates/base.html
index 630fe666e..630fe666e 100644
--- a/ishtar/templates/base.html
+++ b/ishtar_common/templates/base.html
diff --git a/ishtar/templates/dashboard_file.html b/ishtar_common/templates/dashboard_file.html
index cebd147f4..cebd147f4 100644
--- a/ishtar/templates/dashboard_file.html
+++ b/ishtar_common/templates/dashboard_file.html
diff --git a/ishtar/templates/dashboard_main.html b/ishtar_common/templates/dashboard_main.html
index e710dbe16..e710dbe16 100644
--- a/ishtar/templates/dashboard_main.html
+++ b/ishtar_common/templates/dashboard_main.html
diff --git a/ishtar/templates/dashboard_operation.html b/ishtar_common/templates/dashboard_operation.html
index 28f1dd9c6..28f1dd9c6 100644
--- a/ishtar/templates/dashboard_operation.html
+++ b/ishtar_common/templates/dashboard_operation.html
diff --git a/ishtar/templates/form_snippet.html b/ishtar_common/templates/form_snippet.html
index 2f841e078..2f841e078 100644
--- a/ishtar/templates/form_snippet.html
+++ b/ishtar_common/templates/form_snippet.html
diff --git a/ishtar/templates/index.html b/ishtar_common/templates/index.html
index c4c0b0f2a..c4c0b0f2a 100644
--- a/ishtar/templates/index.html
+++ b/ishtar_common/templates/index.html
diff --git a/ishtar/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index bd80e3967..bd80e3967 100644
--- a/ishtar/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
diff --git a/ishtar/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 1996f4e46..1996f4e46 100644
--- a/ishtar/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
diff --git a/ishtar/templates/registration/activate.html b/ishtar_common/templates/registration/activate.html
index 0dcbccc00..0dcbccc00 100644
--- a/ishtar/templates/registration/activate.html
+++ b/ishtar_common/templates/registration/activate.html
diff --git a/ishtar/templates/registration/activation_email.txt b/ishtar_common/templates/registration/activation_email.txt
index b30035969..b30035969 100644
--- a/ishtar/templates/registration/activation_email.txt
+++ b/ishtar_common/templates/registration/activation_email.txt
diff --git a/ishtar/templates/registration/activation_email_subject.txt b/ishtar_common/templates/registration/activation_email_subject.txt
index 24f477cbb..24f477cbb 100644
--- a/ishtar/templates/registration/activation_email_subject.txt
+++ b/ishtar_common/templates/registration/activation_email_subject.txt
diff --git a/ishtar/templates/registration/login.html b/ishtar_common/templates/registration/login.html
index ada4f6aa9..ada4f6aa9 100644
--- a/ishtar/templates/registration/login.html
+++ b/ishtar_common/templates/registration/login.html
diff --git a/ishtar/templates/registration/logout.html b/ishtar_common/templates/registration/logout.html
index 029a0c25b..029a0c25b 100644
--- a/ishtar/templates/registration/logout.html
+++ b/ishtar_common/templates/registration/logout.html
diff --git a/ishtar/templates/registration/password_change_done.html b/ishtar_common/templates/registration/password_change_done.html
index 9d442360c..9d442360c 100644
--- a/ishtar/templates/registration/password_change_done.html
+++ b/ishtar_common/templates/registration/password_change_done.html
diff --git a/ishtar/templates/registration/password_change_form.html b/ishtar_common/templates/registration/password_change_form.html
index 84d915eaa..84d915eaa 100644
--- a/ishtar/templates/registration/password_change_form.html
+++ b/ishtar_common/templates/registration/password_change_form.html
diff --git a/ishtar/templates/registration/password_reset_complete.html b/ishtar_common/templates/registration/password_reset_complete.html
index dfa3ce682..dfa3ce682 100644
--- a/ishtar/templates/registration/password_reset_complete.html
+++ b/ishtar_common/templates/registration/password_reset_complete.html
diff --git a/ishtar/templates/registration/password_reset_confirm.html b/ishtar_common/templates/registration/password_reset_confirm.html
index b0e2cc142..b0e2cc142 100644
--- a/ishtar/templates/registration/password_reset_confirm.html
+++ b/ishtar_common/templates/registration/password_reset_confirm.html
diff --git a/ishtar/templates/registration/password_reset_done.html b/ishtar_common/templates/registration/password_reset_done.html
index cc7d9b40e..cc7d9b40e 100644
--- a/ishtar/templates/registration/password_reset_done.html
+++ b/ishtar_common/templates/registration/password_reset_done.html
diff --git a/ishtar/templates/registration/password_reset_email.html b/ishtar_common/templates/registration/password_reset_email.html
index a55c86958..a55c86958 100644
--- a/ishtar/templates/registration/password_reset_email.html
+++ b/ishtar_common/templates/registration/password_reset_email.html
diff --git a/ishtar/templates/registration/password_reset_form.html b/ishtar_common/templates/registration/password_reset_form.html
index d6fad7a0a..d6fad7a0a 100644
--- a/ishtar/templates/registration/password_reset_form.html
+++ b/ishtar_common/templates/registration/password_reset_form.html
diff --git a/ishtar/templates/registration/registration_complete.html b/ishtar_common/templates/registration/registration_complete.html
index e9f487444..e9f487444 100644
--- a/ishtar/templates/registration/registration_complete.html
+++ b/ishtar_common/templates/registration/registration_complete.html
diff --git a/ishtar/templates/registration/registration_form.html b/ishtar_common/templates/registration/registration_form.html
index b15f0e74b..b15f0e74b 100644
--- a/ishtar/templates/registration/registration_form.html
+++ b/ishtar_common/templates/registration/registration_form.html
diff --git a/ishtar/templates/search.html b/ishtar_common/templates/search.html
index 1b5829820..1b5829820 100644
--- a/ishtar/templates/search.html
+++ b/ishtar_common/templates/search.html
diff --git a/ishtar/templates/sheet.html b/ishtar_common/templates/sheet.html
index 5608a684f..5608a684f 100644
--- a/ishtar/templates/sheet.html
+++ b/ishtar_common/templates/sheet.html
diff --git a/ishtar/templates/sheet_contextrecord.html b/ishtar_common/templates/sheet_contextrecord.html
index c2b94bafe..c2b94bafe 100644
--- a/ishtar/templates/sheet_contextrecord.html
+++ b/ishtar_common/templates/sheet_contextrecord.html
diff --git a/ishtar/templates/sheet_contextrecord_window.html b/ishtar_common/templates/sheet_contextrecord_window.html
index 7ff65d1e7..7ff65d1e7 100644
--- a/ishtar/templates/sheet_contextrecord_window.html
+++ b/ishtar_common/templates/sheet_contextrecord_window.html
diff --git a/ishtar/templates/sheet_file.html b/ishtar_common/templates/sheet_file.html
index 88ef1b3a2..88ef1b3a2 100644
--- a/ishtar/templates/sheet_file.html
+++ b/ishtar_common/templates/sheet_file.html
diff --git a/ishtar/templates/sheet_file_pdf.html b/ishtar_common/templates/sheet_file_pdf.html
index 3c77c75f8..3c77c75f8 100644
--- a/ishtar/templates/sheet_file_pdf.html
+++ b/ishtar_common/templates/sheet_file_pdf.html
diff --git a/ishtar/templates/sheet_file_window.html b/ishtar_common/templates/sheet_file_window.html
index e9debdd0d..e9debdd0d 100644
--- a/ishtar/templates/sheet_file_window.html
+++ b/ishtar_common/templates/sheet_file_window.html
diff --git a/ishtar/templates/sheet_ope.html b/ishtar_common/templates/sheet_ope.html
index dbe3297b3..dbe3297b3 100644
--- a/ishtar/templates/sheet_ope.html
+++ b/ishtar_common/templates/sheet_ope.html
diff --git a/ishtar/templates/sheet_ope_modif.html b/ishtar_common/templates/sheet_ope_modif.html
index cc3a4492e..cc3a4492e 100644
--- a/ishtar/templates/sheet_ope_modif.html
+++ b/ishtar_common/templates/sheet_ope_modif.html
diff --git a/ishtar/templates/sheet_operation.html b/ishtar_common/templates/sheet_operation.html
index aa571d20c..aa571d20c 100644
--- a/ishtar/templates/sheet_operation.html
+++ b/ishtar_common/templates/sheet_operation.html
diff --git a/ishtar/templates/sheet_operation_pdf.html b/ishtar_common/templates/sheet_operation_pdf.html
index 3397d5f43..3397d5f43 100644
--- a/ishtar/templates/sheet_operation_pdf.html
+++ b/ishtar_common/templates/sheet_operation_pdf.html
diff --git a/ishtar/templates/sheet_operation_window.html b/ishtar_common/templates/sheet_operation_window.html
index 9c595a1e9..9c595a1e9 100644
--- a/ishtar/templates/sheet_operation_window.html
+++ b/ishtar_common/templates/sheet_operation_window.html
diff --git a/ishtar/templates/towns_wizard.html b/ishtar_common/templates/towns_wizard.html
index 115ac9838..115ac9838 100644
--- a/ishtar/templates/towns_wizard.html
+++ b/ishtar_common/templates/towns_wizard.html
diff --git a/ishtar/templates/window.html b/ishtar_common/templates/window.html
index a92f859ab..a92f859ab 100644
--- a/ishtar/templates/window.html
+++ b/ishtar_common/templates/window.html
diff --git a/ishtar/templates/wizard_closing_done.html b/ishtar_common/templates/wizard_closing_done.html
index 54990a629..54990a629 100644
--- a/ishtar/templates/wizard_closing_done.html
+++ b/ishtar_common/templates/wizard_closing_done.html
diff --git a/ishtar/templates/wizard_delete_done.html b/ishtar_common/templates/wizard_delete_done.html
index 854341aa3..854341aa3 100644
--- a/ishtar/templates/wizard_delete_done.html
+++ b/ishtar_common/templates/wizard_delete_done.html
diff --git a/ishtar/templates/wizard_done.html b/ishtar_common/templates/wizard_done.html
index a7068bbab..a7068bbab 100644
--- a/ishtar/templates/wizard_done.html
+++ b/ishtar_common/templates/wizard_done.html
diff --git a/ishtar/templates/wizard_done_summary.html b/ishtar_common/templates/wizard_done_summary.html
index 53650dafe..53650dafe 100644
--- a/ishtar/templates/wizard_done_summary.html
+++ b/ishtar_common/templates/wizard_done_summary.html
diff --git a/ishtar/templates/wizard_done_summary_2.html b/ishtar_common/templates/wizard_done_summary_2.html
index 66a572542..66a572542 100644
--- a/ishtar/templates/wizard_done_summary_2.html
+++ b/ishtar_common/templates/wizard_done_summary_2.html
diff --git a/ishtar/templates/wizard_list_search_result.html b/ishtar_common/templates/wizard_list_search_result.html
index 6cbafb930..6cbafb930 100644
--- a/ishtar/templates/wizard_list_search_result.html
+++ b/ishtar_common/templates/wizard_list_search_result.html
diff --git a/ishtar/ishtar_base/templatetags/__init__.py b/ishtar_common/templatetags/__init__.py
index 792d60054..792d60054 100644
--- a/ishtar/ishtar_base/templatetags/__init__.py
+++ b/ishtar_common/templatetags/__init__.py
diff --git a/ishtar/ishtar_base/templatetags/range.py b/ishtar_common/templatetags/range.py
index 3b3a9097b..3b3a9097b 100644
--- a/ishtar/ishtar_base/templatetags/range.py
+++ b/ishtar_common/templatetags/range.py
diff --git a/ishtar/ishtar_base/templatetags/table_form.py b/ishtar_common/templatetags/table_form.py
index 7adb54d65..7adb54d65 100644
--- a/ishtar/ishtar_base/templatetags/table_form.py
+++ b/ishtar_common/templatetags/table_form.py
diff --git a/ishtar/ishtar_base/tests.py b/ishtar_common/tests.py
index 5a433b381..5a433b381 100644
--- a/ishtar/ishtar_base/tests.py
+++ b/ishtar_common/tests.py
diff --git a/ishtar/ishtar_base/urls.py b/ishtar_common/urls.py
index a5b1f5efa..437a6bbb4 100644
--- a/ishtar/ishtar_base/urls.py
+++ b/ishtar_common/urls.py
@@ -140,7 +140,7 @@ for section in menu.childs:
 actions = r"|".join(actions)
 
 # other views
-urlpatterns += patterns('ishtar.ishtar_base.views',
+urlpatterns += patterns('ishtar_common.views',
      # General
      url(r'(?P<action_slug>' + actions + r')/$', 'action',
            name='action'),
diff --git a/ishtar/ishtar_base/views.py b/ishtar_common/views.py
index 4a7f276fb..9b06276f8 100644
--- a/ishtar/ishtar_base/views.py
+++ b/ishtar_common/views.py
@@ -31,6 +31,7 @@ import cStringIO as StringIO
 from tempfile import NamedTemporaryFile
 import ho.pisa as pisa
 
+from django.conf import settings
 from django.contrib.formtools.wizard.views import NamedUrlWizardView
 from django.core import serializers
 from django.core.exceptions import ObjectDoesNotExist
@@ -42,7 +43,6 @@ from django.template import RequestContext, loader
 from django.template.defaultfilters import slugify
 from django.utils.translation import ugettext, ugettext_lazy as _
 
-from ishtar import settings
 if settings.XHTML2ODT_PATH:
     import sys
     sys.path.append(settings.XHTML2ODT_PATH)
@@ -51,8 +51,8 @@ if settings.XHTML2ODT_PATH:
 from menus import menu
 import forms_main as ishtar_forms
 
-from ishtar.ishtar_base.forms import FinalForm
-from ishtar.ishtar_base.forms_common import PersonForm
+from ishtar_common.forms import FinalForm
+from ishtar_common.forms_common import PersonForm
 import models
 
 CSV_OPTIONS = {'delimiter':';', 'quotechar':'"', 'quoting':csv.QUOTE_ALL}
@@ -690,8 +690,8 @@ def check_permission(request, action_slug, obj_id=None):
 
 def autocomplete_person(request, person_type=None):
     person_types = request.user.ishtaruser.person.person_type
-    if (not request.user.has_perm('ishtar_base.view_person', models.Person) and
-       not request.user.has_perm('ishtar_base.view_own_person', models.Person)
+    if (not request.user.has_perm('ishtar_common.view_person', models.Person) and
+       not request.user.has_perm('ishtar_common.view_own_person', models.Person)
        and not person_types.rights.filter(wizard__url_name='person_search'
                                                                      ).count()):
         return HttpResponse(mimetype='text/plain')
@@ -739,8 +739,8 @@ def autocomplete_town(request):
 
 def autocomplete_file(request):
     person_types = request.user.ishtaruser.person.person_type
-    if (not request.user.has_perm('ishtar_base.view_file', models.File) and \
-       not request.user.has_perm('ishtar_base.view_own_file', models.File)
+    if (not request.user.has_perm('ishtar_common.view_file', models.File) and \
+       not request.user.has_perm('ishtar_common.view_own_file', models.File)
        and not person_types.rights.filter(wizard__url_name='file_search'
                                                                      ).count()):
         return HttpResponse(mimetype='text/plain')
@@ -1056,8 +1056,8 @@ revert_file = revert_item(models.File)
 
 def autocomplete_operation(request, non_closed=True):
     person_types = request.user.ishtaruser.person.person_type
-    if (not request.user.has_perm('ishtar_base.view_operation', models.Operation)\
-       and not request.user.has_perm('ishtar_base.view_own_operation',
+    if (not request.user.has_perm('ishtar_common.view_operation', models.Operation)\
+       and not request.user.has_perm('ishtar_common.view_own_operation',
                                                               models.Operation)
        and not person_types.rights.filter(wizard__url_name='operation_search'
                                                                      ).count()):
@@ -1083,8 +1083,8 @@ def autocomplete_operation(request, non_closed=True):
     return HttpResponse(data, mimetype='text/plain')
 
 def get_available_operation_code(request, year=None):
-    if not request.user.has_perm('ishtar_base.view_operation', models.Operation)\
-       and not request.user.has_perm('ishtar_base.view_own_operation',
+    if not request.user.has_perm('ishtar_common.view_operation', models.Operation)\
+       and not request.user.has_perm('ishtar_common.view_own_operation',
                                                               models.Operation):
         return HttpResponse(mimetype='text/plain')
     data = json.dumps({'id':models.Operation.get_available_operation_code(year)})
@@ -1117,9 +1117,9 @@ get_administrativeactop = get_item(models.AdministrativeAct,
 
 def autocomplete_organization(request, orga_type=None):
     person_types = request.user.ishtaruser.person.person_type
-    if (not request.user.has_perm('ishtar_base.view_organization',
+    if (not request.user.has_perm('ishtar_common.view_organization',
                                  models.Organization) and \
-       not request.user.has_perm('ishtar_base.view_own_organization',
+       not request.user.has_perm('ishtar_common.view_own_organization',
                                  models.Organization)
        and not person_types.rights.filter(wizard__url_name='person_search'
                                                                      ).count()):
@@ -1188,8 +1188,8 @@ get_container = get_item(models.Container,
     })
 
 def autocomplete_warehouse(request):
-    if not request.user.has_perm('ishtar_base.view_warehouse', models.Warehouse)\
-       and not request.user.has_perm('ishtar_base.view_own_warehouse',
+    if not request.user.has_perm('ishtar_common.view_warehouse', models.Warehouse)\
+       and not request.user.has_perm('ishtar_common.view_own_warehouse',
                                      models.Warehouse) :
         return HttpResponse(mimetype='text/plain')
     if not request.GET.get('term'):
@@ -1207,8 +1207,8 @@ def autocomplete_warehouse(request):
     return HttpResponse(data, mimetype='text/plain')
 
 def autocomplete_author(request):
-    if not request.user.has_perm('ishtar_base.view_author', models.Author)\
-       and not request.user.has_perm('ishtar_base.view_own_author',
+    if not request.user.has_perm('ishtar_common.view_author', models.Author)\
+       and not request.user.has_perm('ishtar_common.view_own_author',
                                      models.Warehouse) :
         return HttpResponse(mimetype='text/plain')
     if not request.GET.get('term'):
@@ -1228,9 +1228,9 @@ def autocomplete_author(request):
     return HttpResponse(data, mimetype='text/plain')
 
 def autocomplete_container(request):
-    if not request.user.has_perm('ishtar_base.view_warehouse',
+    if not request.user.has_perm('ishtar_common.view_warehouse',
                                      models.Warehouse)\
-       and not request.user.has_perm('ishtar_base.view_own_warehouse',
+       and not request.user.has_perm('ishtar_common.view_own_warehouse',
                                      models.Warehouse):
         return HttpResponse(mimetype='text/plain')
     if not request.GET.get('term'):
diff --git a/ishtar/ishtar_base/widgets.py b/ishtar_common/widgets.py
index 00f185b5a..ecc48a1e8 100644
--- a/ishtar/ishtar_base/widgets.py
+++ b/ishtar_common/widgets.py
@@ -18,18 +18,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 

 # See the file COPYING for details.

+

 from django import forms

-from django.template import Context, loader

-from django.utils.safestring import mark_safe

+from django.conf import settings

+from django.core.urlresolvers import resolve, reverse

+from django.db.models import fields

 from django.forms.widgets import flatatt

+from django.template import Context, loader

 from django.utils.encoding import smart_unicode

 from django.utils.html import escape

+from django.utils.safestring import mark_safe

 from django.utils.simplejson import JSONEncoder

-from django.core.urlresolvers import resolve, reverse

 from django.utils.translation import ugettext_lazy as _

-from django.db.models import fields

 

-from ishtar import settings

 import models

 

 class DeleteWidget(forms.CheckboxInput):