Merge remote branch 'origin/dev' into dae

Conflicts:
	project/dae/models.py
	project/dae/urls.py
	project/templates/menu.html

diff --cc project/dae/forms.py
index a40545b,cadb948..18b1176
--- 1/project/dae/forms.py
--- 2/project/dae/forms.py
+++ b/project/dae/forms.py
@@@ -25,13 -27,12 +27,15 @@@ class PosteForm(forms.ModelForm)
                    'comp_ong_min', 'comp_ong_max',
                    'comp_autre_min', 'comp_autre_max',)
          widgets = dict(statut_residence=forms.RadioSelect(),
-                        appel=forms.RadioSelect())
+                        appel=forms.RadioSelect(),
+                        nom=forms.TextInput(attrs={'size': 60 }),
+ )
  
 +    responsable=forms.ModelChoiceField(
 +            queryset=rh.Poste.objects.select_related(depth=1))
 +
      # La liste des choix est laissée vide. Voir __init__ pour la raison.
-     poste = forms.ChoiceField(choices=(), required=False)
+     poste = forms.ChoiceField(label="Nouveau poste, ou évolution du poste", choices=(), required=False)
  
      def __init__(self, *args, **kwargs):
          """ Mise à jour dynamique du contenu du menu des postes.

diff --cc project/dae/models.py
index d17f349,6009bd3..9e44988
--- 1/project/dae/models.py
--- 2/project/dae/models.py
+++ b/project/dae/models.py
@@@ -193,15 -194,18 +218,16 @@@ class Dossier(models.Model)
                                          choices=STATUT_RESIDENCE_CHOICES)
  
      # Rémunération
 -    classement = models.ForeignKey(rh.Classement,
 -                                   verbose_name='Classement proposé',
 -                                   related_name='+')
 -    salaire = models.DecimalField(max_digits=12,
 -                                  decimal_places=2,
 +    classement = models.ForeignKey(rh.Classement, related_name='+',
 +                                   verbose_name='Classement proposé')
 +    salaire = models.DecimalField(max_digits=12, decimal_places=2,
                                    verbose_name='Salaire de base',
 -                                  null=True,
 -                                  default=None)
 +                                  null=True, default=None)
      devise = models.ForeignKey(rh.Devise, related_name='+')
-     regime_travail = models.DecimalField(max_digits=12, decimal_places=2)
 -    regime_travail = models.DecimalField(max_digits=12, verbose_name="Régime de travail", decimal_places=2)
 -    regime_travail_nb_heure_semaine = \
 -        models.DecimalField(max_digits=12, verbose_name="Nbr heures par semaine", decimal_places=2)
++    regime_travail = models.DecimalField(max_digits=12, decimal_places=2,
++                                         verbose_name="Régime de travail")
 +    regime_travail_nb_heure_semaine = models.DecimalField(max_digits=12,
-                                                           decimal_places=2)
++            decimal_places=2, verbose_name="Nbr heures par semaine")
  
      # Contrat
      type_contrat = models.ForeignKey(rh.TypeContrat, related_name='+')

diff --cc project/dae/urls.py
index 6c72c55,d6674c9..33269f4
--- 1/project/dae/urls.py
--- 2/project/dae/urls.py
+++ b/project/dae/urls.py
@@@ -3,7 -3,7 +3,8 @@@ from django.conf.urls.defaults import p
  
  urlpatterns = patterns(
      'project.dae.views',
-     (r'^$', 'index'),
+     url(r'^$', 'index', name='dae_index'),
++    url(r'^postes$', 'postes_liste', name='dae_postes_liste'),
      url(r'^poste/(?P<key>.*)/financement$', 'financement', name='financement'),
      url(r'^poste/(?P<key>.*)/financement/(?P<id>\d*)$', 'financement',
          name='financement'),

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

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

diff --cc project/templates/menu.html
index 75948bd,37f1b87..9cb6dd9
--- 1/project/templates/menu.html
--- 2/project/templates/menu.html
+++ b/project/templates/menu.html
@@@ -1,11 -1,6 +1,16 @@@
  {% load auf_menu %}
  
  <ul class="menu">
-   <li class="{% menu_actif request '^$' %}"><a href="/">Accueil</a></li>
 -  <li class="{% menu_actif request '^$' %}"><a href="{% url index %}">Accueil</a></li>
 -  <li class="{% menu_actif request '^dae$' %}"><a href="{% url dae_index %}">DAE</a></li>
++  <li class="{% menu_actif request '^$' %}">
++    <a href="{% url index %}">Accueil</a>
++  </li>
 +  <li class="{% menu_actif request '^dae$' %}">
-     <a href="{% url poste %}">Postes</a>
++    <a href="{% url dae_index %}">DAE</a>
++  </li>
++  <li class="{% menu_actif request '^postes$' %}">
++    <a href="{% url dae_postes_liste %}">Postes</a>
 +  </li>
 +  <li class="{% menu_actif request '^embauche$' %}">
 +    <a href="{% url embauche %}">Embauche</a>
 +  </li>
  </ul>