Merge branch 'master' into dev

CHANGELOG.md

@@ -57,13 +57,13 @@ Here is a list of noteworthy features brought by this update:
 * [!516](https://gitlab.federez.net/re2o/re2o/-/merge_requests/516): Detailed events in history views (e.g. show `old_email -> new_email`).
 * [!519](https://gitlab.federez.net/re2o/re2o/-/merge_requests/519): Add ability to filter event logs (e.g. to show all the subscriptions added by an admin).
 * [!569](https://gitlab.federez.net/re2o/re2o/-/merge_requests/569): Refactor navbar to make menu navigation easier.
-* [!569](https://gitlab.federez.net/re2o/re2o/-/merge_requests/569): Add ability to install custom themes.
+* [!569](https://gitlab.federez.net/re2o/re2o/-/merge_requests/569): Add ability to install custom themes (checkout [this repository](https://gitlab.federez.net/re2o/re2o-themes) for a list of Re2o themes).
 * [!578](https://gitlab.federez.net/re2o/re2o/-/merge_requests/578) : Migrations squashed to ease the installation process.
 * [!582](https://gitlab.federez.net/re2o/re2o/-/merge_requests/582): Improve autocomplete fields so they load faster and have a clearer behavior (no more entering a value without clicking and thinking it was taken into account).
 * [!589](https://gitlab.federez.net/re2o/re2o/-/merge_requests/589): Move LDAP to a separate optional app.
 * Plenty of bug fixes.
 
-You can view the full list of closed issues [here](https://gitlab.federez.net/re2o/re2o/-/issues?scope=all&state=all&milestone_title=Re2o 2.9).
+You can view the full list of closed issues [here](https://gitlab.federez.net/re2o/re2o/-/issues?scope=all&state=all&milestone_title=Re2o%202.9).
 
 # Before Re2o 2.9
 

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:

machines/models.py

@@ -223,7 +223,7 @@ class Machine(RevMixin, FieldPermissionModelMixin, AclMixin, models.Model):
                         "You don't have the right to delete a machine"
                         " of another user."
                     ),
-                    ("machines.delete_interface",) + (permissions or ()),
+                    ("machines.change_interface",) + (permissions or ()),
                 )
         return True, None, None
 
@@ -1654,7 +1654,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             if not (user_request.has_perm("machines.change_interface") and can_user):
                 return (
                     False,
-                    _("You don't have the right to edit a machine of another user."),
+                    _("You don't have the right to edit a machine of another" " user."),
                     ("machines.change_interface",) + (permissions or ()),
                 )
         return True, None, None

templates/locale/fr/LC_MESSAGES/django.po

@@ -88,7 +88,7 @@ msgstr "Contenu incconu"
 #: templates/registration/password_reset_done.html:11
 #: templates/registration/password_reset_form.html:11
 msgid "Home"
-msgstr "Acceuil"
+msgstr "Accueil"
 
 #: templates/buttons/add.html:27
 msgid "Add"
@@ -270,7 +270,7 @@ msgid "Control invoices"
 msgstr "Contrôler les factures"
 
 #: templates/nav.html:112
-msgid "Cutsom invoices"
+msgid "Custom invoices"
 msgstr "Facture personnalisée"
 
 #: templates/nav.html:117

templates/nav.html

@@ -109,7 +109,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                         {% trans "Invoices" %}</a></li>
                                 <li><a class="dropdown-item" href="{% url 'cotisations:index-custom-invoice' %}"><i
                                             class="fa fa-file-text"></i>
-                                        {% trans "Cutsom invoices" %}</a></li>
+                                        {% trans "Custom invoices" %}</a></li>
                             </ul>
                         </li>
                         <li><a class="dropdown-item" href="{% url 'cotisations:index-cost-estimate' %}"><i
@@ -319,4 +319,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             </ul>
         </div>
     </div>
-</nav>
+</nav>