From 205dc93f4b736e8dbca8342912f807f74e908f44 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Tue, 15 Sep 2020 19:40:45 +0200 Subject: [PATCH] =?UTF-8?q?FilterHistoryForm=20est=20un=20formulaire=20d?= =?UTF-8?q?=C3=A9cent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kfet/forms.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/kfet/forms.py b/kfet/forms.py index 9419d9f8..896621f0 100644 --- a/kfet/forms.py +++ b/kfet/forms.py @@ -7,6 +7,7 @@ from django.core import validators from django.core.exceptions import ValidationError from django.forms import modelformset_factory from django.utils import timezone +from django.utils.translation import ugettext_lazy as _ from djconfig.forms import ConfigForm from gestioncof.models import CofProfile @@ -482,10 +483,23 @@ class KFetConfigForm(ConfigForm): class FilterHistoryForm(forms.Form): - checkouts = forms.ModelMultipleChoiceField(queryset=Checkout.objects.all()) - accounts = forms.ModelMultipleChoiceField(queryset=Account.objects.all()) - from_date = forms.DateTimeField(widget=DateTimeWidget) - to_date = forms.DateTimeField(widget=DateTimeWidget) + start = forms.DateTimeField(label=_("De"), widget=DateTimeWidget, required=False) + end = forms.DateTimeField(label=_("À"), widget=DateTimeWidget, required=False) + checkout = forms.ModelChoiceField( + label=_("Caisse"), + queryset=Checkout.objects.all(), + required=False, + empty_label=_("Toutes les caisses"), + ) + account = forms.ModelChoiceField( + label=_("Compte"), + queryset=Account.objects.all(), + required=False, + empty_label=_("Tous les comptes"), + ) + + transfers_only = forms.BooleanField(widget=forms.HiddenInput, required=False) + opes_only = forms.BooleanField(widget=forms.HiddenInput, required=False) # -----