Merge with dev

diff --cc teleforma/forms.py
index e2a4d4a850f1847277eeba0b477b3000e3c18c00,7a77f7794b9ec3b8b8049c007bf05c83da897247..8a6203c2ae7acb037017cad6111874899e6d7358
--- 1/teleforma/forms.py
--- 2/teleforma/forms.py
+++ b/teleforma/forms.py
@@@ -68,30 -83,19 +83,23 @@@ class UserForm(ModelForm)
      period = ModelChoiceField(label='Période',
                                queryset=Period.objects.filter(is_open=True,
                                                               date_inscription_start__lte=datetime.datetime.now(),
-                                                              date_inscription_end__gte=datetime.datetime.now()),
-                               required=False)
-     trainings = ModelMultipleChoiceField(label='Formations',
-                                          queryset=Training.objects.filter(available=True),
-                                          required=False)
-     platform_only = BooleanField(label=_('e-learning platform only'),
-                                  required=False)
-     procedure = ModelChoiceField(label=_('procedure'),
+                                                              date_inscription_end__gte=datetime.datetime.now()))
+     training = ModelChoiceField(label='Formation',
+                                 queryset=Training.objects.filter(available=True))
+     procedure = ModelChoiceField(label=_('Procedure'),
                                   help_text="Matière de procédure",
-                                  queryset=Course.objects.filter(procedure=True),
-                                  required=False)
-     written_speciality = ModelChoiceField(label=_('written speciality'),
+                                  queryset=Course.objects.filter(procedure=True))
+     written_speciality = ModelChoiceField(label='Specialité écrite',
                                            queryset=Course.objects.filter(written_speciality=True),
-                                           help_text="Matière juridique de spécialité",
-                                           required=False)
-     oral_1 = ModelChoiceField(label=_('oral de langue (option)'),
+                                           help_text="Matière juridique de spécialité")
+     oral_1 = ModelChoiceField(label=_('Oral de langue (option)'),
                                help_text="Matière d’oral de langue (en option)",
-                               queryset=Course.objects.filter(oral_1=True),
-                               required=False)
-     promo_code = CharField(label=_('promo code'), max_length=100, required=False)
+                               queryset=Course.objects.filter(oral_1=True))
+     promo_code = CharField(label=_('Code promo'), max_length=100, required=False)
 +    payment_schedule = ChoiceField(label=_(u'échéancier de paiement'),
 +                                 choices=payment_schedule_choices,
 +                                 required=True)
 +    
      # no model
      captcha = CaptchaField()
      accept = BooleanField()

diff --cc teleforma/views/crfpa.py
Simple merge