diff --git a/InvenTree/InvenTree/helpers.py b/InvenTree/InvenTree/helpers.py deleted file mode 100644 index 1025f74e34..0000000000 --- a/InvenTree/InvenTree/helpers.py +++ /dev/null @@ -1,18 +0,0 @@ -import inspect -from enum import Enum - - -class ChoiceEnum(Enum): - """ Helper class to provide enumerated choice values for integer fields - """ - # http://blog.richard.do/index.php/2014/02/how-to-use-enums-for-django-field-choices/ - - @classmethod - def choices(cls): - # get all members of the class - members = inspect.getmembers(cls, lambda m: not(inspect.isroutine(m))) - # filter down to just properties - props = [m for m in members if not(m[0][:2] == '__')] - # format into django choice tuple - choices = tuple([(str(p[1].value), p[0]) for p in props]) - return choices \ No newline at end of file diff --git a/InvenTree/build/admin.py b/InvenTree/build/admin.py index dfbefc45e1..9662f6bf79 100644 --- a/InvenTree/build/admin.py +++ b/InvenTree/build/admin.py @@ -18,4 +18,5 @@ class BuildAdmin(admin.ModelAdmin): 'notes', ) + admin.site.register(Build, BuildAdmin) diff --git a/InvenTree/build/forms.py b/InvenTree/build/forms.py index 0134a1e92b..a59f4b2f77 100644 --- a/InvenTree/build/forms.py +++ b/InvenTree/build/forms.py @@ -30,4 +30,4 @@ class EditBuildForm(forms.ModelForm): 'quantity', 'status', 'completion_date', - ] \ No newline at end of file + ] diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py index ac9c26bdd8..ed65124ee5 100644 --- a/InvenTree/build/models.py +++ b/InvenTree/build/models.py @@ -8,6 +8,7 @@ from django.core.validators import MinValueValidator from part.models import Part + class Build(models.Model): """ A Build object organises the creation of new parts from the component parts It uses the part BOM to generate new parts. @@ -19,26 +20,24 @@ class Build(models.Model): # Build status codes PENDING = 10 # Build is pending / active - HOLDING = 20 # Build is currently being held - CANCELLED = 30 # Build was cancelled - COMPLETE = 40 # Build is complete + HOLDING = 20 # Build is currently being held + CANCELLED = 30 # Build was cancelled + COMPLETE = 40 # Build is complete - BUILD_STATUS_CODES = { - PENDING : _("Pending"), - HOLDING : _("Holding"), - CANCELLED : _("Cancelled"), - COMPLETE : _("Complete"), - } + BUILD_STATUS_CODES = {PENDING: _("Pending"), + HOLDING: _("Holding"), + CANCELLED: _("Cancelled"), + COMPLETE: _("Complete"), + } batch = models.CharField(max_length=100, blank=True, null=True, - help_text='Batch code for this build output') + help_text='Batch code for this build output') # Status of the build status = models.PositiveIntegerField(default=PENDING, choices=BUILD_STATUS_CODES.items(), validators=[MinValueValidator(0)]) - # Date the build model was 'created' creation_date = models.DateField(auto_now=True, editable=False) diff --git a/InvenTree/build/urls.py b/InvenTree/build/urls.py index f5a2192a43..890da9451d 100644 --- a/InvenTree/build/urls.py +++ b/InvenTree/build/urls.py @@ -15,4 +15,4 @@ build_urls = [ url(r'^(?P\d+)/', include(build_detail_urls)), url(r'.*$', views.BuildIndex.as_view(), name='build-index'), -] \ No newline at end of file +] diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py index 64139b4a9f..e0b593e2ab 100644 --- a/InvenTree/build/views.py +++ b/InvenTree/build/views.py @@ -12,6 +12,7 @@ from .models import Build from .forms import EditBuildForm + class BuildIndex(ListView): model = Build template_name = 'build/index.html' diff --git a/InvenTree/customer/admin.py b/InvenTree/customer/admin.py index 128d2822df..59ff91a61d 100644 --- a/InvenTree/customer/admin.py +++ b/InvenTree/customer/admin.py @@ -18,4 +18,4 @@ class CustomerOrderLineAdmin(admin.ModelAdmin): admin.site.register(Customer, CustomerAdmin) admin.site.register(CustomerOrder, CustomerOrderAdmin) -admin.site.register(CustomerOrderLine, CustomerOrderLineAdmin) \ No newline at end of file +admin.site.register(CustomerOrderLine, CustomerOrderLineAdmin) diff --git a/InvenTree/customer/models.py b/InvenTree/customer/models.py index 4b16ef634b..c48fcd6b1f 100644 --- a/InvenTree/customer/models.py +++ b/InvenTree/customer/models.py @@ -64,7 +64,7 @@ class CustomerOrderLine(models.Model): # TODO: for now, each line corresponds to some quantity of some part, but in future we might want more flexibility # Only 'salable' items should be allowed in a CSO part = models.ForeignKey(Part, blank=True, help_text="Part", - limit_choices_to={'salable' : True} + limit_choices_to={'salable': True} ) # TODO: should quantity field here somehow related to quantity field of related part? Views will handle this, right? @@ -72,4 +72,3 @@ class CustomerOrderLine(models.Model): # Line notes notes = models.TextField(blank=True, help_text="Line notes") - diff --git a/InvenTree/customer/templates/customer/order_index.html b/InvenTree/customer/templates/customer/order_index.html index c33d615951..b71db4932b 100644 --- a/InvenTree/customer/templates/customer/order_index.html +++ b/InvenTree/customer/templates/customer/order_index.html @@ -1,3 +1,7 @@ +{% extends "base.html" %} + +{% block contents %} + @@ -11,4 +15,6 @@ {% endfor %} -
Internal Ref{{ order.customer_ref }}
\ No newline at end of file + + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/customer/tests.py b/InvenTree/customer/tests.py index 7ce503c2dd..a79ca8be56 100644 --- a/InvenTree/customer/tests.py +++ b/InvenTree/customer/tests.py @@ -1,3 +1,3 @@ -from django.test import TestCase +# from django.test import TestCase # Create your tests here. diff --git a/InvenTree/customer/views.py b/InvenTree/customer/views.py index aeaaa1d99c..5d82964b06 100644 --- a/InvenTree/customer/views.py +++ b/InvenTree/customer/views.py @@ -30,4 +30,4 @@ class CustomerOrderDetail(DetailView): model = CustomerOrder template_name = 'customer/order_detail.html' queryset = CustomerOrder.objects.all() - context_object_name = 'order' \ No newline at end of file + context_object_name = 'order'