Andrey Smakotin
6c8af5ab2c
Исправлены 4 проблемы: 1. Расчёт цены первого товара - улучшена валидация в getProductPrice и calculateFinalPrice 2. Отображение actual_price в Select2 вместо обычной цены 3. Количество по умолчанию = 1 для новых форм компонентов 4. Auto-select текста при клике на поле количества для удобства редактирования Изменённые файлы: - products/forms.py: добавлен __init__ в KitItemForm для quantity.initial = 1 - products/templates/includes/select2-product-init.html: обновлена formatSelectResult - products/templates/productkit_create.html: добавлен focus handler для auto-select - products/templates/productkit_edit.html: добавлен focus handler для auto-select 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com>
318 lines
22 KiB
Python
318 lines
22 KiB
Python
# Generated by Django 5.0.10 on 2025-10-30 21:24
|
||
|
||
import django.db.models.deletion
|
||
from django.db import migrations, models
|
||
|
||
|
||
class Migration(migrations.Migration):
|
||
|
||
initial = True
|
||
|
||
dependencies = [
|
||
('orders', '0001_initial'),
|
||
('products', '0001_initial'),
|
||
]
|
||
|
||
operations = [
|
||
migrations.CreateModel(
|
||
name='Inventory',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата инвентаризации')),
|
||
('status', models.CharField(choices=[('draft', 'Черновик'), ('processing', 'В обработке'), ('completed', 'Завершена')], default='draft', max_length=20, verbose_name='Статус')),
|
||
('conducted_by', models.CharField(blank=True, max_length=200, null=True, verbose_name='Провел инвентаризацию')),
|
||
('notes', models.TextField(blank=True, null=True, verbose_name='Примечания')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Инвентаризация',
|
||
'verbose_name_plural': 'Инвентаризации',
|
||
'ordering': ['-date'],
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='InventoryLine',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity_system', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество в системе')),
|
||
('quantity_fact', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Фактическое количество')),
|
||
('difference', models.DecimalField(decimal_places=3, default=0, editable=False, max_digits=10, verbose_name='Разница (факт - система)')),
|
||
('processed', models.BooleanField(default=False, verbose_name='Обработана (создана операция)')),
|
||
('inventory', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lines', to='inventory.inventory', verbose_name='Инвентаризация')),
|
||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.product', verbose_name='Товар')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Строка инвентаризации',
|
||
'verbose_name_plural': 'Строки инвентаризации',
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='Sale',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество')),
|
||
('sale_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='Цена продажи')),
|
||
('document_number', models.CharField(blank=True, max_length=100, null=True, verbose_name='Номер документа')),
|
||
('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата операции')),
|
||
('processed', models.BooleanField(default=False, verbose_name='Обработана (FIFO применена)')),
|
||
('order', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sales', to='orders.order', verbose_name='Заказ')),
|
||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sales', to='products.product', verbose_name='Товар')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Продажа',
|
||
'verbose_name_plural': 'Продажи',
|
||
'ordering': ['-date'],
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='StockBatch',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество')),
|
||
('cost_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='Закупочная цена')),
|
||
('is_active', models.BooleanField(default=True, verbose_name='Активна')),
|
||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||
('updated_at', models.DateTimeField(auto_now=True, verbose_name='Дата обновления')),
|
||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stock_batches', to='products.product', verbose_name='Товар')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Партия товара',
|
||
'verbose_name_plural': 'Партии товаров',
|
||
'ordering': ['created_at'],
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='SaleBatchAllocation',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество')),
|
||
('cost_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='Закупочная цена')),
|
||
('sale', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='batch_allocations', to='inventory.sale', verbose_name='Продажа')),
|
||
('batch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sale_allocations', to='inventory.stockbatch', verbose_name='Партия')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Распределение продажи по партиям',
|
||
'verbose_name_plural': 'Распределения продаж по партиям',
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='Warehouse',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('name', models.CharField(max_length=200, verbose_name='Название')),
|
||
('description', models.TextField(blank=True, null=True, verbose_name='Описание')),
|
||
('is_active', models.BooleanField(default=True, verbose_name='Активен')),
|
||
('is_default', models.BooleanField(default=False, help_text='Автоматически выбирается при создании новых документов', verbose_name='Склад по умолчанию')),
|
||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||
('updated_at', models.DateTimeField(auto_now=True, verbose_name='Дата обновления')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Склад',
|
||
'verbose_name_plural': 'Склады',
|
||
'indexes': [models.Index(fields=['is_active'], name='inventory_w_is_acti_3ddeac_idx'), models.Index(fields=['is_default'], name='inventory_w_is_defa_4b7615_idx')],
|
||
},
|
||
),
|
||
migrations.AddField(
|
||
model_name='stockbatch',
|
||
name='warehouse',
|
||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stock_batches', to='inventory.warehouse', verbose_name='Склад'),
|
||
),
|
||
migrations.CreateModel(
|
||
name='Stock',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity_available', models.DecimalField(decimal_places=3, default=0, editable=False, max_digits=10, verbose_name='Доступное количество')),
|
||
('quantity_reserved', models.DecimalField(decimal_places=3, default=0, editable=False, max_digits=10, verbose_name='Зарезервированное количество')),
|
||
('updated_at', models.DateTimeField(auto_now=True, verbose_name='Дата обновления')),
|
||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stocks', to='products.product', verbose_name='Товар')),
|
||
('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stocks', to='inventory.warehouse', verbose_name='Склад')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Остаток на складе',
|
||
'verbose_name_plural': 'Остатки на складе',
|
||
},
|
||
),
|
||
migrations.AddField(
|
||
model_name='sale',
|
||
name='warehouse',
|
||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sales', to='inventory.warehouse', verbose_name='Склад'),
|
||
),
|
||
migrations.CreateModel(
|
||
name='Reservation',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество')),
|
||
('status', models.CharField(choices=[('reserved', 'Зарезервирован'), ('released', 'Освобожден'), ('converted_to_sale', 'Преобразован в продажу')], default='reserved', max_length=20, verbose_name='Статус')),
|
||
('reserved_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата резервирования')),
|
||
('released_at', models.DateTimeField(blank=True, null=True, verbose_name='Дата освобождения')),
|
||
('converted_at', models.DateTimeField(blank=True, null=True, verbose_name='Дата преобразования в продажу')),
|
||
('order_item', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reservations', to='orders.orderitem', verbose_name='Позиция заказа')),
|
||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reservations', to='products.product', verbose_name='Товар')),
|
||
('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reservations', to='inventory.warehouse', verbose_name='Склад')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Резервирование',
|
||
'verbose_name_plural': 'Резервирования',
|
||
'ordering': ['-reserved_at'],
|
||
},
|
||
),
|
||
migrations.AddField(
|
||
model_name='inventory',
|
||
name='warehouse',
|
||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='inventories', to='inventory.warehouse', verbose_name='Склад'),
|
||
),
|
||
migrations.CreateModel(
|
||
name='IncomingBatch',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('document_number', models.CharField(db_index=True, max_length=100, unique=True, verbose_name='Номер документа')),
|
||
('supplier_name', models.CharField(blank=True, max_length=200, null=True, verbose_name='Наименование поставщика')),
|
||
('notes', models.TextField(blank=True, null=True, verbose_name='Примечания')),
|
||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||
('updated_at', models.DateTimeField(auto_now=True, verbose_name='Дата обновления')),
|
||
('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='incoming_batches', to='inventory.warehouse', verbose_name='Склад')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Партия поступления',
|
||
'verbose_name_plural': 'Партии поступлений',
|
||
'ordering': ['-created_at'],
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='WriteOff',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество')),
|
||
('reason', models.CharField(choices=[('damage', 'Повреждение'), ('spoilage', 'Порча'), ('shortage', 'Недостача'), ('inventory', 'Инвентаризационная недостача'), ('other', 'Другое')], default='other', max_length=20, verbose_name='Причина')),
|
||
('cost_price', models.DecimalField(decimal_places=2, editable=False, max_digits=10, verbose_name='Закупочная цена')),
|
||
('document_number', models.CharField(blank=True, max_length=100, null=True, verbose_name='Номер документа')),
|
||
('notes', models.TextField(blank=True, null=True, verbose_name='Примечания')),
|
||
('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата операции')),
|
||
('batch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='writeoffs', to='inventory.stockbatch', verbose_name='Партия')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Списание',
|
||
'verbose_name_plural': 'Списания',
|
||
'ordering': ['-date'],
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='Incoming',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество')),
|
||
('cost_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='Закупочная цена')),
|
||
('notes', models.TextField(blank=True, null=True, verbose_name='Примечания')),
|
||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='incomings', to='products.product', verbose_name='Товар')),
|
||
('batch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='inventory.incomingbatch', verbose_name='Партия')),
|
||
('stock_batch', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='incomings', to='inventory.stockbatch', verbose_name='Складская партия')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Товар в поступлении',
|
||
'verbose_name_plural': 'Товары в поступлениях',
|
||
'ordering': ['-created_at'],
|
||
'indexes': [models.Index(fields=['batch'], name='inventory_i_batch_i_c50b63_idx'), models.Index(fields=['product'], name='inventory_i_product_39b00d_idx'), models.Index(fields=['-created_at'], name='inventory_i_created_563ec0_idx')],
|
||
'unique_together': {('batch', 'product')},
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='StockMovement',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('change', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Изменение')),
|
||
('reason', models.CharField(choices=[('purchase', 'Закупка'), ('sale', 'Продажа'), ('write_off', 'Списание'), ('adjustment', 'Корректировка')], max_length=20, verbose_name='Причина')),
|
||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||
('order', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_movements', to='orders.order', verbose_name='Заказ')),
|
||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movements', to='products.product', verbose_name='Товар')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Движение товара',
|
||
'verbose_name_plural': 'Движения товаров',
|
||
'indexes': [models.Index(fields=['product'], name='inventory_s_product_cbdc37_idx'), models.Index(fields=['created_at'], name='inventory_s_created_05ebf5_idx')],
|
||
},
|
||
),
|
||
migrations.CreateModel(
|
||
name='Transfer',
|
||
fields=[
|
||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||
('quantity', models.DecimalField(decimal_places=3, max_digits=10, verbose_name='Количество')),
|
||
('document_number', models.CharField(blank=True, max_length=100, null=True, verbose_name='Номер документа')),
|
||
('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата операции')),
|
||
('batch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='transfers', to='inventory.stockbatch', verbose_name='Партия')),
|
||
('new_batch', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='transfer_sources', to='inventory.stockbatch', verbose_name='Новая партия')),
|
||
('from_warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='transfers_from', to='inventory.warehouse', verbose_name='Из склада')),
|
||
('to_warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='transfers_to', to='inventory.warehouse', verbose_name='На склад')),
|
||
],
|
||
options={
|
||
'verbose_name': 'Перемещение',
|
||
'verbose_name_plural': 'Перемещения',
|
||
'ordering': ['-date'],
|
||
'indexes': [models.Index(fields=['from_warehouse', 'to_warehouse'], name='inventory_t_from_wa_578feb_idx'), models.Index(fields=['date'], name='inventory_t_date_e1402d_idx')],
|
||
},
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='stockbatch',
|
||
index=models.Index(fields=['product', 'warehouse'], name='inventory_s_product_022460_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='stockbatch',
|
||
index=models.Index(fields=['created_at'], name='inventory_s_created_10279b_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='stockbatch',
|
||
index=models.Index(fields=['is_active'], name='inventory_s_is_acti_0dd559_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='stock',
|
||
index=models.Index(fields=['product', 'warehouse'], name='inventory_s_product_112b63_idx'),
|
||
),
|
||
migrations.AlterUniqueTogether(
|
||
name='stock',
|
||
unique_together={('product', 'warehouse')},
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='sale',
|
||
index=models.Index(fields=['product', 'warehouse'], name='inventory_s_product_084314_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='sale',
|
||
index=models.Index(fields=['date'], name='inventory_s_date_8972d4_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='sale',
|
||
index=models.Index(fields=['order'], name='inventory_s_order_i_7d13ea_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='reservation',
|
||
index=models.Index(fields=['product', 'warehouse'], name='inventory_r_product_fa0d33_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='reservation',
|
||
index=models.Index(fields=['status'], name='inventory_r_status_806333_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='reservation',
|
||
index=models.Index(fields=['order_item'], name='inventory_r_order_i_ae991f_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='incomingbatch',
|
||
index=models.Index(fields=['document_number'], name='inventory_i_documen_679096_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='incomingbatch',
|
||
index=models.Index(fields=['warehouse'], name='inventory_i_warehou_cc3a73_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='incomingbatch',
|
||
index=models.Index(fields=['-created_at'], name='inventory_i_created_59ee8b_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='writeoff',
|
||
index=models.Index(fields=['batch'], name='inventory_w_batch_i_b098ce_idx'),
|
||
),
|
||
migrations.AddIndex(
|
||
model_name='writeoff',
|
||
index=models.Index(fields=['date'], name='inventory_w_date_70c7e3_idx'),
|
||
),
|
||
]
|