Merge pull request #896 from SchrodingersGat/company-ordering

Add default ordering for Company model

InvenTree/company/migrations/0023_auto_20200808_0715.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.7 on 2020-08-08 07:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0022_auto_20200613_1045'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='company',
+            options={'ordering': ['name']},
+        ),
+    ]

InvenTree/company/models.py

@@ -79,6 +79,9 @@ class Company(models.Model):
         is_manufacturer: boolean value, is this company a manufacturer
     """
 
+    class Meta:
+        ordering = ['name', ]
+
     name = models.CharField(max_length=100, blank=False, unique=True,
                             help_text=_('Company name'),
                             verbose_name=_('Company name'))

InvenTree/part/migrations/0047_auto_20200808_0715.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.7 on 2020-08-08 07:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0046_auto_20200804_0107'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='part',
+            options={'ordering': ['name'], 'verbose_name': 'Part', 'verbose_name_plural': 'Parts'},
+        ),
+    ]

InvenTree/part/models.py

@@ -71,8 +71,8 @@ class PartCategory(InvenTreeTree):
         return reverse('category-detail', kwargs={'pk': self.id})
 
     class Meta:
-        verbose_name = "Part Category"
-        verbose_name_plural = "Part Categories"
+        verbose_name = _("Part Category")
+        verbose_name_plural = _("Part Categories")
 
     def get_parts(self, cascade=True):
         """ Return a queryset for all parts under this category.
@@ -239,6 +239,7 @@ class Part(MPTTModel):
     class Meta:
         verbose_name = _("Part")
         verbose_name_plural = _("Parts")
+        ordering = ['name', ]
 
     class MPTTMeta:
         # For legacy reasons the 'variant_of' field is used to indicate the MPTT parent
@@ -1490,7 +1491,7 @@ class BomItem(models.Model):
             pass
 
     class Meta:
-        verbose_name = "BOM Item"
+        verbose_name = _("BOM Item")
 
         # Prevent duplication of parent/child rows
         unique_together = ('part', 'sub_part')