diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py index 282541d19f..15f93c9133 100644 --- a/InvenTree/InvenTree/views.py +++ b/InvenTree/InvenTree/views.py @@ -170,7 +170,7 @@ class AjaxView(AjaxMixin, View): """ def post(self, request, *args, **kwargs): - return JsonResponse('', safe=False) + return self.renderJsonResponse(request) def get(self, request, *args, **kwargs): diff --git a/InvenTree/order/templates/order/order_select_parts.html b/InvenTree/order/templates/order/order_select_parts.html new file mode 100644 index 0000000000..eede585b82 --- /dev/null +++ b/InvenTree/order/templates/order/order_select_parts.html @@ -0,0 +1,44 @@ +{% extends "modal_form.html" %} + +{% block form %} + +
+ {% csrf_token %} + {% load crispy_forms_tags %} + + + + + + + + + + + {% for part in parts %} + + + + + + + {% endfor %} +
PartSupplierQuantity
+ {% include "hover_image.html" with image=part.image hover=False %} + {{ part.full_name }} {{ part.description }} + + + + + + +
+ +{% endblock %} \ No newline at end of file diff --git a/InvenTree/order/urls.py b/InvenTree/order/urls.py index 20379edb76..410efb8129 100644 --- a/InvenTree/order/urls.py +++ b/InvenTree/order/urls.py @@ -26,6 +26,8 @@ purchase_order_urls = [ url(r'^new/', views.PurchaseOrderCreate.as_view(), name='purchase-order-create'), + url(r'^order-parts/', views.OrderParts.as_view(), name='order-parts'), + # Display detail view for a single purchase order url(r'^(?P\d+)/', include(purchase_order_detail_urls)), diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 718b26c98c..6382ab1d99 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -7,14 +7,17 @@ from __future__ import unicode_literals from django.utils.translation import ugettext as _ from django.views.generic import DetailView, ListView +from django.views.generic.edit import FormMixin from django.forms import HiddenInput from .models import PurchaseOrder, PurchaseOrderLineItem from company.models import Company, SupplierPart +from stock.models import StockItem +from part.models import Part from . import forms as order_forms -from InvenTree.views import AjaxCreateView, AjaxUpdateView +from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView from InvenTree.helpers import str2bool from InvenTree.status_codes import OrderStatus @@ -135,6 +138,96 @@ class PurchaseOrderIssue(AjaxUpdateView): return self.renderJsonResponse(request, form, data) +class OrderParts(AjaxView): + """ View for adding various SupplierPart items to a Purchase Order. + + SupplierParts can be selected from a variety of 'sources': + + - ?supplier_parts[]= -> Direct list of SupplierPart objects + - ?parts[]= -> List of base Part objects (user must then select supplier parts) + - ?stock[]= -> List of StockItem objects (user must select supplier parts) + - ?build= -> A Build object (user must select parts, then supplier parts) + + """ + + ajax_form_title = "Order Parts" + ajax_template_name = 'order/order_select_parts.html' + + # List of Parts we wish to order + parts = [] + + def get_context_data(self): + + ctx = {} + + print("Getting context data") + + ctx['parts'] = self.get_parts() + + return ctx + + def get_parts(self): + """ Determine which parts the user wishes to order. + This is performed on the initial GET request. + """ + + self.parts = [] + + part_ids = set() + + # User has passed a list of stock items + if 'stock[]' in self.request.GET: + + stock_id_list = self.request.GET.getlist('stock[]') + + print("Looking up parts from stock items:") + print(stock_id_list) + + """ Get a list of all the parts associated with the stock items. + - Base part must be purchaseable. + - Return a set of corresponding Part IDs + """ + stock_items = StockItem.objects.filter( + part__purchaseable=True, + id__in=stock_id_list) + + for item in stock_items: + part_ids.add(item.part.id) + + print("Parts:", part_ids) + + + # Create the list of parts + for id in part_ids: + try: + part = Part.objects.get(id=id) + except Part.DoesNotExist: + continue + + self.parts.append(part) + + return self.parts + + def get(self, request, *args, **kwargs): + + self.request = request + + print("GET HERE") + + print(request.GET) + + self.get_parts() + + return self.renderJsonResponse(request) + + def post(self, request, *args, **kwargs): + + self.request = request + print("POST here") + + return self.renderJsonResponse(request) + + class POLineItemCreate(AjaxCreateView): """ AJAX view for creating a new PurchaseOrderLineItem object """ diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 4fd7360810..38acae3360 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -339,7 +339,7 @@ class Part(models.Model): """ if self.default_supplier: - return self.default_suppliers + return self.default_supplier if self.supplier_count == 1: return self.supplier_parts.first() @@ -410,6 +410,13 @@ class Part(models.Model): return max(total, 0) + @property + def quantity_to_order(self): + """ Return the quantity needing to be ordered for this part. """ + + required = -1 * self.net_stock + return max(required, 0) + @property def net_stock(self): """ Return the 'net' stock. It takes into account: diff --git a/InvenTree/static/script/inventree/stock.js b/InvenTree/static/script/inventree/stock.js index ae3ab55a7e..baa9c2ee87 100644 --- a/InvenTree/static/script/inventree/stock.js +++ b/InvenTree/static/script/inventree/stock.js @@ -237,6 +237,22 @@ function loadStockTable(table, options) { $("#multi-item-move").click(function() { stockAdjustment('move'); }); + + $("#multi-item-order").click(function() { + var selections = $("#stock-table").bootstrapTable("getSelections"); + + var stock = []; + + selections.forEach(function(item) { + stock.push(item.pk); + }); + + launchModalForm("/order/purchase-order/order-parts/", { + data: { + stock: stock, + }, + }); + }); } diff --git a/InvenTree/templates/modal_form.html b/InvenTree/templates/modal_form.html index 1f5482f8d6..eb5334b445 100644 --- a/InvenTree/templates/modal_form.html +++ b/InvenTree/templates/modal_form.html @@ -21,6 +21,8 @@ {% block pre_form_content %} {% endblock %} + +{% block form %} {% csrf_token %} {% load crispy_forms_tags %} @@ -32,5 +34,7 @@ {% endblock %} +{% endblock %} + {% block post_form_content %} {% endblock %} \ No newline at end of file diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html index acdd371d08..aa07f99959 100644 --- a/InvenTree/templates/stock_table.html +++ b/InvenTree/templates/stock_table.html @@ -9,7 +9,8 @@
  • Add stock
  • Remove stock
  • Count stock
    • -
  • Move stock
    • +
  • Move stock
    • +
  • Order stock