From 634527dc959e0ddbce9627812183ff872188041a Mon Sep 17 00:00:00 2001 From: detraz Date: Sat, 13 Oct 2018 16:33:36 +0200 Subject: [PATCH] Fix name of user after invoice comnpay + acl delete invoice --- cotisations/models.py | 6 ++++-- cotisations/payment_methods/comnpay/views.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cotisations/models.py b/cotisations/models.py index 3e5855f3..914dc115 100644 --- a/cotisations/models.py +++ b/cotisations/models.py @@ -182,10 +182,12 @@ class Facture(BaseInvoice): def can_delete(self, user_request, *args, **kwargs): if not user_request.has_perm('cotisations.delete_facture'): return False, _("You don't have the right to delete an invoice.") - if not self.user.can_edit(user_request, *args, **kwargs)[0]: + elif not user_request.has_perm('cotisations.change_all_facture') and \ + not self.user.can_edit(user_request, *args, **kwargs)[0]: return False, _("You don't have the right to delete this user's " "invoices.") - if self.control or not self.valid: + elif not user_request.has_perm('cotisations.change_all_facture') and \ + (self.control or not self.valid): return False, _("You don't have the right to delete an invoice " "already controlled or invalidated.") else: diff --git a/cotisations/payment_methods/comnpay/views.py b/cotisations/payment_methods/comnpay/views.py index 49dc496f..12a5747b 100644 --- a/cotisations/payment_methods/comnpay/views.py +++ b/cotisations/payment_methods/comnpay/views.py @@ -62,8 +62,8 @@ def accept_payment(request, factureid): request, _("The subscription of %(member_name)s was extended to" " %(end_date)s.") % { - 'member_name': request.user.pseudo, - 'end_date': request.user.end_adhesion() + 'member_name': invoice.user.pseudo, + 'end_date': invoice.user.end_adhesion() } ) return redirect(reverse(