Merge branch 'invoice_modification' into 'main'

changement template facture

Closes #128

See merge request bde/nk20!243

apps/activity/templates/activity/activity_form.html

@@ -17,24 +17,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </form>
   </div>
 </div>
-<script>
-  var date_end = document.getElementById("id_date_end");
-  var date_start = document.getElementById("id_date_start");
-  
-  function update_date_end (){
-    if(date_end.value=="" || date_end.value<date_start.value){
-      date_end.value = date_start.value;
-    };
-  };
-  
-  function update_date_start (){
-    if(date_start.value=="" || date_end.value<date_start.value){
-      date_start.value = date_end.value;
-    };
-  };
-  
-  date_start.addEventListener('focusout', update_date_end);
-  date_end.addEventListener('focusout', update_date_start);
-  
-</script>
 {% endblock %}

apps/registration/forms.py

@@ -5,7 +5,7 @@ from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
-# from member.models import Club
+from member.models import Club
 from note.models import NoteSpecial, Alias
 from note_kfet.inputs import AmountInput
 
@@ -115,12 +115,13 @@ class ValidationForm(forms.Form):
         required=False,
         initial=True,
     )
-
+    '''
     # If the bda exists
-#     if Club.objects.filter(name__iexact="bda").exists():
+    if Club.objects.filter(name__iexact="bda").exists():
         # The user can join the bda club at the inscription
-#         join_bda = forms.BooleanField(
+        join_bda = forms.BooleanField(
-#             label=_("Join BDA Club"),
+            label=_("Join BDA Club"),
-#             required=False,
+            required=False,
-#             initial=True,
+            initial=True,
-#         )
+        )
+    '''