conflit réglé merge master et regionalisation

[auf_rh_dae.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 96525ff..7ff1454 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -138,7 +138,6 @@ AJAX_LOOKUP_CHANNELS = {
     'employes': ('project.rh.catalogues', 'Employe'),
     'dossiers': ('project.rh.catalogues', 'Dossier'),
 }
-AJAX_SELECT_BOOTSTRAP = True
 AJAX_SELECT_INLINES = 'inline'
 
 
@@ -196,3 +195,5 @@ QBE_ALLOWED_FIELDS = {'Rh': {
     'Remuneration': ['montant', 'date_debut', 'date_fin'],
     'Contrat': ['date_debut', 'date_fin'],
 }}
+
+SOUTH_TESTS_MIGRATE = False