Fixes after rebase

This commit is contained in:
Oliver 2021-06-18 17:25:24 +10:00
parent 0b8a50cd92
commit 10ecddf9b4
2 changed files with 5 additions and 3 deletions

View File

@ -18,7 +18,7 @@ from InvenTree.serializers import InvenTreeAttachmentSerializerField
from company.serializers import CompanyBriefSerializer, SupplierPartSerializer from company.serializers import CompanyBriefSerializer, SupplierPartSerializer
from part.serializers import PartBriefSerializer from part.serializers import PartBriefSerializer
from stock.serializers import LocationBriefSerializer from stock.serializers import LocationBriefSerializer
from stock.serializers import StockItemSerializer, StockItemSerializer from stock.serializers import StockItemSerializer, LocationSerializer
from .models import PurchaseOrder, PurchaseOrderLineItem from .models import PurchaseOrder, PurchaseOrderLineItem
from .models import PurchaseOrderAttachment, SalesOrderAttachment from .models import PurchaseOrderAttachment, SalesOrderAttachment
@ -43,7 +43,7 @@ class POSerializer(InvenTreeModelSerializer):
""" """
Add extra information to the queryset Add extra information to the queryset
- Number of liens in the PurchaseOrder - Number of lines in the PurchaseOrder
- Overdue status of the PurchaseOrder - Overdue status of the PurchaseOrder
""" """

View File

@ -13,10 +13,12 @@
{% block details %} {% block details %}
<h4>{% trans "Part Stock Allocations" %}</h4> <h4>{% trans "Build Order Allocations" %}</h4>
<table class='table table-striped table-condensed' id='build-order-table'></table> <table class='table table-striped table-condensed' id='build-order-table'></table>
<h4>{% trans "Sales Order Allocations" %}</h4>
<table class='table table-striped table-condensed' id='sales-order-table'></table> <table class='table table-striped table-condensed' id='sales-order-table'></table>
<table class='table table-striped table-condensed' id='build-table'> <table class='table table-striped table-condensed' id='build-table'>