From ad977d4d26df8e9d8cacd35585113735f2fa13d2 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sat, 8 Aug 2020 16:54:09 +1000 Subject: [PATCH] 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')