diff --git a/kfet/models.py b/kfet/models.py index 92a547c1..624f9deb 100644 --- a/kfet/models.py +++ b/kfet/models.py @@ -273,29 +273,35 @@ class CheckoutStatement(models.Model): checkout = models.ForeignKey( Checkout, on_delete = models.PROTECT, related_name = "statements") - balance_old = models.DecimalField(max_digits = 6, decimal_places = 2) - balance_new = models.DecimalField(max_digits = 6, decimal_places = 2) - amount_taken = models.DecimalField(max_digits = 6, decimal_places = 2) - amount_error = models.DecimalField(max_digits = 6, decimal_places = 2) + balance_old = models.DecimalField("Ancienne balance", + max_digits = 6, decimal_places = 2) + balance_new = models.DecimalField("Nouvelle balance", + max_digits = 6, decimal_places = 2) + amount_taken = models.DecimalField("Montant pris", + max_digits = 6, decimal_places = 2) + amount_error = models.DecimalField("Montant de l'erreur", + max_digits = 6, decimal_places = 2) at = models.DateTimeField(auto_now_add = True) - not_count = models.BooleanField(default=False) + not_count = models.BooleanField("Caisse non comptée", default=False) - taken_001 = models.PositiveSmallIntegerField(default=0) - taken_002 = models.PositiveSmallIntegerField(default=0) - taken_005 = models.PositiveSmallIntegerField(default=0) - taken_01 = models.PositiveSmallIntegerField(default=0) - taken_02 = models.PositiveSmallIntegerField(default=0) - taken_05 = models.PositiveSmallIntegerField(default=0) - taken_1 = models.PositiveSmallIntegerField(default=0) - taken_2 = models.PositiveSmallIntegerField(default=0) - taken_5 = models.PositiveSmallIntegerField(default=0) - taken_10 = models.PositiveSmallIntegerField(default=0) - taken_20 = models.PositiveSmallIntegerField(default=0) - taken_50 = models.PositiveSmallIntegerField(default=0) - taken_100 = models.PositiveSmallIntegerField(default=0) - taken_200 = models.PositiveSmallIntegerField(default=0) - taken_500 = models.PositiveSmallIntegerField(default=0) - taken_cheque = models.DecimalField(default=0, max_digits=6, decimal_places=2) + taken_001 = models.PositiveSmallIntegerField("Pièces de 1¢", default=0) + taken_002 = models.PositiveSmallIntegerField("Pièces de 2¢", default=0) + taken_005 = models.PositiveSmallIntegerField("Pièces de 5¢", default=0) + taken_01 = models.PositiveSmallIntegerField("Pièces de 10¢", default=0) + taken_02 = models.PositiveSmallIntegerField("Pièces de 20¢", default=0) + taken_05 = models.PositiveSmallIntegerField("Pièces de 50¢", default=0) + taken_1 = models.PositiveSmallIntegerField("Pièces de 1€", default=0) + taken_2 = models.PositiveSmallIntegerField("Pièces de 2€", default=0) + taken_5 = models.PositiveSmallIntegerField("Billets de 5€", default=0) + taken_10 = models.PositiveSmallIntegerField("Billets de 10€", default=0) + taken_20 = models.PositiveSmallIntegerField("Billets de 20€", default=0) + taken_50 = models.PositiveSmallIntegerField("Billets de 50€", default=0) + taken_100 = models.PositiveSmallIntegerField("Billets de 100€", default=0) + taken_200 = models.PositiveSmallIntegerField("Billets de 200€", default=0) + taken_500 = models.PositiveSmallIntegerField("Billets de 500€", default=0) + taken_cheque = models.DecimalField( + "Montant des chèques", + default=0, max_digits=6, decimal_places=2) def __str__(self): return '%s %s' % (self.checkout, self.at) diff --git a/kfet/templates/kfet/article_update.html b/kfet/templates/kfet/article_update.html index f4260a97..85a29f6b 100644 --- a/kfet/templates/kfet/article_update.html +++ b/kfet/templates/kfet/article_update.html @@ -15,7 +15,7 @@
{% csrf_token %} {% include 'kfet/form_snippet.html' with form=form %} - {% if not perms.kfet.add_article %} + {% if not perms.kfet.change_article %} {% include 'kfet/form_authentication_snippet.html' %} {% endif %} {% include 'kfet/form_submit_snippet.html' with value="Mettre à jour" %} diff --git a/kfet/templates/kfet/checkoutstatement_create.html b/kfet/templates/kfet/checkoutstatement_create.html index 0edb66ad..8ed57017 100644 --- a/kfet/templates/kfet/checkoutstatement_create.html +++ b/kfet/templates/kfet/checkoutstatement_create.html @@ -80,7 +80,7 @@ - Chèque: +

Chèque:

diff --git a/kfet/templates/kfet/checkoutstatement_update.html b/kfet/templates/kfet/checkoutstatement_update.html index 18d8938f..fd35b959 100644 --- a/kfet/templates/kfet/checkoutstatement_update.html +++ b/kfet/templates/kfet/checkoutstatement_update.html @@ -15,15 +15,15 @@ Caisse {{ checkout.name }} - Modification relevé {{ checkoutstatement.at }}
{% include 'kfet/base_messages.html' %} -
-
- +
+
+ {% csrf_token %} - {{ form.as_p }} + {% include 'kfet/form_snippet.html' with form=form %} {% if not perms.kfet.change_checkoutstatement %} - + {% include 'kfet/form_authentication_snippet.html' %} {% endif %} - + {% include 'kfet/form_submit_snippet.html' with value="Enregistrer" %}