From e0fc3d384676bc30c16a0fac75b09e880b6d886a Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Fri, 28 Dec 2018 20:32:39 +0100
Subject: [PATCH] Menage ordre des fonctions du forms de users

---
 users/forms.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/users/forms.py b/users/forms.py
index b5b8b602..ca01c52d 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -324,14 +324,6 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
             self.fields['room'].empty_label = _("No room")
         self.fields['school'].empty_label = _("Select a school")
 
-    def clean_email(self):
-        if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'):
-            return self.cleaned_data.get('email').lower()
-        else:
-            raise forms.ValidationError(
-                    _("You can't use a {} address.").format(
-                        OptionalUser.objects.first().local_email_domain))
-
     class Meta:
         model = Adherent
         fields = [
@@ -345,6 +337,19 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
             'room',
         ]
 
+    force = forms.BooleanField(
+        label=_("Force the move?"),
+        initial=False,
+        required=False
+    )
+
+    def clean_email(self):
+        if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'):
+            return self.cleaned_data.get('email').lower()
+        else:
+            raise forms.ValidationError(
+                    _("You can't use a {} address.").format(
+                        OptionalUser.objects.first().local_email_domain))
 
     def clean_telephone(self):
         """Verifie que le tel est présent si 'option est validée
@@ -356,12 +361,6 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
             )
         return telephone
 
-    force = forms.BooleanField(
-        label=_("Force the move?"),
-        initial=False,
-        required=False
-    )
-
     def clean_force(self):
         """On supprime l'ancien user de la chambre si et seulement si la
         case est cochée"""