{{ order.notes | markdownify }}
diff --git a/InvenTree/order/templates/order/so_allocate_by_serial.html b/InvenTree/order/templates/order/so_allocate_by_serial.html
new file mode 100644
index 0000000000..3e11d658c7
--- /dev/null
+++ b/InvenTree/order/templates/order/so_allocate_by_serial.html
@@ -0,0 +1,12 @@
+{% extends "modal_form.html" %}
+{% load i18n %}
+
+{% block pre_form_content %}
+
+
+ {% include "hover_image.html" with image=part.image hover=true %}{{ part }}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/test_sales_order.py b/InvenTree/order/test_sales_order.py
index c619aec5bc..0b37b96409 100644
--- a/InvenTree/order/test_sales_order.py
+++ b/InvenTree/order/test_sales_order.py
@@ -3,7 +3,6 @@
from django.test import TestCase
from django.core.exceptions import ValidationError
-from django.db.utils import IntegrityError
from datetime import datetime, timedelta
@@ -73,10 +72,10 @@ class SalesOrderTest(TestCase):
self.assertFalse(self.order.is_fully_allocated())
def test_add_duplicate_line_item(self):
- # Adding a duplicate line item to a SalesOrder must throw an error
+ # Adding a duplicate line item to a SalesOrder is accepted
- with self.assertRaises(IntegrityError):
- SalesOrderLineItem.objects.create(order=self.order, part=self.part)
+ for ii in range(1, 5):
+ SalesOrderLineItem.objects.create(order=self.order, part=self.part, quantity=ii)
def allocate_stock(self, full=True):
diff --git a/InvenTree/order/urls.py b/InvenTree/order/urls.py
index 7707b73f37..97903d81c1 100644
--- a/InvenTree/order/urls.py
+++ b/InvenTree/order/urls.py
@@ -81,6 +81,7 @@ sales_order_urls = [
# URLs for sales order allocations
url(r'^allocation/', include([
url(r'^new/', views.SalesOrderAllocationCreate.as_view(), name='so-allocation-create'),
+ url(r'^assign-serials/', views.SalesOrderAssignSerials.as_view(), name='so-assign-serials'),
url(r'(?P
\d+)/', include([
url(r'^edit/', views.SalesOrderAllocationEdit.as_view(), name='so-allocation-edit'),
url(r'^delete/', views.SalesOrderAllocationDelete.as_view(), name='so-allocation-delete'),
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index 2cd8e8a4cb..bdf0407603 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -7,9 +7,11 @@ from __future__ import unicode_literals
from django.db import transaction
from django.shortcuts import get_object_or_404
+from django.core.exceptions import ValidationError
from django.urls import reverse
from django.utils.translation import ugettext as _
from django.views.generic import DetailView, ListView, UpdateView
+from django.views.generic.edit import FormMixin
from django.forms import HiddenInput
import logging
@@ -30,6 +32,7 @@ from . import forms as order_forms
from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView
from InvenTree.helpers import DownloadFile, str2bool
+from InvenTree.helpers import extract_serial_numbers
from InvenTree.views import InvenTreeRoleMixin
from InvenTree.status_codes import PurchaseOrderStatus, SalesOrderStatus, StockStatus
@@ -1291,11 +1294,179 @@ class SOLineItemDelete(AjaxDeleteView):
}
+class SalesOrderAssignSerials(AjaxView, FormMixin):
+ """
+ View for assigning stock items to a sales order,
+ by serial number lookup.
+ """
+
+ model = SalesOrderAllocation
+ role_required = 'sales_order.change'
+ ajax_template_name = 'order/so_allocate_by_serial.html'
+ ajax_form_title = _('Allocate Serial Numbers')
+ form_class = order_forms.AllocateSerialsToSalesOrderForm
+
+ # Keep track of SalesOrderLineItem and Part references
+ line = None
+ part = None
+
+ def get_initial(self):
+ """
+ Initial values are passed as query params
+ """
+
+ initials = super().get_initial()
+
+ try:
+ self.line = SalesOrderLineItem.objects.get(pk=self.request.GET.get('line', None))
+ initials['line'] = self.line
+ except (ValueError, SalesOrderLineItem.DoesNotExist):
+ pass
+
+ try:
+ self.part = Part.objects.get(pk=self.request.GET.get('part', None))
+ initials['part'] = self.part
+ except (ValueError, Part.DoesNotExist):
+ pass
+
+ return initials
+
+ def post(self, request, *args, **kwargs):
+
+ self.form = self.get_form()
+
+ # Validate the form
+ self.form.is_valid()
+ self.validate()
+
+ valid = self.form.is_valid()
+
+ if valid:
+ self.allocate_items()
+
+ data = {
+ 'form_valid': valid,
+ 'form_errors': self.form.errors.as_json(),
+ 'non_field_errors': self.form.non_field_errors().as_json(),
+ 'success': _("Allocated") + f" {len(self.stock_items)} " + _("items")
+ }
+
+ return self.renderJsonResponse(request, self.form, data)
+
+ def validate(self):
+
+ data = self.form.cleaned_data
+
+ # Extract hidden fields from posted data
+ self.line = data.get('line', None)
+ self.part = data.get('part', None)
+
+ if self.line:
+ self.form.fields['line'].widget = HiddenInput()
+ else:
+ self.form.add_error('line', _('Select line item'))
+
+ if self.part:
+ self.form.fields['part'].widget = HiddenInput()
+ else:
+ self.form.add_error('part', _('Select part'))
+
+ if not self.form.is_valid():
+ return
+
+ # Form is otherwise valid - check serial numbers
+ serials = data.get('serials', '')
+ quantity = data.get('quantity', 1)
+
+ # Save a list of serial_numbers
+ self.serial_numbers = None
+ self.stock_items = []
+
+ try:
+ self.serial_numbers = extract_serial_numbers(serials, quantity)
+
+ for serial in self.serial_numbers:
+ try:
+ # Find matching stock item
+ stock_item = StockItem.objects.get(
+ part=self.part,
+ serial=serial
+ )
+ except StockItem.DoesNotExist:
+ self.form.add_error(
+ 'serials',
+ _('No matching item for serial') + f" '{serial}'"
+ )
+ continue
+
+ # Now we have a valid stock item - but can it be added to the sales order?
+
+ # If not in stock, cannot be added to the order
+ if not stock_item.in_stock:
+ self.form.add_error(
+ 'serials',
+ f"'{serial}' " + _("is not in stock")
+ )
+ continue
+
+ # Already allocated to an order
+ if stock_item.is_allocated():
+ self.form.add_error(
+ 'serials',
+ f"'{serial}' " + _("already allocated to an order")
+ )
+ continue
+
+ # Add it to the list!
+ self.stock_items.append(stock_item)
+
+ except ValidationError as e:
+ self.form.add_error('serials', e.messages)
+
+ def allocate_items(self):
+ """
+ Create stock item allocations for each selected serial number
+ """
+
+ for stock_item in self.stock_items:
+ SalesOrderAllocation.objects.create(
+ item=stock_item,
+ line=self.line,
+ quantity=1,
+ )
+
+ def get_form(self):
+
+ form = super().get_form()
+
+ if self.line:
+ form.fields['line'].widget = HiddenInput()
+
+ if self.part:
+ form.fields['part'].widget = HiddenInput()
+
+ return form
+
+ def get_context_data(self):
+ return {
+ 'line': self.line,
+ 'part': self.part,
+ }
+
+ def get(self, request, *args, **kwargs):
+
+ return self.renderJsonResponse(
+ request,
+ self.get_form(),
+ context=self.get_context_data(),
+ )
+
+
class SalesOrderAllocationCreate(AjaxCreateView):
""" View for creating a new SalesOrderAllocation """
model = SalesOrderAllocation
- form_class = order_forms.EditSalesOrderAllocationForm
+ form_class = order_forms.CreateSalesOrderAllocationForm
ajax_form_title = _('Allocate Stock to Order')
def get_initial(self):
diff --git a/InvenTree/part/templates/part/notes.html b/InvenTree/part/templates/part/notes.html
index 7b3fe8ca0f..8397c32b88 100644
--- a/InvenTree/part/templates/part/notes.html
+++ b/InvenTree/part/templates/part/notes.html
@@ -10,35 +10,34 @@
{% block heading %}
{% trans "Part Notes" %}
+{% if roles.part.change and not editing %}
+
+ {% if part.notes %}
- {% if part.notes %}
{{ part.notes | markdownify }}
- {% endif %}
+ {% endif %}