\ No newline at end of file
diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py
index e21c6295e3..f275edede2 100644
--- a/InvenTree/part/urls.py
+++ b/InvenTree/part/urls.py
@@ -75,6 +75,7 @@ part_detail_urls = [
# Normal thumbnail with form
url(r'^thumbnail/?', views.PartImageUpload.as_view(), name='part-image-upload'),
url(r'^thumb-select/?', views.PartImageSelect.as_view(), name='part-image-select'),
+ url(r'^thumb-download/', views.PartImageDownloadFromURL.as_view(), name='part-image-download'),
# Any other URLs go to the part detail page
url(r'^.*$', views.PartDetail.as_view(), name='part-detail'),
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 65f859566b..0208636a48 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -5,6 +5,7 @@ Django views for interacting with Part app
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
+from django.core.files.base import ContentFile
from django.core.exceptions import ValidationError
from django.db import transaction
from django.db.utils import IntegrityError
@@ -19,7 +20,11 @@ from django.conf import settings
from moneyed import CURRENCIES
+from PIL import Image
+
+import requests
import os
+import io
from rapidfuzz import fuzz
from decimal import Decimal, InvalidOperation
@@ -831,6 +836,89 @@ class PartQRCode(QRCodeView):
return None
+class PartImageDownloadFromURL(AjaxUpdateView):
+ """
+ View for downloading an image from a provided URL
+ """
+
+ model = Part
+
+ ajax_template_name = 'image_download.html'
+ form_class = part_forms.PartImageDownloadForm
+ ajax_form_title = _('Download Image')
+
+ def validate(self, part, form):
+ """
+ Validate that the image data are correct.
+
+ - Try to download the image!
+ """
+
+ # First ensure that the normal validation routines pass
+ if not form.is_valid():
+ return
+
+ # We can now extract a valid URL from the form data
+ url = form.cleaned_data.get('url', None)
+
+ # Download the file
+ response = requests.get(url, stream=True)
+
+ # Look at response header, reject if too large
+ content_length = response.headers.get('Content-Length', '0')
+
+ try:
+ content_length = int(content_length)
+ except (ValueError):
+ # If we cannot extract meaningful length, just assume it's "small enough"
+ content_length = 0
+
+ # TODO: Factor this out into a configurable setting
+ MAX_IMG_LENGTH = 10 * 1024 * 1024
+
+ if content_length > MAX_IMG_LENGTH:
+ form.add_error('url', _('Image size exceeds maximum allowable size for download'))
+ return
+
+ self.response = response
+
+ # Check for valid response code
+ if not response.status_code == 200:
+ form.add_error('url', f"{_('Invalid response')}: {response.status_code}")
+ return
+
+ response.raw.decode_content = True
+
+ try:
+ self.image = Image.open(response.raw).convert()
+ self.image.verify()
+ except:
+ form.add_error('url', _("Supplied URL is not a valid image file"))
+ return
+
+ def save(self, part, form, **kwargs):
+ """
+ Save the downloaded image to the part
+ """
+
+ fmt = self.image.format
+
+ if not fmt:
+ fmt = 'PNG'
+
+ buffer = io.BytesIO()
+
+ self.image.save(buffer, format=fmt)
+
+ # Construct a simplified name for the image
+ filename = f"part_{part.pk}_image.{fmt.lower()}"
+
+ part.image.save(
+ filename,
+ ContentFile(buffer.getvalue()),
+ )
+
+
class PartImageUpload(AjaxUpdateView):
""" View for uploading a new Part image """
@@ -910,6 +998,12 @@ class PartEdit(AjaxUpdateView):
form.fields['default_supplier'].queryset = SupplierPart.objects.filter(part=part)
+ # Check if IPN can be edited
+ ipn_edit_enable = InvenTreeSetting.get_setting('PART_ALLOW_EDIT_IPN')
+ if not ipn_edit_enable and not self.request.user.is_superuser:
+ # Admin can still change IPN
+ form.fields['IPN'].disabled = True
+
return form
@@ -1425,10 +1519,23 @@ class BomUpload(InvenTreeRoleMixin, FormView):
# Are there any missing columns?
self.missing_columns = []
+ # Check that all required fields are present
for col in BomUploadManager.REQUIRED_HEADERS:
if col not in self.column_selections.values():
self.missing_columns.append(col)
+ # Check that at least one of the part match field is present
+ part_match_found = False
+ for col in BomUploadManager.PART_MATCH_HEADERS:
+ if col in self.column_selections.values():
+ part_match_found = True
+ break
+
+ # If not, notify user
+ if not part_match_found:
+ for col in BomUploadManager.PART_MATCH_HEADERS:
+ self.missing_columns.append(col)
+
def handleFieldSelection(self):
""" Handle the output of the field selection form.
Here the user is presented with the raw data and must select the
diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py
index 60e511616a..a7a7955c22 100644
--- a/InvenTree/stock/api.py
+++ b/InvenTree/stock/api.py
@@ -665,6 +665,13 @@ class StockList(generics.ListCreateAPIView):
active = str2bool(active)
queryset = queryset.filter(part__active=active)
+ # Do we wish to filter by "assembly parts"
+ assembly = params.get('assembly', None)
+
+ if assembly is not None:
+ assembly = str2bool(assembly)
+ queryset = queryset.filter(part__assembly=assembly)
+
# Filter by 'depleted' status
depleted = params.get('depleted', None)
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 5a09480c40..f5459dac27 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -155,18 +155,24 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
- {% if item.can_adjust_location %}
{% if not item.serialized %}
+ {% if item.in_stock %}
{% endif %}
{% endif %}
- {% if item.part.salable and not item.customer %}
+ {% if item.in_stock and item.can_adjust_location and item.part.salable and not item.customer %}
+
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index 298ea9e213..0000000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS =
-SPHINXBUILD = sphinx-build
-SOURCEDIR = .
-BUILDDIR = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
- @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
- @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
diff --git a/docs/_static/img/api_doc.png b/docs/_static/img/api_doc.png
deleted file mode 100644
index 1466eb7b54..0000000000
Binary files a/docs/_static/img/api_doc.png and /dev/null differ
diff --git a/docs/_static/img/api_http.png b/docs/_static/img/api_http.png
deleted file mode 100644
index 0023358760..0000000000
Binary files a/docs/_static/img/api_http.png and /dev/null differ
diff --git a/docs/_static/img/modal_form.png b/docs/_static/img/modal_form.png
deleted file mode 100644
index a1daf28e21..0000000000
Binary files a/docs/_static/img/modal_form.png and /dev/null differ
diff --git a/docs/conf.py b/docs/conf.py
deleted file mode 100644
index b02b70a41d..0000000000
--- a/docs/conf.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# http://www.sphinx-doc.org/en/master/config
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-import os
-import sys
-sys.path.insert(0, os.path.abspath('../'))
-sys.path.append(os.path.abspath('../InvenTree'))
-
-
-# -- Project information -----------------------------------------------------
-
-project = 'InvenTree'
-copyright = '2019, InvenTree'
-
-
-# -- General configuration ---------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
- 'sphinx.ext.autodoc',
- 'sphinx.ext.napoleon',
- 'autoapi.extension',
-]
-
-napoleon_google_docstring = True
-napoleon_numpy_docstring = False
-
-autoapi_dirs = [
- '../InvenTree',
-]
-
-autoapi_options = [
- 'members',
- 'private-members',
- 'special-members',
-]
-
-autoapi_type = 'python'
-
-autoapi_ignore = [
- '*migrations*',
- '**/test*.py',
- '**/manage.py',
- '**/apps.py',
- '**/admin.py',
- '**/middleware.py',
- '**/utils.py',
- '**/wsgi.py',
- '**/templates/',
-]
-
-# Add any paths that contain templates here, relative to this directory.
-autoapi_template_dir = 'templates'
-autoapi_root = 'docs'
-autoapi_add_toctree_entry = False
-
-templates_path = ['templates']
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = [
- '_build',
- 'Thumbs.db',
- '.DS_Store',
- 'manage.rst', # Ignore django management file
- '**/*.migrations*.rst', # Ignore migration files
-]
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'sphinx_rtd_theme'
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Table of contents in sidebar
-html_sidebars = {'**': [
- 'globaltoc.html',
- 'relations.html',
- 'sourcelink.html',
- 'searchbox.html'
-]}
\ No newline at end of file
diff --git a/docs/forms.rst b/docs/forms.rst
deleted file mode 100644
index 9bdb0dc7a6..0000000000
--- a/docs/forms.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-InvenTree Modal Forms
-=====================
-
-.. toctree::
- :titlesonly:
- :maxdepth: 2
- :caption: Modal Forms
- :hidden:
-
-
-The InvenTree web interface uses modal forms for user input. InvenTree defines a wrapper layer around the Django form classes to provide a mechanism for retrieving and rendering forms via jQuery and AJAX.
-
-.. image:: _static/img/modal_form.png
-
-Forms are rendered to a Bootstrap modal window, allowing in-page data input and live page updating.
-
-Crispy Forms
-------------
-
-Django provides native form rendering tools which are very powerful, allowing form rendering, input validation, and display of error messages for each field.
-
-InvenTree makes use of the `django-crispy-forms