From 6cf253365b6fd5191288df7ba53613d4209cb168 Mon Sep 17 00:00:00 2001 From: Skia Date: Tue, 13 Sep 2016 02:04:49 +0200 Subject: [PATCH] Add cash register summary view --- core/templates/core/user_tools.jinja | 1 + counter/models.py | 8 ++ .../templates/counter/cash_summary_list.jinja | 58 +++++++++ counter/urls.py | 1 + counter/views.py | 29 ++++- locale/fr/LC_MESSAGES/django.mo | Bin 34080 -> 34434 bytes locale/fr/LC_MESSAGES/django.po | 120 +++++++++++------- sith/settings.py | 2 +- 8 files changed, 171 insertions(+), 48 deletions(-) create mode 100644 counter/templates/counter/cash_summary_list.jinja diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja index 1806d63d..bec08530 100644 --- a/core/templates/core/user_tools.jinja +++ b/core/templates/core/user_tools.jinja @@ -26,6 +26,7 @@
  • {% trans %}General counters management{% endtrans %}
  • {% trans %}Products management{% endtrans %}
  • {% trans %}Product types management{% endtrans %}
    • +
  • {% trans %}Cash register summaries{% endtrans %}
    • {% endif %} {% for b in settings.SITH_COUNTER_BARS %} {% if user.is_in_group(b[1]+" admin") %} diff --git a/counter/models.py b/counter/models.py index 9b1aebc1..b553bac9 100644 --- a/counter/models.py +++ b/counter/models.py @@ -346,6 +346,14 @@ class CashRegisterSummary(models.Model): def __str__(self): return "At %s by %s - Total: %s €" % (self.counter, self.user, self.get_total()) + def is_owned_by(self, user): + """ + Method to see if that object can be edited by the given user + """ + if user.is_in_group(settings.SITH_GROUPS['counter-admin']['name']): + return True + return False + def get_total(self): t = 0 for it in self.items.all(): diff --git a/counter/templates/counter/cash_summary_list.jinja b/counter/templates/counter/cash_summary_list.jinja new file mode 100644 index 00000000..02661710 --- /dev/null +++ b/counter/templates/counter/cash_summary_list.jinja @@ -0,0 +1,58 @@ +{% extends "core/base.jinja" %} +{% from 'core/macros.jinja' import user_profile_link %} + +{% block title %} +{% trans %}Cash register summary list{% endtrans %} +{% endblock %} + +{% block content %} +{% if cashsummary_list %} +

    {% trans %}Cash register summary list{% endtrans %}

    +
    {% trans %}Theoric sums{% endtrans %}
    +
    {% trans %}Refillings{% endtrans %}
    +

    +{% for b,s in refilling_sums.items() %} + {{ b }}: {{ s }} €
    +{% endfor %} +

    +
    {% trans %}Cash register summaries{% endtrans %}
    +

    +{% for b,s in summaries_sums.items() %} + {{ b }}: {{ s }} €
    +{% endfor %} +

    + + + + + + + + + + + + + {% for c in cashsummary_list.order_by('-date') %} + + + + + + {% if c.emptied %} + + {% else %} + + {% endif %} + + + {% endfor %} + +
    {% trans %}User{% endtrans %}{% trans %}Counter{% endtrans %}{% trans %}Date{% endtrans %}{% trans %}Total{% endtrans %}{% trans %}Emptied{% endtrans %}{% trans %}Comment{% endtrans %}
    {{ user_profile_link(c.user) }}{{ c.counter }}{{ c.date|localtime|date(DATETIME_FORMAT) }} - {{ c.date|localtime|time(DATETIME_FORMAT) }}{{ c.get_total() }} €{% trans %}yes{% endtrans %}{{ c.comment }}
    +{% else %} +{% trans %}There is no cash register summary in this website.{% endtrans %} +{% endif %} +{% endblock %} + + + diff --git a/counter/urls.py b/counter/urls.py index b5f547ad..2516a0de 100644 --- a/counter/urls.py +++ b/counter/urls.py @@ -14,6 +14,7 @@ urlpatterns = [ url(r'^admin$', CounterListView.as_view(), name='admin_list'), url(r'^admin/new$', CounterCreateView.as_view(), name='new'), url(r'^admin/delete/(?P[0-9]+)$', CounterDeleteView.as_view(), name='delete'), + url(r'^admin/cash_summary/list$', CashSummaryListView.as_view(), name='cash_summary_list'), url(r'^admin/product/list$', ProductListView.as_view(), name='product_list'), url(r'^admin/product/list_archived$', ProductArchivedListView.as_view(), name='product_list_archived'), url(r'^admin/product/create$', ProductCreateView.as_view(), name='new_product'), diff --git a/counter/views.py b/counter/views.py index 96020217..cc0e36aa 100644 --- a/counter/views.py +++ b/counter/views.py @@ -12,7 +12,8 @@ from django.conf import settings from django.db import DataError, transaction import re -from datetime import date, timedelta +import pytz +from datetime import date, timedelta, datetime from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultipleField from ajax_select import make_ajax_form, make_ajax_field @@ -407,6 +408,11 @@ class CounterTabsMixin(TabedViewMixin): 'slug': 'product_types', 'name': _("Product types"), }, + { + 'url': reverse_lazy('counter:cash_summary_list'), + 'slug': 'cash_summary', + 'name': _("Cash register summaries"), + }, ] class CounterListView(CounterTabsMixin, CanViewMixin, ListView): @@ -687,3 +693,24 @@ class CounterActivityView(DetailView): pk_url_kwarg = "counter_id" template_name = 'counter/activity.jinja' +class CashSummaryListView(CanEditPropMixin, CounterTabsMixin, ListView): + """Display a list of cash summaries""" + model = CashRegisterSummary + template_name = 'counter/cash_summary_list.jinja' + context_object_name = "cashsummary_list" + current_tab = "cash_summary" + + def get_context_data(self, **kwargs): + """ Add sums to the context """ + kwargs = super(CashSummaryListView, self).get_context_data(**kwargs) + kwargs['summaries_sums'] = {} + kwargs['refilling_sums'] = {} + for c in Counter.objects.filter(type="BAR").all(): + last_summary = CashRegisterSummary.objects.filter(counter=c, emptied=True).order_by('-date').first() + if last_summary: + last_date = last_summary.date + else: + last_date = datetime(year=1994, month=5, day=17, tzinfo=pytz.UTC) # My birth date should be old enough + kwargs['summaries_sums'][c.name] = sum([s.get_total() for s in CashRegisterSummary.objects.filter(counter=c, date__gt=last_date).all()]) + kwargs['refilling_sums'][c.name] = sum([s.amount for s in Refilling.objects.filter(counter=c, date__gt=last_date).all()]) + return kwargs diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 63940e59a8961133180049dd145aba759bfc9be4..ad19e64d45c3517cb718ac337b237786655135e4 100644 GIT binary patch delta 12621 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 J#{awg{{iz|r2qf` delta 12329 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\n" "Language-Team: AE info \n" @@ -164,6 +164,7 @@ msgstr "type de cible" #: accounting/models.py:190 club/templates/club/club_members.jinja:8 #: club/templates/club/club_old_members.jinja:8 +#: counter/templates/counter/cash_summary_list.jinja:27 #: launderette/templates/launderette/launderette_admin.jinja:44 msgid "User" msgstr "Utilisateur" @@ -270,7 +271,7 @@ msgstr "Liste des types comptable" #: accounting/templates/accounting/journal_details.jinja:9 #: accounting/templates/accounting/operation_edit.jinja:9 #: accounting/templates/accounting/simplifiedaccountingtype_list.jinja:9 -#: core/templates/core/user_tools.jinja:39 +#: core/templates/core/user_tools.jinja:40 msgid "Accounting" msgstr "Comptabilité" @@ -289,7 +290,7 @@ msgstr "Il n'y a pas de types comptable dans ce site web." #: accounting/templates/accounting/bank_account_details.jinja:4 #: accounting/templates/accounting/bank_account_details.jinja:13 -#: core/templates/core/user_tools.jinja:46 +#: core/templates/core/user_tools.jinja:47 msgid "Bank account: " msgstr "Compte en banque : " @@ -325,7 +326,7 @@ msgstr "Nouveau compte club" #: accounting/templates/accounting/club_account_details.jinja:53 #: accounting/templates/accounting/journal_details.jinja:66 club/views.py:52 #: core/templates/core/file.jinja:38 core/templates/core/page.jinja:31 -#: core/templates/core/user_tools.jinja:33 core/views/user.py:145 +#: core/templates/core/user_tools.jinja:34 core/views/user.py:145 #: counter/templates/counter/counter_list.jinja:17 #: counter/templates/counter/counter_list.jinja:31 #: counter/templates/counter/counter_list.jinja:45 @@ -448,6 +449,7 @@ msgstr "No" #: core/templates/core/user_account_detail.jinja:17 #: core/templates/core/user_account_detail.jinja:46 #: core/templates/core/user_account_detail.jinja:79 +#: counter/templates/counter/cash_summary_list.jinja:29 msgid "Date" msgstr "Date" @@ -472,7 +474,7 @@ msgid "Done" msgstr "Effectué" #: accounting/templates/accounting/journal_details.jinja:34 -#: counter/views.py:614 +#: counter/templates/counter/cash_summary_list.jinja:32 counter/views.py:615 msgid "Comment" msgstr "Commentaire" @@ -647,6 +649,7 @@ msgstr "Total : " #: club/templates/club/club_sellings.jinja:19 club/views.py:159 #: core/templates/core/user_account_detail.jinja:18 #: core/templates/core/user_account_detail.jinja:47 +#: counter/templates/counter/cash_summary_list.jinja:28 msgid "Counter" msgstr "Comptoir" @@ -674,6 +677,7 @@ msgstr "Quantité" #: club/templates/club/club_sellings.jinja:24 #: core/templates/core/user_account.jinja:9 #: core/templates/core/user_account_detail.jinja:51 +#: counter/templates/counter/cash_summary_list.jinja:30 msgid "Total" msgstr "Total" @@ -684,7 +688,7 @@ msgid "Payment method" msgstr "Méthode de paiement" #: club/templates/club/club_tools.jinja:4 -#: core/templates/core/user_tools.jinja:58 +#: core/templates/core/user_tools.jinja:59 msgid "Club tools" msgstr "Outils club" @@ -1580,6 +1584,7 @@ msgstr "Compte utilisateur" #: core/templates/core/user_account.jinja:38 #: core/templates/core/user_account_detail.jinja:13 +#: counter/templates/counter/cash_summary_list.jinja:12 msgid "Refillings" msgstr "Rechargements" @@ -1719,8 +1724,8 @@ msgstr "Groupes" msgid "Subscriptions" msgstr "Cotisations" -#: core/templates/core/user_tools.jinja:22 counter/views.py:393 -#: counter/views.py:527 +#: core/templates/core/user_tools.jinja:22 counter/views.py:394 +#: counter/views.py:528 msgid "Counters" msgstr "Comptoirs" @@ -1740,11 +1745,16 @@ msgstr "Gestion des produits" msgid "Product types management" msgstr "Gestion des types de produit" -#: core/templates/core/user_tools.jinja:42 +#: core/templates/core/user_tools.jinja:29 +#: counter/templates/counter/cash_summary_list.jinja:18 +msgid "Cash register summaries" +msgstr "Relevés de caisse" + +#: core/templates/core/user_tools.jinja:43 msgid "General accounting" msgstr "Comptabilité générale" -#: core/templates/core/user_tools.jinja:51 +#: core/templates/core/user_tools.jinja:52 msgid "Club account: " msgstr "Compte club : " @@ -1912,7 +1922,7 @@ msgstr "rechargement" msgid "unit price" msgstr "prix unitaire" -#: counter/models.py:253 counter/models.py:363 eboutic/models.py:104 +#: counter/models.py:253 counter/models.py:371 eboutic/models.py:104 msgid "quantity" msgstr "quantité" @@ -1945,24 +1955,25 @@ msgstr "coffre vidée" msgid "cash register summary" msgstr "relevé de caisse" -#: counter/models.py:361 +#: counter/models.py:369 msgid "cash summary" msgstr "relevé" -#: counter/models.py:362 +#: counter/models.py:370 msgid "value" msgstr "valeur" -#: counter/models.py:364 +#: counter/models.py:372 msgid "check" msgstr "chèque" -#: counter/models.py:367 +#: counter/models.py:375 msgid "cash register summary item" msgstr "élément de relevé de caisse" #: counter/templates/counter/activity.jinja:5 #: counter/templates/counter/activity.jinja:9 +#, python-format msgid "%(counter_name)s activity" msgstr "Activité sur %(counter_name)s" @@ -1975,6 +1986,27 @@ msgstr "Barmans" msgid "Make a cash register summary" msgstr "Faire un relevé de caisse" +#: counter/templates/counter/cash_summary_list.jinja:5 +#: counter/templates/counter/cash_summary_list.jinja:10 +msgid "Cash register summary list" +msgstr "Liste des relevés de caisse" + +#: counter/templates/counter/cash_summary_list.jinja:11 +msgid "Theoric sums" +msgstr "Sommes théoriques" + +#: counter/templates/counter/cash_summary_list.jinja:31 counter/views.py:616 +msgid "Emptied" +msgstr "Coffre vidé" + +#: counter/templates/counter/cash_summary_list.jinja:43 +msgid "yes" +msgstr "oui" + +#: counter/templates/counter/cash_summary_list.jinja:53 +msgid "There is no cash register summary in this website." +msgstr "Il n'y a pas de relevé de caisse dans ce site web." + #: counter/templates/counter/counter_click.jinja:34 #: launderette/templates/launderette/launderette_admin.jinja:8 msgid "Selling" @@ -2095,112 +2127,108 @@ msgstr "Nouveau type de produit" msgid "There is no product types in this website." msgstr "Il n'y a pas de types de produit dans ce site web." -#: counter/views.py:35 +#: counter/views.py:36 msgid "Select user" msgstr "Choisir un utilisateur" -#: counter/views.py:51 +#: counter/views.py:52 msgid "User not found" msgstr "Utilisateur non trouvé" -#: counter/views.py:84 +#: counter/views.py:85 msgid "Bad credentials" msgstr "Mauvais identifiants" -#: counter/views.py:86 +#: counter/views.py:87 msgid "User is not barman" msgstr "L'utilisateur n'est pas barman." -#: counter/views.py:266 +#: counter/views.py:267 msgid "END" msgstr "FIN" -#: counter/views.py:268 +#: counter/views.py:269 msgid "CAN" msgstr "ANN" -#: counter/views.py:298 +#: counter/views.py:299 msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: counter/views.py:388 +#: counter/views.py:389 msgid "Counter administration" msgstr "Administration des comptoirs" -#: counter/views.py:398 +#: counter/views.py:399 msgid "Products" msgstr "Produits" -#: counter/views.py:403 +#: counter/views.py:404 msgid "Archived products" msgstr "Produits archivés" -#: counter/views.py:408 +#: counter/views.py:409 msgid "Product types" msgstr "Types de produit" -#: counter/views.py:524 +#: counter/views.py:525 msgid "Parent product" msgstr "Produit parent" -#: counter/views.py:525 +#: counter/views.py:526 msgid "Buying groups" msgstr "Groupes d'achat" -#: counter/views.py:594 +#: counter/views.py:595 msgid "10 cents" msgstr "10 centimes" -#: counter/views.py:595 +#: counter/views.py:596 msgid "20 cents" msgstr "20 centimes" -#: counter/views.py:596 +#: counter/views.py:597 msgid "50 cents" msgstr "50 centimes" -#: counter/views.py:597 +#: counter/views.py:598 msgid "1 euro" msgstr "1 €" -#: counter/views.py:598 +#: counter/views.py:599 msgid "2 euros" msgstr "2 €" -#: counter/views.py:599 +#: counter/views.py:600 msgid "5 euros" msgstr "5 €" -#: counter/views.py:600 +#: counter/views.py:601 msgid "10 euros" msgstr "10 €" -#: counter/views.py:601 +#: counter/views.py:602 msgid "20 euros" msgstr "20 €" -#: counter/views.py:602 +#: counter/views.py:603 msgid "50 euros" msgstr "50 €" -#: counter/views.py:603 +#: counter/views.py:604 msgid "100 euros" msgstr "100 €" -#: counter/views.py:604 counter/views.py:606 counter/views.py:608 -#: counter/views.py:610 counter/views.py:612 +#: counter/views.py:605 counter/views.py:607 counter/views.py:609 +#: counter/views.py:611 counter/views.py:613 msgid "Check amount" msgstr "Montant du chèque" -#: counter/views.py:605 counter/views.py:607 counter/views.py:609 -#: counter/views.py:611 counter/views.py:613 +#: counter/views.py:606 counter/views.py:608 counter/views.py:610 +#: counter/views.py:612 counter/views.py:614 msgid "Check quantity" msgstr "Nombre de chèque" -#: counter/views.py:615 -msgid "Emptied" -msgstr "Coffre vidé" - #: eboutic/models.py:49 msgid "validated" msgstr "validé" diff --git a/sith/settings.py b/sith/settings.py index 9d88ed4b..7c99d27e 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -122,7 +122,7 @@ TEMPLATES = [ "enabled": False, }, "autoescape": True, - "auto_reload": DEBUG, + "auto_reload": True, "translation_engine": "django.utils.translation", } },