Merge branch 'weiWords' into 'main'

change wei words

See merge request bde/nk20!203

apps/treasury/models.py

@@ -329,17 +329,18 @@ class SogeCredit(models.Model):
         bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
         kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
 
-        if bde_qs.exists():
-            m = bde_qs.get()
-            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
-                if m.transaction not in self.transactions.all():
-                    self.transactions.add(m.transaction)
-
-        if kfet_qs.exists():
-            m = kfet_qs.get()
-            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
-                if m.transaction not in self.transactions.all():
-                    self.transactions.add(m.transaction)
+## Soge do not pay BDE and kfet memberships this year (2022-2023)
+#        if bde_qs.exists():
+#            m = bde_qs.get()
+#            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
+#                if m.transaction not in self.transactions.all():
+#                    self.transactions.add(m.transaction)
+#
+#        if kfet_qs.exists():
+#            m = kfet_qs.get()
+#            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
+#                if m.transaction not in self.transactions.all():
+#                    self.transactions.add(m.transaction)
 
         if 'wei' in settings.INSTALLED_APPS:
             from wei.models import WEIClub

apps/wei/forms/surveys/wei2022.py

@@ -14,14 +14,17 @@ from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInf
 from ...models import WEIMembership
 
 WORDS = [
-    '13 organisé', '3ième mi temps', 'Années 2000', 'Apéro', 'BBQ', 'BP', 'Beauf', 'Binge drinking', 'Bon enfant',
-    'Cartouche', 'Catacombes', 'Chansons paillardes', 'Chansons populaires', 'Chanteur', 'Chartreuse', 'Chill',
-    'Core', 'DJ', 'Dancefloor', 'Danse', 'David Guetta', 'Disco', 'Eau de vie', 'Électro', 'Escalade', 'Familial',
-    'Fanfare', 'Fracassage', 'Féria', 'Hard rock', 'Hoeggarden', 'House', 'Huit-six', 'IPA', 'Inclusif', 'Inferno',
-    'Introverti', 'Jager bomb', 'Jazz', 'Jeux d\'alcool', 'Jeux de rôles', 'Jeux vidéo', 'Jul', 'Jus de fruit',
-    'Karaoké', 'LGBTQI+', 'Lady Gaga', 'Loup garou', 'Morning beer', 'Métal', 'Nuit blanche', 'Ovalie', 'Psychedelic',
-    'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi',
-    'Théâtre', 'Trap', 'Turn up', 'Underground', 'Volley', 'Wati B', 'Zinédine Zidane',
+	'ABBA', 'After', 'Alcoolique anonyme', 'Ambiance festive', 'Années 2000', 'Apéro', 'Art',
+	'Baby foot billard biere pong', 'BBQ', 'Before', 'Bière pong', 'Bon enfant', 'Calme', 'Canapé',
+	'Chanson paillarde', 'Chanson populaire', 'Chartreuse', 'Cheerleader', 'Chill', 'Choré',
+	'Cinéma', 'Cocktail', 'Comédie musicle', 'Commercial', 'Copaing', 'Danse', 'Dancefloor',
+	'Electro', 'Fanfare', 'Gin tonic', 'Inclusif', 'Jazz', "Jeux d'alcool", 'Jeux de carte',
+	'Jeux de rôle', 'Jeux de société', 'JUL', 'Jus de fruit', 'Kfet', 'Kleptomanie assurée',
+	'LGBTQ+', 'Livre', 'Morning beer', 'Musique', 'NAPS', 'Paillettes', 'Pastis', 'Paté Hénaff',
+	'Peluche', 'Pena baiona', "Peu d'alcool", 'Pilier de bar', 'PMU', 'Poulpe', 'Punch', 'Rap',
+	'Réveil', 'Rock', 'Rugby', 'Sandwich', 'Serge', 'Shot', 'Sociable', 'Spectacle', 'Techno',
+	'Techno house', 'Thérapie Taxi', 'Tradition kchanaises', 'Troisième mi-temps', 'Turn up',
+	'Vodka', 'Vodka pomme', 'Volley', 'Vomi stratégique'
 ]
 
 

note_kfet/templates/registration/signup.html

@@ -23,11 +23,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
             {% csrf_token %}
             {{ form|crispy }}
             {{ profile_form|crispy }}
-            {{ soge_form|crispy }}
+            {% comment "Soge not for membership (only WEI)" %} {{ soge_form|crispy }} {% endcomment %}
             <button class="btn btn-success" type="submit">
                 {% trans "Sign up" %}
             </button>
         </form>
     </div>
 </div>
-{% endblock %}
+{% endblock %}