diff --git a/myproject/discounts/templates/discounts/discount_form.html b/myproject/discounts/templates/discounts/discount_form.html
index 557823b..1e9bedd 100644
--- a/myproject/discounts/templates/discounts/discount_form.html
+++ b/myproject/discounts/templates/discounts/discount_form.html
@@ -33,13 +33,13 @@
                         <div class="col-md-6">
                             <label for="id_name" class="form-label">Название * <span class="text-muted small">(макс. 200 символов)</span></label>
                             <input type="text" class="form-control" id="id_name" name="name"
-                                   value="{% if form.name.value %}{{ form.name.value }}{% endif %}"
+                                   value="{% if form.instance.pk %}{{ form.instance.name|default_if_none:'' }}{% else %}{{ form.name.value|default_if_none:'' }}{% endif %}"
                                    maxlength="200" required>
                         </div>
                         <div class="col-md-6">
                             <label for="id_priority" class="form-label">Приоритет</label>
                             <input type="number" class="form-control" id="id_priority" name="priority"
-                                   value="{% if form.priority.value %}{{ form.priority.value }}{% else %}0{% endif %}"
+                                   value="{% if form.instance.pk %}{{ form.instance.priority|default_if_none:0 }}{% else %}{{ form.priority.value|default_if_none:0 }}{% endif %}"
                                    min="0">
                             <div class="form-text">Выше = применяется раньше</div>
                         </div>
@@ -47,7 +47,7 @@
 
                     <div class="mb-3">
                         <label for="id_description" class="form-label">Описание</label>
-                        <textarea class="form-control" id="id_description" name="description" rows="2">{{ form.description.value }}</textarea>
+                        <textarea class="form-control" id="id_description" name="description" rows="2">{% if form.instance.pk %}{{ form.instance.description|default_if_none:'' }}{% else %}{{ form.description.value|default_if_none:'' }}{% endif %}</textarea>
                     </div>
 
                     <!-- Параметры скидки -->
@@ -57,23 +57,28 @@
                             <label for="id_discount_type" class="form-label">Тип скидки *</label>
                             <select class="form-select" id="id_discount_type" name="discount_type" required>
                                 <option value="">Выберите...</option>
-                                <option value="percentage" {% if form.discount_type.value == 'percentage' %}selected{% endif %}>Процент</option>
-                                <option value="fixed_amount" {% if form.discount_type.value == 'fixed_amount' %}selected{% endif %}>Фиксированная сумма (руб.)</option>
+                                <option value="percentage"
+                                    {% if form.instance.pk and form.instance.discount_type == 'percentage' or form.discount_type.value == 'percentage' %}selected{% endif %}>Процент</option>
+                                <option value="fixed_amount"
+                                    {% if form.instance.pk and form.instance.discount_type == 'fixed_amount' or form.discount_type.value == 'fixed_amount' %}selected{% endif %}>Фиксированная сумма (руб.)</option>
                             </select>
                         </div>
                         <div class="col-md-4">
                             <label for="id_value" class="form-label">Значение *</label>
                             <input type="number" class="form-control" id="id_value" name="value"
-                                   value="{{ form.value.value|default:'' }}"
+                                   value="{% if form.instance.pk %}{{ form.instance.value|default_if_none:'' }}{% else %}{{ form.value.value|default_if_none:'' }}{% endif %}"
                                    step="0.01" min="0" required>
                         </div>
                         <div class="col-md-4">
                             <label for="id_scope" class="form-label">Область действия *</label>
                             <select class="form-select" id="id_scope" name="scope" required>
                                 <option value="">Выберите...</option>
-                                <option value="order" {% if form.scope.value == 'order' %}selected{% endif %}>На весь заказ</option>
-                                <option value="product" {% if form.scope.value == 'product' %}selected{% endif %}>На конкретные товары</option>
-                                <option value="category" {% if form.scope.value == 'category' %}selected{% endif %}>На категории товаров</option>
+                                <option value="order"
+                                    {% if form.instance.pk and form.instance.scope == 'order' or form.scope.value == 'order' %}selected{% endif %}>На весь заказ</option>
+                                <option value="product"
+                                    {% if form.instance.pk and form.instance.scope == 'product' or form.scope.value == 'product' %}selected{% endif %}>На конкретные товары</option>
+                                <option value="category"
+                                    {% if form.instance.pk and form.instance.scope == 'category' or form.scope.value == 'category' %}selected{% endif %}>На категории товаров</option>
                             </select>
                         </div>
                     </div>
@@ -82,7 +87,7 @@
                         <div class="col-md-6">
                             <div class="form-check form-switch mt-4">
                                 <input class="form-check-input" type="checkbox" id="id_is_auto" name="is_auto"
-                                       {% if form.is_auto.value %}checked{% endif %}>
+                                       {% if form.instance.pk and form.instance.is_auto or form.is_auto.value %}checked{% endif %}>
                                 <label class="form-check-label" for="id_is_auto">
                                     Автоматическое применение
                                 </label>
@@ -92,7 +97,7 @@
                         <div class="col-md-6">
                             <div class="form-check form-switch mt-4">
                                 <input class="form-check-input" type="checkbox" id="id_is_active" name="is_active"
-                                       {% if form.is_active.value is None or form.is_active.value %}checked{% endif %}>
+                                       {% if form.instance.pk and form.instance.is_active != False or form.is_active.value != False %}checked{% endif %}>
                                 <label class="form-check-label" for="id_is_active">
                                     Активна
                                 </label>
@@ -104,13 +109,16 @@
                     <div class="mb-3">
                         <label for="id_combine_mode" class="form-label">Режим объединения с другими скидками</label>
                         <select class="form-select" id="id_combine_mode" name="combine_mode">
-                            <option value="max_only" {% if form.combine_mode.value == 'max_only' or not form.combine_mode.value %}selected{% endif %}>
+                            <option value="max_only"
+                                {% if form.instance.pk and form.instance.combine_mode == 'max_only' or not form.instance.pk and form.combine_mode.value == 'max_only' or not form.combine_mode.value %}selected{% endif %}>
                                 🏆 Только максимум (применяется лучшая скидка)
                             </option>
-                            <option value="stack" {% if form.combine_mode.value == 'stack' %}selected{% endif %}>
+                            <option value="stack"
+                                {% if form.instance.pk and form.instance.combine_mode == 'stack' or not form.instance.pk and form.combine_mode.value == 'stack' %}selected{% endif %}>
                                 📚 Складывать (суммировать с другими)
                             </option>
-                            <option value="exclusive" {% if form.combine_mode.value == 'exclusive' %}selected{% endif %}>
+                            <option value="exclusive"
+                                {% if form.instance.pk and form.instance.combine_mode == 'exclusive' or not form.instance.pk and form.combine_mode.value == 'exclusive' %}selected{% endif %}>
                                 🚫 Исключающая (отменяет остальные скидки)
                             </option>
                         </select>
@@ -123,14 +131,14 @@
                         <div class="col-md-6">
                             <label for="id_min_order_amount" class="form-label">Мин. сумма заказа</label>
                             <input type="number" class="form-control" id="id_min_order_amount" name="min_order_amount"
-                                   value="{{ form.min_order_amount.value|default:'' }}"
+                                   value="{% if form.instance.pk %}{{ form.instance.min_order_amount|default_if_none:'' }}{% else %}{{ form.min_order_amount.value|default_if_none:'' }}{% endif %}"
                                    step="0.01" min="0">
                             <div class="form-text">Для скидок на заказ</div>
                         </div>
                         <div class="col-md-6">
                             <label for="id_max_usage_count" class="form-label">Макс. использований</label>
                             <input type="number" class="form-control" id="id_max_usage_count" name="max_usage_count"
-                                   value="{{ form.max_usage_count.value|default:'' }}"
+                                   value="{% if form.instance.pk %}{{ form.instance.max_usage_count|default_if_none:'' }}{% else %}{{ form.max_usage_count.value|default_if_none:'' }}{% endif %}"
                                    min="1">
                             <div class="form-text">Оставьте пустым для безлимитного использования</div>
                         </div>
@@ -140,12 +148,12 @@
                         <div class="col-md-6">
                             <label for="id_start_date" class="form-label">Дата начала</label>
                             <input type="datetime-local" class="form-control" id="id_start_date" name="start_date"
-                                   value="{% if form.start_date.value %}{{ form.start_date.value|date:'Y-m-d\TH:i' }}{% endif %}">
+                                   value="{% if form.instance.pk and form.instance.start_date %}{{ form.instance.start_date|date:'Y-m-d\TH:i' }}{% elif form.start_date.value %}{{ form.start_date.value|date:'Y-m-d\TH:i' }}{% endif %}">
                         </div>
                         <div class="col-md-6">
                             <label for="id_end_date" class="form-label">Дата окончания</label>
                             <input type="datetime-local" class="form-control" id="id_end_date" name="end_date"
-                                   value="{% if form.end_date.value %}{{ form.end_date.value|date:'Y-m-d\TH:i' }}{% endif %}">
+                                   value="{% if form.instance.pk and form.instance.end_date %}{{ form.instance.end_date|date:'Y-m-d\TH:i' }}{% elif form.end_date.value %}{{ form.end_date.value|date:'Y-m-d\TH:i' }}{% endif %}">
                         </div>
                     </div>
 
@@ -174,7 +182,6 @@
                             {% if not all_categories %}
                             <option value="" disabled>Нет доступных категорий</option>
                             {% endif %}
-                            %}
                         </select>
                         <div class="form-text">Удерживайте Ctrl для выбора нескольких категорий</div>
                     </div>