Merge branch 'master' into test

Conflicts:
	buildout.cfg
	project/dae/models.py
	project/rh/models.py
	project/settings.py

diff --cc buildout.cfg
index 59d9a41,2a0b949..d4e6a15
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -10,12 -9,8 +9,14 @@@ find-links = http://pypi.auf.org/simple
      http://pypi.auf.org/simple/auf.django.workflow/
      http://pypi.auf.org/simple/auf.django.admingroup/
      http://pypi.auf.org/simple/auf.django.permissions/
++<<<<<<< HEAD
 +    http://pypi.auf.org/simple/auf.django.metadata/
 +    http://pypi.auf.org/simple/auf.django.emploi/
 +    http://pypi.auf.org/django-alphafilter/
+     http://pypi.aur.org/simple/auf.django.references/
  
 +develop = src/qbe
 +
  eggs =
      django
      south
@@@ -23,51 -18,30 +24,43 @@@
      auf.django.skin
      auf.django.workflow
      auf.django.admingroup
 +    auf.django.emploi
-     datamaster_modeles
      auf.django.auth
      auf.django.permissions
+     auf.django.references
+     auf.recipe.django
      django-reversion
      simplejson
      django-ajax-selects
 +    django-form-utils
 +    django-tinymce
 +    django-simple-captcha
 +    auf.django.metadata
 +    django-alphafilter
      django-sendfile
 +    django-qbe
 +    django-urldecorators
  
- # LA PROD ne dispose que de reportlab 2.1, incompatible avec
- # les versions de pisa assez évoluées pour un bon rendu.
- #    reportlab
- #    html5lib
- #    pyPDF
- #    pisa
+ develop = ../auf_django_references
  
  [versions]
  django-admin-tools = 0.4.0
 -django = 1.2.5
 +django = 1.3.1
  south = 0.7
- auf.django.skin = 0.17dev
  auf.django.auth = 0.5.5dev
++auf.django.emploi = 0.6dev
 +auf.django.metadata = 0.3dev
- django-reversion = 1.3.3
+ auf.django.permissions = 0.1
+ auf.django.references = 0.4
+ auf.django.skin = 0.17dev
  auf.django.workflow = 0.14dev
+ auf.recipe.django = 0.20dev
+ django-reversion = 1.3.3
  django-ajax-selects = 1.1.4
 +django-alphafilter = 0.5.3auf4
- auf.django.emploi = 0.6dev
  django-sendfile = 0.2.1
- auf.django.permissions = 0.1
 +django-alphafilter = 0.5.3auf4
- auf.django.emploi = 0.6dev
 +django-urldecorators = 0.3
- datamaster-modeles = 0.1.14
- #reportlab = 2.5
- #html5lib = 0.90
- #pyPDF = 1.13
- #pisa = 3.0.33
  
  [django]
  recipe = auf.recipe.django

diff --cc project/dae/forms.py
index 2e33c61,1dc5f97..1d1f482
--- 1/project/dae/forms.py
--- 2/project/dae/forms.py
+++ b/project/dae/forms.py
@@@ -6,10 -6,10 +6,10 @@@ from django.forms.models import inlinef
  from django.contrib.admin import widgets as admin_widgets
  from ajax_select.fields import AutoCompleteSelectField
  from auf.django.workflow.forms import WorkflowFormMixin
- from datamaster_modeles import models as ref
+ from auf.django.references import models as ref
  from dae import models as dae
  from utils import get_employe_from_user, is_user_dans_services_centraux
 -from rh_v1 import models as rh
 +from rh import models as rh
  from workflow import grp_drh, POSTE_ETATS_BOUTONS
  
  def _implantation_choices(obj, request):

diff --cc project/dae/models.py
index 51e0c8d,a42281d..d268a3f
--- 1/project/dae/models.py
--- 2/project/dae/models.py
+++ b/project/dae/models.py
@@@ -10,8 -10,8 +10,8 @@@ from workflow import DOSSIER_ETAT_DRH_F
                       DOSSIER_ETAT_FINALISE
  from managers import DossierManager, PosteManager, PosteComparaisonManager, \
                       DossierComparaisonManager
- import datamaster_modeles.models as ref
+ import auf.django.references.models as ref
 -from rh_v1 import models as rh
 +from rh import models as rh
  
  
  # Constantes

diff --cc project/rh/models.py
index 87cf6a8,8092af1..817a7e6
--- 1/project/rh/models.py
--- 2/project/rh/models.py
+++ b/project/rh/models.py
@@@ -4,15 -4,13 +4,15 @@@ from datetime import dat
  
  from django.core.files.storage import FileSystemStorage
  from django.db import models
 -import settings
 +from django.conf import settings
  
 +from auf.django.metadata.models import AUFMetadata
 +from auf.django.metadata.managers import NoDeleteManager
- import datamaster_modeles.models as ref
+ import auf.django.references.models as ref
 -
 +from validators import validate_date_passee
 +from dae.managers import SecurityManager
  
  # Constantes
 -HELP_TEXT_DATE = "format: aaaa-mm-jj"
  REGIME_TRAVAIL_DEFAULT = 100.00
  REGIME_TRAVAIL_NB_HEURE_SEMAINE_DEFAULT = 35.00
  

diff --cc project/settings.py
index 7048099,647b9c9..8f1e771
--- 1/project/settings.py
--- 2/project/settings.py
+++ b/project/settings.py
@@@ -57,8 -49,10 +57,9 @@@ MIDDLEWARE_CLASSES = 
  
  ROOT_URLCONF = 'project.urls'
  
 -
  INSTALLED_APPS = (
      'auf.django.skin',
+     'auf.django.references',
      'admin_tools',
      'admin_tools.theming',
      'admin_tools.menu',