refactor: Миграция всех страниц на минималистичный базовый шаблон

Мигрированы все 31 страница модуля inventory с устаревшего base_inventory.html (с sidebar) на новый base_inventory_minimal.html (без sidebar).

Изменения:
- Обновлены все extends на base_inventory_minimal.html
- Добавлены breadcrumb блоки для навигации на всех страницах
- Удалён устаревший base_inventory.html с боковой панелью
- Единообразный UI на всех страницах склада

Обновлённые разделы (31 файл):
- Allocation (1): распределение продаж
- Batch (2): партии товаров
- Incoming (4): приходы товара
- Incoming Batch (2): партии поступлений
- Inventory (3): инвентаризация
- Movements (1): журнал операций
- Reservation (3): резервирования
- Sale (4): продажи
- Stock (2): остатки
- Transfer (3): перемещения
- Warehouse (3): склады
- Writeoff (3): списания

Результат:
- Консистентный минималистичный дизайн на всех страницах
- Больше пространства для контента (100% ширины вместо 75%)
- Улучшенная навигация через breadcrumbs и dropdown меню
- Проще поддержка (один базовый шаблон вместо двух)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
2025-11-14 00:33:26 +03:00
parent afec5c6ef8
commit 8deef2fa75
32 changed files with 62 additions and 127 deletions

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Распределение продаж{% endblock %}
{% block breadcrumb_current %}Распределение продаж{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">Распределение продаж по партиям (FIFO)</h4></div><div class="card-body">{% if allocations %}<table class="table table-hover table-sm"><thead><tr><th>Продажа</th><th>Товар</th><th>Партия</th><th>Кол-во</th><th>Цена</th><th>Дата</th></tr></thead><tbody>{% for a in allocations %}<tr><td>#{{ a.sale.id }}</td><td>{{ a.sale.product.name }}</td><td>#{{ a.batch.id }}</td><td>{{ a.quantity|smart_quantity }}</td><td>{{ a.cost_price }}</td><td>{{ a.sale.date|date:"d.m.Y" }}</td></tr>{% endfor %}</tbody></table>{% else %}<div class="alert alert-info">Распределений не найдено.</div>{% endif %}</div></div>
{% endblock %}

View File

@@ -1,96 +0,0 @@
{% extends 'base.html' %}
{% block title %}{% block inventory_title %}Склад{% endblock %}{% endblock %}
{% block content %}
<div class="container-fluid mt-4">
<div class="row">
<!-- Боковая панель навигации -->
<div class="col-md-3 mb-4">
<div class="card">
<div class="card-header bg-primary text-white">
<h5 class="mb-0">Управление складом</h5>
</div>
<div class="list-group list-group-flush">
<a href="{% url 'inventory:inventory-home' %}" class="list-group-item list-group-item-action">
<i class="bi bi-house-door"></i> Главная
</a>
<a href="{% url 'inventory:warehouse-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-building"></i> Склады
</a>
<a href="{% url 'inventory:incoming-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-arrow-down-square"></i> Приходы
</a>
<a href="{% url 'inventory:incoming-create' %}" class="list-group-item list-group-item-action">
<i class="bi bi-file-earmark-plus"></i> Поступление товара
</a>
<a href="{% url 'inventory:incoming-batch-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-diagram-3-fill"></i> Партии поступлений
</a>
<a href="{% url 'inventory:sale-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-arrow-up-square"></i> Продажи
</a>
<a href="{% url 'inventory:inventory-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-clipboard-check"></i> Инвентаризация
</a>
<a href="{% url 'inventory:writeoff-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-x-circle"></i> Списания
</a>
<a href="{% url 'inventory:transfer-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-arrow-left-right"></i> Перемещения
</a>
</div>
</div>
<!-- Справочная информация -->
<div class="card mt-3">
<div class="card-header bg-info text-white">
<h5 class="mb-0">Справочная информация</h5>
</div>
<div class="list-group list-group-flush">
<a href="{% url 'inventory:stock-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-box-seam"></i> Остатки
</a>
<a href="{% url 'inventory:batch-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-diagram-3"></i> Партии
</a>
<a href="{% url 'inventory:movement-list' %}" class="list-group-item list-group-item-action">
<i class="bi bi-journal-check"></i> Журнал
</a>
</div>
</div>
</div>
<!-- Основной контент -->
<div class="col-md-9">
{% block inventory_content %}{% endblock %}
</div>
</div>
</div>
<style>
.list-group-item {
border-left: 4px solid transparent;
transition: all 0.2s;
}
.list-group-item:hover {
border-left-color: #007bff;
background-color: #f8f9fa;
}
.list-group-item.active {
border-left-color: #007bff;
background-color: #e7f1ff;
}
.card {
border: none;
box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
}
.card-header {
border-bottom: 1px solid rgba(0, 0, 0, 0.125);
}
</style>
{% endblock %}

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Партия товара{% endblock %}
{% block breadcrumb_current %}Партии{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">Партия #{{ batch.id }}: {{ batch.product.name }}</h4></div><div class="card-body"><table class="table table-borderless"><tr><th>Товар:</th><td>{{ batch.product.name }}</td></tr><tr><th>Склад:</th><td>{{ batch.warehouse.name }}</td></tr><tr><th>Количество:</th><td><strong>{{ batch.quantity|smart_quantity }} шт</strong></td></tr><tr><th>Цена закупки:</th><td>{{ batch.cost_price }} руб.</td></tr><tr><th>Создана:</th><td>{{ batch.created_at|date:"d.m.Y H:i" }}</td></tr><tr><th>Статус:</th><td>{% if batch.is_active %}<span class="badge bg-success">Активна</span>{% else %}<span class="badge bg-secondary">Неактивна</span>{% endif %}</td></tr></table><h5 class="mt-4">История операций</h5><div class="alert alert-info">История продаж и списаний этой партии.</div><a href="{% url 'inventory:batch-list' %}" class="btn btn-secondary"><i class="bi bi-arrow-left"></i> Вернуться</a></div></div>
{% endblock %}

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Партии товаров{% endblock %}
{% block breadcrumb_current %}Партии{% endblock %}
{% block inventory_content %}
<div class="card">
<div class="card-header">

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Массовое поступление товара{% endblock %}
{% block breadcrumb_current %}Приходы{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,7 +1,8 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Отмена приходу товара{% endblock %}
{% block breadcrumb_current %}Приходы{% endblock %}
{% block inventory_content %}
<div class="card border-danger">

View File

@@ -1,4 +1,4 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}
@@ -8,6 +8,7 @@
Новый приход товара
{% endif %}
{% endblock %}
{% block breadcrumb_current %}Приходы{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,7 +1,8 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}История приходов товара{% endblock %}
{% block breadcrumb_current %}Приходы{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Партия {{ batch.document_number }}{% endblock %}
{% block breadcrumb_current %}Партии поступлений{% endblock %}
{% block inventory_content %}
<div class="card">
<div class="card-header">

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Партии поступлений{% endblock %}
{% block breadcrumb_current %}Партии поступлений{% endblock %}
{% block inventory_content %}
<div class="card">
<div class="card-header">

View File

@@ -1,7 +1,8 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Детали инвентаризации{% endblock %}
{% block breadcrumb_current %}Инвентаризация{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Новая инвентаризация{% endblock %}
{% block breadcrumb_current %}Инвентаризация{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,7 +1,8 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Внесение результатов инвентаризации{% endblock %}
{% block breadcrumb_current %}Инвентаризация{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,4 +1,5 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Журнал операций{% endblock %}
{% block breadcrumb_current %}Журнал{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">Журнал всех складских операций</h4></div><div class="card-body">{% if movements %}<table class="table table-hover table-sm"><thead><tr><th>Товар</th><th>Изменение</th><th>Причина</th><th>Дата</th></tr></thead><tbody>{% for m in movements %}<tr><td>{{ m.product.name }}</td><td>{% if m.change > 0 %}<span class="badge bg-success">+{{ m.change }}</span>{% else %}<span class="badge bg-danger">{{ m.change }}</span>{% endif %}</td><td>{{ m.get_reason_display }}</td><td>{{ m.created_at|date:"d.m.Y H:i" }}</td></tr>{% endfor %}</tbody></table>{% else %}<div class="alert alert-info">Операций не найдено.</div>{% endif %}</div></div>
{% endblock %}

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Новое резервирование{% endblock %}
{% block breadcrumb_current %}Резервирования{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">Резервирование товара</h4></div><div class="card-body"><form method="post">{% csrf_token %}<div class="mb-3"><label class="form-label">{{ form.product.label }} *</label>{{ form.product }}</div><div class="mb-3"><label class="form-label">{{ form.warehouse.label }} *</label>{{ form.warehouse }}</div><div class="mb-3"><label class="form-label">{{ form.quantity.label }} *</label>{{ form.quantity|smart_quantity }}</div><div class="mb-3"><label class="form-label">{{ form.order_item.label }}</label>{{ form.order_item }}</div><div class="d-flex gap-2"><button type="submit" class="btn btn-primary">Сохранить</button><a href="{% url 'inventory:reservation-list' %}" class="btn btn-secondary">Отмена</a></div></form></div></div>
<style>select,input{width:100%;}</style>
{% endblock %}

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Резервирования{% endblock %}
{% block breadcrumb_current %}Резервирования{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">Активные резервирования <a href="{% url 'inventory:reservation-create' %}" class="btn btn-primary btn-sm float-end"><i class="bi bi-plus-circle"></i> Новое</a></h4></div><div class="card-body">{% if reservations %}<table class="table table-hover table-sm"><thead><tr><th>Товар</th><th>Кол-во</th><th>Склад</th><th>Зарезервировано</th><th class="text-end">Действия</th></tr></thead><tbody>{% for r in reservations %}<tr><td>{{ r.product.name }}</td><td>{{ r.quantity|smart_quantity }}</td><td>{{ r.warehouse.name }}</td><td>{{ r.reserved_at|date:"d.m.Y" }}</td><td class="text-end"><a href="{% url 'inventory:reservation-update' r.pk %}" class="btn btn-sm btn-outline-primary"><i class="bi bi-pencil"></i></a></td></tr>{% endfor %}</tbody></table>{% else %}<div class="alert alert-info">Резервирований не найдено.</div>{% endif %}</div></div>
{% endblock %}

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Изменение резервирования{% endblock %}
{% block breadcrumb_current %}Резервирования{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">Изменение статуса резервирования</h4></div><div class="card-body"><form method="post">{% csrf_token %}<div class="mb-3"><label class="form-label">{{ form.status.label }}</label>{{ form.status }}</div><div class="d-flex gap-2"><button type="submit" class="btn btn-primary">Сохранить</button><a href="{% url 'inventory:reservation-list' %}" class="btn btn-secondary">Отмена</a></div></form></div></div>
<style>select{width:100%;}</style>
{% endblock %}

View File

@@ -1,7 +1,8 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Отмена продажи{% endblock %}
{% block breadcrumb_current %}Продажи{% endblock %}
{% block inventory_content %}
<div class="card border-danger">

View File

@@ -1,7 +1,8 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Детали продажи{% endblock %}
{% block breadcrumb_current %}Продажи{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,4 +1,4 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}
@@ -8,6 +8,7 @@
Новая продажа
{% endif %}
{% endblock %}
{% block breadcrumb_current %}Продажи{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,7 +1,8 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}История продаж{% endblock %}
{% block breadcrumb_current %}Продажи{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Остатки товара{% endblock %}
{% block breadcrumb_current %}Остатки{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">{{ stock.product.name }} на {{ stock.warehouse.name }}</h4></div><div class="card-body"><table class="table table-borderless"><tr><th>Товар:</th><td><strong>{{ stock.product.name }}</strong></td></tr><tr><th>Склад:</th><td>{{ stock.warehouse.name }}</td></tr><tr><th>Доступно:</th><td><strong>{{ stock.quantity_available|smart_quantity }} шт</strong></td></tr><tr><th>Зарезервировано:</th><td>{{ stock.quantity_reserved|smart_quantity }} шт</td></tr><tr><th>Свободно:</th><td><strong>{{ stock.quantity_free|smart_quantity }} шт</strong></td></tr><tr><th>Последнее обновление:</th><td>{{ stock.updated_at|date:"d.m.Y H:i" }}</td></tr></table><a href="{% url 'inventory:stock-list' %}" class="btn btn-secondary"><i class="bi bi-arrow-left"></i> Вернуться</a></div></div>
{% endblock %}

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Остатки товаров{% endblock %}
{% block breadcrumb_current %}Остатки{% endblock %}
{% block inventory_content %}<div class="card"><div class="card-header"><h4 class="mb-0">Остатки на складах</h4></div><div class="card-body">{% if stocks %}<table class="table table-hover table-sm"><thead><tr><th>Товар</th><th>Склад</th><th>Доступно</th><th>Зарезервировано</th><th>Свободно</th><th>Последний обновления</th></tr></thead><tbody>{% for stock in stocks %}<tr><td><a href="{% url 'inventory:stock-detail' stock.pk %}">{{ stock.product.name }}</a></td><td>{{ stock.warehouse.name }}</td><td>{{ stock.quantity_available|smart_quantity }}</td><td>{{ stock.quantity_reserved|smart_quantity }}</td><td><strong>{{ stock.quantity_free|smart_quantity }}</strong></td><td>{{ stock.updated_at|date:"d.m.Y H:i" }}</td></tr>{% endfor %}</tbody></table>{% else %}<div class="alert alert-info">Остатки не найдены.</div>{% endif %}</div></div>
{% endblock %}

View File

@@ -1,4 +1,5 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Отмена перемещения{% endblock %}
{% block breadcrumb_current %}Перемещения{% endblock %}
{% block inventory_content %}<div class="card border-danger"><div class="card-header bg-danger text-white"><h4 class="mb-0">Подтверждение</h4></div><div class="card-body"><div class="alert alert-warning"><i class="bi bi-exclamation-triangle"></i> Отменить перемещение товара?</div><form method="post">{% csrf_token %}<div class="d-flex gap-2"><button type="submit" class="btn btn-danger">Подтвердить</button><a href="{% url 'inventory:transfer-list' %}" class="btn btn-secondary">Отмена</a></div></form></div></div>
{% endblock %}

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Перемещение товара{% endblock %}
{% block breadcrumb_current %}Перемещения{% endblock %}
{% block inventory_content %}
<div class="card"><div class="card-header"><h4 class="mb-0">Перемещение товара</h4></div><div class="card-body"><form method="post">{% csrf_token %}<div class="mb-3"><label class="form-label">{{ form.batch.label }} *</label>{{ form.batch }}</div><div class="mb-3"><label class="form-label">{{ form.from_warehouse.label }} *</label>{{ form.from_warehouse }}</div><div class="mb-3"><label class="form-label">{{ form.to_warehouse.label }} *</label>{{ form.to_warehouse }}</div><div class="mb-3"><label class="form-label">{{ form.quantity.label }} *</label>{{ form.quantity|smart_quantity }}</div><div class="mb-3"><label class="form-label">{{ form.document_number.label }}</label>{{ form.document_number }}</div><div class="d-flex gap-2"><button type="submit" class="btn btn-primary">Сохранить</button><a href="{% url 'inventory:transfer-list' %}" class="btn btn-secondary">Отмена</a></div></form></div></div>
<style>select,textarea,input{width:100%;}</style>

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}Перемещение товаров{% endblock %}
{% block breadcrumb_current %}Перемещения{% endblock %}
{% block inventory_content %}
<div class="card">
<div class="card-header">

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Архивирование склада{% endblock %}
{% block breadcrumb_current %}Склады{% endblock %}
{% block inventory_content %}
<div class="card border-warning">

View File

@@ -1,4 +1,4 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}
{% if form.instance.pk %}
@@ -7,6 +7,7 @@
Создание нового склада
{% endif %}
{% endblock %}
{% block breadcrumb_current %}Склады{% endblock %}
{% block inventory_content %}
<div class="card">

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Управление складами{% endblock %}
{% block breadcrumb_current %}Склады{% endblock %}
{% block inventory_content %}
<!-- Скрытое поле для CSRF токена (нужно для AJAX запросов) -->

View File

@@ -1,5 +1,6 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% block inventory_title %}Отмена списания{% endblock %}
{% block breadcrumb_current %}Списания{% endblock %}
{% block inventory_content %}
<div class="card border-danger">
<div class="card-header bg-danger text-white"><h4 class="mb-0">Подтверждение отмены</h4></div>

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}{% if form.instance.pk %}Редактирование списания{% else %}Новое списание{% endif %}{% endblock %}
{% block breadcrumb_current %}Списания{% endblock %}
{% block inventory_content %}
<div class="card">
<div class="card-header"><h4 class="mb-0">{% if form.instance.pk %}Редактирование{% else %}Создание{% endif %} списания</h4></div>

View File

@@ -1,6 +1,7 @@
{% extends 'inventory/base_inventory.html' %}
{% extends 'inventory/base_inventory_minimal.html' %}
{% load inventory_filters %}
{% block inventory_title %}История списаний{% endblock %}
{% block breadcrumb_current %}Списания{% endblock %}
{% block inventory_content %}
<div class="card">
<div class="card-header d-flex justify-content-between align-items-center">