From 50bab299c53aa2ea37aee3bbffc6c122835a59bf Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 11 Jun 2019 21:52:43 +1000 Subject: [PATCH 01/33] Add hover image to 'parts to order' table --- InvenTree/templates/required_part_table.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/InvenTree/templates/required_part_table.html b/InvenTree/templates/required_part_table.html index 24eae0012f..6f21f5f7df 100644 --- a/InvenTree/templates/required_part_table.html +++ b/InvenTree/templates/required_part_table.html @@ -9,7 +9,10 @@ {% for part in parts %} - {{ part.full_name }} + + {% include "hover_image.html" with image=part.image hover=True %} + {{ part.full_name }} + {{ part.description }} {{ part.allocation_count }} {{ part.total_stock }} From 8e82488f70cfcf8005e5b32045ea4e12be3fc122 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 11 Jun 2019 21:58:20 +1000 Subject: [PATCH 02/33] Display 'net stock' value on front page --- InvenTree/part/models.py | 13 +++++++++++++ InvenTree/static/css/inventree.css | 4 ++++ InvenTree/templates/required_part_table.html | 6 +++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 67a82a9504..4fd7360810 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -410,6 +410,19 @@ class Part(models.Model): return max(total, 0) + @property + def net_stock(self): + """ Return the 'net' stock. It takes into account: + + - Stock on hand (total_stock) + - Stock on order (on_order) + - Stock allocated (allocation_count) + + This number (unlike 'available_stock') can be negative. + """ + + return self.total_stock - self.allocation_count + self.on_order + def isStarredBy(self, user): """ Return True if this part has been starred by a particular user """ diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css index 3bef992d34..2a98814dda 100644 --- a/InvenTree/static/css/inventree.css +++ b/InvenTree/static/css/inventree.css @@ -14,6 +14,10 @@ color: #ffbb00; } +.red-cell { + background-color: #ec7f7f; +} + .part-price { color: rgb(13, 245, 25); } diff --git a/InvenTree/templates/required_part_table.html b/InvenTree/templates/required_part_table.html index 6f21f5f7df..74feb07336 100644 --- a/InvenTree/templates/required_part_table.html +++ b/InvenTree/templates/required_part_table.html @@ -2,9 +2,9 @@ Part Description - Required In Stock On Order + Allocted Net Stock {% for part in parts %} @@ -14,10 +14,10 @@ {{ part.full_name }} {{ part.description }} - {{ part.allocation_count }} {{ part.total_stock }} {{ part.on_order }} - {{ part.available_stock }} + {{ part.allocation_count }} + {{ part.net_stock }} {% endfor %} \ No newline at end of file From bc05146e72d68dcdbe1f66f64dec1266b7efba42 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 11 Jun 2019 23:37:32 +1000 Subject: [PATCH 03/33] First pass at 'order parts' fom - Select parts in modal form window --- InvenTree/InvenTree/views.py | 2 +- .../templates/order/order_select_parts.html | 44 +++++++++ InvenTree/order/urls.py | 2 + InvenTree/order/views.py | 95 ++++++++++++++++++- InvenTree/part/models.py | 9 +- InvenTree/static/script/inventree/stock.js | 16 ++++ InvenTree/templates/modal_form.html | 4 + InvenTree/templates/stock_table.html | 3 +- 8 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 InvenTree/order/templates/order/order_select_parts.html 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
    • From 0bc8190e8c7b2ff6640aa3da822a0988b4142925 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 11 Jun 2019 23:41:15 +1000 Subject: [PATCH 04/33] Style supplier-part selection as 'select2' --- .../templates/order/order_select_parts.html | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/InvenTree/order/templates/order/order_select_parts.html b/InvenTree/order/templates/order/order_select_parts.html index eede585b82..dbedcc4a91 100644 --- a/InvenTree/order/templates/order/order_select_parts.html +++ b/InvenTree/order/templates/order/order_select_parts.html @@ -22,12 +22,16 @@ {{ part.full_name }} {{ part.description }} - +
    +
    + +
    +
    From 0ca01fb0e7523d106e5d3c4cb2fdf0ce763c286d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 11 Jun 2019 23:47:09 +1000 Subject: [PATCH 05/33] Template improvements --- .../order/templates/order/order_select_parts.html | 10 +++++++--- InvenTree/order/views.py | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/InvenTree/order/templates/order/order_select_parts.html b/InvenTree/order/templates/order/order_select_parts.html index dbedcc4a91..4dc233c72d 100644 --- a/InvenTree/order/templates/order/order_select_parts.html +++ b/InvenTree/order/templates/order/order_select_parts.html @@ -16,7 +16,7 @@ {% for part in parts %} - + {% include "hover_image.html" with image=part.image hover=False %} {{ part.full_name }} {{ part.description }} @@ -34,11 +34,15 @@ - +
    +
    + +
    +
    diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 6382ab1d99..26e48e59fe 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -225,7 +225,11 @@ class OrderParts(AjaxView): self.request = request print("POST here") - return self.renderJsonResponse(request) + data = { + 'form_valid': False, + } + + return self.renderJsonResponse(request, data=data) class POLineItemCreate(AjaxCreateView): From 1cb6c670861ca3075ec75e4ee96c150eca7557cf Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 11 Jun 2019 23:55:20 +1000 Subject: [PATCH 06/33] Launch order dialog from the 'Parts' table --- InvenTree/order/views.py | 16 +++++++++++++++- InvenTree/part/templates/part/category.html | 1 + InvenTree/static/script/inventree/part.js | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 26e48e59fe..d200392084 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -194,8 +194,22 @@ class OrderParts(AjaxView): for item in stock_items: part_ids.add(item.part.id) - print("Parts:", part_ids) + # User has passed a list of part ID values + if 'parts[]' in self.request.GET: + part_id_list = self.request.GET.getlist('parts[]') + + print("Provided list of part:") + print(part_id_list) + + parts = Part.objects.filter( + purchaseable=True, + id__in=part_id_list) + + for part in parts: + part_ids.add(part.id) + + print("Parts:", part_ids) # Create the list of parts for id in part_ids: diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html index 2d76b08ac9..bbe449d217 100644 --- a/InvenTree/part/templates/part/category.html +++ b/InvenTree/part/templates/part/category.html @@ -49,6 +49,7 @@
    diff --git a/InvenTree/static/script/inventree/part.js b/InvenTree/static/script/inventree/part.js index 7c933ef303..d56a8d4769 100644 --- a/InvenTree/static/script/inventree/part.js +++ b/InvenTree/static/script/inventree/part.js @@ -192,4 +192,22 @@ function loadPartTable(table, url, options={}) { if (options.buttons) { linkButtonsToSelection($(table), options.buttons); } + + /* Button callbacks for part table buttons */ + + $("#multi-part-order").click(function() { + var selections = $(table).bootstrapTable("getSelections"); + + var parts = []; + + selections.forEach(function(item) { + parts.push(item.pk); + }); + + launchModalForm("/order/purchase-order/order-parts/", { + data: { + parts: parts, + }, + }); + }); } \ No newline at end of file From 3460a48b634ce8a01b35dd8d58a1067fe92aa793 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 11 Jun 2019 23:58:00 +1000 Subject: [PATCH 07/33] Extra form info --- .../order/templates/order/order_select_parts.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/InvenTree/order/templates/order/order_select_parts.html b/InvenTree/order/templates/order/order_select_parts.html index 4dc233c72d..4191010df5 100644 --- a/InvenTree/order/templates/order/order_select_parts.html +++ b/InvenTree/order/templates/order/order_select_parts.html @@ -2,6 +2,16 @@ {% block form %} +{% if parts|length > 0 %} + +{% else %} + +{% endif %} +
    {% csrf_token %} {% load crispy_forms_tags %} From e4f5cc8ccdd86df7440f5f9e9f7e6a9ce5b39d45 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Jun 2019 00:04:20 +1000 Subject: [PATCH 08/33] Order from a part page --- InvenTree/order/views.py | 14 +++++++++++++- InvenTree/part/templates/part/detail.html | 11 +++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index d200392084..6f466d687c 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -194,9 +194,21 @@ class OrderParts(AjaxView): for item in stock_items: part_ids.add(item.part.id) + # User has passed a single Part ID + elif 'part' in self.request.GET: + try: + part_id = self.request.GET.get('part') + part = Part.objects.get(id=part_id) + + part_ids.add(part.id) + + except Part.DoesNotExist: + pass + + # User has passed a list of part ID values - if 'parts[]' in self.request.GET: + elif 'parts[]' in self.request.GET: part_id_list = self.request.GET.getlist('parts[]') print("Provided list of part:") diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html index b536a5542e..fe357a6bdc 100644 --- a/InvenTree/part/templates/part/detail.html +++ b/InvenTree/part/templates/part/detail.html @@ -15,6 +15,9 @@
      {% if part.active %}
    • Edit
      • + {% if part.purchaseable %} +
    • Order
      • + {% endif %}
    • Duplicate
    • Deactivate
      • @@ -158,6 +161,14 @@ } ); }); + + $("#order-part").click(function() { + launchModalForm("/order/purchase-order/order-parts/", { + data: { + part: {{ part.id }}, + }, + }); + }); $("#edit-part").click(function() { launchModalForm( From 74327d3094e853443dc6691b76bad766d626efba Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Jun 2019 00:10:39 +1000 Subject: [PATCH 09/33] Order from supplier 'parts list' page --- .../templates/company/detail_part.html | 17 +++++++++++++++++ InvenTree/order/views.py | 19 +------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html index 5e0a28541c..d0ec6ce66a 100644 --- a/InvenTree/company/templates/company/detail_part.html +++ b/InvenTree/company/templates/company/detail_part.html @@ -12,6 +12,7 @@ @@ -101,4 +102,20 @@ url: "{% url 'api-part-supplier-list' %}" }); + $("#multi-part-order").click(function() { + var selections = $("#part-table").bootstrapTable("getSelections"); + + var parts = []; + + selections.forEach(function(item) { + parts.push(item.part); + }); + + launchModalForm("/order/purchase-order/order-parts/", { + data: { + parts: parts, + }, + }); + }); + {% endblock %} \ No newline at end of file diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 6f466d687c..da58111dcd 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -160,8 +160,6 @@ class OrderParts(AjaxView): ctx = {} - print("Getting context data") - ctx['parts'] = self.get_parts() return ctx @@ -179,9 +177,6 @@ class OrderParts(AjaxView): 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. @@ -205,15 +200,10 @@ class OrderParts(AjaxView): except Part.DoesNotExist: pass - - # User has passed a list of part ID values elif 'parts[]' in self.request.GET: part_id_list = self.request.GET.getlist('parts[]') - print("Provided list of part:") - print(part_id_list) - parts = Part.objects.filter( purchaseable=True, id__in=part_id_list) @@ -221,8 +211,6 @@ class OrderParts(AjaxView): for part in parts: part_ids.add(part.id) - print("Parts:", part_ids) - # Create the list of parts for id in part_ids: try: @@ -238,10 +226,6 @@ class OrderParts(AjaxView): self.request = request - print("GET HERE") - - print(request.GET) - self.get_parts() return self.renderJsonResponse(request) @@ -249,8 +233,7 @@ class OrderParts(AjaxView): def post(self, request, *args, **kwargs): self.request = request - print("POST here") - + data = { 'form_valid': False, } From b138a4bd5f0880083902038632f3a001a5203999 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Jun 2019 00:21:18 +1000 Subject: [PATCH 10/33] Order parts directly from a build --- InvenTree/build/templates/build/allocate.html | 8 ++++++++ .../build/templates/build/allocate_view.html | 1 + InvenTree/order/views.py | 16 +++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/InvenTree/build/templates/build/allocate.html b/InvenTree/build/templates/build/allocate.html index 3a024c8255..9f504e0901 100644 --- a/InvenTree/build/templates/build/allocate.html +++ b/InvenTree/build/templates/build/allocate.html @@ -68,6 +68,14 @@ InvenTree | Allocate Parts location.href = "{% url 'build-allocate' build.id %}?edit=1"; }); + $("#btn-order-parts").click(function() { + launchModalForm("/order/purchase-order/order-parts/", { + data: { + build: {{ build.id }}, + }, + }); + }); + {% endif %} {% endblock %} diff --git a/InvenTree/build/templates/build/allocate_view.html b/InvenTree/build/templates/build/allocate_view.html index 49ee5d71c4..31d35b43f9 100644 --- a/InvenTree/build/templates/build/allocate_view.html +++ b/InvenTree/build/templates/build/allocate_view.html @@ -3,6 +3,7 @@
      +
      diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index da58111dcd..c522208f9e 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -11,6 +11,7 @@ from django.views.generic.edit import FormMixin from django.forms import HiddenInput from .models import PurchaseOrder, PurchaseOrderLineItem +from build.models import Build from company.models import Company, SupplierPart from stock.models import StockItem from part.models import Part @@ -211,6 +212,19 @@ class OrderParts(AjaxView): for part in parts: part_ids.add(part.id) + # User has provided a Build ID + elif 'build' in self.request.GET: + build_id = self.request.GET.get('build') + try: + build = Build.objects.get(id=build_id) + + parts = build.part.required_parts() + + for part in parts: + part_ids.add(part.id) + except Build.DoesNotExist: + pass + # Create the list of parts for id in part_ids: try: @@ -220,7 +234,7 @@ class OrderParts(AjaxView): self.parts.append(part) - return self.parts + return sorted(self.parts, key=lambda part: part.quantity_to_order, reverse=True) def get(self, request, *args, **kwargs): From f0796327b360184e69f14ecedd176cf72fe1fa8b Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Jun 2019 00:29:47 +1000 Subject: [PATCH 11/33] Improve display of part base page --- InvenTree/part/templates/part/part_base.html | 39 +++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 2661497c74..92dccbcae1 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -72,24 +72,16 @@
      -

      Stock Status - {{ part.available_stock }}{% if part.units %} {{ part.units }} {% endif%} available

      + + + - {% if part.assembly %} - - - - - {% if part.quantity_being_built > 0 %} - - - - - {% endif %} - {% endif %} {% if part.allocation_count > 0 %} @@ -102,6 +94,27 @@ {% endif %} + + + + + {% if part.assembly %} + + + + + + + + {% if part.quantity_being_built > 0 %} + + + + + {% endif %} + {% endif %}
      +

      Stock Status

      +
      In Stock {{ part.total_stock }}
      Can Build{{ part.can_build }}
      Underway{{ part.quantity_being_built }}
      Allocated{{ part.on_order }}
      Total Available{{ part.net_stock }}
      +

      Build Status

      +
      Can Build{{ part.can_build }}
      Underway{{ part.quantity_being_built }}
      From a41a6c52ca42357df611a35e33b87ae5a8bfdc16 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Jun 2019 00:39:33 +1000 Subject: [PATCH 12/33] Peppy fixes --- InvenTree/order/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index c522208f9e..e836e49b9e 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -7,7 +7,6 @@ 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 @@ -181,7 +180,7 @@ class OrderParts(AjaxView): """ Get a list of all the parts associated with the stock items. - Base part must be purchaseable. - - Return a set of corresponding Part IDs + - Return a set of corresponding Part IDs """ stock_items = StockItem.objects.filter( part__purchaseable=True, From c9b946655c0f4160e0fd3aed073ef46122190e5d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 18:33:15 +1000 Subject: [PATCH 13/33] Add some more data to Part serializer --- InvenTree/part/serializers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py index 224e41cd97..37f5f1db7a 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -65,6 +65,8 @@ class PartSerializer(serializers.ModelSerializer): image_url = serializers.CharField(source='get_image_url', read_only=True) category_name = serializers.CharField(source='category_path', read_only=True) + allocated_stock = serializers.IntegerField(source='allocation_count', read_only=True) + @staticmethod def setup_eager_loading(queryset): queryset = queryset.prefetch_related('category') @@ -91,7 +93,8 @@ class PartSerializer(serializers.ModelSerializer): 'keywords', 'URL', 'total_stock', - # 'available_stock', + 'allocated_stock', + 'on_order', 'units', 'trackable', 'assembly', From 15432fd6b7822fa9789d85523bfa65798855bc46 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 19:10:31 +1000 Subject: [PATCH 14/33] Handle list of parts sent back to the order-parts form - Eliminate parts which are zero quantity - Display an error message when no supplier is selected --- .../select_parts.html} | 9 ++- InvenTree/order/views.py | 79 ++++++++++++++++++- 2 files changed, 81 insertions(+), 7 deletions(-) rename InvenTree/order/templates/order/{order_select_parts.html => order_wizard/select_parts.html} (83%) diff --git a/InvenTree/order/templates/order/order_select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html similarity index 83% rename from InvenTree/order/templates/order/order_select_parts.html rename to InvenTree/order/templates/order/order_wizard/select_parts.html index 4191010df5..0e77fe4796 100644 --- a/InvenTree/order/templates/order/order_select_parts.html +++ b/InvenTree/order/templates/order/order_wizard/select_parts.html @@ -34,19 +34,22 @@
      - {% for supplier in part.supplier_parts.all %} - + {% endfor %}
      + {% if not part.order_supplier %} +
      Select a supplier for {{ part.name }} + {% endif %}
      - +
      diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index e836e49b9e..079ac51756 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -151,7 +151,7 @@ class OrderParts(AjaxView): """ ajax_form_title = "Order Parts" - ajax_template_name = 'order/order_select_parts.html' + ajax_template_name = 'order/order_wizard/select_parts.html' # List of Parts we wish to order parts = [] @@ -160,7 +160,7 @@ class OrderParts(AjaxView): ctx = {} - ctx['parts'] = self.get_parts() + ctx['parts'] = sorted(self.parts, key=lambda part: part.order_quantity, reverse=True) return ctx @@ -228,13 +228,20 @@ class OrderParts(AjaxView): for id in part_ids: try: part = Part.objects.get(id=id) + # Pre-fill the 'order quantity' value + part.order_quantity = part.quantity_to_order + + default_supplier = part.get_default_supplier() + + if default_supplier: + part.order_supplier = default_supplier.id + else: + part.order_supplier = None except Part.DoesNotExist: continue self.parts.append(part) - return sorted(self.parts, key=lambda part: part.quantity_to_order, reverse=True) - def get(self, request, *args, **kwargs): self.request = request @@ -246,6 +253,12 @@ class OrderParts(AjaxView): def post(self, request, *args, **kwargs): self.request = request + form_step = request.POST.get('form_step') + + if form_step == 'select_parts': + return self.handlePartSelection() + elif form_step == 'assign_orders': + return self.handleOrderAssignment() data = { 'form_valid': False, @@ -253,6 +266,64 @@ class OrderParts(AjaxView): return self.renderJsonResponse(request, data=data) + def handlePartSelection(self): + """ Handle the POST action for part selection. + + - Validates each part / quantity / supplier / etc + + Part selection form contains the following fields for each part: + + - supplier- : The ID of the selected supplier + - quantity- : The quantity to add to the order + """ + + self.parts = [] + + for item in self.request.POST: + + if item.startswith('supplier-'): + + pk = item.replace('supplier-', '') + + # Check that the part actually exists + try: + part = Part.objects.get(id=pk) + except (Part.DoesNotExist, ValueError): + continue + + supplier_part_id = self.request.POST[item] + + quantity = self.request.POST.get('quantity-' + str(pk), 0) + + # Ensure a valid supplier has been passed + try: + supplier_part = SupplierPart.objects.get(id=supplier_part_id) + except (SupplierPart.DoesNotExist, ValueError): + supplier_part = None + print('Error getting supplier part for ID', supplier_part_id) + + # Ensure a valid quantity is passed + try: + q = int(quantity) + # Ignore any parts for which the selected quantity is zero + if q <= 0: + continue + except ValueError: + quantity = part.quantity_to_order + + part.order_supplier = supplier_part.id if supplier_part else None + part.order_quantity = quantity + + self.parts.append(part) + + print(part.name, part.order_supplier, part.order_quantity) + + data = { + 'form_valid': False, + } + + return self.renderJsonResponse(self.request, data=data) + class POLineItemCreate(AjaxCreateView): """ AJAX view for creating a new PurchaseOrderLineItem object From 2fffd874a388f3cb2588f07d139c87450a078ea9 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 19:12:34 +1000 Subject: [PATCH 15/33] Use integer ordering for part quantity --- InvenTree/order/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 079ac51756..bf2561233d 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -160,7 +160,7 @@ class OrderParts(AjaxView): ctx = {} - ctx['parts'] = sorted(self.parts, key=lambda part: part.order_quantity, reverse=True) + ctx['parts'] = sorted(self.parts, key=lambda part: int(part.order_quantity), reverse=True) return ctx From 7049ab1d8ca82b65a92e40e088b08bfa8ecea576 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 19:30:18 +1000 Subject: [PATCH 16/33] Collate parts by supplier and present a purchase-order form --- .../order/order_wizard/select_parts.html | 8 ++- .../order/order_wizard/select_pos.html | 49 +++++++++++++++++++ InvenTree/order/views.py | 37 +++++++++++++- 3 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 InvenTree/order/templates/order/order_wizard/select_pos.html diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html index 0e77fe4796..fc4c5c3801 100644 --- a/InvenTree/order/templates/order/order_wizard/select_parts.html +++ b/InvenTree/order/templates/order/order_wizard/select_parts.html @@ -2,6 +2,10 @@ {% block form %} +

      + Step 1 of 2 - Select Parts +

      + {% if parts|length > 0 %} diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 68273f7410..303e713a2d 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -185,6 +185,10 @@ class OrderParts(AjaxView): if not supplier.name in suppliers: supplier.order_items = [] suppliers[supplier.name] = supplier + + print("Supplier:", supplier.name) + for order in supplier.outstanding_purchase_orders(): + print("order:", order.reference) suppliers[supplier.name].order_items.append(part) From 3bb76060d95b385a29ebc71b6cb405c2d51e3ec7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 20:17:36 +1000 Subject: [PATCH 18/33] Extract supplier purchase order selection information --- .../order/order_wizard/select_parts.html | 6 +- .../order/order_wizard/select_pos.html | 26 ++++- InvenTree/order/views.py | 101 ++++++++++++------ InvenTree/static/css/inventree.css | 7 ++ 4 files changed, 101 insertions(+), 39 deletions(-) diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html index fc4c5c3801..602b88bfe7 100644 --- a/InvenTree/order/templates/order/order_wizard/select_parts.html +++ b/InvenTree/order/templates/order/order_wizard/select_parts.html @@ -38,7 +38,7 @@
      - {% for supplier in part.supplier_parts.all %} @@ -46,14 +46,14 @@
      {% if not part.order_supplier %} -
      Select a supplier for {{ part.name }} + Select a supplier for {{ part.name }} {% endif %}
      - +
      diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html index 03094ecdda..fdd6ff3e0b 100644 --- a/InvenTree/order/templates/order/order_wizard/select_pos.html +++ b/InvenTree/order/templates/order/order_wizard/select_pos.html @@ -16,11 +16,19 @@ + {% for supplier in suppliers %} + {% for item in supplier.order_items %} + + + {% endfor %} + {% endfor %} + + {% for supplier in suppliers %} @@ -34,18 +42,30 @@
      + {% if not supplier.selected_purchase_order %} + Select a purchase order for {{ supplier.name }} + {% endif %} + {% endfor %} diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 303e713a2d..53e8355d79 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -174,6 +174,10 @@ class OrderParts(AjaxView): suppliers = {} + for supplier in self.suppliers: + supplier.order_items = [] + suppliers[supplier.name] = supplier + for part in self.parts: supplier_part_id = part.order_supplier @@ -184,11 +188,8 @@ class OrderParts(AjaxView): if not supplier.name in suppliers: supplier.order_items = [] + supplier.selected_purchase_order = None suppliers[supplier.name] = supplier - - print("Supplier:", supplier.name) - for order in supplier.outstanding_purchase_orders(): - print("order:", order.reference) suppliers[supplier.name].order_items.append(part) @@ -281,22 +282,6 @@ class OrderParts(AjaxView): return self.renderJsonResponse(request) def post(self, request, *args, **kwargs): - - self.request = request - form_step = request.POST.get('form_step') - - if form_step == 'select_parts': - return self.handlePartSelection() - elif form_step == 'assign_orders': - return self.handleOrderAssignment() - - data = { - 'form_valid': False, - } - - return self.renderJsonResponse(request, data=data) - - def handlePartSelection(self): """ Handle the POST action for part selection. - Validates each part / quantity / supplier / etc @@ -307,16 +292,21 @@ class OrderParts(AjaxView): - quantity- : The quantity to add to the order """ + self.request = request + self.parts = [] + self.suppliers = [] # Any errors for the part selection form? - errors = False + part_errors = False + supplier_errors = False + # Extract part information from the form for item in self.request.POST: - if item.startswith('supplier-'): + if item.startswith('part-supplier-'): - pk = item.replace('supplier-', '') + pk = item.replace('part-supplier-', '') # Check that the part actually exists try: @@ -326,7 +316,7 @@ class OrderParts(AjaxView): supplier_part_id = self.request.POST[item] - quantity = self.request.POST.get('quantity-' + str(pk), 0) + quantity = self.request.POST.get('part-quantity-' + str(pk), 0) # Ensure a valid supplier has been passed try: @@ -337,9 +327,10 @@ class OrderParts(AjaxView): # Ensure a valid quantity is passed try: - q = int(quantity) - # Ignore any parts for which the selected quantity is zero - if q <= 0: + quantity = int(quantity) + + # Eliminate lines where the quantity is zero + if quantity == 0: continue except ValueError: quantity = part.quantity_to_order @@ -350,17 +341,61 @@ class OrderParts(AjaxView): self.parts.append(part) if supplier_part is None: - errors = True + part_errors = True + + elif quantity < 0: + part_errors = True + + elif item.startswith('purchase-order-'): + # Which purchase order is selected for a given supplier? + pk = item.replace('purchase-order-', '') + + print(item) + + # Check that the Supplier actually exists + try: + supplier = Company.objects.get(id=pk) + except Company.DoesNotExist: + # Skip this item + continue + + purchase_order_id = self.request.POST[item] + + # Ensure that a valid purchase order has been passed + try: + purchase_order = PurchaseOrder.objects.get(pk=purchase_order_id) + except (PurchaseOrder.DoesNotExist, ValueError): + purchase_order = None + + supplier.selected_purchase_order = purchase_order.id if purchase_order else None + + self.suppliers.append(supplier) + + if supplier.selected_purchase_order is None: + supplier_errors = True + + form_step = request.POST.get('form_step') + + # Map parts to suppliers + self.get_suppliers() + + if form_step == 'select_parts': + # No errors? Proceed to PO selection form + if part_errors == False: + self.ajax_template_name = 'order/order_wizard/select_pos.html' + + else: + self.ajax_template_name = 'order/order_wizard/select_parts.html' + + elif form_step == 'select_purchase_orders': + + + self.ajax_template_name = 'order/order_wizard/select_pos.html' data = { 'form_valid': False, } - # No errors? Proceed to PO selection form - if errors == False: - self.ajax_template_name = 'order/order_wizard/select_pos.html' - self.get_suppliers() - return self.renderJsonResponse(self.request, data=data) diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css index 2a98814dda..3371b8d399 100644 --- a/InvenTree/static/css/inventree.css +++ b/InvenTree/static/css/inventree.css @@ -292,6 +292,13 @@ color: #A11; } +.btn-create { + padding: 3px; + padding-left: 5px; + padding-right: 5px; + color: #1A1; +} + .button-toolbar { padding-left: 0px; } From 4be82a31ced886aa08c659fad553e7f9e353d94c Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 20:26:53 +1000 Subject: [PATCH 19/33] Remove rows from order form --- .../order/order_wizard/select_parts.html | 9 ++++++-- .../order/order_wizard/select_pos.html | 21 +++++++++---------- InvenTree/static/script/inventree/order.js | 11 ++++++++++ InvenTree/templates/base.html | 1 + 4 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 InvenTree/static/script/inventree/order.js diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html index 602b88bfe7..755d4812bc 100644 --- a/InvenTree/order/templates/order/order_wizard/select_parts.html +++ b/InvenTree/order/templates/order/order_wizard/select_parts.html @@ -25,7 +25,7 @@
      Supplier Items Purchase Order
      + +
      - + @@ -35,6 +35,11 @@ {% include "hover_image.html" with image=part.image hover=False %} {{ part.full_name }} {{ part.description }} + diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html index fdd6ff3e0b..bed01bbb5c 100644 --- a/InvenTree/order/templates/order/order_wizard/select_pos.html +++ b/InvenTree/order/templates/order/order_wizard/select_pos.html @@ -27,8 +27,7 @@ - - + {% for supplier in suppliers %} @@ -37,6 +36,15 @@ {{ supplier.name }} + - {% endfor %} diff --git a/InvenTree/static/script/inventree/order.js b/InvenTree/static/script/inventree/order.js new file mode 100644 index 0000000000..09e50fa4b6 --- /dev/null +++ b/InvenTree/static/script/inventree/order.js @@ -0,0 +1,11 @@ +function removeOrderRowFromOrderWizard(e) { + /* Remove a part selection from an order form. */ + + e = e || window.event; + + var src = e.target || e.srcElement; + + var row = $(src).attr('row'); + + $('#' + row).remove(); +} \ No newline at end of file diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index cc58d27197..43a9e7678b 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -99,6 +99,7 @@ InvenTree + {% block js_load %} From 915395e676afe031758334767d655d8cb14ab4e0 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 20:35:15 +1000 Subject: [PATCH 20/33] Create a new supplier part directly from the order form --- .../order/order_wizard/select_parts.html | 2 +- InvenTree/static/script/inventree/order.js | 31 ++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html index 755d4812bc..f8ed6e2a93 100644 --- a/InvenTree/order/templates/order/order_wizard/select_parts.html +++ b/InvenTree/order/templates/order/order_wizard/select_parts.html @@ -37,7 +37,7 @@ + {% for order in orders %} @@ -11,6 +12,7 @@ + {% endfor %}
      PartSupplierSelect Supplier Quantity
      + +
      @@ -59,7 +64,7 @@
      Supplier ItemsPurchase OrderSelect Purchase Order
      {{ supplier.order_items|length }} + +
      @@ -57,15 +65,6 @@ {% endif %}
      		- -
      diff --git a/InvenTree/static/script/inventree/order.js b/InvenTree/static/script/inventree/order.js index 09e50fa4b6..79ac2b76bd 100644 --- a/InvenTree/static/script/inventree/order.js +++ b/InvenTree/static/script/inventree/order.js @@ -8,4 +8,33 @@ function removeOrderRowFromOrderWizard(e) { var row = $(src).attr('row'); $('#' + row).remove(); -} \ No newline at end of file +} + +function newSupplierPartFromOrderWizard(e) { + /* Create a new supplier part directly from an order form. + * Launches a secondary modal and (if successful), + * back-populates the selected row. + */ + + e = e || window.event; + + var src = e.target || e.srcElement; + + var part = $(src).attr('part-id'); + + launchModalForm("/supplier-part/new/", { + modal: '#modal-form-secondary', + data: { + part: part, + }, + success: function(response) { + /* A new supplier part has been created! */ + + var dropdown = '#id_supplier_part_' + part; + + var option = new Option(response.text, response.pk, true, true); + + $('#modal-form').find(dropdown).append(option).trigger('change'); + }, + }); +} From f52aa0af21454998262826d27fce9dfb74861822 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 20:42:09 +1000 Subject: [PATCH 21/33] Create a new purchase order directly from the "Order Parts" form wizard --- .../order/order_wizard/select_pos.html | 2 +- InvenTree/order/templates/order/po_table.html | 2 ++ InvenTree/static/script/inventree/order.js | 29 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html index bed01bbb5c..f97ba95ee2 100644 --- a/InvenTree/order/templates/order/order_wizard/select_pos.html +++ b/InvenTree/order/templates/order/order_wizard/select_pos.html @@ -42,7 +42,7 @@ id='new_po_{{ supplier.id }}' title='Create new purchase order for {{ supplier.name }}' type='button'> - + diff --git a/InvenTree/order/templates/order/po_table.html b/InvenTree/order/templates/order/po_table.html index 0c1149470f..cfd4811d97 100644 --- a/InvenTree/order/templates/order/po_table.html +++ b/InvenTree/order/templates/order/po_table.html @@ -4,6 +4,7 @@ Order Reference Description StatusItems
      {{ order }} {{ order.description }} {% include "order/order_status.html" %}{{ order.lines.count }}
      \ No newline at end of file diff --git a/InvenTree/static/script/inventree/order.js b/InvenTree/static/script/inventree/order.js index 79ac2b76bd..82e14532d6 100644 --- a/InvenTree/static/script/inventree/order.js +++ b/InvenTree/static/script/inventree/order.js @@ -38,3 +38,32 @@ function newSupplierPartFromOrderWizard(e) { }, }); } + +function newPurchaseOrderFromOrderWizard(e) { + /* Create a new purchase order directly from an order form. + * Launches a secondary modal and (if successful), + * back-fills the newly created purchase order. + */ + + e = e || window.event; + + var src = e.target || e.srcElement; + + var supplier = $(src).attr('supplier-id'); + + launchModalForm("/order/purchase-order/new/", { + modal: '#modal-form-secondary', + data: { + supplier: supplier, + }, + success: function(response) { + /* A new purchase order has been created! */ + + var dropdown = '#id-purchase-order-' + supplier; + + var option = new Option(response.text, response.pk, true, true); + + $('#modal-form').find(dropdown).append(option).trigger('change'); + }, + }); +} \ No newline at end of file From 52b70510607b37d5c95374d1d5d8ea68bd141a32 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 21:17:06 +1000 Subject: [PATCH 22/33] Automatically add line items to an order --- InvenTree/order/models.py | 45 +++++++++++++++++++++++++++++++++ InvenTree/order/views.py | 53 +++++++++++++++++++++++++++++++++++---- 2 files changed, 93 insertions(+), 5 deletions(-) diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index 7ca2e942fd..aae5e5bfe9 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -6,6 +6,7 @@ Order model definitions from django.db import models from django.core.validators import MinValueValidator +from django.core.exceptions import ValidationError from django.contrib.auth.models import User from django.urls import reverse from django.utils.translation import ugettext as _ @@ -101,6 +102,50 @@ class PurchaseOrder(Order): def get_absolute_url(self): return reverse('purchase-order-detail', kwargs={'pk': self.id}) + def add_line_item(self, supplier_part, quantity, group=True, reference=''): + """ Add a new line item to this purchase order. + This function will check that: + + * The supplier part matches the supplier specified for this purchase order + * The quantity is greater than zero + + Args: + supplier_part - The supplier_part to add + quantity - The number of items to add + group - If True, this new quantity will be added to an existing line item for the same supplier_part (if it exists) + """ + + try: + quantity = int(quantity) + if quantity <= 0: + raise ValidationError({ + 'quantity': _("Quantity must be greater than zero")}) + except ValueError: + raise ValidationError({'quantity': _("Invalid quantity provided")}) + + if not supplier_part.supplier == self.supplier: + raise ValidationError({'supplier': _("Part supplier must match PO supplier")}) + + if group: + # Check if there is already a matching line item + matches = PurchaseOrderLineItem.objects.filter(part=supplier_part) + + if matches.count() > 0: + line = matches.first() + + line.quantity += quantity + line.save() + + return + + line = PurchaseOrderLineItem( + order=self, + part=supplier_part, + quantity=quantity, + reference=reference) + + line.save() + class OrderLineItem(models.Model): """ Abstract model for an order line item diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 53e8355d79..69766db282 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -9,6 +9,8 @@ from django.utils.translation import ugettext as _ from django.views.generic import DetailView, ListView from django.forms import HiddenInput +import logging + from .models import PurchaseOrder, PurchaseOrderLineItem from build.models import Build from company.models import Company, SupplierPart @@ -22,6 +24,8 @@ from InvenTree.helpers import str2bool from InvenTree.status_codes import OrderStatus +logger = logging.getLogger(__name__) + class PurchaseOrderIndex(ListView): """ List view for all purchase orders """ @@ -323,7 +327,6 @@ class OrderParts(AjaxView): supplier_part = SupplierPart.objects.get(id=supplier_part_id) except (SupplierPart.DoesNotExist, ValueError): supplier_part = None - print('Error getting supplier part for ID', supplier_part_id) # Ensure a valid quantity is passed try: @@ -350,8 +353,6 @@ class OrderParts(AjaxView): # Which purchase order is selected for a given supplier? pk = item.replace('purchase-order-', '') - print(item) - # Check that the Supplier actually exists try: supplier = Company.objects.get(id=pk) @@ -379,6 +380,8 @@ class OrderParts(AjaxView): # Map parts to suppliers self.get_suppliers() + valid = False + if form_step == 'select_parts': # No errors? Proceed to PO selection form if part_errors == False: @@ -389,15 +392,55 @@ class OrderParts(AjaxView): elif form_step == 'select_purchase_orders': - self.ajax_template_name = 'order/order_wizard/select_pos.html' + valid = part_errors is False and supplier_errors is False + + # Form wizard is complete! Add items to purchase orders + if valid: + self.order_items() + data = { - 'form_valid': False, + 'form_valid': valid, + 'success': 'Ordered {n} parts'.format(n=len(self.parts)) } return self.renderJsonResponse(self.request, data=data) + def order_items(self): + """ Add the selected items to the purchase orders. """ + + for supplier in self.suppliers: + + # Check that the purchase order does actually exist + try: + order = PurchaseOrder.objects.get(pk=supplier.selected_purchase_order) + except PurchaseOrder.DoesNotExist: + logger.critical('Could not add items to purchase order {po} - Order does not exist'.format(po=supplier.selected_purchase_order)) + continue + + for item in supplier.order_items: + + # Ensure that the quantity is valid + try: + quantity = int(item.order_quantity) + if quantity <= 0: + continue + except ValueError: + logger.warning("Did not add part to purchase order - incorrect quantity") + continue + + # Check that the supplier part does actually exist + try: + supplier_part = SupplierPart.objects.get(pk=item.order_supplier) + except SupplierPart.DoesNotExist: + logger.critical("Could not add part '{part}' to purchase order - selected supplier part '{sp}' does not exist.".format( + part=item, + sp=item.order_supplier)) + continue + + order.add_line_item(supplier_part, quantity) + class POLineItemCreate(AjaxCreateView): """ AJAX view for creating a new PurchaseOrderLineItem object From 771a008e84458313cdf83ed3ae3aa609b6c6b622 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 21:21:22 +1000 Subject: [PATCH 23/33] Printable string for PurchaseOrderLineItem --- InvenTree/order/models.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index aae5e5bfe9..27f57faa87 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -177,6 +177,13 @@ class PurchaseOrderLineItem(OrderLineItem): ('order', 'part') ) + def __str__(self): + return "{n} x {part} from {supplier} (for {po})".format( + n=self.quantity, + part=self.part.SKU if self.part else 'unknown part', + supplier=self.order.supplier.name, + po=self.order) + order = models.ForeignKey( PurchaseOrder, on_delete=models.CASCADE, related_name='lines', From 2b74a0ed2cfda0808f7bb89131c2965b0e7c327a Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 21:28:01 +1000 Subject: [PATCH 24/33] Don't show zero-quantity items when ordering against a build --- InvenTree/build/templates/build/allocate_view.html | 2 ++ InvenTree/order/views.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/InvenTree/build/templates/build/allocate_view.html b/InvenTree/build/templates/build/allocate_view.html index 31d35b43f9..4f60405ff0 100644 --- a/InvenTree/build/templates/build/allocate_view.html +++ b/InvenTree/build/templates/build/allocate_view.html @@ -13,6 +13,7 @@ Part Description Available + On Order Required Allocated @@ -26,6 +27,7 @@ {{ item.part.description }} {{ item.part.total_stock }} + {{ item.part.on_order }} {{ item.quantity }} {{ item.allocated }} diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 69766db282..450a4c87a4 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -255,6 +255,9 @@ class OrderParts(AjaxView): parts = build.part.required_parts() for part in parts: + # If ordering from a Build page, ignore parts that we have enough of + if part.quantity_to_order <= 0: + continue part_ids.add(part.id) except Build.DoesNotExist: pass From a37a2120fa84ba8d9c93c56863804fbe293a844a Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 21:32:37 +1000 Subject: [PATCH 25/33] Add some context data to build views --- InvenTree/build/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py index 028546a6d4..0e7d73d294 100644 --- a/InvenTree/build/views.py +++ b/InvenTree/build/views.py @@ -275,6 +275,7 @@ class BuildDetail(DetailView): build = self.get_object() ctx['bom_price'] = build.part.get_price_info(build.quantity, buy=False) + ctx['BuildStatus'] = BuildStatus return ctx @@ -296,6 +297,7 @@ class BuildAllocate(DetailView): context['part'] = part context['bom_items'] = bom_items + context['BuildStatus'] = BuildStatus context['bom_price'] = build.part.get_price_info(build.quantity, buy=False) From d860336060c2c532e4ca3dc3d51070ff54a8fd19 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 21:44:09 +1000 Subject: [PATCH 26/33] Add some pretty buttons to the purchase order detail table --- .../order/purchase_order_detail.html | 24 +++++++++++++++++-- InvenTree/static/css/inventree.css | 8 +++++++ InvenTree/templates/hover_image.html | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index b6751e044d..9f5c7a588e 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -79,20 +79,40 @@ InvenTree | {{ order }} Order Code Reference Quantity + {% if not order.status == OrderStatus.PENDING %} Received + {% endif %} + {% for line in order.lines.all %} - {{ forloop.counter }} + + {{ forloop.counter }} + {% if line.part %} - {{ line.part.part.full_name }} + + {% include "hover_image.html" with image=line.part.part.image hover=True %} + {{ line.part.part.full_name }} + {{ line.part.SKU }} {% else %} Warning: Part has been deleted. {% endif %} {{ line.reference }} {{ line.quantity }} + {% if not order.status == OrderStatus.PENDING %} {{ line.received }} + {% endif %} + +
      + + +
      + {% endfor %} diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css index 3371b8d399..755b41c104 100644 --- a/InvenTree/static/css/inventree.css +++ b/InvenTree/static/css/inventree.css @@ -299,6 +299,14 @@ color: #1A1; } +.btn-edit { + padding: 3px; + padding: 3px; + padding-left: 5px; + padding-right: 5px; + color: #55E; +} + .button-toolbar { padding-left: 0px; } diff --git a/InvenTree/templates/hover_image.html b/InvenTree/templates/hover_image.html index 4ee9f67b2c..556a8db140 100644 --- a/InvenTree/templates/hover_image.html +++ b/InvenTree/templates/hover_image.html @@ -5,7 +5,7 @@ {% endif %} - {% if hover %} + {% if hover and image %} {% endif %} From fe5bb23d1345e11c590a25368375aab4191fb4c1 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 21:57:35 +1000 Subject: [PATCH 27/33] Add notes field to purchase order line item --- InvenTree/order/forms.py | 2 +- .../0010_purchaseorderlineitem_notes.py | 18 ++++++++++++++++++ InvenTree/order/models.py | 2 ++ .../templates/order/purchase_order_detail.html | 13 +++++++++---- 4 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 InvenTree/order/migrations/0010_purchaseorderlineitem_notes.py diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py index 08e9a6f740..c7942e3549 100644 --- a/InvenTree/order/forms.py +++ b/InvenTree/order/forms.py @@ -47,5 +47,5 @@ class EditPurchaseOrderLineItemForm(HelperForm): 'part', 'quantity', 'reference', - 'received' + 'notes', ] diff --git a/InvenTree/order/migrations/0010_purchaseorderlineitem_notes.py b/InvenTree/order/migrations/0010_purchaseorderlineitem_notes.py new file mode 100644 index 0000000000..a38a564041 --- /dev/null +++ b/InvenTree/order/migrations/0010_purchaseorderlineitem_notes.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.2 on 2019-06-13 11:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0009_auto_20190606_2133'), + ] + + operations = [ + migrations.AddField( + model_name='purchaseorderlineitem', + name='notes', + field=models.CharField(blank=True, help_text='Line item notes', max_length=500), + ), + ] diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index 27f57faa87..e4417f939a 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -162,6 +162,8 @@ class OrderLineItem(models.Model): quantity = models.PositiveIntegerField(validators=[MinValueValidator(0)], default=1, help_text=_('Item quantity')) reference = models.CharField(max_length=100, blank=True, help_text=_('Line item reference')) + + notes = models.CharField(max_length=500, blank=True, help_text=_('Line item notes')) class PurchaseOrderLineItem(OrderLineItem): diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 9f5c7a588e..16bf09f7e1 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -82,6 +82,7 @@ InvenTree | {{ order }} {% if not order.status == OrderStatus.PENDING %} Received {% endif %} + Note {% for line in order.lines.all %} @@ -103,13 +104,16 @@ InvenTree | {{ order }} {% if not order.status == OrderStatus.PENDING %} {{ line.received }} {% endif %} + + {{ line.notes }} +
      - -
      @@ -171,4 +175,5 @@ $('#new-po-line').click(function() { $("#po-lines-table").bootstrapTable({ }); + {% endblock %} \ No newline at end of file From c9cddd2a194efbaa5f4752276834f553d070115f Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 22:13:22 +1000 Subject: [PATCH 28/33] Add ability to edit and delete a purchase order line item --- InvenTree/order/forms.py | 1 + .../templates/order/po_lineitem_delete.html | 5 +++ .../order/purchase_order_detail.html | 4 +-- InvenTree/order/urls.py | 8 +++++ InvenTree/order/views.py | 28 ++++++++++++++-- InvenTree/static/script/inventree/order.js | 32 +++++++++++++++++++ 6 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 InvenTree/order/templates/order/po_lineitem_delete.html diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py index c7942e3549..ba2707133f 100644 --- a/InvenTree/order/forms.py +++ b/InvenTree/order/forms.py @@ -49,3 +49,4 @@ class EditPurchaseOrderLineItemForm(HelperForm): 'reference', 'notes', ] + diff --git a/InvenTree/order/templates/order/po_lineitem_delete.html b/InvenTree/order/templates/order/po_lineitem_delete.html new file mode 100644 index 0000000000..3264fea625 --- /dev/null +++ b/InvenTree/order/templates/order/po_lineitem_delete.html @@ -0,0 +1,5 @@ +{% extends "modal_delete_form.html" %} + +{% block pre_form_content %} +Are you sure you wish to delete this line item? +{% endblock %} \ No newline at end of file diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 16bf09f7e1..7028f96a8b 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -110,10 +110,10 @@ InvenTree | {{ order }}
      diff --git a/InvenTree/order/urls.py b/InvenTree/order/urls.py index 410efb8129..0c064ee9ee 100644 --- a/InvenTree/order/urls.py +++ b/InvenTree/order/urls.py @@ -17,9 +17,17 @@ purchase_order_detail_urls = [ url(r'^.*$', views.PurchaseOrderDetail.as_view(), name='purchase-order-detail'), ] +po_line_item_detail_urls = [ + + url(r'^edit/', views.POLineItemEdit.as_view(), name='po-line-item-edit'), + url(r'^delete/', views.POLineItemDelete.as_view(), name='po-line-item-delete'), +] + po_line_urls = [ url(r'^new/', views.POLineItemCreate.as_view(), name='po-line-item-create'), + + url(r'^(?P\d+)/', include(po_line_item_detail_urls)), ] purchase_order_urls = [ diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 450a4c87a4..3b789301de 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -19,7 +19,7 @@ from part.models import Part from . import forms as order_forms -from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView +from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView from InvenTree.helpers import str2bool from InvenTree.status_codes import OrderStatus @@ -539,8 +539,32 @@ class POLineItemCreate(AjaxCreateView): class POLineItemEdit(AjaxUpdateView): + """ View for editing a PurchaseOrderLineItem object in a modal form. + """ model = PurchaseOrderLineItem form_class = order_forms.EditPurchaseOrderLineItemForm ajax_template_name = 'modal_form.html' - ajax_form_action = 'Edit Line Item' + ajax_form_title = 'Edit Line Item' + + def get_form(self): + form = super().get_form() + + # Prevent user from editing order once line item is assigned + form.fields.pop('order') + + return form + + +class POLineItemDelete(AjaxDeleteView): + """ View for deleting a PurchaseOrderLineItem object in a modal form + """ + + model = PurchaseOrderLineItem + ajax_form_title = 'Delete Line Item' + ajax_template_name = 'order/po_lineitem_delete.html' + + def get_data(self): + return { + 'danger': 'Deleted line item', + } \ No newline at end of file diff --git a/InvenTree/static/script/inventree/order.js b/InvenTree/static/script/inventree/order.js index 82e14532d6..818596f7c9 100644 --- a/InvenTree/static/script/inventree/order.js +++ b/InvenTree/static/script/inventree/order.js @@ -66,4 +66,36 @@ function newPurchaseOrderFromOrderWizard(e) { $('#modal-form').find(dropdown).append(option).trigger('change'); }, }); +} + +function editPurchaseOrderLineItem(e) { + + /* Edit a purchase order line item in a modal form. + */ + + e = e || window.event; + + var src = e.target || e.srcElement; + + var url = $(src).attr('url'); + + launchModalForm(url, { + reload: true, + }); +} + +function removePurchaseOrderLineItem(e) { + + /* Delete a purchase order line item in a modal form + */ + + e = e || window.event; + + var src = e.target || e.srcElement; + + var url = $(src).attr('url'); + + launchModalForm(url, { + reload: true, + }); } \ No newline at end of file From 38001b5358eec24d4b4dd0aa845e2765756bef45 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 22:16:27 +1000 Subject: [PATCH 29/33] Peppy fixes --- InvenTree/order/forms.py | 1 - InvenTree/order/templates/order/purchase_order_detail.html | 4 ++++ InvenTree/order/views.py | 6 +++--- setup.cfg | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py index ba2707133f..c7942e3549 100644 --- a/InvenTree/order/forms.py +++ b/InvenTree/order/forms.py @@ -49,4 +49,3 @@ class EditPurchaseOrderLineItemForm(HelperForm): 'reference', 'notes', ] - diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 7028f96a8b..4360f4de4f 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -83,7 +83,9 @@ InvenTree | {{ order }} Received {% endif %} Note + {% if order.status == OrderStatus.PENDING %} + {% endif %} {% for line in order.lines.all %} @@ -107,6 +109,7 @@ InvenTree | {{ order }} {{ line.notes }} + {% if order.status == OrderStatus.PENDING %}
      + {% endif %} {% endfor %} diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 3b789301de..ea9da7e373 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -190,7 +190,7 @@ class OrderParts(AjaxView): except SupplierPart.DoesNotExist: continue - if not supplier.name in suppliers: + if supplier.name not in suppliers: supplier.order_items = [] supplier.selected_purchase_order = None suppliers[supplier.name] = supplier @@ -387,7 +387,7 @@ class OrderParts(AjaxView): if form_step == 'select_parts': # No errors? Proceed to PO selection form - if part_errors == False: + if part_errors is False: self.ajax_template_name = 'order/order_wizard/select_pos.html' else: @@ -567,4 +567,4 @@ class POLineItemDelete(AjaxDeleteView): def get_data(self): return { 'danger': 'Deleted line item', - } \ No newline at end of file + } diff --git a/setup.cfg b/setup.cfg index 697f6d1f02..d6e7ca056a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,6 +3,8 @@ ignore = # - W293 - blank lines contain whitespace W293, # - E501 - line too long (82 characters) - E501 + E501, + # - C901 - function is too complex + C901, exclude = .git,__pycache__,*/migrations/* max-complexity = 20 From 73b9881dc542ed6bc5e418caed2993406ef1d331 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 22:18:27 +1000 Subject: [PATCH 30/33] Improve table rendering for build allocation view --- InvenTree/build/templates/build/allocate.html | 5 ++++- InvenTree/build/templates/build/allocate_view.html | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/InvenTree/build/templates/build/allocate.html b/InvenTree/build/templates/build/allocate.html index 9f504e0901..3471b1283a 100644 --- a/InvenTree/build/templates/build/allocate.html +++ b/InvenTree/build/templates/build/allocate.html @@ -62,7 +62,10 @@ InvenTree | Allocate Parts {% else %} - $("#build-list").bootstrapTable({}); + $("#build-list").bootstrapTable({ + search: true, + sortable: true, + }); $("#btn-allocate").click(function() { location.href = "{% url 'build-allocate' build.id %}?edit=1"; diff --git a/InvenTree/build/templates/build/allocate_view.html b/InvenTree/build/templates/build/allocate_view.html index 4f60405ff0..b37f079b9d 100644 --- a/InvenTree/build/templates/build/allocate_view.html +++ b/InvenTree/build/templates/build/allocate_view.html @@ -10,12 +10,12 @@ - + - - - - + + + + @@ -27,9 +27,9 @@ - + {% endfor %} From 1b06d86f593e26a13b023dff27b7501df578723b Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 22:38:10 +1000 Subject: [PATCH 31/33] Export purchase order to CSV --- InvenTree/order/models.py | 50 +++++++++++++++++++ .../order/purchase_order_detail.html | 5 ++ InvenTree/order/urls.py | 2 + InvenTree/order/views.py | 25 +++++++++- InvenTree/part/views.py | 4 -- 5 files changed, 81 insertions(+), 5 deletions(-) diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index e4417f939a..7c9308fbbe 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -11,6 +11,7 @@ from django.contrib.auth.models import User from django.urls import reverse from django.utils.translation import ugettext as _ +import tablib from datetime import datetime from company.models import Company, SupplierPart @@ -99,6 +100,55 @@ class PurchaseOrder(Order): help_text=_('Company') ) + def export_to_file(self, **kwargs): + """ Export order information to external file """ + + file_format = kwargs.get('format', 'csv').lower() + + data = tablib.Dataset(headers=[ + 'Line', + 'Part', + 'Description', + 'Manufacturer', + 'MPN', + 'Order Code', + 'Quantity', + 'Received', + 'Reference', + 'Notes', + ]) + + idx = 0 + + for item in self.lines.all(): + + line = [] + + line.append(idx) + + if item.part: + line.append(item.part.part.name) + line.append(item.part.part.description) + + line.append(item.part.manufacturer) + line.append(item.part.MPN) + line.append(item.part.SKU) + + else: + line += [[] * 5] + + line.append(item.quantity) + line.append(item.received) + line.append(item.reference) + line.append(item.notes) + + idx += 1 + + data.append(line) + + return data.export(file_format) + + def get_absolute_url(self): return reverse('purchase-order-detail', kwargs={'pk': self.id}) diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 4360f4de4f..185eba4cad 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -64,6 +64,7 @@ InvenTree | {{ order }} {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %} {% endif %} +

      Order Items

      @@ -152,6 +153,10 @@ $("#edit-order").click(function() { ); }); +$("#export-order").click(function() { + location.href = "{% url 'purchase-order-export' order.id %}"; +}); + {% if order.status == OrderStatus.PENDING %} $('#new-po-line').click(function() { launchModalForm("{% url 'po-line-item-create' %}", diff --git a/InvenTree/order/urls.py b/InvenTree/order/urls.py index 0c064ee9ee..695628bad0 100644 --- a/InvenTree/order/urls.py +++ b/InvenTree/order/urls.py @@ -14,6 +14,8 @@ 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'^export/?', views.PurchaseOrderExport.as_view(), name='purchase-order-export'), + url(r'^.*$', views.PurchaseOrderDetail.as_view(), name='purchase-order-detail'), ] diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index ea9da7e373..578021b2cb 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -5,6 +5,7 @@ Django views for interacting with Order app # -*- coding: utf-8 -*- from __future__ import unicode_literals +from django.shortcuts import get_object_or_404 from django.utils.translation import ugettext as _ from django.views.generic import DetailView, ListView from django.forms import HiddenInput @@ -20,7 +21,7 @@ from part.models import Part from . import forms as order_forms from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView -from InvenTree.helpers import str2bool +from InvenTree.helpers import DownloadFile, str2bool from InvenTree.status_codes import OrderStatus @@ -142,6 +143,28 @@ class PurchaseOrderIssue(AjaxUpdateView): return self.renderJsonResponse(request, form, data) +class PurchaseOrderExport(AjaxView): + """ File download for a purchase order + + - File format can be optionally passed as a query param e.g. ?format=CSV + - Default file format is CSV + """ + + model = PurchaseOrder + + def get(self, request, *args, **kwargs): + + order = get_object_or_404(PurchaseOrder, pk=self.kwargs['pk']) + + export_format = request.GET.get('format', 'csv') + + filename = str(order) + '.' + export_format + + filedata = order.export_to_file(format=export_format) + + return DownloadFile(filedata, filename) + + class OrderParts(AjaxView): """ View for adding various SupplierPart items to a Purchase Order. diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py index 9f8b8652bd..1224d1de22 100644 --- a/InvenTree/part/views.py +++ b/InvenTree/part/views.py @@ -585,10 +585,6 @@ class BomDownload(AjaxView): # TODO - This should no longer extend an AjaxView! model = Part - # form_class = BomExportForm - # template_name = 'part/bom_export.html' - # ajax_form_title = 'Export Bill of Materials' - # context_object_name = 'part' def get(self, request, *args, **kwargs): From a424a805e42c2142b9ecddd8547d7de49ab74c77 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 22:39:57 +1000 Subject: [PATCH 32/33] Bump version string --- InvenTree/InvenTree/version.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py index 06336e136a..457ad3bd28 100644 --- a/InvenTree/InvenTree/version.py +++ b/InvenTree/InvenTree/version.py @@ -4,7 +4,7 @@ Provides information on the current InvenTree version import subprocess -INVENTREE_SW_VERSION = "0.0.1" +INVENTREE_SW_VERSION = "0.0.2" def inventreeVersion(): @@ -14,6 +14,8 @@ def inventreeVersion(): def inventreeCommitHash(): """ Returns the git commit hash for the running codebase """ + + # TODO - This doesn't seem to work when running under gunicorn. Why is this?! commit = str(subprocess.check_output('git rev-parse --short HEAD'.split()), 'utf-8').strip() return commit From 5aac603d63e392ce9e2cc4301ba9571e06bc22ae Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 13 Jun 2019 22:43:31 +1000 Subject: [PATCH 33/33] Satisfying the frog --- InvenTree/order/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index 7c9308fbbe..e2a0efc36d 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -148,7 +148,6 @@ class PurchaseOrder(Order): return data.export(file_format) - def get_absolute_url(self): return reverse('purchase-order-detail', kwargs={'pk': self.id})
      PartPart DescriptionAvailableOn OrderRequiredAllocatedAvailableRequiredAllocatedOn Order
      {{ item.part.description }} {{ item.part.total_stock }}{{ item.part.on_order }} {{ item.quantity }} {{ item.allocated }}{{ item.part.on_order }}