Merge branch 'release-2.9' of https://gitlab.federez.net/federez/re2o into new_radius_api

cotisations/templates/cotisations/aff_cost_estimate.html

@@ -73,9 +73,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ estimate.id }}</td>
             <td>
                 {% if estimate.final_invoice %}
-                <a href="{% url 'cotisations:edit-custom-invoice' estimate.final_invoice.pk %}"><i style="color: #1ECA18;" class="fa fa-check"></i></a>
+                <a href="{% url 'cotisations:edit-custom-invoice' estimate.final_invoice.pk %}"><i class="fa fa-check text-success"></i></a>
                 {% else %}
-                <i style="color: #D10115;" class="fa fa-times"></i>
+                <i class="fa fa-times text-danger"></i>
                 {% endif %}
             </td>
             <td>

cotisations/templates/cotisations/aff_cotisations.html

@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <td><a href="{% url 'users:profil' userid=facture.user.id %}">{{ facture.user }}</a></td>
             <td>
-                <table class="table-striped">
+                <table class="table-borderless">
                     {% for article in facture.name_detailed %}
                     <tr>
                         <td>

cotisations/views.py

@@ -1057,7 +1057,7 @@ def voucher_pdf(request, invoice, **_kwargs):
             "lastname": invoice.user.surname,
             "email": invoice.user.email,
             "phone": invoice.user.telephone,
-            "date_end": invoice.get_subscription().latest("date_end").date_end,
+            "date_end": invoice.get_subscription().latest("date_end_memb").date_end_memb,
             "date_begin": invoice.date,
         },
     )

logs/models.py

@@ -360,7 +360,7 @@ class HistoryEvent:
 
         return value
 
-    def edits(self, hide=[]):
+    def edits(self, hide=["password", "pwd_ntlm"]):
         """Get the list of the changes performed during this event.
 
         Args:

re2o/templatetags/design.py

@@ -31,9 +31,9 @@ def tick(valeur, autoescape=False):
 
     if isinstance(valeur, bool):
         if valeur == True:
-            result = '<i style="color: #1ECA18;" class="fa fa-check"></i>'
+            result = '<i class="fa fa-check text-success"></i>'
         else:
-            result = '<i style="color: #D10115;" class="fa fa-times"></i>'
+            result = '<i class="fa fa-times text-danger"></i>'
         return mark_safe(result)
 
     else:  #  if the value is not a boolean, display it as if tick was not called

tickets/templates/tickets/aff_tickets.html

@@ -46,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 
-<div class="table-responsiv">
+<div class="table-responsive">
 
 	<table class="table">
     <thead>

users/templates/users/aff_whitelists.html

@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load acl %}
 {% load logs_extra %}
 
+<div class="table-responsive">
     <table class="table table-striped">
         <thead>
             <tr>
@@ -69,4 +70,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% if white_list.paginator %}
         {% include 'pagination.html' with list=white_list %}
     {% endif %}
-
+</div>