some fixes

haikalbot/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Generated by Django 4.2.17 on 2025-01-13 08:40
-=======
 # Generated by Django 5.1.4 on 2025-01-12 17:20
->>>>>>> 3889fed781038764cbb5e2e895a933edb4ebb451
 
 from django.db import migrations, models
 

inventory/migrations/0003_alter_carmake_car_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.17 on 2025-01-14 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0002_alter_carmake_car_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='carmake',
+            name='car_type',
+            field=models.SmallIntegerField(blank=True, choices=[(1, 'Car'), (2, 'Light Commercial'), (3, 'Heavy-Duty Tractors'), (4, 'Trailers'), (5, 'Medium Trucks'), (6, 'Buses'), (20, 'Motorcycles'), (21, 'Buggy'), (22, 'Moto ATV'), (23, 'Scooters'), (24, 'Karting'), (25, 'ATV'), (26, 'Snowmobiles')], null=True),
+        ),
+    ]

inventory/models.py

@@ -48,9 +48,6 @@ class StaffUserManager(UserManager):
         Staff.objects.create(user=user, name=name, arabic_name=arabic_name, phone_number=phone_number, staff_type=staff_type, **extra_fields)
         return user
     
-class CarType(models.TextChoices):
-    pass
-
 class UnitOfMeasure(models.TextChoices):
         EACH = 'EA', 'Each'
         PAIR = 'PR', 'Pair'