From 7644617af0b969316473fe7d4b1a5c35f353f86d Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Wed, 9 May 2018 00:17:39 +1000
Subject: [PATCH] Better string formatting for models

Allows for easier searching in drop-downs for ForeignKeys
---
 InvenTree/company/models.py                   |  2 +-
 .../templates/company/detail_part.html        | 23 +++++++++++++++----
 .../company/templates/company/partdetail.html |  2 +-
 InvenTree/part/models.py                      |  7 +-----
 4 files changed, 21 insertions(+), 13 deletions(-)

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' %}
 
-<h3>Company Parts</h3>
+<div class='row'>
+    <div class='col-sm-6'>
+        <h3>Supplier Parts</h3>
+    </div>
+    <div class='col-sm-6'>
+        <h3 class='float-right'>
+            <button class="btn btn-success" id='part-create'>New Supplier Part</button>
+            <div class="dropdown" style="float: right;">
+                <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
+                <span class="caret"></span></button>
+                <ul class="dropdown-menu">
+                </ul>
+            </div>
+        </h3>
+    </div>
+</div>
+
+<hr>
 
 <table clas='table table-striped table-condensed' id='part-table'>
 </table>
 
-<div class='container-fluid'>
-<button class="btn btn-success" id='part-create'>New Supplier Part</button>
-</div>
-
 {% 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 @@
 <div class='row'>
     <div class='col-sm-6'>
         <h3>Supplier Part</h3>
-        <p>{{ part.SKU }} - <a href="{% url 'company-detail' part.supplier.id %}">{{ part.supplier.name }}</a></p>
+        <p>{{ part.SKU }} - <a href="{% url 'company-detail-parts' part.supplier.id %}">{{ part.supplier.name }}</a></p>
     </div>
     <div class='col-sm-6'>
         <h3>
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"