conflit réglé

diff --cc project/rh/urls.py
index f987404,e40a695..c1eec7d
--- 1/project/rh/urls.py
--- 2/project/rh/urls.py
+++ b/project/rh/urls.py
@@@ -2,12 -2,16 +2,11 @@@
  
  from django.conf.urls.defaults import patterns, url
  
- urlpatterns = patterns(
-     'project.rh.views',
+ urlpatterns = patterns('project.rh.views',
 -    
 -    # rapports
 -    url(r'^admin/rh/rapports/postes$', 'rapports_poste', name='rhr_postes'),
      url(r'^admin/rh/rapports/employes_sans_contrats$',
 -        'rapports_employe_sans_contrat', name='rhr_employe_sans_contrat'),
 +        'rapports_employes_sans_contrat', name='rhr_employe_sans_contrat'),
      url(r'^admin/rh/rapports/contrats$', 'rapports_contrat',
          name='rhr_contrats'),
 -    url(r'^admin/rh/rapports/remuneration$', 'rapports_remuneration',
 -        name='rhr_remuneration'),
      url(r'^admin/rh/rapports/masse_salariale$', 'rapports_masse_salariale',
          name='rhr_masse_salariale'),
      url(r'^admin/rh/rapports/postes_par_service$',

diff --cc project/rh/views.py
index 1ed8c53,aadc33a..fed110b
--- 1/project/rh/views.py
--- 2/project/rh/views.py
+++ b/project/rh/views.py
@@@ -6,29 -6,31 +6,30 @@@ from itertools import izi
  import StringIO
  
  import pygraphviz as pgv
- from datamaster_modeles import models as ref
- from django.core.urlresolvers import reverse
- from django.db.models import Q
- from django.shortcuts import render_to_response, get_object_or_404
- from django.template import RequestContext
- from django.http import HttpResponse
+ 
  from django import forms
+ from django.conf import settings
  from django.contrib.auth.decorators import login_required
  from django.core.servers.basehttp import FileWrapper
+ from django.core.urlresolvers import reverse
+ from django.db.models import Q
+ from django.http import HttpResponse
+ from django.shortcuts import render, get_object_or_404
 -from django.utils.encoding import smart_str
  
- from rh import models as rh
- from rh.lib import calc_remun, get_lookup_params
- from rh.decorators import drh_or_admin_required
- from rh.templatetags.rapports import SortHeaders
- from rh.change_list import RechercheTemporelle
- from rh import graph as rh_graph
- from rh.masse_salariale import MasseSalariale
- 
- # pas de reference a DAE devrait etre refactorisé
- from dae.utils import get_employe_from_user
- from dae.decorators import redirect_interdiction
- from dae.workflow import grp_drh, grp_correspondants_rh
- from django.conf import settings
+ from auf.django.references import models as ref
+ 
+ from project.decorators import redirect_interdiction
+ from project.decorators import drh_or_admin_required
+ from project.decorators import region_protected
+ from project.groups import get_employe_from_user
+ from project.groups import grp_drh, grp_correspondants_rh
+ 
+ from project.rh import models as rh
+ from project.rh import graph as rh_graph
+ from project.rh.change_list import RechercheTemporelle
 -from project.rh.lib import calc_remun
++from project.rh.lib import calc_remun, get_lookup_params
+ from project.rh.masse_salariale import MasseSalariale
+ from project.rh.templatetags.rapports import SortHeaders
  
  
  @login_required