From ad977d4d26df8e9d8cacd35585113735f2fa13d2 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 8 Aug 2020 16:54:09 +1000
Subject: [PATCH 1/3] Add default ordering for Company model

- Now will sort by "name" in choice fields, etc
---
 InvenTree/company/models.py | 3 +++
 InvenTree/part/models.py    | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py
index 2179897263..7c059782fb 100644
--- a/InvenTree/company/models.py
+++ b/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'))
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 01768b4bb3..6ec3f2cfea 100644
--- a/InvenTree/part/models.py
+++ b/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')

From a7ee3230350fe724520d0d0f683d14ec2c9f11b5 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 8 Aug 2020 16:59:48 +1000
Subject: [PATCH 2/3] PEP fix

---
 InvenTree/company/models.py | 2 +-
 InvenTree/part/models.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py
index 7c059782fb..a06ddd94bf 100644
--- a/InvenTree/company/models.py
+++ b/InvenTree/company/models.py
@@ -80,7 +80,7 @@ class Company(models.Model):
     """
 
     class Meta:
-        ordering = ['name',]
+        ordering = ['name', ]
 
     name = models.CharField(max_length=100, blank=False, unique=True,
                             help_text=_('Company name'),
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 6ec3f2cfea..308808fbdd 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -239,7 +239,7 @@ class Part(MPTTModel):
     class Meta:
         verbose_name = _("Part")
         verbose_name_plural = _("Parts")
-        ordering = ['name',]
+        ordering = ['name', ]
 
     class MPTTMeta:
         # For legacy reasons the 'variant_of' field is used to indicate the MPTT parent

From 19c036f50abdc887eef25e569dd0664da9502c7c Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 8 Aug 2020 17:16:04 +1000
Subject: [PATCH 3/3] Add migration files

---
 .../migrations/0023_auto_20200808_0715.py       | 17 +++++++++++++++++
 .../part/migrations/0047_auto_20200808_0715.py  | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 InvenTree/company/migrations/0023_auto_20200808_0715.py
 create mode 100644 InvenTree/part/migrations/0047_auto_20200808_0715.py

diff --git a/InvenTree/company/migrations/0023_auto_20200808_0715.py b/InvenTree/company/migrations/0023_auto_20200808_0715.py
new file mode 100644
index 0000000000..22097e8e2b
--- /dev/null
+++ b/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']},
+        ),
+    ]
diff --git a/InvenTree/part/migrations/0047_auto_20200808_0715.py b/InvenTree/part/migrations/0047_auto_20200808_0715.py
new file mode 100644
index 0000000000..4fc3d5a7d9
--- /dev/null
+++ b/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'},
+        ),
+    ]