Fix migration conflicts

This commit is contained in:
Oliver Walters 2026-07-04 12:40:27 +00:00
parent c86f36e555
commit 592a4ab357
9 changed files with 9 additions and 9 deletions

View File

@ -7,7 +7,7 @@ class Migration(migrations.Migration):
dependencies = [
("build", "0059_build_tags"),
("common", "0048_remove_notesimage_model_id_and_more")
("common", "0049_remove_notesimage_model_id_and_more")
]
operations = [

View File

@ -10,7 +10,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("common", "0045_projectcode_active"),
("common", "0046_alter_emailmessage_global_id_and_more"),
("contenttypes", "0002_remove_content_type_name"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

View File

@ -123,7 +123,7 @@ class Migration(migrations.Migration):
# Ensure that each app which supports 'notes' is up-to-date first
dependencies = [
("build", "0059_build_tags"),
("common", "0046_note"),
("common", "0047_note"),
("company", "0079_auto_20260212_1054"),
("order", "0119_transferorderlineitem_line_int"),
("part", "0150_part_maximum_stock"),

View File

@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("common", "0047_auto_20260525_0956"),
("common", "0048_auto_20260525_0956"),
]
operations = [

View File

@ -308,7 +308,7 @@ class TestNoteMigrations(MigratorTestCase):
('part', '0150_part_maximum_stock'),
('stock', '0123_remove_stockitem_review_needed'),
]
migrate_to = ('common', '0048_remove_notesimage_model_id_and_more')
migrate_to = ('common', '0049_remove_notesimage_model_id_and_more')
def generate_image(self, name: str):
"""Generate a dummy image file for upload."""

View File

@ -7,7 +7,7 @@ class Migration(migrations.Migration):
dependencies = [
("company", "0080_company_tags"),
("common", "0048_remove_notesimage_model_id_and_more")
("common", "0049_remove_notesimage_model_id_and_more")
]
operations = [

View File

@ -7,7 +7,7 @@ class Migration(migrations.Migration):
dependencies = [
("order", "0120_purchaseorder_tags_returnorder_tags_salesorder_tags_and_more"),
("common", "0048_remove_notesimage_model_id_and_more")
("common", "0049_remove_notesimage_model_id_and_more")
]
operations = [

View File

@ -7,7 +7,7 @@ class Migration(migrations.Migration):
dependencies = [
("part", "0150_part_maximum_stock"),
("common", "0048_remove_notesimage_model_id_and_more")
("common", "0049_remove_notesimage_model_id_and_more")
]
operations = [

View File

@ -7,7 +7,7 @@ class Migration(migrations.Migration):
dependencies = [
("stock", "0123_remove_stockitem_review_needed"),
("common", "0048_remove_notesimage_model_id_and_more")
("common", "0049_remove_notesimage_model_id_and_more")
]
operations = [