Utilise un ModelForm pour les données de chèque + doc

cotisations/models.py

@@ -232,7 +232,6 @@ class Facture(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             _("You don't have the right to create an invoice.")
         )
 
-
     def __init__(self, *args, **kwargs):
         super(Facture, self).__init__(*args, **kwargs)
         self.field_permissions = {
@@ -632,12 +631,19 @@ class Paiement(RevMixin, AclMixin, models.Model):
             )
         super(Paiement, self).save(*args, **kwargs)
 
-    def end_payment(self, invoice, request):
+    def end_payment(self, invoice, request, use_payment_method=True):
         """
-        The general way of ending a payment. You may redefine this method for custom
-        payment methods. Must return a HttpResponse-like object.
+        The general way of ending a payment.
+
+        :param invoice: The invoice being created.
+        :param request: Request sended by the user.
+        :param use_payment_method: If `self` has an attribute `payment_method`,
+            returns the result of
+            `self.payment_method.end_payment(invoice, request)`
+
+        :returns: An `HttpResponse`-like object.
         """
-        if hasattr(self, 'payment_method'):
+        if hasattr(self, 'payment_method') and use_payment_method:
             return self.payment_method.end_payment(invoice, request)
 
         # In case a cotisation was bought, inform the user, the

cotisations/payment_methods/cheque/views.py

@@ -12,7 +12,7 @@ from django.utils.translation import ugettext as _
 from cotisations.models import Facture as Invoice
 
 from .models import ChequePayment
-from .forms import ChequeForm
+from .forms import InvoiceForm
 
 
 @login_required
@@ -28,16 +28,15 @@ def cheque(request, invoice_pk):
             'users:profil',
             kwargs={'userid': request.user.pk}
         ))
-    form = ChequeForm(request.POST or None)
+    form = InvoiceForm(request.POST or None, instance=invoice)
     if form.is_valid():
-        invoice.banque = form.cleaned_data['bank']
-        invoice.cheque = form.cleaned_data['number']
-        invoice.valid = True
-        invoice.save()
-        return redirect(reverse(
-            'users:profil',
-            kwargs={'userid': request.user.pk}
-        ))
+        form.instance.valid = True
+        form.save()
+        return form.instance.paiement.end_payment(
+            form.instance,
+            request,
+            use_payment_method=False
+        )
     return render(
         request,
         'cotisations/payment_form.html',