Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Oliver 2018-04-17 23:42:30 +10:00
commit 8b1dbd4500
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/customer/admin.py
View File

@ -9,11 +9,11 @@ class CustomerAdmin(ImportExportModelAdmin):
class CustomerOrderAdmin(admin.ModelAdmin):
pass
list_display = ('internal_ref',)
class CustomerOrderLineAdmin(admin.ModelAdmin):
pass
list_display = ('customer_order', 'line_number')
admin.site.register(Customer, CustomerAdmin)

6
InvenTree/customer/models.py
View File

@ -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")
@ -39,6 +38,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):
"""