{% if order.notes %}
@@ -153,6 +163,12 @@ $("#edit-order").click(function() {
);
});
+$("#receive-order").click(function() {
+ launchModalForm("{% url 'purchase-order-receive' order.id %}", {
+ reload: true,
+ });
+});
+
$("#export-order").click(function() {
location.href = "{% url 'purchase-order-export' order.id %}";
});
@@ -182,6 +198,8 @@ $('#new-po-line').click(function() {
{% endif %}
$("#po-lines-table").bootstrapTable({
+ search: true,
+ sortable: true,
});
diff --git a/InvenTree/order/templates/order/receive_parts.html b/InvenTree/order/templates/order/receive_parts.html
new file mode 100644
index 0000000000..68a6533b2e
--- /dev/null
+++ b/InvenTree/order/templates/order/receive_parts.html
@@ -0,0 +1,69 @@
+{% extends "modal_form.html" %}
+
+{% block form %}
+
+Receive outstanding parts for {{ order }} - {{ order.description }}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/tests.py b/InvenTree/order/tests.py
index ce215e567d..3a773ad0e9 100644
--- a/InvenTree/order/tests.py
+++ b/InvenTree/order/tests.py
@@ -1 +1,146 @@
-# TODO - Implement tests for the order app
+from django.test import TestCase
+import django.core.exceptions as django_exceptions
+
+from part.models import Part
+from .models import PurchaseOrder, PurchaseOrderLineItem
+from stock.models import StockLocation
+from company.models import SupplierPart
+
+from InvenTree.status_codes import OrderStatus
+
+
+class OrderTest(TestCase):
+ """
+ Tests to ensure that the order models are functioning correctly.
+ """
+
+ fixtures = [
+ 'company',
+ 'supplier_part',
+ 'category',
+ 'part',
+ 'location',
+ 'stock',
+ 'order'
+ ]
+
+ def test_basics(self):
+ """ Basic tests e.g. repr functions etc """
+
+ order = PurchaseOrder.objects.get(pk=1)
+
+ self.assertEqual(order.get_absolute_url(), '/order/purchase-order/1/')
+
+ self.assertEqual(str(order), 'PO 1')
+
+ line = PurchaseOrderLineItem.objects.get(pk=1)
+
+ self.assertEqual(str(line), "100 x ACME0001 from ACME (for PO 1)")
+
+ def test_on_order(self):
+ """ There should be 3 separate items on order for the M2x4 LPHS part """
+
+ part = Part.objects.get(name='M2x4 LPHS')
+
+ open_orders = []
+
+ for supplier in part.supplier_parts.all():
+ open_orders += supplier.open_orders()
+
+ self.assertEqual(len(open_orders), 3)
+
+ # Test the total on-order quantity
+ self.assertEqual(part.on_order, 400)
+
+ def test_add_items(self):
+ """ Test functions for adding line items to an order """
+
+ order = PurchaseOrder.objects.get(pk=1)
+
+ self.assertEqual(order.status, OrderStatus.PENDING)
+ self.assertEqual(order.lines.count(), 2)
+
+ sku = SupplierPart.objects.get(SKU='ACME-WIDGET')
+ part = sku.part
+
+ # Try to order some invalid things
+ with self.assertRaises(django_exceptions.ValidationError):
+ order.add_line_item(sku, -999)
+
+ with self.assertRaises(django_exceptions.ValidationError):
+ order.add_line_item(sku, 'not a number')
+
+ # Order the part
+ self.assertEqual(part.on_order, 0)
+
+ order.add_line_item(sku, 100)
+
+ self.assertEqual(part.on_order, 100)
+ self.assertEqual(order.lines.count(), 3)
+
+ # Order the same part again (it should be merged)
+ order.add_line_item(sku, 50)
+ self.assertEqual(order.lines.count(), 3)
+ self.assertEqual(part.on_order, 150)
+
+ # Try to order a supplier part from the wrong supplier
+ sku = SupplierPart.objects.get(SKU='ZERG-WIDGET')
+
+ with self.assertRaises(django_exceptions.ValidationError):
+ order.add_line_item(sku, 99)
+
+ def test_receive(self):
+ """ Test order receiving functions """
+
+ part = Part.objects.get(name='M2x4 LPHS')
+
+ # Receive some items
+ line = PurchaseOrderLineItem.objects.get(id=1)
+
+ order = line.order
+ loc = StockLocation.objects.get(id=1)
+
+ # There should be two lines against this order
+ self.assertEqual(len(order.pending_line_items()), 2)
+
+ # Should fail, as order is 'PENDING' not 'PLACED"
+ self.assertEqual(order.status, OrderStatus.PENDING)
+
+ with self.assertRaises(django_exceptions.ValidationError):
+ order.receive_line_item(line, loc, 50, user=None)
+
+ order.place_order()
+
+ self.assertEqual(order.status, OrderStatus.PLACED)
+
+ order.receive_line_item(line, loc, 50, user=None)
+
+ self.assertEqual(line.remaining(), 50)
+
+ self.assertEqual(part.on_order, 350)
+
+ # Try to order some invalid things
+ with self.assertRaises(django_exceptions.ValidationError):
+ order.receive_line_item(line, loc, -10, user=None)
+
+ with self.assertRaises(django_exceptions.ValidationError):
+ order.receive_line_item(line, loc, 'not a number', user=None)
+
+ # Receive the rest of the items
+ order.receive_line_item(line, loc, 50, user=None)
+
+ line = PurchaseOrderLineItem.objects.get(id=2)
+ order.receive_line_item(line, loc, 2 * line.quantity, user=None)
+
+ self.assertEqual(part.on_order, 100)
+ self.assertEqual(order.status, OrderStatus.COMPLETE)
+
+ def test_export(self):
+ """ Test order exporting """
+
+ order = PurchaseOrder.objects.get(pk=1)
+
+ output = order.export_to_file(format='csv')
+
+ self.assertIn('M2x4 LPHS', output)
+ self.assertIn('Line,Part,Description', output)
diff --git a/InvenTree/order/urls.py b/InvenTree/order/urls.py
index 695628bad0..38687342c2 100644
--- a/InvenTree/order/urls.py
+++ b/InvenTree/order/urls.py
@@ -13,6 +13,7 @@ purchase_order_detail_urls = [
url(r'^edit/?', views.PurchaseOrderEdit.as_view(), name='purchase-order-edit'),
url(r'^issue/?', views.PurchaseOrderIssue.as_view(), name='purchase-order-issue'),
+ url(r'^receive/?', views.PurchaseOrderReceive.as_view(), name='purchase-order-receive'),
url(r'^export/?', views.PurchaseOrderExport.as_view(), name='purchase-order-export'),
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index 578021b2cb..b5b9540fed 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -15,7 +15,7 @@ import logging
from .models import PurchaseOrder, PurchaseOrderLineItem
from build.models import Build
from company.models import Company, SupplierPart
-from stock.models import StockItem
+from stock.models import StockItem, StockLocation
from part.models import Part
from . import forms as order_forms
@@ -165,6 +165,126 @@ class PurchaseOrderExport(AjaxView):
return DownloadFile(filedata, filename)
+class PurchaseOrderReceive(AjaxView):
+ """ View for receiving parts which are outstanding against a PurchaseOrder.
+
+ Any parts which are outstanding are listed.
+ If all parts are marked as received, the order is closed out.
+
+ """
+
+ ajax_form_title = "Receive Parts"
+ ajax_template_name = "order/receive_parts.html"
+
+ # Where the parts will be going (selected in POST request)
+ destination = None
+
+ def get_context_data(self):
+
+ ctx = {
+ 'order': self.order,
+ 'lines': self.lines,
+ 'locations': StockLocation.objects.all(),
+ 'destination': self.destination,
+ }
+
+ return ctx
+
+ def get(self, request, *args, **kwargs):
+ """ Respond to a GET request. Determines which parts are outstanding,
+ and presents a list of these parts to the user.
+ """
+
+ self.request = request
+ self.order = get_object_or_404(PurchaseOrder, pk=self.kwargs['pk'])
+
+ self.lines = self.order.pending_line_items()
+
+ for line in self.lines:
+ # Pre-fill the remaining quantity
+ line.receive_quantity = line.remaining()
+
+ return self.renderJsonResponse(request)
+
+ def post(self, request, *args, **kwargs):
+ """ Respond to a POST request. Data checking and error handling.
+ If the request is valid, new StockItem objects will be made
+ for each received item.
+ """
+
+ self.request = request
+ self.order = get_object_or_404(PurchaseOrder, pk=self.kwargs['pk'])
+
+ self.lines = []
+ self.destination = None
+
+ # Extract the destination for received parts
+ if 'receive_location' in request.POST:
+ pk = request.POST['receive_location']
+ try:
+ self.destination = StockLocation.objects.get(id=pk)
+ except (StockLocation.DoesNotExist, ValueError):
+ pass
+
+ errors = self.destination is None
+
+ # Extract information on all submitted line items
+ for item in request.POST:
+ if item.startswith('line-'):
+ pk = item.replace('line-', '')
+
+ try:
+ line = PurchaseOrderLineItem.objects.get(id=pk)
+ except (PurchaseOrderLineItem.DoesNotExist, ValueError):
+ continue
+
+ # Ignore a part that doesn't map to a SupplierPart
+ try:
+ if line.part is None:
+ continue
+ except SupplierPart.DoesNotExist:
+ continue
+
+ receive = self.request.POST[item]
+
+ try:
+ receive = int(receive)
+ except ValueError:
+ # In the case on an invalid input, reset to default
+ receive = line.remaining()
+ errors = True
+
+ if receive < 0:
+ receive = 0
+ errors = True
+
+ line.receive_quantity = receive
+ self.lines.append(line)
+
+ # No errors? Receive the submitted parts!
+ if errors is False:
+ self.receive_parts()
+
+ data = {
+ 'form_valid': errors is False,
+ 'success': 'Items marked as received',
+ }
+
+ return self.renderJsonResponse(request, data=data)
+
+ def receive_parts(self):
+ """ Called once the form has been validated.
+ Create new stockitems against received parts.
+ """
+
+ for line in self.lines:
+
+ if not line.part:
+ continue
+
+ self.order.receive_line_item(line, self.destination, line.receive_quantity, self.request.user)
+
+
class OrderParts(AjaxView):
""" View for adding various SupplierPart items to a Purchase Order.
diff --git a/InvenTree/stock/migrations/0006_stockitem_purchase_order.py b/InvenTree/stock/migrations/0006_stockitem_purchase_order.py
new file mode 100644
index 0000000000..08d7f4de01
--- /dev/null
+++ b/InvenTree/stock/migrations/0006_stockitem_purchase_order.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.2 on 2019-06-15 09:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0010_purchaseorderlineitem_notes'),
+ ('stock', '0005_auto_20190602_1944'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='stockitem',
+ name='purchase_order',
+ field=models.ForeignKey(blank=True, help_text='Purchase order for this stock item', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_items', to='order.PurchaseOrder'),
+ ),
+ ]
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index 50a0f39e72..a53e61f86d 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -96,6 +96,7 @@ class StockItem(models.Model):
delete_on_deplete: If True, StockItem will be deleted when the stock level gets to zero
status: Status of this StockItem (ref: InvenTree.status_codes.StockStatus)
notes: Extra notes field
+ purchase_order: Link to a PurchaseOrder (if this stock item was created from a PurchaseOrder)
infinite: If True this StockItem can never be exhausted
"""
@@ -249,6 +250,14 @@ class StockItem(models.Model):
updated = models.DateField(auto_now=True, null=True)
+ purchase_order = models.ForeignKey(
+ 'order.PurchaseOrder',
+ on_delete=models.SET_NULL,
+ related_name='stock_items',
+ blank=True, null=True,
+ help_text='Purchase order for this stock item'
+ )
+
# last time the stock was checked / counted
stocktake_date = models.DateField(blank=True, null=True)
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index 40d78eb7e1..7300855389 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -71,6 +71,12 @@