diff --git a/myproject/inventory/templates/inventory/debug_page.html b/myproject/inventory/templates/inventory/debug_page.html index 85eb8f0..cdc9823 100644 --- a/myproject/inventory/templates/inventory/debug_page.html +++ b/myproject/inventory/templates/inventory/debug_page.html @@ -341,7 +341,6 @@ Склад Кол-во Цена продажи - Себестоимость Заказ Документ Создана @@ -355,7 +354,6 @@ {{ sale.warehouse.name }} {{ sale.quantity }} {{ sale.sale_price|floatformat:2 }} - {{ sale.cost_price|floatformat:2 }} {% if sale.order %} {{ sale.order.order_number }} @@ -364,10 +362,10 @@ {% endif %} {{ sale.document_number|default:"-" }} - {{ sale.created_at|date:"d.m.Y H:i:s" }} + {{ sale.date|date:"d.m.Y H:i:s" }} {% empty %} - Нет продаж + Нет продаж {% endfor %} diff --git a/myproject/inventory/views/debug_views.py b/myproject/inventory/views/debug_views.py index 368caa6..5182fc4 100644 --- a/myproject/inventory/views/debug_views.py +++ b/myproject/inventory/views/debug_views.py @@ -34,7 +34,7 @@ def debug_inventory_page(request): reservations = Reservation.objects.select_related( 'product', 'warehouse', 'order_item__order' ).order_by('-reserved_at') - sales = Sale.objects.select_related('product', 'warehouse', 'order').order_by('-created_at') + sales = Sale.objects.select_related('product', 'warehouse', 'order').order_by('-date') allocations = SaleBatchAllocation.objects.select_related( 'sale__product', 'batch' ).order_by('-id') @@ -83,7 +83,7 @@ def debug_inventory_page(request): orders = orders[:50] # Списки для фильтров - products = Product.objects.filter(is_active=True).order_by('name')[:200] + products = Product.objects.filter(archived_at__isnull=True).order_by('name')[:200] warehouses = Warehouse.objects.filter(is_active=True).order_by('name') context = {