diff --git a/kfet/static/kfet/css/base/misc.css b/kfet/static/kfet/css/base/misc.css index fab1a33a..97c0ee7e 100644 --- a/kfet/static/kfet/css/base/misc.css +++ b/kfet/static/kfet/css/base/misc.css @@ -61,7 +61,7 @@ ul { } .table td.no-padding { - padding:0; + padding:0 !important; } .table thead { diff --git a/kfet/templates/kfet/inventory_read.html b/kfet/templates/kfet/inventory_read.html index 0d98e2d8..b9020b96 100644 --- a/kfet/templates/kfet/inventory_read.html +++ b/kfet/templates/kfet/inventory_read.html @@ -48,7 +48,6 @@ Stock avant Stock après Erreur - Valeur {% regroup inventoryarts by article.category.name as category_list %} @@ -68,16 +67,17 @@ {{ inventoryart.stock_old }} {{ inventoryart.stock_new }} - {{ inventoryart.stock_error }} - {{ inventoryart.amount_new }} + {{ inventoryart.stock_error }} / {{ inventoryart.amount_error|floatformat:"-2" }} € {% endfor %} {% endfor %} - Total - {{ total_amount }} + Valeurs totales + {{ total_amount_old|floatformat:"-2" }} € + {{ total_amount_new|floatformat:"-2" }} € + {{ total_amount_error|floatformat:"-2" }} € diff --git a/kfet/views.py b/kfet/views.py index fdfb1b0d..15bde0f7 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -2024,23 +2024,34 @@ class InventoryRead(DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + output_field = DecimalField(max_digits=10, decimal_places=2, default=0) inventory_articles = ( InventoryArticle.objects.select_related("article", "article__category") .filter(inventory=self.object) .annotate( - amount_new=ExpressionWrapper( - F("stock_new") * F("article__price"), - output_field=DecimalField( - max_digits=6, decimal_places=2, default=0 - ), + amount_error=ExpressionWrapper( + F("stock_error") * F("article__price"), output_field=output_field ) ) .order_by("article__category__name", "article__name") ) context["inventoryarts"] = inventory_articles - context["total_amount"] = inventory_articles.aggregate(total=Sum("amount_new"))[ - "total" - ] + stats = inventory_articles.aggregate( + new=ExpressionWrapper( + Sum(F("stock_new") * F("article__price")), output_field=output_field + ), + error=Sum("amount_error"), + old=ExpressionWrapper( + Sum(F("stock_old") * F("article__price")), output_field=output_field + ), + ) + context.update( + { + "total_amount_old": stats["old"], + "total_amount_new": stats["new"], + "total_amount_error": stats["error"], + } + ) return context