From 8deef2fa75dbbec442c279b648417337cf79d0bb Mon Sep 17 00:00:00 2001 From: Andrey Smakotin Date: Fri, 14 Nov 2025 00:33:26 +0300 Subject: [PATCH] =?UTF-8?q?refactor:=20=D0=9C=D0=B8=D0=B3=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D1=86=20=D0=BD=D0=B0=20=D0=BC=D0=B8?= =?UTF-8?q?=D0=BD=D0=B8=D0=BC=D0=B0=D0=BB=D0=B8=D1=81=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=8B=D0=B9?= =?UTF-8?q?=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Мигрированы все 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 --- .../inventory/allocation/allocation_list.html | 3 +- .../templates/inventory/base_inventory.html | 96 ------------------- .../inventory/batch/batch_detail.html | 3 +- .../templates/inventory/batch/batch_list.html | 3 +- .../incoming/incoming_bulk_form.html | 3 +- .../incoming/incoming_confirm_delete.html | 3 +- .../inventory/incoming/incoming_form.html | 3 +- .../inventory/incoming/incoming_list.html | 3 +- .../incoming_batch/batch_detail.html | 3 +- .../inventory/incoming_batch/batch_list.html | 3 +- .../inventory/inventory/inventory_detail.html | 3 +- .../inventory/inventory/inventory_form.html | 3 +- .../inventory/inventory_line_bulk_form.html | 3 +- .../inventory/movements/movement_list.html | 3 +- .../reservation/reservation_form.html | 3 +- .../reservation/reservation_list.html | 3 +- .../reservation/reservation_update.html | 3 +- .../inventory/sale/sale_confirm_delete.html | 3 +- .../templates/inventory/sale/sale_detail.html | 3 +- .../templates/inventory/sale/sale_form.html | 3 +- .../templates/inventory/sale/sale_list.html | 3 +- .../inventory/stock/stock_detail.html | 3 +- .../templates/inventory/stock/stock_list.html | 3 +- .../transfer/transfer_confirm_delete.html | 3 +- .../inventory/transfer/transfer_form.html | 3 +- .../inventory/transfer/transfer_list.html | 3 +- .../warehouse/warehouse_confirm_delete.html | 3 +- .../inventory/warehouse/warehouse_form.html | 3 +- .../inventory/warehouse/warehouse_list.html | 3 +- .../writeoff/writeoff_confirm_delete.html | 3 +- .../inventory/writeoff/writeoff_form.html | 3 +- .../inventory/writeoff/writeoff_list.html | 3 +- 32 files changed, 62 insertions(+), 127 deletions(-) delete mode 100644 myproject/inventory/templates/inventory/base_inventory.html diff --git a/myproject/inventory/templates/inventory/allocation/allocation_list.html b/myproject/inventory/templates/inventory/allocation/allocation_list.html index f7d64f3..f7ab729 100644 --- a/myproject/inventory/templates/inventory/allocation/allocation_list.html +++ b/myproject/inventory/templates/inventory/allocation/allocation_list.html @@ -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 %}

Распределение продаж по партиям (FIFO)

{% if allocations %}{% for a in allocations %}{% endfor %}
ПродажаТоварПартияКол-воЦенаДата
#{{ a.sale.id }}{{ a.sale.product.name }}#{{ a.batch.id }}{{ a.quantity|smart_quantity }}{{ a.cost_price }}{{ a.sale.date|date:"d.m.Y" }}
{% else %}
Распределений не найдено.
{% endif %}
{% endblock %} diff --git a/myproject/inventory/templates/inventory/base_inventory.html b/myproject/inventory/templates/inventory/base_inventory.html deleted file mode 100644 index 4b01735..0000000 --- a/myproject/inventory/templates/inventory/base_inventory.html +++ /dev/null @@ -1,96 +0,0 @@ -{% extends 'base.html' %} - -{% block title %}{% block inventory_title %}Склад{% endblock %}{% endblock %} - -{% block content %} -
-
- -
-
-
-
Управление складом
-
-
- - Главная - - - Склады - - - Приходы - - - Поступление товара - - - Партии поступлений - - - Продажи - - - Инвентаризация - - - Списания - - - Перемещения - -
-
- - -
-
-
Справочная информация
-
-
- - Остатки - - - Партии - - - Журнал - -
-
-
- - -
- {% block inventory_content %}{% endblock %} -
-
-
- - -{% endblock %} diff --git a/myproject/inventory/templates/inventory/batch/batch_detail.html b/myproject/inventory/templates/inventory/batch/batch_detail.html index b0fe20f..8baf93d 100644 --- a/myproject/inventory/templates/inventory/batch/batch_detail.html +++ b/myproject/inventory/templates/inventory/batch/batch_detail.html @@ -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 %}

Партия #{{ batch.id }}: {{ batch.product.name }}

Товар:{{ batch.product.name }}
Склад:{{ batch.warehouse.name }}
Количество:{{ batch.quantity|smart_quantity }} шт
Цена закупки:{{ batch.cost_price }} руб.
Создана:{{ batch.created_at|date:"d.m.Y H:i" }}
Статус:{% if batch.is_active %}Активна{% else %}Неактивна{% endif %}
История операций
История продаж и списаний этой партии.
Вернуться
{% endblock %} diff --git a/myproject/inventory/templates/inventory/batch/batch_list.html b/myproject/inventory/templates/inventory/batch/batch_list.html index b54e3b4..5dbaedf 100644 --- a/myproject/inventory/templates/inventory/batch/batch_list.html +++ b/myproject/inventory/templates/inventory/batch/batch_list.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/incoming/incoming_bulk_form.html b/myproject/inventory/templates/inventory/incoming/incoming_bulk_form.html index fe3cc84..0df1645 100644 --- a/myproject/inventory/templates/inventory/incoming/incoming_bulk_form.html +++ b/myproject/inventory/templates/inventory/incoming/incoming_bulk_form.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/incoming/incoming_confirm_delete.html b/myproject/inventory/templates/inventory/incoming/incoming_confirm_delete.html index 21a6f87..443abe8 100644 --- a/myproject/inventory/templates/inventory/incoming/incoming_confirm_delete.html +++ b/myproject/inventory/templates/inventory/incoming/incoming_confirm_delete.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/incoming/incoming_form.html b/myproject/inventory/templates/inventory/incoming/incoming_form.html index 482e7a0..75f812b 100644 --- a/myproject/inventory/templates/inventory/incoming/incoming_form.html +++ b/myproject/inventory/templates/inventory/incoming/incoming_form.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/incoming/incoming_list.html b/myproject/inventory/templates/inventory/incoming/incoming_list.html index b40916a..32cf03f 100644 --- a/myproject/inventory/templates/inventory/incoming/incoming_list.html +++ b/myproject/inventory/templates/inventory/incoming/incoming_list.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/incoming_batch/batch_detail.html b/myproject/inventory/templates/inventory/incoming_batch/batch_detail.html index 32a283c..2a89c08 100644 --- a/myproject/inventory/templates/inventory/incoming_batch/batch_detail.html +++ b/myproject/inventory/templates/inventory/incoming_batch/batch_detail.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/incoming_batch/batch_list.html b/myproject/inventory/templates/inventory/incoming_batch/batch_list.html index e9b9097..4bfb3d1 100644 --- a/myproject/inventory/templates/inventory/incoming_batch/batch_list.html +++ b/myproject/inventory/templates/inventory/incoming_batch/batch_list.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/inventory/inventory_detail.html b/myproject/inventory/templates/inventory/inventory/inventory_detail.html index 8d6a309..8cebe45 100644 --- a/myproject/inventory/templates/inventory/inventory/inventory_detail.html +++ b/myproject/inventory/templates/inventory/inventory/inventory_detail.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/inventory/inventory_form.html b/myproject/inventory/templates/inventory/inventory/inventory_form.html index 1fff69c..229ea60 100644 --- a/myproject/inventory/templates/inventory/inventory/inventory_form.html +++ b/myproject/inventory/templates/inventory/inventory/inventory_form.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/inventory/inventory_line_bulk_form.html b/myproject/inventory/templates/inventory/inventory/inventory_line_bulk_form.html index 7998206..152ed2e 100644 --- a/myproject/inventory/templates/inventory/inventory/inventory_line_bulk_form.html +++ b/myproject/inventory/templates/inventory/inventory/inventory_line_bulk_form.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/movements/movement_list.html b/myproject/inventory/templates/inventory/movements/movement_list.html index 178f065..cd60995 100644 --- a/myproject/inventory/templates/inventory/movements/movement_list.html +++ b/myproject/inventory/templates/inventory/movements/movement_list.html @@ -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 %}

Журнал всех складских операций

{% if movements %}{% for m in movements %}{% endfor %}
ТоварИзменениеПричинаДата
{{ m.product.name }}{% if m.change > 0 %}+{{ m.change }}{% else %}{{ m.change }}{% endif %}{{ m.get_reason_display }}{{ m.created_at|date:"d.m.Y H:i" }}
{% else %}
Операций не найдено.
{% endif %}
{% endblock %} diff --git a/myproject/inventory/templates/inventory/reservation/reservation_form.html b/myproject/inventory/templates/inventory/reservation/reservation_form.html index 860a215..fb8262a 100644 --- a/myproject/inventory/templates/inventory/reservation/reservation_form.html +++ b/myproject/inventory/templates/inventory/reservation/reservation_form.html @@ -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 %}

Резервирование товара

{% csrf_token %}
{{ form.product }}
{{ form.warehouse }}
{{ form.quantity|smart_quantity }}
{{ form.order_item }}
Отмена
{% endblock %} diff --git a/myproject/inventory/templates/inventory/reservation/reservation_list.html b/myproject/inventory/templates/inventory/reservation/reservation_list.html index e1b32d4..8e624fe 100644 --- a/myproject/inventory/templates/inventory/reservation/reservation_list.html +++ b/myproject/inventory/templates/inventory/reservation/reservation_list.html @@ -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 %}

Активные резервирования Новое

{% if reservations %}{% for r in reservations %}{% endfor %}
ТоварКол-воСкладЗарезервированоДействия
{{ r.product.name }}{{ r.quantity|smart_quantity }}{{ r.warehouse.name }}{{ r.reserved_at|date:"d.m.Y" }}
{% else %}
Резервирований не найдено.
{% endif %}
{% endblock %} diff --git a/myproject/inventory/templates/inventory/reservation/reservation_update.html b/myproject/inventory/templates/inventory/reservation/reservation_update.html index fef6528..be2d39e 100644 --- a/myproject/inventory/templates/inventory/reservation/reservation_update.html +++ b/myproject/inventory/templates/inventory/reservation/reservation_update.html @@ -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 %}

Изменение статуса резервирования

{% csrf_token %}
{{ form.status }}
Отмена
{% endblock %} diff --git a/myproject/inventory/templates/inventory/sale/sale_confirm_delete.html b/myproject/inventory/templates/inventory/sale/sale_confirm_delete.html index 08ef86a..e82c282 100644 --- a/myproject/inventory/templates/inventory/sale/sale_confirm_delete.html +++ b/myproject/inventory/templates/inventory/sale/sale_confirm_delete.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/sale/sale_detail.html b/myproject/inventory/templates/inventory/sale/sale_detail.html index 6b1148f..b838535 100644 --- a/myproject/inventory/templates/inventory/sale/sale_detail.html +++ b/myproject/inventory/templates/inventory/sale/sale_detail.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/sale/sale_form.html b/myproject/inventory/templates/inventory/sale/sale_form.html index c0f5cda..d30f50b 100644 --- a/myproject/inventory/templates/inventory/sale/sale_form.html +++ b/myproject/inventory/templates/inventory/sale/sale_form.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/sale/sale_list.html b/myproject/inventory/templates/inventory/sale/sale_list.html index 5689325..d6e3076 100644 --- a/myproject/inventory/templates/inventory/sale/sale_list.html +++ b/myproject/inventory/templates/inventory/sale/sale_list.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/stock/stock_detail.html b/myproject/inventory/templates/inventory/stock/stock_detail.html index 12ddb89..4ba145b 100644 --- a/myproject/inventory/templates/inventory/stock/stock_detail.html +++ b/myproject/inventory/templates/inventory/stock/stock_detail.html @@ -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 %}

{{ stock.product.name }} на {{ stock.warehouse.name }}

Товар:{{ stock.product.name }}
Склад:{{ stock.warehouse.name }}
Доступно:{{ stock.quantity_available|smart_quantity }} шт
Зарезервировано:{{ stock.quantity_reserved|smart_quantity }} шт
Свободно:{{ stock.quantity_free|smart_quantity }} шт
Последнее обновление:{{ stock.updated_at|date:"d.m.Y H:i" }}
Вернуться
{% endblock %} diff --git a/myproject/inventory/templates/inventory/stock/stock_list.html b/myproject/inventory/templates/inventory/stock/stock_list.html index 353fbf8..59b2e1f 100644 --- a/myproject/inventory/templates/inventory/stock/stock_list.html +++ b/myproject/inventory/templates/inventory/stock/stock_list.html @@ -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 %}

Остатки на складах

{% if stocks %}{% for stock in stocks %}{% endfor %}
ТоварСкладДоступноЗарезервированоСвободноПоследний обновления
{{ stock.product.name }}{{ stock.warehouse.name }}{{ stock.quantity_available|smart_quantity }}{{ stock.quantity_reserved|smart_quantity }}{{ stock.quantity_free|smart_quantity }}{{ stock.updated_at|date:"d.m.Y H:i" }}
{% else %}
Остатки не найдены.
{% endif %}
{% endblock %} diff --git a/myproject/inventory/templates/inventory/transfer/transfer_confirm_delete.html b/myproject/inventory/templates/inventory/transfer/transfer_confirm_delete.html index 8318384..7caf755 100644 --- a/myproject/inventory/templates/inventory/transfer/transfer_confirm_delete.html +++ b/myproject/inventory/templates/inventory/transfer/transfer_confirm_delete.html @@ -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 %}

Подтверждение

Отменить перемещение товара?
{% csrf_token %}
Отмена
{% endblock %} diff --git a/myproject/inventory/templates/inventory/transfer/transfer_form.html b/myproject/inventory/templates/inventory/transfer/transfer_form.html index bbe94b3..87f439e 100644 --- a/myproject/inventory/templates/inventory/transfer/transfer_form.html +++ b/myproject/inventory/templates/inventory/transfer/transfer_form.html @@ -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 %}

Перемещение товара

{% csrf_token %}
{{ form.batch }}
{{ form.from_warehouse }}
{{ form.to_warehouse }}
{{ form.quantity|smart_quantity }}
{{ form.document_number }}
Отмена
diff --git a/myproject/inventory/templates/inventory/transfer/transfer_list.html b/myproject/inventory/templates/inventory/transfer/transfer_list.html index 57e831a..941b0f9 100644 --- a/myproject/inventory/templates/inventory/transfer/transfer_list.html +++ b/myproject/inventory/templates/inventory/transfer/transfer_list.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/warehouse/warehouse_confirm_delete.html b/myproject/inventory/templates/inventory/warehouse/warehouse_confirm_delete.html index 6429e38..a25caaf 100644 --- a/myproject/inventory/templates/inventory/warehouse/warehouse_confirm_delete.html +++ b/myproject/inventory/templates/inventory/warehouse/warehouse_confirm_delete.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/warehouse/warehouse_form.html b/myproject/inventory/templates/inventory/warehouse/warehouse_form.html index caed441..992c492 100644 --- a/myproject/inventory/templates/inventory/warehouse/warehouse_form.html +++ b/myproject/inventory/templates/inventory/warehouse/warehouse_form.html @@ -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 %}
diff --git a/myproject/inventory/templates/inventory/warehouse/warehouse_list.html b/myproject/inventory/templates/inventory/warehouse/warehouse_list.html index 3cde7d0..bb7fbff 100644 --- a/myproject/inventory/templates/inventory/warehouse/warehouse_list.html +++ b/myproject/inventory/templates/inventory/warehouse/warehouse_list.html @@ -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 %} diff --git a/myproject/inventory/templates/inventory/writeoff/writeoff_confirm_delete.html b/myproject/inventory/templates/inventory/writeoff/writeoff_confirm_delete.html index 7150633..c6917d1 100644 --- a/myproject/inventory/templates/inventory/writeoff/writeoff_confirm_delete.html +++ b/myproject/inventory/templates/inventory/writeoff/writeoff_confirm_delete.html @@ -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 %}

Подтверждение отмены

diff --git a/myproject/inventory/templates/inventory/writeoff/writeoff_form.html b/myproject/inventory/templates/inventory/writeoff/writeoff_form.html index ed073c1..c7a070f 100644 --- a/myproject/inventory/templates/inventory/writeoff/writeoff_form.html +++ b/myproject/inventory/templates/inventory/writeoff/writeoff_form.html @@ -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 %}

{% if form.instance.pk %}Редактирование{% else %}Создание{% endif %} списания

diff --git a/myproject/inventory/templates/inventory/writeoff/writeoff_list.html b/myproject/inventory/templates/inventory/writeoff/writeoff_list.html index 0bb7c91..f15fbb1 100644 --- a/myproject/inventory/templates/inventory/writeoff/writeoff_list.html +++ b/myproject/inventory/templates/inventory/writeoff/writeoff_list.html @@ -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 %}