From 65ed493283da676ca8936ac2d4718f7132a6d7db Mon Sep 17 00:00:00 2001 From: James Newlands Date: Tue, 17 Apr 2018 23:27:06 +1000 Subject: [PATCH 1/2] Admin readability --- InvenTree/customer_orders/admin.py | 4 ++-- InvenTree/customer_orders/models.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/InvenTree/customer_orders/admin.py b/InvenTree/customer_orders/admin.py index f2919066ca..a321a491d3 100644 --- a/InvenTree/customer_orders/admin.py +++ b/InvenTree/customer_orders/admin.py @@ -5,10 +5,10 @@ from .models import CustomerOrder, CustomerOrderLine class CustomerOrderAdmin(admin.ModelAdmin): - pass + list_display = ('internal_ref',) class CustomerOrderLineAdmin(admin.ModelAdmin): - pass + list_display = ('customer_order', 'line_number') admin.site.register(CustomerOrder, CustomerOrderAdmin) diff --git a/InvenTree/customer_orders/models.py b/InvenTree/customer_orders/models.py index 93171fe2a7..6d74cbc103 100644 --- a/InvenTree/customer_orders/models.py +++ b/InvenTree/customer_orders/models.py @@ -33,6 +33,9 @@ class CustomerOrder(models.Model): # Order notes notes = models.TextField(blank=True, default="", help_text="Order notes") + def __str__(self): + return "OrderRef {internal_ref}".format(internal_ref=self.internal_ref) + class CustomerOrderLine(models.Model): """ From 65351260694a4f4deb6097634500a821096251a1 Mon Sep 17 00:00:00 2001 From: James Newlands Date: Tue, 17 Apr 2018 23:32:50 +1000 Subject: [PATCH 2/2] Fixed weird line break in string --- InvenTree/customer_orders/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/InvenTree/customer_orders/models.py b/InvenTree/customer_orders/models.py index 80bfd3933f..45caedcbed 100644 --- a/InvenTree/customer_orders/models.py +++ b/InvenTree/customer_orders/models.py @@ -30,8 +30,7 @@ class CustomerOrder(models.Model): # TODO: Should the customer and customer_ref together be unique? # Date the order was entered into system - created_date = models.DateField(auto_now_add=True, blank=True, help_text="Date order entered " - "in system") + created_date = models.DateField(auto_now_add=True, blank=True, help_text="Date order entered in system") # Date the order was issued on the paperwork, if provided issued_date = models.DateField(blank=True, help_text="Date order issued by customer")