dae+rh

diff --cc buildout.cfg
index 9788a97,eb68e29..b3acef4
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -47,9 -47,9 +49,9 @@@ eggs 
  django-admin-tools = 0.4.0
  django = 1.2.5
  south = 0.7
- auf.django.skin = 0.15dev
+ auf.django.skin = 0.17dev
  auf.django.auth = 0.5.5dev
 -auf.django.metadata = 0.2dev
 +auf.django.metadata = 0.3dev
  django-reversion = 1.3.3
  auf.django.workflow = 0.14dev
  django-ajax-selects = 1.1.4

diff --cc project/dae/models.py
index c57b3e8,8ba2afb..a6d5637
--- 1/project/dae/models.py
--- 2/project/dae/models.py
+++ b/project/dae/models.py
@@@ -395,11 -393,13 +395,13 @@@ class PostePiece(models.Model)
  
  class PosteComparaison(models.Model):
      poste = models.ForeignKey('Poste', related_name='comparaisons_internes')
 -    statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name='Statut', null=True, blank=True, )
 -    classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name='Classement', null=True, blank=True, )
 -    implantation = models.ForeignKey(ref.Implantation, null=True, blank=True)
 -    nom = models.CharField(verbose_name="Poste", max_length=255, null=True, blank=True)
 +    implantation = models.ForeignKey(ref.Implantation, null=True, blank=True, related_name="+")
 +    statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name=u'Statut', null=True, blank=True, )
 +    classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name=u'Classement', null=True, blank=True, )
 +    nom = models.CharField(verbose_name=u"Poste", max_length=255, null=True, blank=True)
-     montant = models.IntegerField(null=True)
+     montant = models.IntegerField(
+         null=True, verbose_name="Rémunération totale sans les charges patronales"
+     )
      devise = models.ForeignKey(rh.Devise, default=5, related_name='+', null=True, blank=True)
  
      objects = PosteComparaisonManager()

diff --cc project/dashboard.py
index 70a860c,03ecf29..1be4380
--- 1/project/dashboard.py
--- 2/project/dashboard.py
+++ b/project/dashboard.py
@@@ -29,46 -29,9 +29,47 @@@ class CustomIndexDashboard(Dashboard)
          # append an app list module for "Applications"
          self.children.append(modules.AppList(
              _('Applications'),
 +            models=(
 +            'project.dae.models.*',
 +            'project.recrutement.models.*',
 +            'project.rh.models.AyantDroit',
 +            'project.rh.models.Dossier',
 +            'project.rh.models.DossierInactif',
 +            'project.rh.models.Employe',
 +            'project.rh.models.EmployeInactif',
 +            'project.rh.models.Poste',
 +            ),
 +        ))
 +
 +        # append an app list module for "Configuration"
 +        self.children.append(modules.AppList(
 +            _('Configuration'),
 +            models=(
 +            'project.rh.models.Classement',
 +            'project.rh.models.Devise',
 +            'project.rh.models.FamilleEmploi',
 +            'project.rh.models.OrganismeBstg',
 +            'project.rh.models.Responsable',
 +            'project.rh.models.Service',
 +            'project.rh.models.Statut',
 +            'project.rh.models.TauxChange',
 +            'project.rh.models.TypeContrat',
 +            'project.rh.models.TypePoste',
 +            'project.rh.models.TypeRevalorisation',
 +            'project.rh.models.TypeRemuneration',
 +            'project.rh.models.ValeurPoint',
 +            ),
+             exclude=('django.contrib.*',),
          ))
  
 +        # append an app list module for "Inter-systèmes"
 +        self.children.append(modules.AppList(
 +            _(u'Inter-systèmes'),
 +            models=(
 +            'project.rh.models.ResponsableImplantation',
 +            ),
 +        ))
 +
          # append an app list module for "Administration"
          self.children.append(modules.AppList(
              _('Administration'),

diff --cc project/rh/models.py
index 77a4522,3ac9c10..50f5e0f
--- 1/project/rh/models.py
--- 2/project/rh/models.py
+++ b/project/rh/models.py
@@@ -618,14 -517,6 +618,15 @@@ class Dossier(Dossier_)
      __doc__ = Dossier_.__doc__
  
  
 +class DossierInactif(Dossier):
++
 +    class Meta:
 +        proxy = True
 +        ordering = ['employe__nom', ]
 +        verbose_name = u"Dossier inactif"
 +        verbose_name_plural = u"Dossiers inactifs"
 +
 +
  class DossierPiece(models.Model):
      """Documents relatifs au Dossier (à l'occupation de ce poste par employé).
      Ex.: Lettre de motivation.

diff --cc project/rh/urls.py
index ec96cf2,9430adc..cf138ed
--- 1/project/rh/urls.py
--- 2/project/rh/urls.py
+++ b/project/rh/urls.py
@@@ -1,21 -1,8 +1,10 @@@
  # -*- encoding: utf-8 -*
  from django.conf.urls.defaults import patterns, url
  
- urlpatterns = patterns(
-     'project.rh.views',
-     url(r'^employes/$', 'employes_liste', name='rh_employes'),
-     url(r'^profil$', 'profil', name='rh_profil'),
-     url(r'^employes/(?P<id>\d+)$', 'employe', name='rh_employe'),
- )
- # api
- urlpatterns += patterns(
-     'project.rh.api',
-     url(r'^employes/(?P<id>\d+)/photo$', 'photo', name='rh_photo'),
- )
 +# Rapports
- urlpatterns += patterns(
+ urlpatterns = patterns(
      'project.rh.views',
 -    url(r'^$', 'index', name='index'),
 -    #url(r'^employes$', 'employes', name='employes'),
 +    url(r'^admin/rh/rapports/postes$', 'rapports_poste', name='rhr_postes'),
 +    url(r'^admin/rh/rapports/contrats$', 'rapports_contrat', name='rhr_contrats'),
 +    url(r'^admin/rh/rapports/remuneration$', 'rapports_remuneration', name='rhr_remuneration'),
  )

diff --cc project/settings.py
index ce54083,1451709..5654e7d
--- 1/project/settings.py
--- 2/project/settings.py
+++ b/project/settings.py
@@@ -68,9 -67,10 +68,11 @@@ INSTALLED_APPS = 
      'ajax_select',
      'south',
      'reversion',
 +    'project.rh',
      'auf.django.workflow',
+     'auf.django.permissions',
      'project.rh_v1',
 -    #'project.rh',
++    'project.rh',
      'project.dae',
      'alphafilter',
      'project.recrutement',
@@@ -143,7 -145,3 +146,6 @@@ TINYMCE_DEFAULT_CONFIG = 
  'paste_remove_styles' : 'true',
  'content_css' : '/media/css/tinymce.css',
  }
 +
 +# django-sendfile
- 
 +SENDFILE_BACKEND = 'sendfile.backends.simple'

diff --cc project/urls.py
index 171b2dc,8633816..60284fc
--- 1/project/urls.py
--- 2/project/urls.py
+++ b/project/urls.py
@@@ -10,14 -13,7 +13,8 @@@ handler500 # Pyflake
  
  urlpatterns = patterns(
      '',
-     (r'^$', 'project.views.accueil'),
-     #url(r'^private_files/', include('private_files.urls')),
-     url(r'^captcha/', include('captcha.urls')),
+     (r'^$', 'project.views.index'),
 +    url(r'^admin_tools/', include('admin_tools.urls')),
- 
-     # système
-     url(r'^$', 'project.views.accueil', name='accueil'),
- 
      (r'^admin/', include(admin.site.urls)),
      url(r'^api/(?P<method>[a-z_-]+)/(?P<offre_id>\d+)/$', 'recrutement.api.api', 
              name='recrutement_api'),
@@@ -27,7 -23,7 +24,6 @@@
      (r'^deconnexion/$', 'django.contrib.auth.views.logout'),
      #url(r'^private_files/', include('private_files.urls')),
      url(r'^captcha/', include('captcha.urls')),
--    url(r'^admin_tools/', include('admin_tools.urls')),
      (r'^tinymce/', include('tinymce.urls')),
      (r'^prive/(?P<path>.*)$', 'django.views.static.serve', 
          {'document_root': settings.PRIVE_MEDIA_ROOT}),
@@@ -38,8 -31,7 +31,7 @@@
      # apps
      (r'^dae/', include('project.dae.urls')),
      (r'^recrutement/', include('recrutement.urls')),
--    (r'^', include('project.rh.urls')),
-     url(r'^qbe/', include('django_qbe.urls')),
++    (r'^rh/', include('project.rh.urls')),
  )
  
  if settings.DEBUG: