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

Fix rendering of purchase order status codes

Browse Source
This commit is contained in:
Oliver Walters 2019-06-04 23:14:57 +10:00
parent 76a72be926
commit 8d70d2f28a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/company/views.py
View File

@ -11,6 +11,7 @@ from django.views.generic import DetailView, ListView
from django.forms import HiddenInput
from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView
from InvenTree.status_codes import OrderStatus
from .models import Company
from .models import SupplierPart
@ -57,6 +58,12 @@ class CompanyDetail(DetailView):
queryset = Company.objects.all()
model = Company
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
ctx['OrderStatus'] = OrderStatus
return ctx
class CompanyImage(AjaxUpdateView):
""" View for uploading an image for the Company """

8
InvenTree/order/templates/order/order_status.html
View File

@ -1,10 +1,10 @@
{% if order.status == order.PENDING %}
{% if order.status == OrderStatus.PENDING %}
<span class='label label-info'>
{% elif order.status == order.PLACED %}
{% elif order.status == OrderStatus.PLACED %}
<span class='label label-primary'>
{% elif order.status == order.COMPLETE %}
{% elif order.status == OrderStatus.COMPLETE %}
<span class='label label-success'>
{% elif order.status == order.CANCELLED or order.status == order.RETURNED %}
{% elif order.status == OrderStatus.CANCELLED or order.status == OrderStatus.RETURNED %}
<span class='label label-warning'>
{% else %}
<span class='label label-danger'>