Merge branch 'refactoring' into test

Conflicts:
	project/settings.py

diff --cc project/menu.py
Simple merge

diff --cc project/recrutement/admin.py
Simple merge

diff --cc project/rh/admin.py
index 7d7c0d1,d9899a1..c2eec9e
--- 1/project/rh/admin.py
--- 2/project/rh/admin.py
+++ b/project/rh/admin.py
@@@ -19,16 -23,8 +23,14 @@@ import project.rh.models as r
  from project.rh.forms import \
          ContratForm, AyantDroitForm, EmployeAdminForm, AjaxSelect, DossierForm
  from project.rh.change_list import ChangeList
- from project.rh.groups import grp_correspondants_rh
- from project.rh.decorators import in_drh_or_admin
  
  
 +class BaseAdmin(admin.ModelAdmin):
 +
 +    class Media:
 +        css = {'screen': ('css/admin_custom.css',)}
 +
 +
  class ArchiveMixin(object):
      """
      Archive Mixin pour gérer le queryset et le display

diff --cc project/rh/views.py
Simple merge

diff --cc project/settings.py
index f9531b8,d6624b9..eb03896
--- 1/project/settings.py
--- 2/project/settings.py
+++ b/project/settings.py
@@@ -2,7 -2,7 +2,7 @@@
  
  import os
  import socket
--from project.conf import *
++from project.conf import *  # NOQA
  
  PROJET_TITRE = "Ressources humaines"
  
@@@ -18,8 -18,8 +18,8 @@@ MANAGERS = ADMIN
  TIME_ZONE = 'America/Montreal'
  DATE_FORMAT = 'd-m-Y'
  DATE_INPUT_FORMATS = (
--    '%d-%m-%Y', '%d/%m/%Y', '%d %m %Y', 
--    '%d-%m-%y', '%d/%m/%y', '%d %m %y', 
++    '%d-%m-%Y', '%d/%m/%Y', '%d %m %Y',
++    '%d-%m-%y', '%d/%m/%y', '%d %m %y',
  )
  
  SESSION_SAVE_EVERY_REQUEST = True
@@@ -131,67 -127,44 +130,72 @@@ ADMIN_TOOLS_APP_INDEX_DASHBOARD = 'proj
  ADMIN_TOOLS_MENU = 'project.menu.CustomMenu'
  
  AJAX_LOOKUP_CHANNELS = {
-     'responsables' : ('dae.catalogues', 'Responsable'),
-     'dossiers' : ('dae.catalogues', 'Dossier'),
-     'dae_postes' : ('dae.catalogues', 'Poste'),
-     'pays' : ('rh.catalogues', 'Pays'),
-     'implantations' : ('rh.catalogues', 'Implantation'),
-     'typepostes' : ('rh.catalogues', 'TypePoste'),
-     'postes' : ('rh.catalogues', 'Poste'),
-     'valeurpoints' : ('rh.catalogues', 'ValeurPoint'),
-     'employes' : ('rh.catalogues', 'Employe'),
-     'dossiers' : ('rh.catalogues', 'Dossier'),
 -    'responsables' : ('project.dae.catalogues', 'Responsable'),
 -    'dossiers' : ('project.dae.catalogues', 'Dossier'),
 -    'dae_postes' : ('project.dae.catalogues', 'Poste'),
 -    'pays' : ('project.rh.catalogues', 'Pays'),
 -    'implantations' : ('project.rh.catalogues', 'Implantation'),
 -    'typepostes' : ('project.rh.catalogues', 'TypePoste'),
 -    'postes' : ('project.rh.catalogues', 'Poste'),
 -    'valeurpoints' : ('project.rh.catalogues', 'ValeurPoint'),
 -    'employes' : ('project.rh.catalogues', 'Employe'),
 -    'dossiers' : ('project.rh.catalogues', 'Dossier'),
++    'responsables': ('project.dae.catalogues', 'Responsable'),
++    'dossiers': ('project.dae.catalogues', 'Dossier'),
++    'dae_postes': ('project.dae.catalogues', 'Poste'),
++    'pays': ('project.rh.catalogues', 'Pays'),
++    'implantations': ('project.rh.catalogues', 'Implantation'),
++    'typepostes': ('project.rh.catalogues', 'TypePoste'),
++    'postes': ('project.rh.catalogues', 'Poste'),
++    'valeurpoints': ('project.rh.catalogues', 'ValeurPoint'),
++    'employes': ('project.rh.catalogues', 'Employe'),
++    'dossiers': ('project.rh.catalogues', 'Dossier'),
  }
  AJAX_SELECT_BOOTSTRAP = True
  AJAX_SELECT_INLINES = 'inline'
  
  
  TINYMCE_DEFAULT_CONFIG = {
--'theme': "advanced",
--'plugins':"paste",
--'theme_advanced_buttons1' : "bold,italic,underline,|,formatselect,|,bullist,numlist,|,undo,redo,|,link,unlink",
--'theme_advanced_buttons2' : "",
--'theme_advanced_buttons3' : "",
--'theme_advanced_statusbar_location' : "bottom",
--'theme_advanced_toolbar_align' : "left",
--'theme_advanced_styles' : "Titre=titre;Sous-titre=sous-titre;Normal=normal",
--'width' : "800",
--'height' : "200",
--'theme_advanced_resizing' : "true",
--'custom_undo_redo_levels': 10,
--'theme_advanced_toolbar_location' : 'top',
--'inline_styles' : 'false',
--'paste_use_dialog' : 'false',
--'paste_auto_cleanup_on_paste' : 'true',
--'paste_convert_headers_to_strong' : 'false',
--'paste_strip_class_attributes' : 'all',
--'paste_remove_spans' : 'true',
--'paste_remove_styles' : 'true',
--'content_css' : '/media/css/tinymce.css',
++    'theme': "advanced",
++    'plugins': "paste",
++    'theme_advanced_buttons1': (
++        "bold,italic,underline,|,formatselect,|,bullist,numlist,|,undo,redo,|,"
++        "link,unlink"
++    ),
++    'theme_advanced_buttons2': "",
++    'theme_advanced_buttons3': "",
++    'theme_advanced_statusbar_location': "bottom",
++    'theme_advanced_toolbar_align': "left",
++    'theme_advanced_styles': "Titre=titre;Sous-titre=sous-titre;Normal=normal",
++    'width': "800",
++    'height': "200",
++    'theme_advanced_resizing': "true",
++    'custom_undo_redo_levels': 10,
++    'theme_advanced_toolbar_location': 'top',
++    'inline_styles': 'false',
++    'paste_use_dialog': 'false',
++    'paste_auto_cleanup_on_paste': 'true',
++    'paste_convert_headers_to_strong': 'false',
++    'paste_strip_class_attributes': 'all',
++    'paste_remove_spans': 'true',
++    'paste_remove_styles': 'true',
++    'content_css': '/media/css/tinymce.css',
  }
  
- DATABASE_ROUTERS = (
-     'project.legacy.DatabaseRouter',
- )
- 
  # django-sendfile
  SENDFILE_BACKEND = 'sendfile.backends.simple'
 +
 +QBE_DISPLAY_DATABASES = False
 +
 +# Il est *très* important de respecter la case.
 +QBE_CUSTOM_MODELS = {'Rh': {
 +    'Employe': {},
 +    'Poste': {},
 +    'Dossier': {},
 +    'Remuneration': {},
 +    'Contrat': {},
 +}}
 +
 +QBE_ALLOWED_FIELDS = {'Rh': {
-     'Employe': ['nom', 'prenom', 'genre', 'date_naissance', 'situation_familiale', 'date_entree'],
++    'Employe': [
++        'nom', 'prenom', 'genre', 'date_naissance', 'situation_familiale',
++        'date_entree'
++    ],
 +    'Poste': ['nom', 'date_debut', 'date_fin'],
-     'Dossier': ['statut_residence', 'regime_travail', 'regime_travail_nb_heure_semaine', 'date_debut', 'date_fin'],
++    'Dossier': [
++        'statut_residence', 'regime_travail',
++        'regime_travail_nb_heure_semaine', 'date_debut', 'date_fin'
++    ],
 +    'Remuneration': ['montant', 'date_debut', 'date_fin'],
 +    'Contrat': ['date_debut', 'date_fin'],
 +}}