Commit ca3b7fda authored by Skia's avatar Skia
Browse files

Improve invoice call template

parent 51f342a7
Pipeline #265 failed with stage
in 17 seconds
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h3>{% trans %}Invoices call{% endtrans %}</h3> <h3>{% trans date=start_date|date("F Y") %}Invoices call for {{ date }}{% endtrans %}</h3>
<p>{% trans %}Choose another month: {% endtrans %}</p>
<form method="get" action=""> <form method="get" action="">
<select name="month"> <select name="month">
{% for m in months %} {% for m in months %}
......
...@@ -929,6 +929,7 @@ class InvoiceCallView(CounterAdminTabsMixin, TemplateView): ...@@ -929,6 +929,7 @@ class InvoiceCallView(CounterAdminTabsMixin, TemplateView):
start_date = datetime(year=timezone.now().year, month=(timezone.now().month+10)%12+1, day=1) start_date = datetime(year=timezone.now().year, month=(timezone.now().month+10)%12+1, day=1)
end_date = (start_date + timedelta(days=32)).replace(day=1, hour=0, minute=0, microsecond=0) end_date = (start_date + timedelta(days=32)).replace(day=1, hour=0, minute=0, microsecond=0)
from django.db.models import Sum, Case, When, F, DecimalField from django.db.models import Sum, Case, When, F, DecimalField
kwargs['start_date'] = start_date
kwargs['sums'] = Selling.objects.values('club__name').annotate(selling_sum=Sum( kwargs['sums'] = Selling.objects.values('club__name').annotate(selling_sum=Sum(
Case(When(date__gte=start_date, Case(When(date__gte=start_date,
date__lt=end_date, date__lt=end_date,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-29 18:19+0200\n" "POT-Creation-Date: 2016-09-29 18:31+0200\n"
"PO-Revision-Date: 2016-07-18\n" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
...@@ -171,7 +171,7 @@ msgid "User" ...@@ -171,7 +171,7 @@ msgid "User"
msgstr "Utilisateur" msgstr "Utilisateur"
#: accounting/models.py:190 club/templates/club/club_detail.jinja:5 #: accounting/models.py:190 club/templates/club/club_detail.jinja:5
#: counter/templates/counter/invoices_call.jinja:19 #: counter/templates/counter/invoices_call.jinja:20
msgid "Club" msgid "Club"
msgstr "Club" msgstr "Club"
...@@ -2105,7 +2105,7 @@ msgstr "Pas de date de naissance renseigné" ...@@ -2105,7 +2105,7 @@ msgstr "Pas de date de naissance renseigné"
#: counter/templates/counter/counter_click.jinja:52 #: counter/templates/counter/counter_click.jinja:52
#: counter/templates/counter/counter_click.jinja:86 #: counter/templates/counter/counter_click.jinja:86
#: counter/templates/counter/invoices_call.jinja:15 #: counter/templates/counter/invoices_call.jinja:16
#: launderette/templates/launderette/launderette_admin.jinja:35 #: launderette/templates/launderette/launderette_admin.jinja:35
#: launderette/templates/launderette/launderette_click.jinja:13 #: launderette/templates/launderette/launderette_click.jinja:13
msgid "Go" msgid "Go"
...@@ -2181,12 +2181,20 @@ msgstr "Merci de vous identifier" ...@@ -2181,12 +2181,20 @@ msgstr "Merci de vous identifier"
msgid "Barman: " msgid "Barman: "
msgstr "Barman : " msgstr "Barman : "
#: counter/templates/counter/invoices_call.jinja:4 #: counter/templates/counter/invoices_call.jinja:4 counter/views.py:465
#: counter/templates/counter/invoices_call.jinja:8 counter/views.py:465
msgid "Invoices call" msgid "Invoices call"
msgstr "Appels à facture" msgstr "Appels à facture"
#: counter/templates/counter/invoices_call.jinja:20 #: counter/templates/counter/invoices_call.jinja:8
#, python-format
msgid "Invoices call for %(date)s"
msgstr "Appels à facture pour %(date)s"
#: counter/templates/counter/invoices_call.jinja:9
msgid "Choose another month: "
msgstr "Choisir un autre mois : "
#: counter/templates/counter/invoices_call.jinja:21
msgid "Sum" msgid "Sum"
msgstr "Somme" msgstr "Somme"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment