diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py index 875c8f58b7..940543f365 100644 --- a/InvenTree/company/models.py +++ b/InvenTree/company/models.py @@ -53,7 +53,7 @@ class Company(models.Model): is_supplier = models.BooleanField(default=True) def __str__(self): - return self.name + return "{n} - {d}".format(n=self.name, d=self.description) def get_absolute_url(self): return "/company/{id}/".format(id=self.id) diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html index 94412806e1..1de24d9d7e 100644 --- a/InvenTree/company/templates/company/detail_part.html +++ b/InvenTree/company/templates/company/detail_part.html @@ -4,15 +4,28 @@ {% include 'company/tabs.html' with tab='parts' %} -

Company Parts

+
+
+

Supplier Parts

+
+
+

+ + +

+
+
+ +
-
- -
- {% endblock %} {% block js_ready %} {{ block.super }} diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html index ec9972527d..b17fafebd6 100644 --- a/InvenTree/company/templates/company/partdetail.html +++ b/InvenTree/company/templates/company/partdetail.html @@ -5,7 +5,7 @@

Supplier Part

-

{{ part.SKU }} - {{ part.supplier.name }}

+

{{ part.SKU }} - {{ part.supplier.name }}

diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 316fbaee67..99541cf6d8 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -145,12 +145,7 @@ class Part(models.Model): notes = models.TextField(blank=True) def __str__(self): - if self.IPN: - return "{name} ({ipn})".format( - ipn=self.IPN, - name=self.name) - else: - return self.name + return "{n} - {d}".format(n=self.name, d=self.description) class Meta: verbose_name = "Part"