diff --git a/InvenTree/supplier/models.py b/InvenTree/supplier/models.py index e3d4a7546e..6cd9935be7 100644 --- a/InvenTree/supplier/models.py +++ b/InvenTree/supplier/models.py @@ -34,6 +34,7 @@ class SupplierPart(models.Model): description = models.CharField(max_length=250, blank=True) + def __str__(self): return "{mpn} - {supplier}".format( mpn = self.MPN, @@ -53,9 +54,10 @@ class SupplierPriceBreak(models.Model): currency = models.CharField(max_length=10, blank=True) + def __str__(self): return "{mpn} - {cost}{currency} @ {quan}".format( mpn=part.MPN, cost=self.cost, currency=self.currency if self.currency else '', - quan=self.quantity) \ No newline at end of file + quan=self.quantity) diff --git a/InvenTree/supplier/urls.py b/InvenTree/supplier/urls.py index f382945b7f..5490b22d87 100644 --- a/InvenTree/supplier/urls.py +++ b/InvenTree/supplier/urls.py @@ -8,4 +8,4 @@ urlpatterns = [ url(r'^(?P[0-9]+)/$', views.supplierDetail, name='detail'), url(r'^$', views.index, name='index') -] \ No newline at end of file +] diff --git a/InvenTree/supplier/views.py b/InvenTree/supplier/views.py index 2b0f00335f..edfd3883be 100644 --- a/InvenTree/supplier/views.py +++ b/InvenTree/supplier/views.py @@ -3,11 +3,13 @@ from django.http import HttpResponse from .models import Supplier + def index(request): return HttpResponse("This is the suppliers page") + def supplierDetail(request, supplier_id): supplier = get_object_or_404(Supplier, pk=supplier_id) return render(request, 'supplier/detail.html', - {'supplier': supplier}) \ No newline at end of file + {'supplier': supplier}) diff --git a/InvenTree/track/admin.py b/InvenTree/track/admin.py index b6077f2080..ac6cf4ca7f 100644 --- a/InvenTree/track/admin.py +++ b/InvenTree/track/admin.py @@ -2,7 +2,8 @@ from django.contrib import admin from .models import UniquePart + class UniquePartAdmin(admin.ModelAdmin): list_display = ('part', 'revision', 'serial', 'creation_date') -admin.site.register(UniquePart, UniquePartAdmin) \ No newline at end of file +admin.site.register(UniquePart, UniquePartAdmin) diff --git a/InvenTree/track/models.py b/InvenTree/track/models.py index 9f6ffb3525..bcdc5397dc 100644 --- a/InvenTree/track/models.py +++ b/InvenTree/track/models.py @@ -37,14 +37,14 @@ class UniquePart(models.Model): PART_DESTROYED = 50 status = models.IntegerField(default=PART_IN_PROGRESS, - choices=[ - (PART_IN_PROGRESS, "In progress"), - (PART_IN_STOCK, "In stock"), - (PART_SHIPPED, "Shipped"), - (PART_RETURNED, "Returned"), - (PART_DAMAGED, "Damaged"), - (PART_DESTROYED, "Destroyed"), - ]) + choices=[ + (PART_IN_PROGRESS, "In progress"), + (PART_IN_STOCK, "In stock"), + (PART_SHIPPED, "Shipped"), + (PART_RETURNED, "Returned"), + (PART_DAMAGED, "Damaged"), + (PART_DESTROYED, "Destroyed"), + ]) def __str__(self): return self.part.name @@ -59,4 +59,4 @@ class PartTrackingInfo(models.Model): part = models.ForeignKey(UniquePart, on_delete=models.CASCADE) date = models.DateField(auto_now_add=True, editable=False) - notes = models.CharField(max_length=500) \ No newline at end of file + notes = models.CharField(max_length=500) diff --git a/InvenTree/track/views.py b/InvenTree/track/views.py index 16842c6008..5986b94af1 100644 --- a/InvenTree/track/views.py +++ b/InvenTree/track/views.py @@ -4,4 +4,3 @@ from django.http import HttpResponse def index(request): return HttpResponse("This is the Tracking page") - \ No newline at end of file