Merge branch 'refactoring' of git.auf.org:auf_rh_dae into refactoring

Conflicts:
	project/recrutement/admin.py
	project/recrutement/views.py
	project/rh/catalogues.py
	project/rh/masse_salariale.py
	project/rh/views.py

diff --cc project/dae/models.py
Simple merge

diff --cc project/recrutement/admin.py
index 256402e,dc37cab..cae0160
--- 1/project/recrutement/admin.py
--- 2/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@@ -2,17 -2,19 +2,18 @@@
  
  import textwrap
  
- from auf.django.emploi.models import OffreEmploi, Candidat, CandidatPiece
- from datamaster_modeles.models import Region, Bureau
- from django.core.urlresolvers import reverse
- from django.http import HttpResponseRedirect
+ from django.conf import settings
  from django.contrib import admin
- from django.forms.models import BaseInlineFormSet
+ from django.core.urlresolvers import reverse
  from django.db.models import Avg
- from django.conf import settings
+ from django.forms.models import BaseInlineFormSet
+ from django.http import HttpResponseRedirect
  from django.shortcuts import redirect
 -
  from reversion.admin import VersionAdmin
  
++from auf.django.emploi.models import OffreEmploi, Candidat, CandidatPiece
+ from datamaster_modeles.models import Region, Bureau
+ 
 -from project.rh import models as rh
  from project.dae.utils import get_employe_from_user as get_emp
  from project.recrutement.forms import OffreEmploiForm
  from project.recrutement.models import \

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

diff --cc project/recrutement/views.py
index 2b3f880,903b5a5..1dfe1d3
--- 1/project/recrutement/views.py
--- 2/project/recrutement/views.py
+++ b/project/recrutement/views.py
@@@ -7,15 -6,15 +6,17 @@@ from django.core.urlresolvers import re
  from django.http import HttpResponseRedirect
  from django.shortcuts import render_to_response, redirect
  from django.template import Context, RequestContext, Template
- from django.core.mail import EmailMultiAlternatives
+ from django.views.static import serve
+ 
 -from project.recrutement.forms import *
 -from project.recrutement.models import *
++from auf.django.emploi import models as emploi
 +
 +from project.dae.decorators import redirect_interdiction
 +from project.recrutement import forms
 +from project.recrutement import models
  from project.recrutement.workflow import recrutement_groupes
  
 -################################################################################
 +
  # MEDIA PRIVE
 -################################################################################
  
  def mediaserve(request, path, document_root=None, show_indexes=False):
      """

diff --cc project/rh/catalogues.py
index 3780e90,15dab2a..4dc5d26
--- 1/project/rh/catalogues.py
--- 2/project/rh/catalogues.py
+++ b/project/rh/catalogues.py
@@@ -1,10 -1,8 +1,11 @@@
  # -*- encoding: utf-8 -*-
  
  from django.db.models import Q
++
  from auf.django.references import models as ref
 -import project.rh.models as rh
 +
 +from project.rh import models as rh
 +
  
  class Pays(object):
      fk_key = "code"

diff --cc project/rh/masse_salariale.py
index 4db8cb0,7d47243..64cdd08
--- 1/project/rh/masse_salariale.py
--- 2/project/rh/masse_salariale.py
+++ b/project/rh/masse_salariale.py
@@@ -1,15 -1,17 +1,16 @@@
  # -*- encoding: utf-8 -*-
 -import time
 -import datetime
  import csv
 -import StringIO
 +import datetime
  import itertools
 +import StringIO
 +import time
  
- from datamaster_modeles import models as ref
 -from django.db.models import Q
 -from django.db.models import Count
 +from django.db.models import Q, Count
  
+ from datamaster_modeles import models as ref
+ 
 -import project.rh.ods as ods
 -import project.rh.models as rh
 +from project.rh import ods
 +from project.rh import models as rh
  
  
  KEY_DATE_DEBUT = "debut"

diff --cc project/rh/models.py
index a1a2191,b74201c..646002e
--- 1/project/rh/models.py
--- 2/project/rh/models.py
+++ b/project/rh/models.py
@@@ -21,9 -22,20 +22,9 @@@ from project.rh.managers import 
          PosteManager, DossierManager, DossierComparaisonManager, \
          PosteComparaisonManager, DeviseManager, ServiceManager, \
          TypeRemunerationManager
- from validators import validate_date_passee
+ from project.rh.validators import validate_date_passee
  
  
 -# Gruick hack pour déterminer d'ou provient l'instanciation d'une classe
 -# pour l'héritage.  Cela permet de faire du dynamic loading par app sans
 -# avoir à redéfinir dans DAE la FK
 -def app_context():
 -    import inspect
 -    models_stack = [s[1].split('/')[-2]
 -                    for s in inspect.stack()
 -                    if s[1].endswith('models.py')]
 -    return models_stack[-1]
 -
 -
  # Constantes
  HELP_TEXT_DATE = "format: jj-mm-aaaa"
  REGIME_TRAVAIL_DEFAULT = Decimal('100.00')

diff --cc project/rh/views.py
index e400e8e,7519b00..eb9f40e
--- 1/project/rh/views.py
--- 2/project/rh/views.py
+++ b/project/rh/views.py
@@@ -5,22 -5,20 +5,21 @@@ from datetime import dat
  from itertools import izip
  import StringIO
  
 +import pygraphviz as pgv
- from datamaster_modeles import models as ref
++
 +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.utils.encoding import smart_str
 +from django.http import HttpResponse
  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.contrib.auth.decorators import login_required
 -from django.core.servers.basehttp import FileWrapper
 -from django.conf import settings
 +from django.utils.encoding import smart_str
  
- from project.dae.utils import get_employe_from_user
- from project.dae.decorators import redirect_interdiction
- from project.dae.workflow import grp_drh, grp_correspondants_rh
 -import pygraphviz as pgv
+ from datamaster_modeles import models as ref
+ 
  from project.rh import models as rh
  from project.rh.lib import calc_remun
  from project.rh.decorators import drh_or_admin_required
@@@ -29,7 -27,11 +28,12 @@@ from project.rh.change_list import Rech
  from project.rh import graph as rh_graph
  from project.rh.masse_salariale import MasseSalariale
  
+ # pas de reference a DAE devrait etre refactorisé
+ from project.dae.utils import get_employe_from_user
+ from project.dae.decorators import redirect_interdiction
+ from project.dae.workflow import grp_drh, grp_correspondants_rh
+ 
 +
  @login_required
  def profil(request):
      """Profil personnel de l'employé - éditable"""