8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-25 00:13:45 +00:00

Autorise l'édition de facture si l'auto-souscription est interdite mais que l'on peut créer des factures.

This commit is contained in:
Hugo LEVY-FALK 2018-07-02 14:09:35 +02:00
parent e0d71ed291
commit 24cdc2329d

View file

@ -99,12 +99,15 @@ def new_facture(request, user, userid):
) )
# Building the invocie form and the article formset # Building the invocie form and the article formset
is_self_subscription = False is_self_subscription = False
if not request.user.has_perm('cotisations.add_facture') and OptionalUser.get_cached_value('allow_self_subscription'): can_create_invoice = request.user.has_perm('cotisations.add_facture')
allow_self_subscription = OptionalUser.get_cached_value('allow_self_subscription')
if not can_create_invoice:
if allow_self_subscription:
is_self_subscription = True is_self_subscription = True
article_list = article_list.filter(allow_self_subscription=True) article_list = article_list.filter(allow_self_subscription=True)
allowed_payment = Paiement.objects.filter(allow_self_subscription=True) allowed_payment = Paiement.objects.filter(allow_self_subscription=True)
invoice_form = NewFactureForm(request.POST or None, instance=invoice, allowed_payment=allowed_payment) invoice_form = NewFactureForm(request.POST or None, instance=invoice, allowed_payment=allowed_payment)
elif not OptionalUser.get_cached_value('allow_self_subscription'): else:
messages.error( messages.error(
request, request,
_("You cannot subscribe. Please ask to the staff.") _("You cannot subscribe. Please ask to the staff.")
@ -115,6 +118,7 @@ def new_facture(request, user, userid):
)) ))
else: else:
invoice_form = NewFactureForm(request.POST or None, instance=invoice) invoice_form = NewFactureForm(request.POST or None, instance=invoice)
if request.user.is_class_club: if request.user.is_class_club:
article_formset = formset_factory(SelectClubArticleForm)( article_formset = formset_factory(SelectClubArticleForm)(
request.POST or None, request.POST or None,