diff --git a/cotisations/models.py b/cotisations/models.py index ca342c16..15cd17fe 100644 --- a/cotisations/models.py +++ b/cotisations/models.py @@ -28,7 +28,7 @@ class Facture(models.Model): return name def __str__(self): - return str(self.date) + ' ' + str(self.user) + return str(self.user) + ' ' + str(self.date) @receiver(post_save, sender=Facture) def facture_post_save(sender, **kwargs): diff --git a/logs/templates/logs/aff_actions.html b/logs/templates/logs/aff_actions.html index ee6a85f9..a8e45484 100644 --- a/logs/templates/logs/aff_actions.html +++ b/logs/templates/logs/aff_actions.html @@ -16,20 +16,22 @@ {% for revision in revisions_list %} - - {% for reversion in revision.version_set.all %}{{ reversion.object|truncatechars:20 }}{% endfor %} - {% for reversion in revision.version_set.all %}{{ reversion.object|classname }}{% endfor %} - {{ revision.user }} - {{ revision.date_created }} - {{ revision.comment }} - {% if is_bureau %} - - - - Annuler - - - {% endif %} - + {% for reversion in revision.version_set.all %} + + {{ reversion.object|truncatechars:20 }} + {{ reversion.object|classname }} + {{ revision.user }} + {{ revision.date_created }} + {{ revision.comment }} + {% if is_bureau %} + + + + Annuler + + + {% endif %} + + {% endfor %} {% endfor %}