Merge pull request #2091 from inventree/0.5.1

0.5.1

.devcontainer/Dockerfile

@@ -1,47 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/python-3/.devcontainer/base.Dockerfile
-
-# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
-ARG VARIANT="3.10-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
-
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
-# COPY requirements.txt /tmp/pip-tmp/
-# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
-#    && rm -rf /tmp/pip-tmp
-
-# [Optional] Uncomment this section to install additional OS packages.
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
-    apt-get -y install --no-install-recommends \
-    git gcc g++ gettext gnupg libffi-dev \
-    # Weasyprint requirements : https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11
-    poppler-utils libpango-1.0-0 libpangoft2-1.0-0 \
-    # Image format support
-    libjpeg-dev webp \
-    # SQLite support
-    sqlite3 \
-    # PostgreSQL support
-    libpq-dev \
-    # MySQL / MariaDB support
-    default-libmysqlclient-dev mariadb-client && \
-    apt-get autoclean && apt-get autoremove
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
-
-# Update pip
-RUN pip install --upgrade pip
-
-# Install required base-level python packages
-COPY ./docker/requirements.txt base_requirements.txt
-RUN pip install --disable-pip-version-check -U -r base_requirements.txt
-
-# preserve command history between container starts
-# Ref: https://code.visualstudio.com/remote/advancedcontainers/persist-bash-history
-# Folder will be created in 'postCreateCommand' in devcontainer.json as it's not preserved due to the bind mount
-RUN echo "export PROMPT_COMMAND='history -a' && export HISTFILE=/workspaces/InvenTree/dev/commandhistory/.bash_history" >> "/home/vscode/.bashrc"
-
-WORKDIR /workspaces/InvenTree

.devcontainer/devcontainer.json

@@ -1,88 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/python-3
-{
-  "name": "InvenTree",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "context": "..",
-    "args": {
-      // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
-      // Append -bullseye or -buster to pin to an OS version.
-      // Use -bullseye variants on local on arm64/Apple Silicon.
-      "VARIANT": "3.10-bullseye",
-      // Options
-      "NODE_VERSION": "lts/*"
-    }
-  },
-
-  // Configure tool-specific properties.
-  "customizations": {
-    // Configure properties specific to VS Code.
-    "vscode": {
-      // Set *default* container specific settings.json values on container create.
-      "settings": {
-        "python.defaultInterpreterPath": "/workspaces/InvenTree/dev/venv/bin/python",
-        "python.linting.enabled": true,
-        "python.linting.pylintEnabled": false,
-        "python.linting.flake8Enabled": true,
-        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-        "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-        "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-        "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-        "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-        "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-        "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
-      },
-
-      // Add the IDs of extensions you want installed when the container is created.
-      "extensions": [
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "batisteo.vscode-django"
-      ]
-    }
-  },
-
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  "forwardPorts": [8000],
-  "portsAttributes": {
-    "8000": {
-      "label": "InvenTree server"
-    }
-  },
-
-  // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "./.devcontainer/postCreateCommand.sh",
-
-  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "vscode",
-  "features": {
-    "git": "os-provided",
-    "github-cli": "latest"
-  },
-
-  "remoteEnv": {
-    // InvenTree config
-    "INVENTREE_DEBUG": "True",
-    "INVENTREE_DEBUG_LEVEL": "INFO",
-    "INVENTREE_DB_ENGINE": "sqlite3",
-    "INVENTREE_DB_NAME": "/workspaces/InvenTree/dev/database.sqlite3",
-    "INVENTREE_MEDIA_ROOT": "/workspaces/InvenTree/dev/media",
-    "INVENTREE_STATIC_ROOT": "/workspaces/InvenTree/dev/static",
-    "INVENTREE_BACKUP_DIR": "/workspaces/InvenTree/dev/backup",
-    "INVENTREE_CONFIG_FILE": "/workspaces/InvenTree/dev/config.yaml",
-    "INVENTREE_SECRET_KEY_FILE": "/workspaces/InvenTree/dev/secret_key.txt",
-    "INVENTREE_PLUGIN_DIR": "/workspaces/InvenTree/dev/plugins",
-    "INVENTREE_PLUGIN_FILE": "/workspaces/InvenTree/dev/plugins.txt",
-
-    // Python config
-    "PIP_USER": "no",
-
-    // used to load the venv into the PATH and avtivate it
-    // Ref: https://stackoverflow.com/a/56286534
-    "VIRTUAL_ENV": "/workspaces/InvenTree/dev/venv",
-    "PATH": "/workspaces/InvenTree/dev/venv/bin:${containerEnv:PATH}"
-  }
-}

.devcontainer/postCreateCommand.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# create folders
-mkdir -p /workspaces/InvenTree/dev/{commandhistory,plugins}
-cd /workspaces/InvenTree
-
-# create venv
-python3 -m venv dev/venv
-. dev/venv/bin/activate
-
-# setup InvenTree server
-pip install invoke
-inv update
-inv setup-dev

.gitattributes

@@ -8,4 +8,4 @@
 *.yaml text
 *.conf text
 *.sh text eol=lf
-*.js text
+*.js text

.github/CODEOWNERS

@@ -1,12 +0,0 @@
-# General owner is the maintainers team
-*       @SchrodingersGat
-
-# plugins are co-owned
-/InvenTree/plugin/      @SchrodingersGat @matmair
-/InvenTree/plugins/     @SchrodingersGat @matmair
-
-# Installer functions
-.pkgr.yml               @matmair
-Procfile                @matmair
-runtime.txt             @matmair
-/contrib/               @matmair

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-patreon: inventree
-ko_fi: inventree

.github/ISSUE_TEMPLATE/app_issue.md

@@ -0,0 +1,30 @@
+---
+name: App issue
+about: Report a bug or issue with the InvenTree app
+title: "[APP] Enter bug description"
+labels: bug, app
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of the bug or issue
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to ...
+2. Select ...
+3. ...
+
+**Expected Behavior**
+A clear and concise description of what you expected to happen
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem
+
+**Version Information**
+
+- App platform: *Select iOS or Android*
+- App version: *Enter app version*
+- Server version: *Enter server version*

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a bug report to help us improve InvenTree
+title: "[BUG] Enter bug description"
+labels: bug, question
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Deployment Method**
+Docker
+Bare Metal
+
+**Version Information**
+You can get this by going to the "About InvenTree" section in the upper right corner and cicking on to the "copy version information"

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,62 +0,0 @@
-name: "Bug"
-description: "Create a bug report to help us improve InvenTree!"
-labels: ["bug", "question", "triage:not-checked"]
-body:
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "Please verify that this bug has NOT been raised before."
-      description: "Search in the issues sections by clicking [HERE](https://github.com/inventree/inventree/issues?q=)"
-      options:
-        - label: "I checked and didn't find a similar issue"
-          required: true
-  - type: textarea
-    id: description
-    validations:
-      required: true
-    attributes:
-      label: "Describe the bug*"
-      description: "A clear and concise description of what the bug is."
-  - type: textarea
-    id: steps-to-reproduce
-    validations:
-      required: true
-    attributes:
-      label: "Steps to Reproduce"
-      description: "Steps to reproduce the behaviour, please make it detailed"
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See the error
-  - type: textarea
-    id: expected-behavior
-    validations:
-      required: true
-    attributes:
-      label: "Expected behaviour"
-      description: "A clear and concise description of what you expected to happen."
-      placeholder: "..."
-  - type: checkboxes
-    id: deployment
-    attributes:
-      label: "Deployment Method"
-      options:
-        - label: "Docker"
-        - label: "Bare metal"
-  - type: textarea
-    id: version-info
-    validations:
-      required: true
-    attributes:
-      label: "Version Information"
-      description: "The version info block."
-      placeholder: "You can get this by going to the `About InvenTree` section in the upper right corner and clicking on the `copy version information` button"
-  - type: textarea
-    id: logs
-    attributes:
-      label: "Relevant log output"
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FR]"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request the result of a bug?**
+Please link it here.
+
+**Problem**
+A clear and concise description of what the problem is. e.g. I'm always frustrated when [...]
+
+**Suggested solution**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Examples of other systems**
+Show how other software handles your FR if you have examples.
+
+**Do you want to develop this?**
+If so please describe briefly how you would like to implement it (so we can give advice) and if you have experience in the needed technology (you do not need to be a pro - this is just as a information for us).

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,53 +0,0 @@
-name: Feature Request
-description: Suggest an idea for this project
-title: "[FR] title"
-labels: ["enhancement", "triage:not-checked"]
-body:
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "Please verify that this feature request has NOT been suggested before."
-      description: "Search in the issues sections by clicking [HERE](https://github.com/inventree/inventree/issues?q=)"
-      options:
-        - label: "I checked and didn't find a similar feature request"
-          required: true
-  - type: textarea
-    id: problem
-    validations:
-      required: true
-    attributes:
-      label: "Problem statement"
-      description: "A clear and concise description of the problem or missing feature."
-      placeholder: "I am always struggling with ..."
-  - type: textarea
-    id: solution
-    validations:
-      required: true
-    attributes:
-      label: "Suggested solution"
-      description: "A clear and concise description of what you want to happen to solve the problem statement."
-      placeholder: "In my use-case, ..."
-  - type: textarea
-    id: alternatives
-    validations:
-      required: true
-    attributes:
-      label: "Describe alternatives you've considered"
-      description: "A clear and concise description of any alternative solutions or features you've considered."
-      placeholder: "This could also be done by doing ..."
-  - type: textarea
-    id: examples
-    validations:
-      required: false
-    attributes:
-      label: "Examples of other systems"
-      description: "Show how other software handles your FR if you have examples."
-      placeholder: "I software xxx this is done in the following way..."
-  - type: checkboxes
-    id: self-develop
-    attributes:
-      label: "Do you want to develop this?"
-      description: "This is not required, and you do not need to be a pro - this is just as information for us."
-      options:
-        - label: "I want to develop this."
-          required: false

.github/ISSUE_TEMPLATE/install.yaml

@@ -1,46 +0,0 @@
-name: "Install problems"
-description: "If you have problems deploying InvenTree"
-labels: ["question", "triage:not-checked", "setup"]
-body:
-  - type: checkboxes
-    id: deployment
-    validations:
-      required: true
-    attributes:
-      label: "Deployment Method"
-      options:
-        - label: "Installer"
-        - label: "Docker Development"
-        - label: "Docker Production"
-        - label: "Bare metal Development"
-        - label: "Bare metal Production"
-        - label: "Digital Ocean image"
-        - label: "Other (please provide a link `Steps to Reproduce`"
-  - type: textarea
-    id: description
-    validations:
-      required: true
-    attributes:
-      label: "Describe the problem*"
-      description: "A clear and concise description of what is failing."
-  - type: textarea
-    id: steps-to-reproduce
-    validations:
-      required: true
-    attributes:
-      label: "Steps to Reproduce"
-      description: "Steps to reproduce the behaviour, please make it detailed"
-      placeholder: |
-        0. Link to all docs you used
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See the error
-  - type: textarea
-    id: logs
-    attributes:
-      label: "Relevant log output"
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: bash
-    validations:
-      required: false

.github/actions/migration/action.yaml

@@ -1,17 +0,0 @@
-name: 'Migration test'
-description: 'Run migration test sequenze'
-author: 'InvenTree'
-
-runs:
-    using: 'composite'
-    steps:
-      - name: Data Import Export
-        shell: bash
-        run: |
-          invoke migrate
-          invoke import-fixtures
-          invoke export-records -f data.json
-          python3 ./InvenTree/manage.py flush --noinput
-          invoke migrate
-          invoke import-records -f data.json
-          invoke import-records -f data.json

.github/actions/setup/action.yaml

@@ -1,90 +0,0 @@
-name: 'Setup Enviroment'
-description: 'Setup the enviroment for general InvenTree tests'
-author: 'InvenTree'
-inputs:
-    python:
-        required: false
-        description: 'Install python.'
-        default: 'true'
-    npm:
-        required: false
-        description: 'Install npm.'
-        default: 'false'
-
-    install:
-        required: false
-        description: 'Install the InvenTree requirements?'
-        default: 'false'
-    dev-install:
-        required: false
-        description: 'Install the InvenTree development requirements?'
-        default: 'false'
-    update:
-        required: false
-        description: 'Should a full update cycle be run?'
-        default: 'false'
-
-    apt-dependency:
-        required: false
-        description: 'Extra APT package for install.'
-    pip-dependency:
-        required: false
-        description: 'Extra python package for install.'
-
-runs:
-    using: 'composite'
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-
-      # Python installs
-      - name: Set up Python ${{ env.python_version }}
-        if: ${{ inputs.python == 'true' }}
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # pin@v4.3.0
-        with:
-          python-version: ${{ env.python_version }}
-          cache: pip
-      - name: Install Base Python Dependencies
-        if: ${{ inputs.python == 'true' }}
-        shell: bash
-        run: |
-          python3 -m pip install -U pip
-          pip3 install invoke wheel
-      - name: Install Specific Python Dependencies
-        if: ${{ inputs.pip-dependency }}
-        shell: bash
-        run: pip3 install ${{ inputs.pip-dependency }}
-
-      # NPM installs
-      - name: Install node.js ${{ env.node_version }}
-        if: ${{ inputs.npm == 'true' }}
-        uses: actions/setup-node@969bd2663942d722d85b6a8626225850c2f7be4b  # pin to v3.5.0
-        with:
-          node-version: ${{ env.node_version }}
-          cache: 'npm'
-      - name: Intall npm packages
-        if: ${{ inputs.npm == 'true' }}
-        shell: bash
-        run: npm install
-
-      # OS installs
-      - name: Install OS Dependencies
-        if: ${{ inputs.apt-dependency }}
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install ${{ inputs.apt-dependency }}
-
-      # Invoke commands
-      - name: Install dev requirements
-        if: ${{ inputs.dev-install == 'true' ||inputs.install == 'true' }}
-        shell: bash
-        run: pip install -r requirements-dev.txt
-      - name: Run invoke install
-        if: ${{ inputs.install == 'true' }}
-        shell: bash
-        run: invoke install
-      - name: Run invoke update
-        if: ${{ inputs.update == 'true' }}
-        shell: bash
-        run: invoke update

.github/release.yml

@@ -1,31 +0,0 @@
-# .github/release.yml
-
-changelog:
-  exclude:
-    labels:
-      - translation
-  categories:
-    - title: Breaking Changes
-      labels:
-        - Semver-Major
-        - breaking
-    - title: Security Patches
-      labels:
-        - security
-    - title: New Features
-      labels:
-        - Semver-Minor
-        - enhancement
-    - title: Bug Fixes
-      labels:
-        - Semver-Patch
-        - bug
-    - title: Devops / Setup Changes
-      labels:
-        - docker
-        - setup
-        - demo
-        - CI
-    - title: Other Changes
-      labels:
-        - "*"

.github/workflows/check_translations.yaml

@@ -1,43 +0,0 @@
-name: Check Translations
-
-on:
-  push:
-    branches:
-      - l10
-  pull_request:
-    branches:
-      - l10
-
-jobs:
-
-  check:
-    runs-on: ubuntu-latest
-
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      INVENTREE_DB_NAME: './test_db.sqlite'
-      INVENTREE_DB_ENGINE: django.db.backends.sqlite3
-      INVENTREE_DEBUG: info
-      INVENTREE_MEDIA_ROOT: ./media
-      INVENTREE_STATIC_ROOT: ./static
-      INVENTREE_BACKUP_DIR: ./backup
-      python_version: 3.9
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Set Up Python ${{ env.python_version }}
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # pin@v4.3.0
-        with:
-          python-version: ${{ env.python_version }}
-          cache: 'pip'
-      - name: Install Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install gettext
-          pip3 install invoke
-          invoke install
-      - name: Test Translations
-        run: invoke translate
-      - name: Check Migration Files
-        run: python3 ci/check_migration_files.py

.github/workflows/coverage.yaml

@@ -0,0 +1,60 @@
+# Perform CI checks, and calculate code coverage
+
+name: SQLite
+
+on:
+  push:
+    branches-ignore:
+      - l10*
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  # Run tests on SQLite database
+  # These tests are used for code coverage analysis
+  coverage:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      INVENTREE_DB_NAME: './test_db.sqlite'
+      INVENTREE_DB_ENGINE: django.db.backends.sqlite3
+      INVENTREE_DEBUG: info
+      INVENTREE_MEDIA_ROOT: ./media
+      INVENTREE_STATIC_ROOT: ./static
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+          pip3 install invoke
+          invoke install
+          invoke static
+      - name: Coverage Tests
+        run: |
+          invoke coverage
+      - name: Data Import Export
+        run: |
+          invoke migrate
+          invoke import-fixtures
+          invoke export-records -f data.json
+          rm test_db.sqlite
+          invoke migrate
+          invoke import-records -f data.json
+          invoke import-records -f data.json
+      - name: Test Translations 
+        run: invoke translate
+      - name: Check Migration Files
+        run: python3 ci/check_migration_files.py
+      - name: Upload Coverage Report
+        run: coveralls

.github/workflows/docker.yaml

@@ -1,123 +0,0 @@
-# Build, test and push InvenTree docker image
-# This workflow runs under any of the following conditions:
-#
-# - Push to the master branch
-# - Publish release
-#
-# The following actions are performed:
-#
-# - Check that the version number matches the current branch or tag
-# - Build the InvenTree docker image
-# - Run suite of unit tests against the build image
-# - Push the compiled, tested image to dockerhub
-
-name: Docker
-
-on:
-  release:
-    types: [ published ]
-
-  push:
-    branches:
-      - 'master'
-
-  # pull_request:
-  #   branches:
-  #     - 'master'
-
-jobs:
-
-  # Build the docker image
-  build:
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.event_name }}
-      cancel-in-progress: true
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      python_version: 3.9
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Set Up Python ${{ env.python_version }}
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # pin@v4.3.0
-        with:
-          python-version: ${{ env.python_version }}
-      - name: Version Check
-        run: |
-          pip install requests
-          pip install pyyaml
-          python3 ci/version_check.py
-          echo "git_commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-          echo "git_commit_date=$(git show -s --format=%ci)" >> $GITHUB_ENV
-      - name: Build Docker Image
-        # Build the development docker image (using docker-compose.yml)
-        run: |
-          docker-compose build --no-cache
-      - name: Update Docker Image
-        run: |
-          docker-compose run inventree-dev-server invoke update
-          docker-compose run inventree-dev-server invoke setup-dev
-          docker-compose up -d
-          docker-compose run inventree-dev-server pip install --upgrade setuptools
-          docker-compose run inventree-dev-server invoke wait
-      - name: Check Data Directory
-        # The following file structure should have been created by the docker image
-        run: |
-          test -d data
-          test -d data/env
-          test -d data/pgdb
-          test -d data/media
-          test -d data/static
-          test -d data/plugins
-          test -f data/config.yaml
-          test -f data/plugins.txt
-          test -f data/secret_key.txt
-      - name: Run Unit Tests
-        run: |
-          echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> docker.dev.env
-          docker-compose run inventree-dev-server invoke test --disable-pty
-          docker-compose down
-      - name: Set up QEMU
-        if: github.event_name != 'pull_request'
-        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # pin@v2.1.0
-      - name: Set up Docker Buildx
-        if: github.event_name != 'pull_request'
-        uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # pin@v2.1.0
-      - name: Set up cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@7cc35d7fdbe70d4278a0c96779081e6fac665f88 # pin@v2.8.0
-      - name: Login to Dockerhub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # pin@v2.1.0
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Extract Docker metadata
-        if: github.event_name != 'pull_request'
-        id: meta
-        uses: docker/metadata-action@12cce9efe0d49980455aaaca9b071c0befcdd702 # pin@v4.1.0
-        with:
-          images: |
-            inventree/inventree
-      - name: Build and Push
-        id: build-and-push
-        if: github.event_name != 'pull_request'
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # pin@v3.2.0
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          target: production
-          tags: ${{ env.docker_tags }}
-          build-args: |
-            commit_hash=${{ env.git_commit_hash }}
-            commit_date=${{ env.git_commit_date }}
-      - name: Sign the published image
-        if: ${{ false }} # github.event_name != 'pull_request'
-        env:
-          COSIGN_EXPERIMENTAL: "true"
-        run: cosign sign ${{ steps.meta.outputs.tags }}@${{
-          steps.build-and-push.outputs.digest }}

.github/workflows/docker_latest.yaml

@@ -0,0 +1,40 @@
+# Build and push latest docker image on push to master branch
+
+name: Docker Build
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+
+  docker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Check version number
+        run: |
+          python3 ci/check_version_number.py --dev
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Dockerhub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and Push
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          target: production
+          repository: inventree/inventree
+          tags: inventree/inventree:latest
+      - name: Image Digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/docker_stable.yaml

@@ -0,0 +1,42 @@
+# Build and push latest docker image on push to master branch
+
+name: Docker Build
+
+on:
+  push:
+    branches:
+      - 'stable'
+
+jobs:
+
+  docker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Check version number
+        run: |
+          python3 ci/check_version_number.py --release
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Dockerhub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and Push
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          target: production
+          build-args: |
+            branch=stable
+          repository: inventree/inventree
+          tags: inventree/inventree:stable
+      - name: Image Digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/docker_tag.yaml

@@ -0,0 +1,38 @@
+# Publish docker images to dockerhub
+
+name: Docker Publish
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish_image:
+    name: Push InvenTree web server image to dockerhub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v2
+      - name: Check Release tag
+        run: |
+          python3 ci/check_version_number.py --release --tag ${{ github.event.release.tag_name }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Dockerhub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and Push
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          target: production
+          build-args: |
+            tag=${{ github.event.release.tag_name }}
+          repository: inventree/inventree
+          tags: inventree/inventree:${{ github.event.release.tag_name }}

.github/workflows/html.yaml

@@ -0,0 +1,54 @@
+# Check javascript template files
+
+name: HTML Templates
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  html:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      INVENTREE_DB_ENGINE: sqlite3
+      INVENTREE_DB_NAME: inventree
+      INVENTREE_MEDIA_ROOT: ./media
+      INVENTREE_STATIC_ROOT: ./static
+    steps:
+      - name: Install node.js
+        uses: actions/setup-node@v2
+      - run: npm install
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+          pip3 install invoke
+          invoke install
+          invoke static
+      - name: Check HTML Files
+        run: |
+          npm install markuplint
+          npx markuplint InvenTree/build/templates/build/*.html
+          npx markuplint InvenTree/common/templates/common/*.html
+          npx markuplint InvenTree/company/templates/company/*.html
+          npx markuplint InvenTree/order/templates/order/*.html
+          npx markuplint InvenTree/part/templates/part/*.html
+          npx markuplint InvenTree/stock/templates/stock/*.html
+          npx markuplint InvenTree/templates/*.html
+          npx markuplint InvenTree/templates/InvenTree/*.html
+          npx markuplint InvenTree/templates/InvenTree/settings/*.html
+

.github/workflows/javascript.yaml

@@ -0,0 +1,50 @@
+# Check javascript template files
+
+name: Javascript Templates
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  javascript:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      INVENTREE_DB_ENGINE: sqlite3
+      INVENTREE_DB_NAME: inventree
+      INVENTREE_MEDIA_ROOT: ./media
+      INVENTREE_STATIC_ROOT: ./static
+    steps:
+      - name: Install node.js
+        uses: actions/setup-node@v2
+      - run: npm install
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+          pip3 install invoke
+          invoke install
+          invoke static
+      - name: Check Templated Files
+        run: |
+          cd ci
+          python check_js_templates.py
+      - name: Lint Javascript Files
+        run: |
+          npm install eslint eslint-config-google
+          invoke render-js-files
+          npx eslint js_tmp/*.js

.github/workflows/mysql.yaml

@@ -0,0 +1,67 @@
+# MySQL Unit Testing
+
+name: MySQL
+
+on:
+  push:
+    branches-ignore:
+      - l10*
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  test:
+    runs-on: ubuntu-latest
+
+    env:
+      # Database backend configuration
+      INVENTREE_DB_ENGINE: django.db.backends.mysql
+      INVENTREE_DB_NAME: inventree
+      INVENTREE_DB_USER: root
+      INVENTREE_DB_PASSWORD: password
+      INVENTREE_DB_HOST: '127.0.0.1'
+      INVENTREE_DB_PORT: 3306
+      INVENTREE_DEBUG: info
+      INVENTREE_MEDIA_ROOT: ./media
+      INVENTREE_STATIC_ROOT: ./static
+
+    services:
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: inventree
+          MYSQL_USER: inventree
+          MYSQL_PASSWORD: password
+          MYSQL_ROOT_PASSWORD: password
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        ports:
+          - 3306:3306
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Dependencies
+        run: |
+          sudo apt-get install mysql-server libmysqlclient-dev
+          pip3 install invoke
+          pip3 install mysqlclient
+          invoke install
+      - name: Run Tests
+        run: invoke test
+      - name: Data Import Export
+        run: |
+          invoke migrate
+          python3 ./InvenTree/manage.py flush --noinput
+          invoke import-fixtures
+          invoke export-records -f data.json
+          python3 ./InvenTree/manage.py flush --noinput
+          invoke import-records -f data.json
+          invoke import-records -f data.json

.github/workflows/postgresql.yaml

@@ -0,0 +1,63 @@
+# PostgreSQL Unit Testing
+
+name: PostgreSQL
+
+on:
+  push:
+    branches-ignore:
+      - l10*
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  test:
+    runs-on: ubuntu-latest
+
+    env:
+      # Database backend configuration
+      INVENTREE_DB_ENGINE: django.db.backends.postgresql
+      INVENTREE_DB_NAME: inventree
+      INVENTREE_DB_USER: inventree
+      INVENTREE_DB_PASSWORD: password
+      INVENTREE_DB_HOST: '127.0.0.1'
+      INVENTREE_DB_PORT: 5432
+      INVENTREE_DEBUG: info
+      INVENTREE_MEDIA_ROOT: ./media
+      INVENTREE_STATIC_ROOT: ./static
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: inventree
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Dependencies
+        run: |
+          sudo apt-get install libpq-dev
+          pip3 install invoke
+          pip3 install psycopg2
+          invoke install
+      - name: Run Tests
+        run: invoke test
+      - name: Data Import Export
+        run: |
+          invoke migrate
+          python3 ./InvenTree/manage.py flush --noinput
+          invoke import-fixtures
+          invoke export-records -f data.json
+          python3 ./InvenTree/manage.py flush --noinput
+          invoke import-records -f data.json
+          invoke import-records -f data.json

.github/workflows/python.yaml

@@ -0,0 +1,49 @@
+# Run python library tests whenever code is pushed to master
+
+name: Python Bindings
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  python:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      INVENTREE_DB_NAME: './test_db.sqlite'
+      INVENTREE_DB_ENGINE: 'sqlite3'
+      INVENTREE_DEBUG: info
+      INVENTREE_MEDIA_ROOT: ./media
+      INVENTREE_STATIC_ROOT: ./static
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Install InvenTree
+        run: |
+          sudo apt-get update
+          sudo apt-get install python3-dev python3-pip python3-venv
+          pip3 install invoke
+          invoke install
+          invoke migrate
+      - name: Download Python Code
+        run: |
+          git clone --depth 1 https://github.com/inventree/inventree-python ./inventree-python
+      - name: Start Server
+        run: |
+          invoke import-records -f ./inventree-python/test/test_data.json
+          invoke server -a 127.0.0.1:8000 &
+          sleep 60
+      - name: Run Tests
+        run: |
+          cd inventree-python
+          invoke test
+  

.github/workflows/qc_checks.yaml

@@ -1,272 +0,0 @@
-# Checks for each PR / push
-
-name: QC checks
-
-on:
-  push:
-    branches-ignore:
-      - l10*
-
-  pull_request:
-    branches-ignore:
-      - l10*
-
-env:
-  python_version: 3.9
-  node_version: 16
-  # The OS version must be set per job
-  server_start_sleep: 60
-
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  INVENTREE_DB_ENGINE: sqlite3
-  INVENTREE_DB_NAME: inventree
-  INVENTREE_MEDIA_ROOT: ../test_inventree_media
-  INVENTREE_STATIC_ROOT: ../test_inventree_static
-  INVENTREE_BACKUP_DIR: ../test_inventree_backup
-
-jobs:
-  pep_style:
-    name: Style [Python]
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          dev-install: true
-      - name: Run flake8
-        run: flake8 InvenTree --extend-ignore=D
-
-  javascript:
-    name: Style [JS]
-    runs-on: ubuntu-20.04
-
-    needs: pep_style
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          npm: true
-          install: true
-      - name: Check Templated JS Files
-        run: |
-          cd ci
-          python3 check_js_templates.py
-      - name: Lint Javascript Files
-        run: |
-          python InvenTree/manage.py prerender
-          npx eslint InvenTree/InvenTree/static_i18n/i18n/*.js
-
-  html:
-    name: Style [HTML]
-    runs-on: ubuntu-20.04
-
-    needs: pep_style
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          npm: true
-          install: true
-      - name: Check HTML Files
-        run: npx markuplint **/templates/*.html
-
-  pre-commit:
-    name: Style [pre-commit]
-    runs-on: ubuntu-20.04
-
-    needs: pep_style
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Set up Python ${{ env.python_version }}
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # pin@v4.3.0
-        with:
-          python-version: ${{ env.python_version }}
-          cache: 'pip'
-      - name: Run pre-commit Checks
-        uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507 # pin@v3.0.0
-      - name: Check Version
-        run: |
-          pip install requests
-          python3 ci/version_check.py
-
-  python:
-    name: Tests - inventree-python
-    runs-on: ubuntu-20.04
-
-    needs: pre-commit
-
-    env:
-      wrapper_name: inventree-python
-      INVENTREE_DB_ENGINE: django.db.backends.sqlite3
-      INVENTREE_DB_NAME: ../inventree_unit_test_db.sqlite3
-      INVENTREE_ADMIN_USER: testuser
-      INVENTREE_ADMIN_PASSWORD: testpassword
-      INVENTREE_ADMIN_EMAIL: test@test.com
-      INVENTREE_PYTHON_TEST_SERVER: http://localhost:12345
-      INVENTREE_PYTHON_TEST_USERNAME: testuser
-      INVENTREE_PYTHON_TEST_PASSWORD: testpassword
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          apt-dependency: gettext poppler-utils
-          dev-install: true
-          update: true
-      - name: Download Python Code For `${{ env.wrapper_name }}`
-        run: git clone --depth 1 https://github.com/inventree/${{ env.wrapper_name }}
-          ./${{ env.wrapper_name }}
-      - name: Start InvenTree Server
-        run: |
-          invoke delete-data -f
-          invoke import-fixtures
-          invoke server -a 127.0.0.1:12345 &
-          invoke wait
-      - name: Run Tests For `${{ env.wrapper_name }}`
-        run: |
-          cd ${{ env.wrapper_name }}
-          invoke check-server
-          coverage run -m unittest discover -s test/
-
-  docstyle:
-    name: Style [Python Docstrings]
-    runs-on: ubuntu-20.04
-
-    needs: pre-commit
-    continue-on-error: true
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          install: true
-      - name: Run flake8
-        run: flake8 InvenTree --statistics
-
-  coverage:
-    name: Tests - DB [SQLite] + Coverage
-    runs-on: ubuntu-20.04
-
-    needs: [ 'javascript', 'html', 'pre-commit' ]
-    continue-on-error: true # continue if a step fails so that coverage gets pushed
-
-    env:
-      INVENTREE_DB_NAME: ./inventree.sqlite
-      INVENTREE_DB_ENGINE: sqlite3
-      INVENTREE_PLUGINS_ENABLED: true
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          apt-dependency: gettext poppler-utils
-          dev-install: true
-          update: true
-      - name: Coverage Tests
-        run: invoke coverage
-      - name: Data Export Test
-        uses: ./.github/actions/migration
-      - name: Test Translations
-        run: invoke translate
-      - name: Check Migration Files
-        run: python3 ci/check_migration_files.py
-      - name: Upload Coverage Report
-        run: coveralls
-
-  postgres:
-    name: Tests - DB [PostgreSQL]
-    runs-on: ubuntu-20.04
-    needs: [ 'javascript', 'html', 'pre-commit' ]
-
-    env:
-      INVENTREE_DB_ENGINE: django.db.backends.postgresql
-      INVENTREE_DB_USER: inventree
-      INVENTREE_DB_PASSWORD: password
-      INVENTREE_DB_HOST: '127.0.0.1'
-      INVENTREE_DB_PORT: 5432
-      INVENTREE_DEBUG: info
-      INVENTREE_CACHE_HOST: localhost
-      INVENTREE_PLUGINS_ENABLED: true
-
-    services:
-      postgres:
-        image: postgres:14
-        env:
-          POSTGRES_USER: inventree
-          POSTGRES_PASSWORD: password
-        ports:
-          - 5432:5432
-
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          apt-dependency: gettext poppler-utils libpq-dev
-          pip-dependency: psycopg2 django-redis>=5.0.0
-          dev-install: true
-          update: true
-      - name: Run Tests
-        run: invoke test
-      - name: Data Export Test
-        uses: ./.github/actions/migration
-
-  mysql:
-    name: Tests - DB [MySQL]
-    runs-on: ubuntu-20.04
-
-    needs: [ 'javascript', 'html', 'pre-commit' ]
-    if: github.event_name == 'push'
-
-    env:
-      # Database backend configuration
-      INVENTREE_DB_ENGINE: django.db.backends.mysql
-      INVENTREE_DB_USER: root
-      INVENTREE_DB_PASSWORD: password
-      INVENTREE_DB_HOST: '127.0.0.1'
-      INVENTREE_DB_PORT: 3306
-      INVENTREE_DEBUG: info
-      INVENTREE_PLUGINS_ENABLED: true
-
-    services:
-      mysql:
-        image: mysql:latest
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: ${{ env.INVENTREE_DB_NAME }}
-          MYSQL_USER: inventree
-          MYSQL_PASSWORD: password
-          MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s
-          --health-retries=3
-        ports:
-          - 3306:3306
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          apt-dependency: gettext poppler-utils libmysqlclient-dev
-          pip-dependency: mysqlclient
-          dev-install: true
-          update: true
-      - name: Run Tests
-        run: invoke test
-      - name: Data Export Test
-        uses: ./.github/actions/migration

.github/workflows/release.yml

@@ -1,27 +0,0 @@
-# Runs on releases
-
-name: Publish release notes
-on:
-  release:
-    types: [ published ]
-
-jobs:
-
-  stable:
-    runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Version Check
-        run: |
-          pip install requests
-          python3 ci/version_check.py
-      - name: Push to Stable Branch
-        uses: ad-m/github-push-action@4dcce6dea3e3c8187237fc86b7dfdc93e5aaae58 # pin@master
-        if: env.stable_release == 'true'
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: stable
-          force: true

.github/workflows/social.yml.disabled

@@ -1,35 +0,0 @@
-# Runs on releases
-
-name: Publish release notes
-on:
-  release:
-    types: [ published ]
-
-jobs:
-
-  tweet:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: Eomm/why-don-t-you-tweet@5936bb1fd0096b1c2bbbb7518746638261bb4dae # pin@v1.0.1
-        with:
-          tweet-message: "InvenTree release ${{ github.event.release.tag_name }} is out
-            now! Release notes: ${{ github.event.release.html_url }} #opensource
-            #inventree"
-        env:
-          TWITTER_CONSUMER_API_KEY: ${{ secrets.TWITTER_CONSUMER_API_KEY }}
-          TWITTER_CONSUMER_API_SECRET: ${{ secrets.TWITTER_CONSUMER_API_SECRET }}
-          TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
-          TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
-
-  reddit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: bluwy/release-for-reddit-action@4b2d034b5c86a24db24363f1064149a8c2db69b4 # pin@v1.2.0
-        with:
-          username: ${{ secrets.REDDIT_USERNAME }}
-          password: ${{ secrets.REDDIT_PASSWORD }}
-          app-id: ${{ secrets.REDDIT_APP_ID }}
-          app-secret: ${{ secrets.REDDIT_APP_SECRET }}
-          subreddit: InvenTree
-          title: "InvenTree version ${{ github.event.release.tag_name }} released"
-          comment: "${{ github.event.release.body }}"

.github/workflows/stale.yml

@@ -1,26 +0,0 @@
-# Marks all issues that do not receive activity stale starting 2022
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-    - cron: '24 11 * * *'
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-
-    steps:
-      - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # pin@v6.0.1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: 'This issue seems stale. Please react to show this is still
-            important.'
-          stale-pr-message: 'This PR seems stale. Please react to show this is still important.'
-          stale-issue-label: 'inactive'
-          stale-pr-label: 'inactive'
-          start-date: '2022-01-01'
-          exempt-all-milestones: true

.github/workflows/style.yaml

@@ -0,0 +1,34 @@
+name: Style Checks
+
+on:
+  push:
+    branches-ignore:
+      - l10*
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+  style:
+    runs-on: ubuntu-latest
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.7]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install deps
+        run: |
+          pip install flake8==3.8.3
+          pip install pep8-naming==0.11.1
+      - name: flake8
+        run: |
+          flake8 InvenTree

.github/workflows/translations.yml

@@ -17,34 +17,44 @@ jobs:
       INVENTREE_DEBUG: info
       INVENTREE_MEDIA_ROOT: ./media
       INVENTREE_STATIC_ROOT: ./static
-      INVENTREE_BACKUP_DIR: ./backup
 
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Set up Python 3.9
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # pin@v4.3.0
-        with:
-          python-version: 3.9
-      - name: Install Dependencies
-        run: |
+    - uses: actions/checkout@v2
+    - name: Get Current Translations
+      run: |
+        git fetch
+        git checkout origin/l10 -- `git ls-tree origin/l10 -r --name-only | grep ".po"`
+        git reset
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    - name: Install Dependencies
+      run: |
           sudo apt-get update
           sudo apt-get install -y gettext
           pip3 install invoke
           invoke install
-      - name: Make Translations
-        run: |
-          invoke translate
-      - name: Commit files
-        run: |
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git checkout -b l10_local
-          git add "*.po"
-          git commit -m "updated translation base"
-      - name: Push changes
-        uses: ad-m/github-push-action@4dcce6dea3e3c8187237fc86b7dfdc93e5aaae58 # pin@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: l10
-          force: true
+    - name: Make Translations
+      run: |
+        invoke translate
+    - name: stash changes
+      run: |
+        git stash
+    - name: Checkout Translation Branch
+      uses: actions/checkout@v2.3.4
+      with:
+        ref: l10
+    - name: Commit files
+      run: |
+        git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config --local user.name "github-actions[bot]"
+        git checkout stash -- .
+        git reset
+        git add "*.po"
+        git commit -m "updated translation base"
+    - name: Push changes
+      uses: ad-m/github-push-action@master
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        branch: l10

.github/workflows/update.yml.disabled

@@ -1,23 +0,0 @@
-name: Update dependency files regularly
-
-on:
-  workflow_dispatch: null
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Setup
-        run: pip install -r requirements-dev.txt
-      - name: Update requirements.txt
-        run: pip-compile --output-file=requirements.txt requirements.in -U
-      - name: Update requirements-dev.txt
-        run: pip-compile --generate-hashes --output-file=requirements-dev.txt
-          requirements-dev.in -U
-      - uses: stefanzweifel/git-auto-commit-action@fd157da78fa13d9383e5580d1fd1184d89554b51 # pin@v4.15.1
-        with:
-          commit_message: "[Bot] Updated dependency"
-          branch: dep-update

.github/workflows/version.yaml

@@ -0,0 +1,20 @@
+# Check that the version number format matches the current branch
+
+name: Version Numbering
+
+on:
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Check version number
+        run: |
+          python3 ci/check_version_number.py --branch ${{ github.base_ref }}

.gitignore

@@ -8,7 +8,6 @@ __pycache__/
 env/
 inventree-env/
 ./build/
-.cache/
 develop-eggs/
 dist/
 bin/
@@ -27,6 +26,7 @@ var/
 .installed.cfg
 *.egg
 
+
 # Django stuff:
 *.log
 local_settings.py
@@ -36,13 +36,8 @@ local_settings.py
 *.old
 
 # Files used for testing
-inventree-demo-dataset/
-inventree-data/
 dummy_image.*
 _tmp.csv
-inventree/label.pdf
-inventree/label.png
-inventree/my_special*
 
 # Sphinx files
 docs/_build
@@ -54,7 +49,6 @@ static_i18n
 
 # Local config file
 config.yaml
-plugins.txt
 
 # Default data file
 data.json
@@ -67,15 +61,7 @@ secret_key.txt
 # IDE / development files
 .idea/
 *.code-workspace
-.bash_history
-
-# https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
-.vscode/*
-#!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-#!.vscode/extensions.json
-#!.vscode/*.code-snippets
+.vscode/
 
 # Coverage reports
 .coverage
@@ -86,20 +72,11 @@ js_tmp/
 
 # Development files
 dev/
-data/
-env/
 
 # Locale stats file
 locale_stats.json
 
 # node.js
-node_modules/
-
-# maintenance locker
-maintenance_mode_state.txt
-
-# plugin dev directory
-plugins/
-
-# Compiled translation files
-*.mo
+package-lock.json
+package.json
+node_modules/

.gitpod.yml

@@ -1,44 +0,0 @@
-tasks:
- - name: Setup django
-   before: |
-      export INVENTREE_DB_ENGINE='sqlite3'
-      export INVENTREE_DB_NAME='/workspace/InvenTree/dev/database.sqlite3'
-      export INVENTREE_MEDIA_ROOT='/workspace/InvenTree/inventree-data/media'
-      export INVENTREE_STATIC_ROOT='/workspace/InvenTree/dev/static'
-      export INVENTREE_BACKUP_DIR='/workspace/InvenTree/dev/backup'
-      export PIP_USER='no'
-
-      sudo apt install -y gettext
-      python3 -m venv venv
-      source venv/bin/activate
-      pip install invoke pyyaml
-      mkdir dev
-      invoke update
-      invoke setup-test --ignore-update --path inventree-data
-      gp sync-done start_server
-
- - name: Start server
-   init: gp sync-await start_server
-   command: |
-      gp sync-await start_server
-      export INVENTREE_DB_ENGINE='sqlite3'
-      export INVENTREE_DB_NAME='/workspace/InvenTree/dev/database.sqlite3'
-      export INVENTREE_MEDIA_ROOT='/workspace/InvenTree/inventree-data/media'
-      export INVENTREE_STATIC_ROOT='/workspace/InvenTree/dev/static'
-      export INVENTREE_BACKUP_DIR='/workspace/InvenTree/dev/backup'
-
-      source venv/bin/activate
-      inv server
-
-ports:
-  - port: 8000
-    onOpen: open-preview
-
-github:
-  prebuilds:
-    master: true
-    pullRequests: false
-    pullRequestsFromForks: true
-    addBadge: true
-    addLabel: gitpod-ready
-    addCheck: false

.pkgr.yml

@@ -1,35 +0,0 @@
-name: inventree
-description: Open Source Inventory Management System
-homepage: https://inventree.org
-notifications: false
-buildpack: https://github.com/mjmair/heroku-buildpack-python#v216-mjmair
-env:
-  - STACK=heroku-20
-  - DISABLE_COLLECTSTATIC=1
-  - INVENTREE_DB_ENGINE=sqlite3
-  - INVENTREE_DB_NAME=database.sqlite3
-  - INVENTREE_PLUGINS_ENABLED
-  - INVENTREE_MEDIA_ROOT=/opt/inventree/media
-  - INVENTREE_STATIC_ROOT=/opt/inventree/static
-  - INVENTREE_BACKUP_DIR=/opt/inventree/backup
-  - INVENTREE_PLUGIN_FILE=/opt/inventree/plugins.txt
-  - INVENTREE_CONFIG_FILE=/opt/inventree/config.yaml
-after_install: contrib/packager.io/postinstall.sh
-dependencies:
-  - curl
-  - python3
-  - python3-venv
-  - python3-pip
-  - python3-cffi
-  - python3-brotli
-  - python3-wheel
-  - libpango-1.0-0
-  - libharfbuzz0b
-  - libpangoft2-1.0-0
-  - gettext
-  - nginx
-  - jq
-  - libffi7
-targets:
-  ubuntu-20.04: true
-  debian-11: true

.pre-commit-config.yaml

@@ -1,41 +0,0 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-exclude: |
-    (?x)^(
-        InvenTree/InvenTree/static/.*|
-        InvenTree/locale/.*
-    )$
-repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
-    -   id: mixed-line-ending
--   repo: https://github.com/pycqa/flake8
-    rev: '6.0.0'
-    hooks:
-    -   id: flake8
-        additional_dependencies: [
-                'flake8-bugbear',
-                'flake8-docstrings',
-                'flake8-string-format',
-                'pep8-naming ',
-        ]
--   repo: https://github.com/pycqa/isort
-    rev: '5.11.4'
-    hooks:
-    -   id: isort
--   repo: https://github.com/jazzband/pip-tools
-    rev: 6.12.1
-    hooks:
-      - id: pip-compile
-        name: pip-compile requirements-dev.in
-        args: [--generate-hashes, requirements-dev.in, -o, requirements-dev.txt]
-        files: ^requirements-dev\.(in|txt)$
-      - id: pip-compile
-        name: pip-compile requirements.txt
-        args: [requirements.in, -o, requirements.txt]
-        files: ^requirements\.(in|txt)$

.vscode/launch.json

@@ -1,26 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "InvenTree Server",
-      "type": "python",
-      "request": "launch",
-      "program": "${workspaceFolder}/InvenTree/manage.py",
-      "args": ["runserver"],
-      "django": true,
-      "justMyCode": true
-    },
-    {
-      "name": "Python: Django - 3rd party",
-      "type": "python",
-      "request": "launch",
-      "program": "${workspaceFolder}/InvenTree/manage.py",
-      "args": ["runserver"],
-      "django": true,
-      "justMyCode": false
-    }
-  ]
-}

.vscode/tasks.json

@@ -1,52 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "clean-settings",
-      "type": "shell",
-      "command": "inv clean-settings",
-    },
-    {
-      "label": "delete-data",
-      "type": "shell",
-      "command": "inv delete-data",
-    },
-    {
-      "label": "migrate",
-      "type": "shell",
-      "command": "inv migrate",
-    },
-    {
-      "label": "server",
-      "type": "shell",
-      "command": "inv server",
-    },
-    {
-      "label": "setup-dev",
-      "type": "shell",
-      "command": "inv setup-dev",
-    },
-    {
-      "label": "setup-test",
-      "type": "shell",
-      "command": "inv setup-test --path dev/inventree-demo-dataset",
-    },
-    {
-      "label": "superuser",
-      "type": "shell",
-      "command": "inv superuser",
-    },
-    {
-      "label": "test",
-      "type": "shell",
-      "command": "inv test",
-    },
-    {
-      "label": "update",
-      "type": "shell",
-      "command": "inv update",
-    },
-  ]
-}

CONTRIBUTING.md

@@ -1,40 +1,5 @@
-Hi there, thank you for your intrest in contributing!
 Please read the contribution guidelines below, before submitting your first pull request to the InvenTree codebase.
 
-## Quickstart
-
-The following commands will get you quickly configure and run a development server, complete with a demo dataset to work with:
-
-### Bare Metal
-
-```bash
-git clone https://github.com/inventree/InvenTree.git && cd InvenTree
-python3 -m venv env && source env/bin/activate
-pip install invoke && invoke
-pip install invoke && invoke setup-dev --tests
-```
-
-### Docker
-
-```bash
-git clone https://github.com/inventree/InvenTree.git && cd InvenTree
-docker compose run inventree-dev-server invoke install
-docker compose run inventree-dev-server invoke setup-test
-docker compose up -d
-```
-
-Read the [InvenTree setup documentation](https://inventree.readthedocs.io/en/latest/start/intro/) for a complete installation reference guide.
-
-### Setup Devtools
-
-Run the following command to set up all toolsets for development.
-
-```bash
-invoke setup-dev
-```
-
-*We recommend you run this command before starting to contribute. This will install and set up `pre-commit` to run some checks before each commit and help reduce the style errors.*
-
 ## Branches and Versioning
 
 InvenTree roughly follow the [GitLab flow](https://docs.gitlab.com/ee/topics/gitlab_flow.html) branching style, to allow simple management of multiple tagged releases, short-lived branches, and development on the main branch.
@@ -52,7 +17,7 @@ The HEAD of the "main" or "master" branch of InvenTree represents the current "l
 
 **No pushing to master:** New featues must be submitted as a pull request from a separate branch (one branch per feature).
 
-### Feature Branches
+#### Feature Branches
 
 Feature branches should be branched *from* the *master* branch.
 
@@ -79,31 +44,6 @@ The HEAD of the "stable" branch represents the latest stable release code.
 - When approved, the branch is merged back *into* stable, with an incremented PATCH number (e.g. 0.4.1 -> 0.4.2)
 - The bugfix *must* also be cherry picked into the *master* branch.
 
-## Environment
-### Target version
-We are currently targeting:
-| Name | Minimum version |
-|---|---|
-| Python | 3.9 |
-| Django | 3.2 |
-
-### Auto creating updates
-The following tools can be used to auto-upgrade syntax that was depreciated in new versions:
-```bash
-pip install pyupgrade
-pip install django-upgrade
-```
-
-To update the codebase run the following script.
-```bash
-pyupgrade `find . -name "*.py"`
-django-upgrade --target-version 3.2 `find . -name "*.py"`
-```
-
-## Credits
-If you add any new dependencies / libraries, they need to be added to [the docs](https://github.com/inventree/inventree-docs/blob/master/docs/credits.md). Please try to do that as timely as possible.
-
-
 ## Migration Files
 
 Any required migration files **must** be included in the commit, or the pull-request will be rejected. If you change the underlying database schema, make sure you run `invoke migrate` and commit the migration files before submitting the PR.
@@ -126,7 +66,6 @@ The various github actions can be found in the `./github/workflows` directory
 ## Code Style
 
 Sumbitted Python code is automatically checked against PEP style guidelines. Locally you can run `invoke style` to ensure the style checks will pass, before submitting the PR.
-Please write docstrings for each function and class - we follow the [google doc-style](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings) for python. Docstrings for general javascript code is encouraged! Docstyles are checked by `invoke style`.
 
 ## Documentation
 
@@ -147,7 +86,7 @@ Any user-facing strings *must* be passed through the translation engine.
 For strings exposed via Python code, use the following format:
 
 ```python
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 user_facing_string = _('This string will be exposed to the translation engine!')
 ```
@@ -160,44 +99,4 @@ HTML and javascript files are passed through the django templating engine. Trans
 {% load i18n %}
 
 <span>{% trans "This string will be translated" %} - this string will not!</span>
-```
-
-## Github use
-### Tags
-The tags describe issues and PRs in multiple areas:
-| Area | Name | Description |
-|---|---|---|
-| Triage Labels |  |  |
-|  | triage:not-checked | Item was not checked by the core team  |
-|  | triage:not-approved | Item is not green-light by maintainer |
-| Type Labels |  |  |
-|  | breaking | Indicates a major update or change which breaks compatibility |
-|  | bug | Identifies a bug which needs to be addressed |
-|  | dependency | Relates to a project dependency |
-|  | duplicate | Duplicate of another issue or PR |
-|  | enhancement | This is an suggested enhancement or new feature |
-|  | help wanted | Assistance required |
-|  | invalid | This issue or PR is considered invalid |
-|  | inactive | Indicates lack of activity |
-|  | question | This is a question |
-|  | roadmap | This is a roadmap feature with no immediate plans for implementation |
-|  | security | Relates to a security issue |
-|  | starter | Good issue for a developer new to the project |
-|  | wontfix | No work will be done against this issue or PR |
-| Feature Labels |  |  |
-|  | API | Relates to the API |
-|  | barcode | Barcode scanning and integration |
-|  | build | Build orders |
-|  | importer | Data importing and processing |
-|  | order | Purchase order and sales orders |
-|  | part | Parts |
-|  | plugin | Plugin ecosystem |
-|  | pricing | Pricing functionality |
-|  | report | Report generation |
-|  | stock | Stock item management |
-|  | user interface | User interface |
-| Ecosystem Labels |  |  |
-|  | demo | Relates to the InvenTree demo server or dataset |
-|  | docker | Docker / docker-compose |
-|  | CI | CI / unit testing ecosystem |
-|  | setup | Relates to the InvenTree setup / installation process |
+```

Dockerfile

@@ -1,141 +0,0 @@
-# The InvenTree dockerfile provides two build targets:
-#
-# production:
-# - Required files are copied into the image
-# - Runs InvenTree web server under gunicorn
-#
-# dev:
-# - Expects source directories to be loaded as a run-time volume
-# - Runs InvenTree web server under django development server
-# - Monitors source files for any changes, and live-reloads server
-
-
-FROM python:3.9-slim as base
-
-# Build arguments for this image
-ARG commit_hash=""
-ARG commit_date=""
-ARG commit_tag=""
-
-ENV PYTHONUNBUFFERED 1
-
-# Ref: https://github.com/pyca/cryptography/issues/5776
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST 1
-
-ENV INVENTREE_LOG_LEVEL="WARNING"
-ENV INVENTREE_DOCKER="true"
-
-# InvenTree paths
-ENV INVENTREE_HOME="/home/inventree"
-ENV INVENTREE_MNG_DIR="${INVENTREE_HOME}/InvenTree"
-ENV INVENTREE_DATA_DIR="${INVENTREE_HOME}/data"
-ENV INVENTREE_STATIC_ROOT="${INVENTREE_DATA_DIR}/static"
-ENV INVENTREE_MEDIA_ROOT="${INVENTREE_DATA_DIR}/media"
-ENV INVENTREE_BACKUP_DIR="${INVENTREE_DATA_DIR}/backup"
-ENV INVENTREE_PLUGIN_DIR="${INVENTREE_DATA_DIR}/plugins"
-
-# InvenTree configuration files
-ENV INVENTREE_CONFIG_FILE="${INVENTREE_DATA_DIR}/config.yaml"
-ENV INVENTREE_SECRET_KEY_FILE="${INVENTREE_DATA_DIR}/secret_key.txt"
-ENV INVENTREE_PLUGIN_FILE="${INVENTREE_DATA_DIR}/plugins.txt"
-
-# Worker configuration (can be altered by user)
-ENV INVENTREE_GUNICORN_WORKERS="4"
-ENV INVENTREE_BACKGROUND_WORKERS="4"
-
-# Default web server address:port
-ENV INVENTREE_WEB_ADDR=0.0.0.0
-ENV INVENTREE_WEB_PORT=8000
-
-LABEL org.label-schema.schema-version="1.0" \
-      org.label-schema.build-date=${DATE} \
-      org.label-schema.vendor="inventree" \
-      org.label-schema.name="inventree/inventree" \
-      org.label-schema.url="https://hub.docker.com/r/inventree/inventree" \
-      org.label-schema.vcs-url="https://github.com/inventree/InvenTree.git" \
-      org.label-schema.vcs-ref=${commit_tag}
-
-# RUN apt-get upgrade && apt-get update
-RUN apt-get update
-
-# Install required system packages
-RUN apt-get install -y  --no-install-recommends \
-    git gcc g++ gettext gnupg libffi-dev \
-    # Weasyprint requirements : https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11
-    poppler-utils libpango-1.0-0 libpangoft2-1.0-0 \
-    # Image format support
-    libjpeg-dev webp libwebp-dev \
-    # SQLite support
-    sqlite3 \
-    # PostgreSQL support
-    libpq-dev postgresql-client \
-    # MySQL / MariaDB support
-    default-libmysqlclient-dev mariadb-client && \
-    apt-get autoclean && apt-get autoremove
-
-# Update pip
-RUN pip install --upgrade pip
-
-# Install required base-level python packages
-COPY ./docker/requirements.txt base_requirements.txt
-RUN pip install --disable-pip-version-check -U -r base_requirements.txt
-
-# InvenTree production image:
-# - Copies required files from local directory
-# - Installs required python packages from requirements.txt
-# - Starts a gunicorn webserver
-
-FROM base as production
-
-ENV INVENTREE_DEBUG=False
-
-# As .git directory is not available in production image, we pass the commit information via ENV
-ENV INVENTREE_COMMIT_HASH="${commit_hash}"
-ENV INVENTREE_COMMIT_DATE="${commit_date}"
-
-# Copy source code
-COPY InvenTree ${INVENTREE_HOME}/InvenTree
-
-# Copy other key files
-COPY requirements.txt ${INVENTREE_HOME}/requirements.txt
-COPY tasks.py ${INVENTREE_HOME}/tasks.py
-COPY docker/gunicorn.conf.py ${INVENTREE_HOME}/gunicorn.conf.py
-COPY docker/init.sh ${INVENTREE_MNG_DIR}/init.sh
-
-# Need to be running from within this directory
-WORKDIR ${INVENTREE_MNG_DIR}
-
-# Drop to the inventree user for the production image
-#RUN adduser inventree
-#RUN chown -R inventree:inventree ${INVENTREE_HOME}
-#USER inventree
-
-# Install InvenTree packages
-RUN pip3 install --user --disable-pip-version-check -r ${INVENTREE_HOME}/requirements.txt
-
-# Server init entrypoint
-ENTRYPOINT ["/bin/bash", "./init.sh"]
-
-# Launch the production server
-# TODO: Work out why environment variables cannot be interpolated in this command
-# TODO: e.g. -b ${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT} fails here
-CMD gunicorn -c ./gunicorn.conf.py InvenTree.wsgi -b 0.0.0.0:8000 --chdir ./InvenTree
-
-FROM base as dev
-
-# The development image requires the source code to be mounted to /home/inventree/
-# So from here, we don't actually "do" anything, apart from some file management
-
-ENV INVENTREE_DEBUG=True
-
-# Location for python virtual environment
-# If the INVENTREE_PY_ENV variable is set, the entrypoint script will use it!
-ENV INVENTREE_PY_ENV="${INVENTREE_DATA_DIR}/env"
-
-WORKDIR ${INVENTREE_HOME}
-
-# Entrypoint ensures that we are running in the python virtual environment
-ENTRYPOINT ["/bin/bash", "./docker/init.sh"]
-
-# Launch the development server
-CMD ["invoke", "server", "-a", "${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT}"]

InvenTree/InvenTree/__init__.py

@@ -1,4 +1,5 @@
-"""The InvenTree module provides high-level management and functionality.
+"""
+The InvenTree module provides high-level management and functionality.
 
 It provides a number of helper functions and generic classes which are used by InvenTree apps.
 """

InvenTree/InvenTree/admin.py

@@ -1,33 +0,0 @@
-"""Admin classes"""
-
-from import_export.resources import ModelResource
-
-
-class InvenTreeResource(ModelResource):
-    """Custom subclass of the ModelResource class provided by django-import-export"
-
-    Ensures that exported data are escaped to prevent malicious formula injection.
-    Ref: https://owasp.org/www-community/attacks/CSV_Injection
-    """
-
-    def export_resource(self, obj):
-        """Custom function to override default row export behaviour.
-
-        Specifically, strip illegal leading characters to prevent formula injection
-        """
-        row = super().export_resource(obj)
-
-        illegal_start_vals = ['@', '=', '+', '-', '@', '\t', '\r', '\n']
-
-        for idx, val in enumerate(row):
-            if type(val) is str:
-                val = val.strip()
-
-                # If the value starts with certain 'suspicious' values, remove it!
-                while len(val) > 0 and val[0] in illegal_start_vals:
-                    # Remove the first character
-                    val = val[1:]
-
-                row[idx] = val
-
-        return row

InvenTree/InvenTree/api.py

@@ -1,62 +1,65 @@
-"""Main JSON interface views."""
+"""
+Main JSON interface views
+"""
 
-from django.conf import settings
-from django.db import transaction
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import logging
+
+from django.utils.translation import ugettext_lazy as _
 from django.http import JsonResponse
-from django.utils.translation import gettext_lazy as _
 
 from django_filters.rest_framework import DjangoFilterBackend
-from django_q.models import OrmQ
-from rest_framework import filters, permissions
+from rest_framework import filters
+
+from rest_framework import permissions
 from rest_framework.response import Response
-from rest_framework.serializers import ValidationError
+from rest_framework.views import APIView
 
-from InvenTree.mixins import ListCreateAPI
-from InvenTree.permissions import RolePermission
-from part.templatetags.inventree_extras import plugins_info
-
-from .status import is_worker_running
-from .version import (inventreeApiVersion, inventreeInstanceName,
-                      inventreeVersion)
 from .views import AjaxView
+from .version import inventreeVersion, inventreeApiVersion, inventreeInstanceName
+from .status import is_worker_running
+
+from plugins import plugins as inventree_plugins
+
+
+logger = logging.getLogger("inventree")
+
+
+logger.info("Loading action plugins...")
+action_plugins = inventree_plugins.load_action_plugins()
 
 
 class InfoView(AjaxView):
-    """Simple JSON endpoint for InvenTree information.
-
+    """ Simple JSON endpoint for InvenTree information.
     Use to confirm that the server is running, etc.
     """
 
     permission_classes = [permissions.AllowAny]
 
-    def worker_pending_tasks(self):
-        """Return the current number of outstanding background tasks"""
-
-        return OrmQ.objects.count()
-
     def get(self, request, *args, **kwargs):
-        """Serve current server information."""
+
         data = {
             'server': 'InvenTree',
             'version': inventreeVersion(),
             'instance': inventreeInstanceName(),
             'apiVersion': inventreeApiVersion(),
             'worker_running': is_worker_running(),
-            'worker_pending_tasks': self.worker_pending_tasks(),
-            'plugins_enabled': settings.PLUGINS_ENABLED,
-            'active_plugins': plugins_info(),
         }
 
         return JsonResponse(data)
 
 
 class NotFoundView(AjaxView):
-    """Simple JSON view when accessing an invalid API view."""
+    """
+    Simple JSON view when accessing an invalid API view.
+    """
 
     permission_classes = [permissions.AllowAny]
 
     def get(self, request, *args, **kwargs):
-        """Proces an `not found` event on the API."""
+
         data = {
             'details': _('API endpoint not found'),
             'url': request.build_absolute_uri(),
@@ -65,137 +68,13 @@ class NotFoundView(AjaxView):
         return JsonResponse(data, status=404)
 
 
-class BulkDeleteMixin:
-    """Mixin class for enabling 'bulk delete' operations for various models.
-
-    Bulk delete allows for multiple items to be deleted in a single API query,
-    rather than using multiple API calls to the various detail endpoints.
-
-    This is implemented for two major reasons:
-    - Atomicity (guaranteed that either *all* items are deleted, or *none*)
-    - Speed (single API call and DB query)
-    """
-
-    def filter_delete_queryset(self, queryset, request):
-        """Provide custom filtering for the queryset *before* it is deleted"""
-        return queryset
-
-    def delete(self, request, *args, **kwargs):
-        """Perform a DELETE operation against this list endpoint.
-
-        We expect a list of primary-key (ID) values to be supplied as a JSON object, e.g.
-        {
-            items: [4, 8, 15, 16, 23, 42]
-        }
-
-        """
-        model = self.serializer_class.Meta.model
-
-        # Extract the items from the request body
-        try:
-            items = request.data.getlist('items', None)
-        except AttributeError:
-            items = request.data.get('items', None)
-
-        # Extract the filters from the request body
-        try:
-            filters = request.data.getlist('filters', None)
-        except AttributeError:
-            filters = request.data.get('filters', None)
-
-        if not items and not filters:
-            raise ValidationError({
-                "non_field_errors": ["List of items or filters must be provided for bulk deletion"],
-            })
-
-        if items and type(items) is not list:
-            raise ValidationError({
-                "items": ["'items' must be supplied as a list object"]
-            })
-
-        if filters and type(filters) is not dict:
-            raise ValidationError({
-                "filters": ["'filters' must be supplied as a dict object"]
-            })
-
-        # Keep track of how many items we deleted
-        n_deleted = 0
-
-        with transaction.atomic():
-
-            # Start with *all* models and perform basic filtering
-            queryset = model.objects.all()
-            queryset = self.filter_delete_queryset(queryset, request)
-
-            # Filter by provided item ID values
-            if items:
-                queryset = queryset.filter(id__in=items)
-
-            # Filter by provided filters
-            if filters:
-                queryset = queryset.filter(**filters)
-
-            n_deleted = queryset.count()
-            queryset.delete()
-
-        return Response(
-            {
-                'success': f"Deleted {n_deleted} items",
-            },
-            status=204
-        )
-
-
-class ListCreateDestroyAPIView(BulkDeleteMixin, ListCreateAPI):
-    """Custom API endpoint which provides BulkDelete functionality in addition to List and Create"""
-    ...
-
-
-class APIDownloadMixin:
-    """Mixin for enabling a LIST endpoint to be downloaded a file.
-
-    To download the data, add the ?export=<fmt> to the query string.
-
-    The implementing class must provided a download_queryset method,
-    e.g.
-
-    def download_queryset(self, queryset, export_format):
-        dataset = StockItemResource().export(queryset=queryset)
-
-        filedata = dataset.export(export_format)
-
-        filename = 'InvenTree_Stocktake_{date}.{fmt}'.format(
-            date=datetime.now().strftime("%d-%b-%Y"),
-            fmt=export_format
-        )
-
-        return DownloadFile(filedata, filename)
-    """
-
-    def get(self, request, *args, **kwargs):
-        """Generic handler for a download request."""
-        export_format = request.query_params.get('export', None)
-
-        if export_format and export_format in ['csv', 'tsv', 'xls', 'xlsx']:
-            queryset = self.filter_queryset(self.get_queryset())
-            return self.download_queryset(queryset, export_format)
-
-        else:
-            # Default to the parent class implementation
-            return super().get(request, *args, **kwargs)
-
-    def download_queryset(self, queryset, export_format):
-        """This function must be implemented to provide a downloadFile request."""
-        raise NotImplementedError("download_queryset method not implemented!")
-
-
 class AttachmentMixin:
-    """Mixin for creating attachment objects, and ensuring the user information is saved correctly."""
+    """
+    Mixin for creating attachment objects,
+    and ensuring the user information is saved correctly.
+    """
 
-    permission_classes = [
-        permissions.IsAuthenticated,
-        RolePermission,
-    ]
+    permission_classes = [permissions.IsAuthenticated]
 
     filter_backends = [
         DjangoFilterBackend,
@@ -204,7 +83,44 @@ class AttachmentMixin:
     ]
 
     def perform_create(self, serializer):
-        """Save the user information when a file is uploaded."""
+        """ Save the user information when a file is uploaded """
+
         attachment = serializer.save()
         attachment.user = self.request.user
         attachment.save()
+
+
+class ActionPluginView(APIView):
+    """
+    Endpoint for running custom action plugins.
+    """
+
+    permission_classes = [
+        permissions.IsAuthenticated,
+    ]
+
+    def post(self, request, *args, **kwargs):
+
+        action = request.data.get('action', None)
+
+        data = request.data.get('data', None)
+
+        if action is None:
+            return Response({
+                'error': _("No action specified")
+            })
+
+        for plugin_class in action_plugins:
+            if plugin_class.action_name() == action:
+
+                plugin = plugin_class(request.user, data=data)
+
+                plugin.perform_action()
+
+                return Response(plugin.get_response())
+
+        # If we got to here, no matching action was found
+        return Response({
+            'error': _("No matching action found"),
+            "action": action,
+        })

InvenTree/InvenTree/api_tester.py

@@ -1,23 +1,15 @@
-"""Helper functions for performing API unit tests."""
-
-import csv
-import io
-import re
+"""
+Helper functions for performing API unit tests
+"""
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
-from django.http.response import StreamingHttpResponse
-
 from rest_framework.test import APITestCase
 
-from plugin import registry
-from plugin.models import PluginConfig
 
-
-class UserMixin:
-    """Mixin to setup a user and login for tests.
-
-    Use parameters to set username, password, email, roles and permissions.
+class InvenTreeAPITestCase(APITestCase):
+    """
+    Base class for running InvenTree API tests
     """
 
     # User information
@@ -33,7 +25,7 @@ class UserMixin:
     roles = []
 
     def setUp(self):
-        """Setup for all tests."""
+
         super().setUp()
 
         # Create a user to log in with
@@ -54,65 +46,44 @@ class UserMixin:
             self.user.is_staff = True
 
         self.user.save()
-
-        # Assign all roles if set
-        if self.roles == 'all':
-            self.assignRole(assign_all=True)
-        # else filter the roles
-        else:
-            for role in self.roles:
-                self.assignRole(role)
+        
+        for role in self.roles:
+            self.assignRole(role)
 
         if self.auto_login:
             self.client.login(username=self.username, password=self.password)
 
-    def assignRole(self, role=None, assign_all: bool = False):
-        """Set the user roles for the registered user."""
+    def assignRole(self, role):
+        """
+        Set the user roles for the registered user
+        """
+
         # role is of the format 'rule.permission' e.g. 'part.add'
 
-        if not assign_all and role:
-            rule, perm = role.split('.')
+        rule, perm = role.split('.')
 
         for ruleset in self.group.rule_sets.all():
 
-            if assign_all or ruleset.name == rule:
+            if ruleset.name == rule:
 
-                if assign_all or perm == 'view':
+                if perm == 'view':
                     ruleset.can_view = True
-                elif assign_all or perm == 'change':
+                elif perm == 'change':
                     ruleset.can_change = True
-                elif assign_all or perm == 'delete':
+                elif perm == 'delete':
                     ruleset.can_delete = True
-                elif assign_all or perm == 'add':
+                elif perm == 'add':
                     ruleset.can_add = True
 
                 ruleset.save()
                 break
 
-
-class PluginMixin:
-    """Mixin to ensure that all plugins are loaded for tests."""
-
-    def setUp(self):
-        """Setup for plugin tests."""
-        super().setUp()
-
-        # Load plugin configs
-        self.plugin_confs = PluginConfig.objects.all()
-        # Reload if not present
-        if not self.plugin_confs:
-            registry.reload_plugins()
-            self.plugin_confs = PluginConfig.objects.all()
-
-
-class InvenTreeAPITestCase(UserMixin, APITestCase):
-    """Base class for running InvenTree API tests."""
-
     def getActions(self, url):
-        """Return a dict of the 'actions' available at a given endpoint.
-
+        """
+        Return a dict of the 'actions' available at a given endpoint.
         Makes use of the HTTP 'OPTIONS' method to request this.
         """
+
         response = self.client.options(url)
         self.assertEqual(response.status_code, 200)
 
@@ -123,166 +94,50 @@ class InvenTreeAPITestCase(UserMixin, APITestCase):
 
         return actions
 
-    def get(self, url, data=None, expected_code=200, format='json'):
-        """Issue a GET request."""
-        # Set default - see B006
-        if data is None:
-            data = {}
+    def get(self, url, data={}, expected_code=200):
+        """
+        Issue a GET request
+        """
 
-        response = self.client.get(url, data, format=format)
-
-        if expected_code is not None:
-
-            if response.status_code != expected_code:
-                print(f"Unexpected response at '{url}': status_code = {response.status_code}")
-                print(response.data)
-
-            self.assertEqual(response.status_code, expected_code)
-
-        return response
-
-    def post(self, url, data=None, expected_code=None, format='json'):
-        """Issue a POST request."""
-
-        # Set default value - see B006
-        if data is None:
-            data = {}
-
-        response = self.client.post(url, data=data, format=format)
-
-        if expected_code is not None:
-
-            if response.status_code != expected_code:
-                print(f"Unexpected response at '{url}': status code = {response.status_code}")
-
-                if hasattr(response, 'data'):
-                    print(response.data)
-                else:
-                    print(f"(response object {type(response)} has no 'data' attribute")
-
-            self.assertEqual(response.status_code, expected_code)
-
-        return response
-
-    def delete(self, url, data=None, expected_code=None, format='json'):
-        """Issue a DELETE request."""
-
-        if data is None:
-            data = {}
-
-        response = self.client.delete(url, data=data, format=format)
+        response = self.client.get(url, data, format='json')
 
         if expected_code is not None:
             self.assertEqual(response.status_code, expected_code)
 
         return response
 
-    def patch(self, url, data, expected_code=None, format='json'):
-        """Issue a PATCH request."""
-        response = self.client.patch(url, data=data, format=format)
+    def post(self, url, data, expected_code=None):
+        """
+        Issue a POST request
+        """
+
+        response = self.client.post(url, data=data, format='json')
 
         if expected_code is not None:
             self.assertEqual(response.status_code, expected_code)
 
         return response
 
-    def put(self, url, data, expected_code=None, format='json'):
-        """Issue a PUT request."""
-        response = self.client.put(url, data=data, format=format)
+    def delete(self, url, expected_code=None):
+        """
+        Issue a DELETE request
+        """
 
-        if expected_code is not None:
-
-            if response.status_code != expected_code:
-                print(f"Unexpected response at '{url}':")
-                print(response.data)
-
-            self.assertEqual(response.status_code, expected_code)
-
-        return response
-
-    def options(self, url, expected_code=None):
-        """Issue an OPTIONS request."""
-        response = self.client.options(url, format='json')
+        response = self.client.delete(url)
 
         if expected_code is not None:
             self.assertEqual(response.status_code, expected_code)
 
         return response
 
-    def download_file(self, url, data, expected_code=None, expected_fn=None, decode=True):
-        """Download a file from the server, and return an in-memory file."""
-        response = self.client.get(url, data=data, format='json')
+    def patch(self, url, data, files=None, expected_code=None):
+        """
+        Issue a PATCH request
+        """
+
+        response = self.client.patch(url, data=data, files=files, format='json')
 
         if expected_code is not None:
             self.assertEqual(response.status_code, expected_code)
 
-        # Check that the response is of the correct type
-        if not isinstance(response, StreamingHttpResponse):
-            raise ValueError("Response is not a StreamingHttpResponse object as expected")
-
-        # Extract filename
-        disposition = response.headers['Content-Disposition']
-
-        result = re.search(r'attachment; filename="([\w.]+)"', disposition)
-
-        fn = result.groups()[0]
-
-        if expected_fn is not None:
-            self.assertEqual(expected_fn, fn)
-
-        if decode:
-            # Decode data and return as StringIO file object
-            fo = io.StringIO()
-            fo.name = fo
-            fo.write(response.getvalue().decode('UTF-8'))
-        else:
-            # Return a a BytesIO file object
-            fo = io.BytesIO()
-            fo.name = fn
-            fo.write(response.getvalue())
-
-        fo.seek(0)
-
-        return fo
-
-    def process_csv(self, fo, delimiter=',', required_cols=None, excluded_cols=None, required_rows=None):
-        """Helper function to process and validate a downloaded csv file."""
-        # Check that the correct object type has been passed
-        self.assertTrue(isinstance(fo, io.StringIO))
-
-        fo.seek(0)
-
-        reader = csv.reader(fo, delimiter=delimiter)
-
-        headers = []
-        rows = []
-
-        for idx, row in enumerate(reader):
-            if idx == 0:
-                headers = row
-            else:
-                rows.append(row)
-
-        if required_cols is not None:
-            for col in required_cols:
-                self.assertIn(col, headers)
-
-        if excluded_cols is not None:
-            for col in excluded_cols:
-                self.assertNotIn(col, headers)
-
-        if required_rows is not None:
-            self.assertEqual(len(rows), required_rows)
-
-        # Return the file data as a list of dict items, based on the headers
-        data = []
-
-        for row in rows:
-            entry = {}
-
-            for idx, col in enumerate(headers):
-                entry[col] = row[idx]
-
-            data.append(entry)
-
-        return data
+        return response

InvenTree/InvenTree/api_version.py

@@ -1,342 +0,0 @@
-"""InvenTree API version information."""
-
-
-# InvenTree API version
-INVENTREE_API_VERSION = 93
-
-"""
-Increment this API version number whenever there is a significant change to the API that any clients need to know about
-
-v93 -> 2023-02-03 : https://github.com/inventree/InvenTree/pull/4300
-    - Adds extra information to the currency exchange endpoint
-    - Adds API endpoint for manually updating exchange rates
-
-v92 -> 2023-02-02 : https://github.com/inventree/InvenTree/pull/4293
-    - Adds API endpoint for currency exchange information
-
-v91 -> 2023-01-31 : https://github.com/inventree/InvenTree/pull/4281
-    - Improves the API endpoint for creating new Part instances
-
-v90 -> 2023-01-25 : https://github.com/inventree/InvenTree/pull/4186/files
-    - Adds a dedicated endpoint to activate a plugin
-
-v89 -> 2023-01-25 : https://github.com/inventree/InvenTree/pull/4214
-    - Adds updated field to SupplierPart API
-    - Adds API date orddering for supplier part list
-
-v88 -> 2023-01-17: https://github.com/inventree/InvenTree/pull/4225
-    - Adds 'priority' field to Build model and api endpoints
-
-v87 -> 2023-01-04 : https://github.com/inventree/InvenTree/pull/4067
-    - Add API date filter for stock table on Expiry date
-
-v86 -> 2022-12-22 : https://github.com/inventree/InvenTree/pull/4069
-    - Adds API endpoints for part stocktake
-
-v85 -> 2022-12-21 : https://github.com/inventree/InvenTree/pull/3858
-    - Add endpoints serving ICS calendars for purchase and sales orders through API
-
-v84 -> 2022-12-21: https://github.com/inventree/InvenTree/pull/4083
-    - Add support for listing PO, BO, SO by their reference
-
-v83 -> 2022-11-19 : https://github.com/inventree/InvenTree/pull/3949
-    - Add support for structural Stock locations
-
-v82 -> 2022-11-16 : https://github.com/inventree/InvenTree/pull/3931
-    - Add support for structural Part categories
-
-v81 -> 2022-11-08 : https://github.com/inventree/InvenTree/pull/3710
-    - Adds cached pricing information to Part API
-    - Adds cached pricing information to BomItem API
-    - Allows Part and BomItem list endpoints to be filtered by 'has_pricing'
-    - Remove calculated 'price_string' values from API endpoints
-    - Allows PurchaseOrderLineItem API endpoint to be filtered by 'has_pricing'
-    - Allows SalesOrderLineItem API endpoint to be filtered by 'has_pricing'
-    - Allows SalesOrderLineItem API endpoint to be filtered by 'order_status'
-    - Adds more information to SupplierPriceBreak serializer
-
-v80 -> 2022-11-07 : https://github.com/inventree/InvenTree/pull/3906
-    - Adds 'barcode_hash' to Part API serializer
-    - Adds 'barcode_hash' to StockLocation API serializer
-    - Adds 'barcode_hash' to SupplierPart API serializer
-
-v79 -> 2022-11-03 : https://github.com/inventree/InvenTree/pull/3895
-    - Add metadata to Company
-
-v78 -> 2022-10-25 : https://github.com/inventree/InvenTree/pull/3854
-    - Make PartCategory to be filtered by name and description
-
-v77 -> 2022-10-12 : https://github.com/inventree/InvenTree/pull/3772
-    - Adds model permission checks for barcode assignment actions
-
-v76 -> 2022-09-10 : https://github.com/inventree/InvenTree/pull/3640
-    - Refactor of barcode data on the API
-    - StockItem.uid renamed to StockItem.barcode_hash
-
-v75 -> 2022-09-05 : https://github.com/inventree/InvenTree/pull/3644
-    - Adds "pack_size" attribute to SupplierPart API serializer
-
-v74 -> 2022-08-28 : https://github.com/inventree/InvenTree/pull/3615
-    - Add confirmation field for completing PurchaseOrder if the order has incomplete lines
-    - Add confirmation field for completing SalesOrder if the order has incomplete lines
-
-v73 -> 2022-08-24 : https://github.com/inventree/InvenTree/pull/3605
-    - Add 'description' field to PartParameterTemplate model
-
-v72 -> 2022-08-18 : https://github.com/inventree/InvenTree/pull/3567
-    - Allow PurchaseOrder to be duplicated via the API
-
-v71 -> 2022-08-18 : https://github.com/inventree/InvenTree/pull/3564
-    - Updates to the "part scheduling" API endpoint
-
-v70 -> 2022-08-02 : https://github.com/inventree/InvenTree/pull/3451
-    - Adds a 'depth' parameter to the PartCategory list API
-    - Adds a 'depth' parameter to the StockLocation list API
-
-v69 -> 2022-08-01 : https://github.com/inventree/InvenTree/pull/3443
-    - Updates the PartCategory list API:
-        - Improve query efficiency: O(n) becomes O(1)
-        - Rename 'parts' field to 'part_count'
-    - Updates the StockLocation list API:
-        - Improve query efficiency: O(n) becomes O(1)
-
-v68 -> 2022-07-27 : https://github.com/inventree/InvenTree/pull/3417
-    - Allows SupplierPart list to be filtered by SKU value
-    - Allows SupplierPart list to be filtered by MPN value
-
-v67 -> 2022-07-25 : https://github.com/inventree/InvenTree/pull/3395
-    - Adds a 'requirements' endpoint for Part instance
-    - Provides information on outstanding order requirements for a given part
-
-v66 -> 2022-07-24 : https://github.com/inventree/InvenTree/pull/3393
-    - Part images can now be downloaded from a remote URL via the API
-    - Company images can now be downloaded from a remote URL via the API
-
-v65 -> 2022-07-15 : https://github.com/inventree/InvenTree/pull/3335
-    - Annotates 'in_stock' quantity to the SupplierPart API
-
-v64 -> 2022-07-08 : https://github.com/inventree/InvenTree/pull/3310
-    - Annotate 'on_order' quantity to BOM list API
-    - Allow BOM List API endpoint to be filtered by "on_order" parameter
-
-v63 -> 2022-07-06 : https://github.com/inventree/InvenTree/pull/3301
-    - Allow BOM List API endpoint to be filtered by "available_stock" paramater
-
-v62 -> 2022-07-05 : https://github.com/inventree/InvenTree/pull/3296
-    - Allows search on BOM List API endpoint
-    - Allows ordering on BOM List API endpoint
-
-v61 -> 2022-06-12 : https://github.com/inventree/InvenTree/pull/3183
-    - Migrate the "Convert Stock Item" form class to use the API
-    - There is now an API endpoint for converting a stock item to a valid variant
-
-v60 -> 2022-06-08 : https://github.com/inventree/InvenTree/pull/3148
-    - Add availability data fields to the SupplierPart model
-
-v59 -> 2022-06-07 : https://github.com/inventree/InvenTree/pull/3154
-    - Adds further improvements to BulkDelete mixin class
-    - Fixes multiple bugs in custom OPTIONS metadata implementation
-    - Adds 'bulk delete' for Notifications
-
-v58 -> 2022-06-06 : https://github.com/inventree/InvenTree/pull/3146
-    - Adds a BulkDelete API mixin class for fast, safe deletion of multiple objects with a single API request
-
-v57 -> 2022-06-05 : https://github.com/inventree/InvenTree/pull/3130
-    - Transfer PartCategoryTemplateParameter actions to the API
-
-v56 -> 2022-06-02 : https://github.com/inventree/InvenTree/pull/3123
-    - Expose the PartParameterTemplate model to use the API
-
-v55 -> 2022-06-02 : https://github.com/inventree/InvenTree/pull/3120
-    - Converts the 'StockItemReturn' functionality to make use of the API
-
-v54 -> 2022-06-02 : https://github.com/inventree/InvenTree/pull/3117
-    - Adds 'available_stock' annotation on the SalesOrderLineItem API
-    - Adds (well, fixes) 'overdue' annotation on the SalesOrderLineItem API
-
-v53 -> 2022-06-01 : https://github.com/inventree/InvenTree/pull/3110
-    - Adds extra search fields to the BuildOrder list API endpoint
-
-v52 -> 2022-05-31 : https://github.com/inventree/InvenTree/pull/3103
-    - Allow part list API to be searched by supplier SKU
-
-v51 -> 2022-05-24 : https://github.com/inventree/InvenTree/pull/3058
-    - Adds new fields to the SalesOrderShipment model
-
-v50 -> 2022-05-18 : https://github.com/inventree/InvenTree/pull/2912
-    - Implement Attachments for manufacturer parts
-
-v49 -> 2022-05-09 : https://github.com/inventree/InvenTree/pull/2957
-    - Allows filtering of plugin list by 'active' status
-    - Allows filtering of plugin list by 'mixin' support
-    - Adds endpoint to "identify" or "locate" stock items and locations (using plugins)
-
-v48 -> 2022-05-12 : https://github.com/inventree/InvenTree/pull/2977
-    - Adds "export to file" functionality for PurchaseOrder API endpoint
-    - Adds "export to file" functionality for SalesOrder API endpoint
-    - Adds "export to file" functionality for BuildOrder API endpoint
-
-v47 -> 2022-05-10 : https://github.com/inventree/InvenTree/pull/2964
-    - Fixes barcode API error response when scanning a StockItem which does not exist
-    - Fixes barcode API error response when scanning a StockLocation which does not exist
-
-v46 -> 2022-05-09
-    - Fixes read permissions on settings API
-    - Allows non-staff users to read global settings via the API
-
-v45 -> 2022-05-08 : https://github.com/inventree/InvenTree/pull/2944
-    - Settings are now accessed via the API using their unique key, not their PK
-    - This allows the settings to be accessed without prior knowledge of the PK
-
-v44 -> 2022-05-04 : https://github.com/inventree/InvenTree/pull/2931
-    - Converting more server-side rendered forms to the API
-    - Exposes more core functionality to API endpoints
-
-v43 -> 2022-04-26 : https://github.com/inventree/InvenTree/pull/2875
-    - Adds API detail endpoint for PartSalePrice model
-    - Adds API detail endpoint for PartInternalPrice model
-
-v42 -> 2022-04-26 : https://github.com/inventree/InvenTree/pull/2833
-    - Adds variant stock information to the Part and BomItem serializers
-
-v41 -> 2022-04-26
-    - Fixes 'variant_of' filter for Part list endpoint
-
-v40 -> 2022-04-19
-    - Adds ability to filter StockItem list by "tracked" parameter
-        - This checks the serial number or batch code fields
-
-v39 -> 2022-04-18
-    - Adds ability to filter StockItem list by "has_batch" parameter
-
-v38 -> 2022-04-14 : https://github.com/inventree/InvenTree/pull/2828
-    - Adds the ability to include stock test results for "installed items"
-
-v37 -> 2022-04-07 : https://github.com/inventree/InvenTree/pull/2806
-    - Adds extra stock availability information to the BomItem serializer
-
-v36 -> 2022-04-03
-    - Adds ability to filter part list endpoint by unallocated_stock argument
-
-v35 -> 2022-04-01 : https://github.com/inventree/InvenTree/pull/2797
-    - Adds stock allocation information to the Part API
-    - Adds calculated field for "unallocated_quantity"
-
-v34 -> 2022-03-25
-    - Change permissions for "plugin list" API endpoint (now allows any authenticated user)
-
-v33 -> 2022-03-24
-    - Adds "plugins_enabled" information to root API endpoint
-
-v32 -> 2022-03-19
-    - Adds "parameters" detail to Part API endpoint (use &parameters=true)
-    - Adds ability to filter PartParameterTemplate API by Part instance
-    - Adds ability to filter PartParameterTemplate API by PartCategory instance
-
-v31 -> 2022-03-14
-    - Adds "updated" field to SupplierPriceBreakList and SupplierPriceBreakDetail API endpoints
-
-v30 -> 2022-03-09
-    - Adds "exclude_location" field to BuildAutoAllocation API endpoint
-    - Allows BuildItem API endpoint to be filtered by BomItem relation
-
-v29 -> 2022-03-08
-    - Adds "scheduling" endpoint for predicted stock scheduling information
-
-v28 -> 2022-03-04
-    - Adds an API endpoint for auto allocation of stock items against a build order
-    - Ref: https://github.com/inventree/InvenTree/pull/2713
-
-v27 -> 2022-02-28
-    - Adds target_date field to individual line items for purchase orders and sales orders
-
-v26 -> 2022-02-17
-    - Adds API endpoint for uploading a BOM file and extracting data
-
-v25 -> 2022-02-17
-    - Adds ability to filter "part" list endpoint by "in_bom_for" argument
-
-v24 -> 2022-02-10
-    - Adds API endpoint for deleting (cancelling) build order outputs
-
-v23 -> 2022-02-02
-    - Adds API endpoints for managing plugin classes
-    - Adds API endpoints for managing plugin settings
-
-v22 -> 2021-12-20
-    - Adds API endpoint to "merge" multiple stock items
-
-v21 -> 2021-12-04
-    - Adds support for multiple "Shipments" against a SalesOrder
-    - Refactors process for stock allocation against a SalesOrder
-
-v20 -> 2021-12-03
-    - Adds ability to filter POLineItem endpoint by "base_part"
-    - Adds optional "order_detail" to POLineItem list endpoint
-
-v19 -> 2021-12-02
-    - Adds the ability to filter the StockItem API by "part_tree"
-    - Returns only stock items which match a particular part.tree_id field
-
-v18 -> 2021-11-15
-    - Adds the ability to filter BomItem API by "uses" field
-    - This returns a list of all BomItems which "use" the specified part
-    - Includes inherited BomItem objects
-
-v17 -> 2021-11-09
-    - Adds API endpoints for GLOBAL and USER settings objects
-    - Ref: https://github.com/inventree/InvenTree/pull/2275
-
-v16 -> 2021-10-17
-    - Adds API endpoint for completing build order outputs
-
-v15 -> 2021-10-06
-    - Adds detail endpoint for SalesOrderAllocation model
-    - Allows use of the API forms interface for adjusting SalesOrderAllocation objects
-
-v14 -> 2021-10-05
-    - Stock adjustment actions API is improved, using native DRF serializer support
-    - However adjustment actions now only support 'pk' as a lookup field
-
-v13 -> 2021-10-05
-    - Adds API endpoint to allocate stock items against a BuildOrder
-    - Updates StockItem API with improved filtering against BomItem data
-
-v12 -> 2021-09-07
-    - Adds API endpoint to receive stock items against a PurchaseOrder
-
-v11 -> 2021-08-26
-    - Adds "units" field to PartBriefSerializer
-    - This allows units to be introspected from the "part_detail" field in the StockItem serializer
-
-v10 -> 2021-08-23
-    - Adds "purchase_price_currency" to StockItem serializer
-    - Adds "purchase_price_string" to StockItem serializer
-    - Purchase price is now writable for StockItem serializer
-
-v9  -> 2021-08-09
-    - Adds "price_string" to part pricing serializers
-
-v8  -> 2021-07-19
-    - Refactors the API interface for SupplierPart and ManufacturerPart models
-    - ManufacturerPart objects can no longer be created via the SupplierPart API endpoint
-
-v7  -> 2021-07-03
-    - Introduced the concept of "API forms" in https://github.com/inventree/InvenTree/pull/1716
-    - API OPTIONS endpoints provide comprehensive field metedata
-    - Multiple new API endpoints added for database models
-
-v6  -> 2021-06-23
-    - Part and Company images can now be directly uploaded via the REST API
-
-v5  -> 2021-06-21
-    - Adds API interface for manufacturer part parameters
-
-v4  -> 2021-06-01
-    - BOM items can now accept "variant stock" to be assigned against them
-    - Many slight API tweaks were needed to get this to work properly!
-
-v3  -> 2021-05-22:
-    - The updated StockItem "history tracking" now uses a different interface
-
-"""

InvenTree/InvenTree/apps.py

@@ -1,108 +1,89 @@
-"""AppConfig for inventree app."""
+# -*- coding: utf-8 -*-
 
 import logging
-from importlib import import_module
-from pathlib import Path
 
-from django.apps import AppConfig, apps
-from django.conf import settings
-from django.contrib.auth import get_user_model
+from django.apps import AppConfig
 from django.core.exceptions import AppRegistryNotReady
-from django.db import transaction
-from django.db.utils import IntegrityError
 
+from InvenTree.ready import isInTestMode, canAppAccessDatabase
 import InvenTree.tasks
-from InvenTree.ready import canAppAccessDatabase, isInTestMode
 
-from .config import get_setting
 
 logger = logging.getLogger("inventree")
 
 
 class InvenTreeConfig(AppConfig):
-    """AppConfig for inventree app."""
     name = 'InvenTree'
 
     def ready(self):
-        """Setup background tasks and update exchange rates."""
-        if canAppAccessDatabase() or settings.TESTING_ENV:
 
-            self.remove_obsolete_tasks()
-
-            self.collect_tasks()
+        if canAppAccessDatabase():
             self.start_background_tasks()
 
-            if not isInTestMode():  # pragma: no cover
+            if not isInTestMode():
                 self.update_exchange_rates()
 
-        self.collect_notification_methods()
-
-        if canAppAccessDatabase() or settings.TESTING_ENV:
-            self.add_user_on_startup()
-
-    def remove_obsolete_tasks(self):
-        """Delete any obsolete scheduled tasks in the database."""
-        obsolete = [
-            'InvenTree.tasks.delete_expired_sessions',
-            'stock.tasks.delete_old_stock_items',
-        ]
+    def start_background_tasks(self):
 
         try:
             from django_q.models import Schedule
-        except AppRegistryNotReady:  # pragma: no cover
+        except (AppRegistryNotReady):
             return
 
-        # Remove any existing obsolete tasks
-        Schedule.objects.filter(func__in=obsolete).delete()
-
-    def start_background_tasks(self):
-        """Start all background tests for InvenTree."""
-
         logger.info("Starting background tasks...")
 
-        for task in InvenTree.tasks.tasks.task_list:
-            ref_name = f'{task.func.__module__}.{task.func.__name__}'
-            InvenTree.tasks.schedule_task(
-                ref_name,
-                schedule_type=task.interval,
-                minutes=task.minutes,
-            )
-
-        # Put at least one task onto the backround worker stack,
-        # which will be processed as soon as the worker comes online
-        InvenTree.tasks.offload_task(
-            InvenTree.tasks.heartbeat,
-            force_async=True,
+        # Remove successful task results from the database
+        InvenTree.tasks.schedule_task(
+            'InvenTree.tasks.delete_successful_tasks',
+            schedule_type=Schedule.DAILY,
         )
 
-        logger.info("Started background tasks...")
+        # Check for InvenTree updates
+        InvenTree.tasks.schedule_task(
+            'InvenTree.tasks.check_for_updates',
+            schedule_type=Schedule.DAILY
+        )
 
-    def collect_tasks(self):
-        """Collect all background tasks."""
+        # Heartbeat to let the server know the background worker is running
+        InvenTree.tasks.schedule_task(
+            'InvenTree.tasks.heartbeat',
+            schedule_type=Schedule.MINUTES,
+            minutes=15
+        )
 
-        for app_name, app in apps.app_configs.items():
-            if app_name == 'InvenTree':
-                continue
+        # Keep exchange rates up to date
+        InvenTree.tasks.schedule_task(
+            'InvenTree.tasks.update_exchange_rates',
+            schedule_type=Schedule.DAILY,
+        )
 
-            if Path(app.path).joinpath('tasks.py').exists():
-                try:
-                    import_module(f'{app.module.__package__}.tasks')
-                except Exception as e:  # pragma: no cover
-                    logger.error(f"Error loading tasks for {app_name}: {e}")
+        # Remove expired sessions
+        InvenTree.tasks.schedule_task(
+            'InvenTree.tasks.delete_expired_sessions',
+            schedule_type=Schedule.DAILY,
+        )
 
-    def update_exchange_rates(self):  # pragma: no cover
-        """Update exchange rates each time the server is started.
+        # Delete "old" stock items
+        InvenTree.tasks.schedule_task(
+            'stock.tasks.delete_old_stock_items',
+            schedule_type=Schedule.MINUTES,
+            minutes=30,
+        )
+
+    def update_exchange_rates(self):
+        """
+        Update exchange rates each time the server is started, *if*:
 
-        Only runs *if*:
         a) Have not been updated recently (one day or less)
         b) The base exchange rate has been altered
         """
+
         try:
             from djmoney.contrib.exchange.models import ExchangeBackend
-
-            from common.settings import currency_code_default
+            from datetime import datetime, timedelta
             from InvenTree.tasks import update_exchange_rates
-        except AppRegistryNotReady:  # pragma: no cover
+            from common.settings import currency_code_default
+        except AppRegistryNotReady:
             pass
 
         base_currency = currency_code_default()
@@ -114,76 +95,28 @@ class InvenTreeConfig(AppConfig):
 
             last_update = backend.last_update
 
-            if last_update is None:
+            if last_update is not None:
+                delta = datetime.now().date() - last_update.date()
+                if delta > timedelta(days=1):
+                    print(f"Last update was {last_update}")
+                    update = True
+            else:
                 # Never been updated
-                logger.info("Exchange backend has never been updated")
+                print("Exchange backend has never been updated")
                 update = True
 
             # Backend currency has changed?
-            if base_currency != backend.base_currency:
-                logger.info(f"Base currency changed from {backend.base_currency} to {base_currency}")
+            if not base_currency == backend.base_currency:
+                print(f"Base currency changed from {backend.base_currency} to {base_currency}")
                 update = True
 
         except (ExchangeBackend.DoesNotExist):
-            logger.info("Exchange backend not found - updating")
+            print("Exchange backend not found - updating")
             update = True
 
-        except Exception:
+        except:
             # Some other error - potentially the tables are not ready yet
             return
 
         if update:
-            try:
-                update_exchange_rates()
-            except Exception as e:
-                logger.error(f"Error updating exchange rates: {e}")
-
-    def add_user_on_startup(self):
-        """Add a user on startup."""
-        # stop if checks were already created
-        if hasattr(settings, 'USER_ADDED') and settings.USER_ADDED:
-            return
-
-        # get values
-        add_user = get_setting('INVENTREE_ADMIN_USER', 'admin_user')
-        add_email = get_setting('INVENTREE_ADMIN_EMAIL', 'admin_email')
-        add_password = get_setting('INVENTREE_ADMIN_PASSWORD', 'admin_password')
-
-        # check if all values are present
-        set_variables = 0
-
-        for tested_var in [add_user, add_email, add_password]:
-            if tested_var:
-                set_variables += 1
-
-        # no variable set -> do not try anything
-        if set_variables == 0:
-            settings.USER_ADDED = True
-            return
-
-        # not all needed variables set
-        if set_variables < 3:
-            logger.warn('Not all required settings for adding a user on startup are present:\nINVENTREE_ADMIN_USER, INVENTREE_ADMIN_EMAIL, INVENTREE_ADMIN_PASSWORD')
-            settings.USER_ADDED = True
-            return
-
-        # good to go -> create user
-        user = get_user_model()
-        try:
-            with transaction.atomic():
-                if user.objects.filter(username=add_user).exists():
-                    logger.info(f"User {add_user} already exists - skipping creation")
-                else:
-                    new_user = user.objects.create_superuser(add_user, add_email, add_password)
-                    logger.info(f'User {str(new_user)} was created!')
-        except IntegrityError as _e:
-            logger.warning(f'The user "{add_user}" could not be created due to the following error:\n{str(_e)}')
-
-        # do not try again
-        settings.USER_ADDED = True
-
-    def collect_notification_methods(self):
-        """Collect all notification methods."""
-        from common.notifications import storage
-
-        storage.collect()
+            update_exchange_rates()

InvenTree/InvenTree/ci_render_js.py

@@ -1,23 +1,37 @@
-"""Pull rendered copies of the templated.
-
-Only used for testing the js files! - This file is omited from coverage.
+"""
+Pull rendered copies of the templated 
 """
 
-import os  # pragma: no cover
-import pathlib  # pragma: no cover
+from django.http import response
+from django.test import TestCase, testcases
+from django.contrib.auth import get_user_model
 
-from InvenTree.helpers import InvenTreeTestCase  # pragma: no cover
+import os
+import pathlib
 
 
-class RenderJavascriptFiles(InvenTreeTestCase):  # pragma: no cover
-    """A unit test to "render" javascript files.
+class RenderJavascriptFiles(TestCase):
+    """
+    A unit test to "render" javascript files.
 
     The server renders templated javascript files,
     we need the fully-rendered files for linting and static tests.
     """
 
+    def setUp(self):
+
+        user = get_user_model()
+
+        self.user = user.objects.create_user(
+            username='testuser',
+            password='testpassword',
+            email='user@gmail.com',
+        )
+
+        self.client.login(username='testuser', password='testpassword')
+
     def download_file(self, filename, prefix):
-        """Function to `download`(copy) a file to a temporay firectory."""
+
         url = os.path.join(prefix, filename)
 
         response = self.client.get(url)
@@ -45,7 +59,6 @@ class RenderJavascriptFiles(InvenTreeTestCase):  # pragma: no cover
             output.write(response.content)
 
     def download_files(self, subdir, prefix):
-        """Download files in directory."""
         here = os.path.abspath(os.path.dirname(__file__))
 
         js_template_dir = os.path.join(
@@ -73,7 +86,10 @@ class RenderJavascriptFiles(InvenTreeTestCase):  # pragma: no cover
         return n
 
     def test_render_files(self):
-        """Look for all javascript files."""
+        """
+        Look for all javascript files
+        """
+
         n = 0
 
         print("Rendering javascript files...")

InvenTree/InvenTree/config.py

@@ -1,320 +0,0 @@
-"""Helper functions for loading InvenTree configuration options."""
-
-import datetime
-import logging
-import os
-import random
-import shutil
-import string
-from pathlib import Path
-
-logger = logging.getLogger('inventree')
-CONFIG_DATA = None
-CONFIG_LOOKUPS = {}
-
-
-def to_list(value, delimiter=','):
-    """Take a configuration setting and make sure it is a list.
-
-    For example, we might have a configuration setting taken from the .config file,
-    which is already a list.
-
-    However, the same setting may be specified via an environment variable,
-    using a comma delimited string!
-    """
-
-    if type(value) in [list, tuple]:
-        return value
-
-    # Otherwise, force string value
-    value = str(value)
-
-    return [x.strip() for x in value.split(delimiter)]
-
-
-def is_true(x):
-    """Shortcut function to determine if a value "looks" like a boolean"""
-    return str(x).strip().lower() in ['1', 'y', 'yes', 't', 'true', 'on']
-
-
-def get_base_dir() -> Path:
-    """Returns the base (top-level) InvenTree directory."""
-    return Path(__file__).parent.parent.resolve()
-
-
-def ensure_dir(path: Path) -> None:
-    """Ensure that a directory exists.
-
-    If it does not exist, create it.
-    """
-
-    if not path.exists():
-        path.mkdir(parents=True, exist_ok=True)
-
-
-def get_config_file(create=True) -> Path:
-    """Returns the path of the InvenTree configuration file.
-
-    Note: It will be created it if does not already exist!
-    """
-    base_dir = get_base_dir()
-
-    cfg_filename = os.getenv('INVENTREE_CONFIG_FILE')
-
-    if cfg_filename:
-        cfg_filename = Path(cfg_filename.strip()).resolve()
-    else:
-        # Config file is *not* specified - use the default
-        cfg_filename = base_dir.joinpath('config.yaml').resolve()
-
-    if not cfg_filename.exists() and create:
-        print("InvenTree configuration file 'config.yaml' not found - creating default file")
-        ensure_dir(cfg_filename.parent)
-
-        cfg_template = base_dir.joinpath("config_template.yaml")
-        shutil.copyfile(cfg_template, cfg_filename)
-        print(f"Created config file {cfg_filename}")
-
-    return cfg_filename
-
-
-def load_config_data(set_cache: bool = False) -> map:
-    """Load configuration data from the config file.
-
-    Arguments:
-        set_cache(bool): If True, the configuration data will be cached for future use after load.
-    """
-    global CONFIG_DATA
-
-    # use cache if populated
-    # skip cache if cache should be set
-    if CONFIG_DATA is not None and not set_cache:
-        return CONFIG_DATA
-
-    import yaml
-
-    cfg_file = get_config_file()
-
-    with open(cfg_file, 'r') as cfg:
-        data = yaml.safe_load(cfg)
-
-    # Set the cache if requested
-    if set_cache:
-        CONFIG_DATA = data
-
-    return data
-
-
-def get_setting(env_var=None, config_key=None, default_value=None, typecast=None):
-    """Helper function for retrieving a configuration setting value.
-
-    - First preference is to look for the environment variable
-    - Second preference is to look for the value of the settings file
-    - Third preference is the default value
-
-    Arguments:
-        env_var: Name of the environment variable e.g. 'INVENTREE_STATIC_ROOT'
-        config_key: Key to lookup in the configuration file
-        default_value: Value to return if first two options are not provided
-        typecast: Function to use for typecasting the value
-    """
-    def try_typecasting(value, source: str):
-        """Attempt to typecast the value"""
-
-        # Force 'list' of strings
-        if typecast is list:
-            value = to_list(value)
-
-        elif typecast is not None:
-            # Try to typecast the value
-            try:
-                val = typecast(value)
-                set_metadata(source)
-                return val
-            except Exception as error:
-                logger.error(f"Failed to typecast '{env_var}' with value '{value}' to type '{typecast}' with error {error}")
-
-        set_metadata(source)
-        return value
-
-    def set_metadata(source: str):
-        """Set lookup metadata for the setting."""
-        key = env_var or config_key
-        CONFIG_LOOKUPS[key] = {'env_var': env_var, 'config_key': config_key, 'source': source, 'accessed': datetime.datetime.now()}
-
-    # First, try to load from the environment variables
-    if env_var is not None:
-        val = os.getenv(env_var, None)
-
-        if val is not None:
-            return try_typecasting(val, 'env')
-
-    # Next, try to load from configuration file
-    if config_key is not None:
-        cfg_data = load_config_data()
-
-        result = None
-
-        # Hack to allow 'path traversal' in configuration file
-        for key in config_key.strip().split('.'):
-
-            if type(cfg_data) is not dict or key not in cfg_data:
-                result = None
-                break
-
-            result = cfg_data[key]
-            cfg_data = cfg_data[key]
-
-        if result is not None:
-            return try_typecasting(result, 'yaml')
-
-    # Finally, return the default value
-    return try_typecasting(default_value, 'default')
-
-
-def get_boolean_setting(env_var=None, config_key=None, default_value=False):
-    """Helper function for retreiving a boolean configuration setting"""
-
-    return is_true(get_setting(env_var, config_key, default_value))
-
-
-def get_media_dir(create=True):
-    """Return the absolute path for the 'media' directory (where uploaded files are stored)"""
-
-    md = get_setting('INVENTREE_MEDIA_ROOT', 'media_root')
-
-    if not md:
-        raise FileNotFoundError('INVENTREE_MEDIA_ROOT not specified')
-
-    md = Path(md).resolve()
-
-    if create:
-        md.mkdir(parents=True, exist_ok=True)
-
-    return md
-
-
-def get_static_dir(create=True):
-    """Return the absolute path for the 'static' directory (where static files are stored)"""
-
-    sd = get_setting('INVENTREE_STATIC_ROOT', 'static_root')
-
-    if not sd:
-        raise FileNotFoundError('INVENTREE_STATIC_ROOT not specified')
-
-    sd = Path(sd).resolve()
-
-    if create:
-        sd.mkdir(parents=True, exist_ok=True)
-
-    return sd
-
-
-def get_backup_dir(create=True):
-    """Return the absolute path for the backup directory"""
-
-    bd = get_setting('INVENTREE_BACKUP_DIR', 'backup_dir')
-
-    if not bd:
-        raise FileNotFoundError('INVENTREE_BACKUP_DIR not specified')
-
-    bd = Path(bd).resolve()
-
-    if create:
-        bd.mkdir(parents=True, exist_ok=True)
-
-    return bd
-
-
-def get_plugin_file():
-    """Returns the path of the InvenTree plugins specification file.
-
-    Note: It will be created if it does not already exist!
-    """
-
-    # Check if the plugin.txt file (specifying required plugins) is specified
-    plugin_file = get_setting('INVENTREE_PLUGIN_FILE', 'plugin_file')
-
-    if not plugin_file:
-        # If not specified, look in the same directory as the configuration file
-        config_dir = get_config_file().parent
-        plugin_file = config_dir.joinpath('plugins.txt')
-    else:
-        # Make sure we are using a modern Path object
-        plugin_file = Path(plugin_file)
-
-    if not plugin_file.exists():
-        logger.warning("Plugin configuration file does not exist - creating default file")
-        logger.info(f"Creating plugin file at '{plugin_file}'")
-        ensure_dir(plugin_file.parent)
-
-        # If opening the file fails (no write permission, for example), then this will throw an error
-        plugin_file.write_text("# InvenTree Plugins (uses PIP framework to install)\n\n")
-
-    return plugin_file
-
-
-def get_secret_key():
-    """Return the secret key value which will be used by django.
-
-    Following options are tested, in descending order of preference:
-
-    A) Check for environment variable INVENTREE_SECRET_KEY => Use raw key data
-    B) Check for environment variable INVENTREE_SECRET_KEY_FILE => Load key data from file
-    C) Look for default key file "secret_key.txt"
-    D) Create "secret_key.txt" if it does not exist
-    """
-
-    # Look for environment variable
-    if secret_key := get_setting('INVENTREE_SECRET_KEY', 'secret_key'):
-        logger.info("SECRET_KEY loaded by INVENTREE_SECRET_KEY")  # pragma: no cover
-        return secret_key
-
-    # Look for secret key file
-    if secret_key_file := get_setting('INVENTREE_SECRET_KEY_FILE', 'secret_key_file'):
-        secret_key_file = Path(secret_key_file).resolve()
-    else:
-        # Default location for secret key file
-        secret_key_file = get_base_dir().joinpath("secret_key.txt").resolve()
-
-    if not secret_key_file.exists():
-        logger.info(f"Generating random key file at '{secret_key_file}'")
-        ensure_dir(secret_key_file.parent)
-
-        # Create a random key file
-        options = string.digits + string.ascii_letters + string.punctuation
-        key = ''.join([random.choice(options) for i in range(100)])
-        secret_key_file.write_text(key)
-
-    logger.info(f"Loading SECRET_KEY from '{secret_key_file}'")
-
-    key_data = secret_key_file.read_text().strip()
-
-    return key_data
-
-
-def get_custom_file(env_ref: str, conf_ref: str, log_ref: str, lookup_media: bool = False):
-    """Returns the checked path to a custom file.
-
-    Set lookup_media to True to also search in the media folder.
-    """
-    from django.contrib.staticfiles.storage import StaticFilesStorage
-    from django.core.files.storage import default_storage
-
-    value = get_setting(env_ref, conf_ref, None)
-
-    if not value:
-        return None
-
-    static_storage = StaticFilesStorage()
-
-    if static_storage.exists(value):
-        logger.info(f"Loading {log_ref} from static directory: {value}")
-    elif lookup_media and default_storage.exists(value):
-        logger.info(f"Loading {log_ref} from media directory: {value}")
-    else:
-        add_dir_str = ' or media' if lookup_media else ''
-        logger.warning(f"The {log_ref} file '{value}' could not be found in the static{add_dir_str} directories")
-        value = False
-
-    return value

InvenTree/InvenTree/context.py

@@ -1,23 +1,29 @@
 # -*- coding: utf-8 -*-
 
-"""Provides extra global data to all templates."""
+"""
+Provides extra global data to all templates.
+"""
+
+from InvenTree.status_codes import SalesOrderStatus, PurchaseOrderStatus
+from InvenTree.status_codes import BuildStatus, StockStatus
+from InvenTree.status_codes import StockHistoryCode
 
 import InvenTree.status
-from InvenTree.status_codes import (BuildStatus, PurchaseOrderStatus,
-                                    SalesOrderStatus, StockHistoryCode,
-                                    StockStatus)
-from users.models import RuleSet, check_user_role
+
+from users.models import RuleSet
 
 
 def health_status(request):
-    """Provide system health status information to the global context.
+    """
+    Provide system health status information to the global context.
 
     - Not required for AJAX requests
     - Do not provide if it is already provided to the context
     """
+
     if request.path.endswith('.js'):
         # Do not provide to script requests
-        return {}  # pragma: no cover
+        return {}
 
     if hasattr(request, '_inventree_health_status'):
         # Do not duplicate efforts
@@ -49,7 +55,10 @@ def health_status(request):
 
 
 def status_codes(request):
-    """Provide status code enumerations."""
+    """
+    Provide status code enumerations.
+    """
+
     if hasattr(request, '_inventree_status_codes'):
         # Do not duplicate efforts
         return {}
@@ -67,7 +76,8 @@ def status_codes(request):
 
 
 def user_roles(request):
-    """Return a map of the current roles assigned to the user.
+    """
+    Return a map of the current roles assigned to the user.
 
     Roles are denoted by their simple names, and then the permission type.
 
@@ -78,18 +88,37 @@ def user_roles(request):
 
     Each value will return a boolean True / False
     """
+
     user = request.user
 
     roles = {
     }
 
-    for role in RuleSet.RULESET_MODELS.keys():
+    if user.is_superuser:
+        for ruleset in RuleSet.RULESET_MODELS.keys():
+            roles[ruleset] = {
+                'view': True,
+                'add': True,
+                'change': True,
+                'delete': True,
+            }
+    else:
+        for group in user.groups.all():
+            for rule in group.rule_sets.all():
 
-        permissions = {}
+                # Ensure the role name is in the dict
+                if rule.name not in roles:
+                    roles[rule.name] = {
+                        'view': user.is_superuser,
+                        'add': user.is_superuser,
+                        'change': user.is_superuser,
+                        'delete': user.is_superuser
+                    }
 
-        for perm in ['view', 'add', 'change', 'delete']:
-            permissions[perm] = user.is_superuser or check_user_role(user, role, perm)
-
-        roles[role] = permissions
+                # Roles are additive across groups
+                roles[rule.name]['view'] |= rule.can_view
+                roles[rule.name]['add'] |= rule.can_add
+                roles[rule.name]['change'] |= rule.can_change
+                roles[rule.name]['delete'] |= rule.can_delete
 
     return {'roles': roles}

InvenTree/InvenTree/exceptions.py

@@ -1,99 +0,0 @@
-"""Custom exception handling for the DRF API."""
-
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import logging
-import sys
-import traceback
-
-from django.conf import settings
-from django.core.exceptions import ValidationError as DjangoValidationError
-from django.db.utils import IntegrityError, OperationalError
-from django.utils.translation import gettext_lazy as _
-
-import rest_framework.views as drfviews
-from error_report.models import Error
-from rest_framework import serializers
-from rest_framework.exceptions import ValidationError as DRFValidationError
-from rest_framework.response import Response
-
-logger = logging.getLogger('inventree')
-
-
-def log_error(path):
-    """Log an error to the database.
-
-    - Uses python exception handling to extract error details
-
-    Arguments:
-        path: The 'path' (most likely a URL) associated with this error (optional)
-    """
-
-    kind, info, data = sys.exc_info()
-
-    # Check if the eror is on the ignore list
-    if kind in settings.IGNORED_ERRORS:
-        return
-
-    # Log error to stderr
-    logger.error(info)
-
-    try:
-        Error.objects.create(
-            kind=kind.__name__,
-            info=info,
-            data='\n'.join(traceback.format_exception(kind, info, data)),
-            path=path,
-        )
-    except (OperationalError, IntegrityError):
-        # Not much we can do if logging the error throws a db exception
-        pass
-
-
-def exception_handler(exc, context):
-    """Custom exception handler for DRF framework.
-
-    Ref: https://www.django-rest-framework.org/api-guide/exceptions/#custom-exception-handling
-    Catches any errors not natively handled by DRF, and re-throws as an error DRF can handle
-    """
-    response = None
-
-    # Catch any django validation error, and re-throw a DRF validation error
-    if isinstance(exc, DjangoValidationError):
-        exc = DRFValidationError(detail=serializers.as_serializer_error(exc))
-
-    # Default to the built-in DRF exception handler
-    response = drfviews.exception_handler(exc, context)
-
-    if response is None:
-        # DRF handler did not provide a default response for this exception
-
-        if settings.TESTING:
-            # If in TESTING mode, re-throw the exception for traceback
-            raise exc
-        elif settings.DEBUG:
-            # If in DEBUG mode, provide error information in the response
-            error_detail = str(exc)
-        else:
-            error_detail = _("Error details can be found in the admin panel")
-
-        response_data = {
-            'error': type(exc).__name__,
-            'error_class': str(type(exc)),
-            'detail': error_detail,
-            'path': context['request'].path,
-            'status_code': 500,
-        }
-
-        response = Response(response_data, status=500)
-
-        log_error(context['request'].path)
-
-    if response is not None:
-        # Convert errors returned under the label '__all__' to 'non_field_errors'
-        if '__all__' in response.data:
-            response.data['non_field_errors'] = response.data['__all__']
-            del response.data['__all__']
-
-    return response

InvenTree/InvenTree/exchange.py

@@ -1,74 +1,34 @@
-"""Exchangerate backend to use `exchangerate.host` to get rates."""
-
-import ssl
-from urllib.error import URLError
-from urllib.request import urlopen
-
-from django.db.utils import OperationalError
-
-import certifi
-from djmoney.contrib.exchange.backends.base import SimpleExchangeBackend
-
 from common.settings import currency_code_default, currency_codes
+from urllib.error import HTTPError, URLError
+
+from djmoney.contrib.exchange.backends.base import SimpleExchangeBackend
 
 
 class InvenTreeExchange(SimpleExchangeBackend):
-    """Backend for automatically updating currency exchange rates.
+    """
+    Backend for automatically updating currency exchange rates.
 
-    Uses the `exchangerate.host` service API
+    Uses the exchangerate.host service API
     """
 
     name = "InvenTreeExchange"
 
     def __init__(self):
-        """Set API url."""
         self.url = "https://api.exchangerate.host/latest"
 
         super().__init__()
 
     def get_params(self):
-        """Placeholder to set API key. Currently not required by `exchangerate.host`."""
         # No API key is required
         return {
         }
 
-    def get_response(self, **kwargs):
-        """Custom code to get response from server.
-
-        Note: Adds a 5-second timeout
-        """
-        url = self.get_url(**kwargs)
-
-        try:
-            context = ssl.create_default_context(cafile=certifi.where())
-            response = urlopen(url, timeout=5, context=context)
-            return response.read()
-        except Exception:
-            # Something has gone wrong, but we can just try again next time
-            # Raise a TypeError so the outer function can handle this
-            raise TypeError
-
-    def update_rates(self, base_currency=None):
-        """Set the requested currency codes and get rates."""
-        # Set default - see B008
-        if base_currency is None:
-            base_currency = currency_code_default()
+    def update_rates(self, base_currency=currency_code_default()):
 
         symbols = ','.join(currency_codes())
 
         try:
             super().update_rates(base=base_currency, symbols=symbols)
         # catch connection errors
-        except URLError:
+        except (HTTPError, URLError):
             print('Encountered connection error while updating')
-        except TypeError:
-            print('Exchange returned invalid response')
-        except OperationalError as e:
-            if 'SerializationFailure' in e.__cause__.__class__.__name__:
-                print('Serialization Failure while updating exchange rates')
-                # We are just going to swallow this exception because the
-                # exchange rates will be updated later by the scheduled task
-            else:
-                # Other operational errors probably are still show stoppers
-                # so reraise them so that the log contains the stacktrace
-                raise

InvenTree/InvenTree/fields.py

@@ -1,51 +1,47 @@
-"""Custom fields used in InvenTree."""
+""" Custom fields used in InvenTree """
 
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import sys
+
+from .validators import allowable_url_schemes
+
+from django.utils.translation import ugettext_lazy as _
+
+from django.forms.fields import URLField as FormURLField
+from django.db import models as models
+from django.core import validators
+from django import forms
+
 from decimal import Decimal
 
-from django import forms
-from django.db import models as models
-from django.utils.translation import gettext_lazy as _
-
-from djmoney.forms.fields import MoneyField
 from djmoney.models.fields import MoneyField as ModelMoneyField
+from djmoney.forms.fields import MoneyField
 from djmoney.models.validators import MinMoneyValidator
-from rest_framework.fields import URLField as RestURLField
 
 import InvenTree.helpers
 
-from .validators import AllowedURLValidator, allowable_url_schemes
 
+class InvenTreeURLFormField(FormURLField):
+    """ Custom URL form field with custom scheme validators """
 
-class InvenTreeRestURLField(RestURLField):
-    """Custom field for DRF with custom scheme vaildators."""
-    def __init__(self, **kwargs):
-        """Update schemes."""
-
-        # Enforce 'max length' parameter in form validation
-        if 'max_length' not in kwargs:
-            kwargs['max_length'] = 200
-
-        super().__init__(**kwargs)
-        self.validators[-1].schemes = allowable_url_schemes()
+    default_validators = [validators.URLValidator(schemes=allowable_url_schemes())]
 
 
 class InvenTreeURLField(models.URLField):
-    """Custom URL field which has custom scheme validators."""
+    """ Custom URL field which has custom scheme validators """
 
-    default_validators = [AllowedURLValidator()]
+    default_validators = [validators.URLValidator(schemes=allowable_url_schemes())]
 
-    def __init__(self, **kwargs):
-        """Initialization method for InvenTreeURLField"""
-
-        # Max length for InvenTreeURLField is set to 200
-        kwargs['max_length'] = 200
-        super().__init__(**kwargs)
+    def formfield(self, **kwargs):
+        return super().formfield(**{
+            'form_class': InvenTreeURLFormField
+        })
 
 
 def money_kwargs():
-    """Returns the database settings for MoneyFields."""
-    from common.settings import currency_code_default, currency_code_mappings
+    """ returns the database settings for MoneyFields """
+    from common.settings import currency_code_mappings, currency_code_default
 
     kwargs = {}
     kwargs['currency_choices'] = currency_code_mappings()
@@ -54,10 +50,11 @@ def money_kwargs():
 
 
 class InvenTreeModelMoneyField(ModelMoneyField):
-    """Custom MoneyField for clean migrations while using dynamic currency settings."""
-
+    """
+    Custom MoneyField for clean migrations while using dynamic currency settings
+    """
+    
     def __init__(self, **kwargs):
-        """Overwrite default values and validators."""
         # detect if creating migration
         if 'migrate' in sys.argv or 'makemigrations' in sys.argv:
             # remove currency information for a clean migration
@@ -67,65 +64,39 @@ class InvenTreeModelMoneyField(ModelMoneyField):
             # set defaults
             kwargs.update(money_kwargs())
 
-        # Default values (if not specified)
-        if 'max_digits' not in kwargs:
-            kwargs['max_digits'] = 19
-
-        if 'decimal_places' not in kwargs:
-            kwargs['decimal_places'] = 6
-
         # Set a minimum value validator
         validators = kwargs.get('validators', [])
 
-        allow_negative = kwargs.pop('allow_negative', False)
-
-        # If no validators are provided, add some "standard" ones
         if len(validators) == 0:
-
-            if not allow_negative:
-                validators.append(
-                    MinMoneyValidator(0),
-                )
+            validators.append(
+                MinMoneyValidator(0),
+            )
 
         kwargs['validators'] = validators
 
         super().__init__(**kwargs)
 
     def formfield(self, **kwargs):
-        """Override form class to use own function."""
+        """ override form class to use own function """
         kwargs['form_class'] = InvenTreeMoneyField
         return super().formfield(**kwargs)
 
-    def to_python(self, value):
-        """Convert value to python type."""
-        value = super().to_python(value)
-        return round_decimal(value, self.decimal_places)
-
-    def prepare_value(self, value):
-        """Override the 'prepare_value' method, to remove trailing zeros when displaying.
-
-        Why? It looks nice!
-        """
-        return round_decimal(value, self.decimal_places, normalize=True)
-
 
 class InvenTreeMoneyField(MoneyField):
-    """Custom MoneyField for clean migrations while using dynamic currency settings."""
+    """ custom MoneyField for clean migrations while using dynamic currency settings """
     def __init__(self, *args, **kwargs):
-        """Override initial values with the real info from database."""
+        # override initial values with the real info from database
         kwargs.update(money_kwargs())
-
-        kwargs['max_digits'] = 19
-        kwargs['decimal_places'] = 6
-
         super().__init__(*args, **kwargs)
 
 
 class DatePickerFormField(forms.DateField):
-    """Custom date-picker field."""
+    """
+    Custom date-picker field
+    """
 
     def __init__(self, **kwargs):
-        """Set up custom values."""
+
         help_text = kwargs.get('help_text', _('Enter date'))
         label = kwargs.get('label', None)
         required = kwargs.get('required', False)
@@ -147,62 +118,45 @@ class DatePickerFormField(forms.DateField):
         )
 
 
-def round_decimal(value, places, normalize=False):
-    """Round value to the specified number of places."""
-
-    if type(value) in [Decimal, float]:
-        value = round(value, places)
-
-        if normalize:
-            # Remove any trailing zeroes
-            value = InvenTree.helpers.normalize(value)
+def round_decimal(value, places):
+    """
+    Round value to the specified number of places.
+    """
 
+    if value is not None:
+        # see https://docs.python.org/2/library/decimal.html#decimal.Decimal.quantize for options
+        return value.quantize(Decimal(10) ** -places)
     return value
 
 
 class RoundingDecimalFormField(forms.DecimalField):
-    """Custom FormField that automatically rounds inputs."""
-
     def to_python(self, value):
-        """Convert value to python type."""
-        value = super().to_python(value)
-        return round_decimal(value, self.decimal_places)
+        value = super(RoundingDecimalFormField, self).to_python(value)
+        value = round_decimal(value, self.decimal_places)
+        return value
 
     def prepare_value(self, value):
-        """Override the 'prepare_value' method, to remove trailing zeros when displaying.
-
+        """
+        Override the 'prepare_value' method, to remove trailing zeros when displaying.
         Why? It looks nice!
         """
-        return round_decimal(value, self.decimal_places, normalize=True)
+
+        if type(value) == Decimal:
+            return InvenTree.helpers.normalize(value)
+        else:
+            return value
 
 
 class RoundingDecimalField(models.DecimalField):
-    """Custom Field that automatically rounds inputs."""
-
     def to_python(self, value):
-        """Convert value to python type."""
-        value = super().to_python(value)
+        value = super(RoundingDecimalField, self).to_python(value)
         return round_decimal(value, self.decimal_places)
 
     def formfield(self, **kwargs):
-        """Return a Field instance for this field."""
+        defaults = {
+            'form_class': RoundingDecimalFormField
+        }
 
-        kwargs['form_class'] = RoundingDecimalFormField
+        defaults.update(kwargs)
 
         return super().formfield(**kwargs)
-
-
-class InvenTreeNotesField(models.TextField):
-    """Custom implementation of a 'notes' field"""
-
-    # Maximum character limit for the various 'notes' fields
-    NOTES_MAX_LENGTH = 50000
-
-    def __init__(self, **kwargs):
-        """Configure default initial values for this field"""
-        kwargs['max_length'] = self.NOTES_MAX_LENGTH
-        kwargs['verbose_name'] = _('Notes')
-        kwargs['blank'] = True
-        kwargs['null'] = True
-
-        super().__init__(**kwargs)

InvenTree/InvenTree/filters.py

@@ -1,10 +1,12 @@
-"""General filters for InvenTree."""
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 from rest_framework.filters import OrderingFilter
 
 
 class InvenTreeOrderingFilter(OrderingFilter):
-    """Custom OrderingFilter class which allows aliased filtering of related fields.
+    """
+    Custom OrderingFilter class which allows aliased filtering of related fields.
 
     To use, simply specify this filter in the "filter_backends" section.
 
@@ -21,56 +23,29 @@ class InvenTreeOrderingFilter(OrderingFilter):
     """
 
     def get_ordering(self, request, queryset, view):
-        """Override ordering for supporting aliases."""
+
         ordering = super().get_ordering(request, queryset, view)
 
         aliases = getattr(view, 'ordering_field_aliases', None)
 
         # Attempt to map ordering fields based on provided aliases
         if ordering is not None and aliases is not None:
-            """Ordering fields should be mapped to separate fields."""
+            """
+            Ordering fields should be mapped to separate fields
+            """
 
-            ordering_initial = ordering
-            ordering = []
+            for idx, field in enumerate(ordering):
 
-            for field in ordering_initial:
+                reverse = False
 
-                reverse = field.startswith('-')
-
-                if reverse:
+                if field.startswith('-'):
                     field = field[1:]
+                    reverse = True
 
-                # Are aliases defined for this field?
                 if field in aliases:
-                    alias = aliases[field]
-                else:
-                    alias = field
+                    ordering[idx] = aliases[field]
 
-                """
-                Potentially, a single field could be "aliased" to multiple field,
-
-                (For example to enforce a particular ordering sequence)
-
-                e.g. to filter first by the integer value...
-
-                ordering_field_aliases = {
-                    "reference": ["integer_ref", "reference"]
-                }
-
-                """
-
-                if type(alias) is str:
-                    alias = [alias]
-                elif type(alias) in [list, tuple]:
-                    pass
-                else:
-                    # Unsupported alias type
-                    continue
-
-                for a in alias:
                     if reverse:
-                        a = '-' + a
-
-                    ordering.append(a)
+                        ordering[idx] = '-' + ordering[idx]
 
         return ordering

InvenTree/InvenTree/format.py

@@ -1,166 +0,0 @@
-"""Custom string formatting functions and helpers"""
-
-import re
-import string
-
-from django.utils.translation import gettext_lazy as _
-
-
-def parse_format_string(fmt_string: str) -> dict:
-    """Extract formatting information from the provided format string.
-
-    Returns a dict object which contains structured information about the format groups
-    """
-
-    groups = string.Formatter().parse(fmt_string)
-
-    info = {}
-
-    seen_groups = set()
-
-    for group in groups:
-        # Skip any group which does not have a named value
-        if not group[1]:
-            continue
-
-        name = group[1]
-
-        # Check for duplicate named groups
-        if name in seen_groups:
-            raise ValueError(f"Duplicate group '{name}'")
-        else:
-            seen_groups.add(name)
-
-        info[group[1]] = {
-            'format': group[1],
-            'prefix': group[0],
-        }
-
-    return info
-
-
-def construct_format_regex(fmt_string: str) -> str:
-    r"""Construct a regular expression based on a provided format string
-
-    This function turns a python format string into a regular expression,
-    which can be used for two purposes:
-
-    - Ensure that a particular string matches the specified format
-    - Extract named variables from a matching string
-
-    This function also provides support for wildcard characters:
-
-    - '?' provides single character matching; is converted to a '.' (period) for regex
-    - '#' provides single digit matching; is converted to '\d'
-
-    Args:
-        fmt_string: A typical format string e.g. "PO-???-{ref:04d}"
-
-    Returns:
-        str: A regular expression pattern e.g. ^PO\-...\-(?P<ref>.*)$
-
-    Raises:
-        ValueError: Format string is invalid
-    """
-
-    pattern = "^"
-
-    for group in string.Formatter().parse(fmt_string):
-        prefix = group[0]  # Prefix (literal text appearing before this group)
-        name = group[1]  # Name of this format variable
-        format = group[2]  # Format specifier e.g :04d
-
-        rep = [
-            '+', '-', '.',
-            '{', '}', '(', ')',
-            '^', '$', '~', '!', '@', ':', ';', '|', '\'', '"',
-        ]
-
-        # Escape any special regex characters
-        for ch in rep:
-            prefix = prefix.replace(ch, '\\' + ch)
-
-        # Replace ? with single-character match
-        prefix = prefix.replace('?', '.')
-
-        # Replace # with single-digit match
-        prefix = prefix.replace('#', r'\d')
-
-        pattern += prefix
-
-        # Add a named capture group for the format entry
-        if name:
-
-            # Check if integer values are requried
-            if format.endswith('d'):
-                chr = '\d'
-            else:
-                chr = '.'
-
-            # Specify width
-            # TODO: Introspect required width
-            w = '+'
-
-            pattern += f"(?P<{name}>{chr}{w})"
-
-    pattern += "$"
-
-    return pattern
-
-
-def validate_string(value: str, fmt_string: str) -> str:
-    """Validate that the provided string matches the specified format.
-
-    Args:
-        value: The string to be tested e.g. 'SO-1234-ABC',
-        fmt_string: The required format e.g. 'SO-{ref}-???',
-
-    Returns:
-        bool: True if the value matches the required format, else False
-
-    Raises:
-        ValueError: The provided format string is invalid
-    """
-
-    pattern = construct_format_regex(fmt_string)
-
-    result = re.match(pattern, value)
-
-    return result is not None
-
-
-def extract_named_group(name: str, value: str, fmt_string: str) -> str:
-    """Extract a named value from the provided string, given the provided format string
-
-    Args:
-        name: Name of group to extract e.g. 'ref'
-        value: Raw string e.g. 'PO-ABC-1234'
-        fmt_string: Format pattern e.g. 'PO-???-{ref}
-
-    Returns:
-        str: String value of the named group
-
-    Raises:
-        ValueError: format string is incorrectly specified, or provided value does not match format string
-        NameError: named value does not exist in the format string
-        IndexError: named value could not be found in the provided entry
-    """
-
-    info = parse_format_string(fmt_string)
-
-    if name not in info.keys():
-        raise NameError(_(f"Value '{name}' does not appear in pattern format"))
-
-    # Construct a regular expression for matching against the provided format string
-    # Note: This will raise a ValueError if 'fmt_string' is incorrectly specified
-    pattern = construct_format_regex(fmt_string)
-
-    # Run the regex matcher against the raw string
-    result = re.match(pattern, value)
-
-    if not result:
-        raise ValueError(_("Provided value does not match required pattern: ") + fmt_string)
-
-    # And return the value we are interested in
-    # Note: This will raise an IndexError if the named group was not matched
-    return result.group(name)

InvenTree/InvenTree/forms.py

@@ -1,35 +1,23 @@
-"""Helper forms which subclass Django forms to provide additional functionality."""
+"""
+Helper forms which subclass Django forms to provide additional functionality
+"""
 
-import logging
-from urllib.parse import urlencode
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
+from django.utils.translation import ugettext_lazy as _
 from django import forms
-from django.conf import settings
-from django.contrib.auth.models import Group, User
-from django.contrib.sites.models import Site
-from django.http import HttpResponseRedirect
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.contrib.auth.models import User
 
-from allauth.account.adapter import DefaultAccountAdapter
-from allauth.account.forms import SignupForm, set_form_field_order
-from allauth.exceptions import ImmediateHttpResponse
-from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
-from allauth_2fa.adapter import OTPAdapter
-from allauth_2fa.utils import user_has_valid_totp_device
-from crispy_forms.bootstrap import (AppendedText, PrependedAppendedText,
-                                    PrependedText)
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Field, Layout
+from crispy_forms.layout import Layout, Field
+from crispy_forms.bootstrap import PrependedText, AppendedText, PrependedAppendedText, StrictButton, Div
 
-from common.models import InvenTreeSetting
-from InvenTree.exceptions import log_error
-
-logger = logging.getLogger('inventree')
+from part.models import PartCategory
 
 
 class HelperForm(forms.ModelForm):
-    """Provides simple integration of crispy_forms extension."""
+    """ Provides simple integration of crispy_forms extension. """
 
     # Custom field decorations can be specified here, per form class
     field_prefix = {}
@@ -37,7 +25,6 @@ class HelperForm(forms.ModelForm):
     field_placeholder = {}
 
     def __init__(self, *args, **kwargs):
-        """Setup layout."""
         super(forms.ModelForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
 
@@ -54,8 +41,14 @@ class HelperForm(forms.ModelForm):
 
         self.rebuild_layout()
 
+    def is_valid(self):
+
+        valid = super(HelperForm, self).is_valid()
+
+        return valid
+
     def rebuild_layout(self):
-        """Build crispy layout out of current fields."""
+
         layouts = []
 
         for field in self.fields:
@@ -110,212 +103,104 @@ class HelperForm(forms.ModelForm):
         self.helper.layout = Layout(*layouts)
 
 
-class EditUserForm(HelperForm):
-    """Form for editing user information."""
+class ConfirmForm(forms.Form):
+    """ Generic confirmation form """
+
+    confirm = forms.BooleanField(
+        required=False, initial=False,
+        help_text=_("Confirm")
+    )
 
     class Meta:
-        """Metaclass options."""
+        fields = [
+            'confirm'
+        ]
 
+
+class DeleteForm(forms.Form):
+    """ Generic deletion form which provides simple user confirmation
+    """
+
+    confirm_delete = forms.BooleanField(
+        required=False,
+        initial=False,
+        label=_('Confirm delete'),
+        help_text=_('Confirm item deletion')
+    )
+
+    class Meta:
+        fields = [
+            'confirm_delete'
+        ]
+
+
+class EditUserForm(HelperForm):
+    """ Form for editing user information
+    """
+
+    class Meta:
         model = User
         fields = [
+            'username',
             'first_name',
             'last_name',
+            'email'
         ]
 
 
 class SetPasswordForm(HelperForm):
-    """Form for setting user password."""
+    """ Form for setting user password
+    """
 
-    enter_password = forms.CharField(
-        max_length=100,
-        min_length=8,
-        required=True,
-        initial='',
-        widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
-        label=_('Enter password'),
-        help_text=_('Enter new password')
-    )
+    enter_password = forms.CharField(max_length=100,
+                                     min_length=8,
+                                     required=True,
+                                     initial='',
+                                     widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
+                                     label=_('Enter password'),
+                                     help_text=_('Enter new password'))
 
-    confirm_password = forms.CharField(
-        max_length=100,
-        min_length=8,
-        required=True,
-        initial='',
-        widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
-        label=_('Confirm password'),
-        help_text=_('Confirm new password')
-    )
-
-    old_password = forms.CharField(
-        label=_("Old password"),
-        strip=False,
-        widget=forms.PasswordInput(attrs={'autocomplete': 'current-password', 'autofocus': True}),
-    )
+    confirm_password = forms.CharField(max_length=100,
+                                       min_length=8,
+                                       required=True,
+                                       initial='',
+                                       widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
+                                       label=_('Confirm password'),
+                                       help_text=_('Confirm new password'))
 
     class Meta:
-        """Metaclass options."""
-
         model = User
         fields = [
             'enter_password',
-            'confirm_password',
-            'old_password',
+            'confirm_password'
         ]
 
 
-# override allauth
-class CustomSignupForm(SignupForm):
-    """Override to use dynamic settings."""
+class SettingCategorySelectForm(forms.ModelForm):
+    """ Form for setting category settings """
+
+    category = forms.ModelChoiceField(queryset=PartCategory.objects.all())
+
+    class Meta:
+        model = PartCategory
+        fields = [
+            'category'
+        ]
 
     def __init__(self, *args, **kwargs):
-        """Check settings to influence which fields are needed."""
-        kwargs['email_required'] = InvenTreeSetting.get_setting('LOGIN_MAIL_REQUIRED')
+        super(SettingCategorySelectForm, self).__init__(*args, **kwargs)
 
-        super().__init__(*args, **kwargs)
-
-        # check for two mail fields
-        if InvenTreeSetting.get_setting('LOGIN_SIGNUP_MAIL_TWICE'):
-            self.fields["email2"] = forms.EmailField(
-                label=_("Email (again)"),
-                widget=forms.TextInput(
-                    attrs={
-                        "type": "email",
-                        "placeholder": _("Email address confirmation"),
-                    }
-                ),
-            )
-
-        # check for two password fields
-        if not InvenTreeSetting.get_setting('LOGIN_SIGNUP_PWD_TWICE'):
-            self.fields.pop("password2")
-
-        # reorder fields
-        set_form_field_order(self, ["username", "email", "email2", "password1", "password2", ])
-
-    def clean(self):
-        """Make sure the supllied emails match if enabled in settings."""
-        cleaned_data = super().clean()
-
-        # check for two mail fields
-        if InvenTreeSetting.get_setting('LOGIN_SIGNUP_MAIL_TWICE'):
-            email = cleaned_data.get("email")
-            email2 = cleaned_data.get("email2")
-            if (email and email2) and email != email2:
-                self.add_error("email2", _("You must type the same email each time."))
-
-        return cleaned_data
-
-
-class RegistratonMixin:
-    """Mixin to check if registration should be enabled."""
-
-    def is_open_for_signup(self, request, *args, **kwargs):
-        """Check if signup is enabled in settings.
-
-        Configure the class variable `REGISTRATION_SETTING` to set which setting should be used, defualt: `LOGIN_ENABLE_REG`.
-        """
-        if settings.EMAIL_HOST and (InvenTreeSetting.get_setting('LOGIN_ENABLE_REG') or InvenTreeSetting.get_setting('LOGIN_ENABLE_SSO_REG')):
-            return super().is_open_for_signup(request, *args, **kwargs)
-        return False
-
-    def clean_email(self, email):
-        """Check if the mail is valid to the pattern in LOGIN_SIGNUP_MAIL_RESTRICTION (if enabled in settings)."""
-        mail_restriction = InvenTreeSetting.get_setting('LOGIN_SIGNUP_MAIL_RESTRICTION', None)
-        if not mail_restriction:
-            return super().clean_email(email)
-
-        split_email = email.split('@')
-        if len(split_email) != 2:
-            logger.error(f'The user {email} has an invalid email address')
-            raise forms.ValidationError(_('The provided primary email address is not valid.'))
-
-        mailoptions = mail_restriction.split(',')
-        for option in mailoptions:
-            if not option.startswith('@'):
-                log_error('LOGIN_SIGNUP_MAIL_RESTRICTION is not configured correctly')
-                raise forms.ValidationError(_('The provided primary email address is not valid.'))
-            else:
-                if split_email[1] == option[1:]:
-                    return super().clean_email(email)
-
-        logger.info(f'The provided email domain for {email} is not approved')
-        raise forms.ValidationError(_('The provided email domain is not approved.'))
-
-    def save_user(self, request, user, form, commit=True):
-        """Check if a default group is set in settings."""
-        # Create the user
-        user = super().save_user(request, user, form)
-
-        # Check if a default group is set in settings
-        start_group = InvenTreeSetting.get_setting('SIGNUP_GROUP')
-        if start_group:
-            try:
-                group = Group.objects.get(id=start_group)
-                user.groups.add(group)
-            except Group.DoesNotExist:
-                logger.error('The setting `SIGNUP_GROUP` contains an non existant group', start_group)
-        user.save()
-        return user
-
-
-class CustomUrlMixin:
-    """Mixin to set urls."""
-
-    def get_email_confirmation_url(self, request, emailconfirmation):
-        """Custom email confirmation (activation) url."""
-        url = reverse("account_confirm_email", args=[emailconfirmation.key])
-        return Site.objects.get_current().domain + url
-
-
-class CustomAccountAdapter(CustomUrlMixin, RegistratonMixin, OTPAdapter, DefaultAccountAdapter):
-    """Override of adapter to use dynamic settings."""
-
-    def send_mail(self, template_prefix, email, context):
-        """Only send mail if backend configured."""
-        if settings.EMAIL_HOST:
-            try:
-                result = super().send_mail(template_prefix, email, context)
-            except Exception:
-                # An exception ocurred while attempting to send email
-                # Log it (for admin users) and return silently
-                log_error('account email')
-                result = False
-
-            return result
-
-        return False
-
-
-class CustomSocialAccountAdapter(CustomUrlMixin, RegistratonMixin, DefaultSocialAccountAdapter):
-    """Override of adapter to use dynamic settings."""
-
-    def is_auto_signup_allowed(self, request, sociallogin):
-        """Check if auto signup is enabled in settings."""
-        if InvenTreeSetting.get_setting('LOGIN_SIGNUP_SSO_AUTO', True):
-            return super().is_auto_signup_allowed(request, sociallogin)
-        return False
-
-    # from OTPAdapter
-    def has_2fa_enabled(self, user):
-        """Returns True if the user has 2FA configured."""
-        return user_has_valid_totp_device(user)
-
-    def login(self, request, user):
-        """Ensure user is send to 2FA before login if enabled."""
-        # Require two-factor authentication if it has been configured.
-        if self.has_2fa_enabled(user):
-            # Cast to string for the case when this is not a JSON serializable
-            # object, e.g. a UUID.
-            request.session['allauth_2fa_user_id'] = str(user.id)
-
-            redirect_url = reverse('two-factor-authenticate')
-            # Add GET parameters to the URL if they exist.
-            if request.GET:
-                redirect_url += '?' + urlencode(request.GET)
-
-            raise ImmediateHttpResponse(
-                response=HttpResponseRedirect(redirect_url)
-            )
-
-        # Otherwise defer to the original allauth adapter.
-        return super().login(request, user)
+        self.helper = FormHelper()
+        # Form rendering
+        self.helper.form_show_labels = False
+        self.helper.layout = Layout(
+            Div(
+                Div(Field('category'),
+                    css_class='col-sm-6',
+                    style='width: 70%;'),
+                Div(StrictButton(_('Select Category'), css_class='btn btn-primary', type='submit'),
+                    css_class='col-sm-6',
+                    style='width: 30%; padding-left: 0;'),
+                css_class='row',
+            ),
+        )

InvenTree/InvenTree/locale_stats.json

@@ -0,0 +1 @@
+{"de": 95, "el": 0, "en": 0, "es": 4, "fr": 6, "he": 0, "id": 0, "it": 0, "ja": 4, "ko": 0, "nl": 0, "no": 0, "pl": 27, "ru": 6, "sv": 0, "th": 0, "tr": 32, "vi": 0, "zh": 1}

InvenTree/InvenTree/management/commands/clean_settings.py

@@ -1,38 +1,38 @@
-"""Custom management command to cleanup old settings that are not defined anymore."""
-
-import logging
+"""
+Custom management command to cleanup old settings that are not defined anymore
+"""
 
 from django.core.management.base import BaseCommand
 
-logger = logging.getLogger('inventree')
-
 
 class Command(BaseCommand):
-    """Cleanup old (undefined) settings in the database."""
+    """
+    Cleanup old (undefined) settings in the database
+    """
 
     def handle(self, *args, **kwargs):
-        """Cleanup old (undefined) settings in the database."""
-        logger.info("Collecting settings")
+
+        print("Collecting settings")
         from common.models import InvenTreeSetting, InvenTreeUserSetting
 
         # general settings
         db_settings = InvenTreeSetting.objects.all()
-        model_settings = InvenTreeSetting.SETTINGS
+        model_settings = InvenTreeSetting.GLOBAL_SETTINGS
 
         # check if key exist and delete if not
         for setting in db_settings:
             if setting.key not in model_settings:
                 setting.delete()
-                logger.info(f"deleted setting '{setting.key}'")
+                print(f"deleted setting '{setting.key}'")
 
         # user settings
         db_settings = InvenTreeUserSetting.objects.all()
-        model_settings = InvenTreeUserSetting.SETTINGS
+        model_settings = InvenTreeUserSetting.GLOBAL_SETTINGS
 
         # check if key exist and delete if not
         for setting in db_settings:
             if setting.key not in model_settings:
                 setting.delete()
-                logger.info(f"deleted user setting '{setting.key}'")
+                print(f"deleted user setting '{setting.key}'")
 
-        logger.info("checked all settings")
+        print("checked all settings")

InvenTree/InvenTree/management/commands/prerender.py

@@ -1,17 +1,19 @@
-"""Custom management command to prerender files."""
+"""
+Custom management command to prerender files
+"""
+
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from django.template.loader import render_to_string
+from django.utils.module_loading import import_string
+from django.http.request import HttpRequest
+from django.utils.translation import override as lang_over
 
 import os
 
-from django.conf import settings
-from django.core.management.base import BaseCommand
-from django.http.request import HttpRequest
-from django.template.loader import render_to_string
-from django.utils.module_loading import import_string
-from django.utils.translation import override as lang_over
-
 
 def render_file(file_name, source, target, locales, ctx):
-    """Renders a file into all provided locales."""
+    """ renders a file into all provided locales """
     for locale in locales:
         target_file = os.path.join(target, locale + '.' + file_name)
         with open(target_file, 'w') as localised_file:
@@ -21,10 +23,11 @@ def render_file(file_name, source, target, locales, ctx):
 
 
 class Command(BaseCommand):
-    """Django command to prerender files."""
+    """
+    django command to prerender files
+    """
 
     def handle(self, *args, **kwargs):
-        """Django command to prerender files."""
         # static directories
         LC_DIR = settings.LOCALE_PATHS[0]
         SOURCE_DIR = settings.STATICFILES_I18_SRC

InvenTree/InvenTree/management/commands/rebuild_models.py

@@ -1,4 +1,5 @@
-"""Custom management command to rebuild all MPTT models.
+"""
+Custom management command to rebuild all MPTT models
 
 - This is crucial after importing any fixtures, etc
 """
@@ -7,17 +8,19 @@ from django.core.management.base import BaseCommand
 
 
 class Command(BaseCommand):
-    """Rebuild all database models which leverage the MPTT structure."""
+    """
+    Rebuild all database models which leverage the MPTT structure.
+    """
 
     def handle(self, *args, **kwargs):
-        """Rebuild all database models which leverage the MPTT structure."""
+
         # Part model
         try:
             print("Rebuilding Part objects")
 
             from part.models import Part
             Part.objects.rebuild()
-        except Exception:
+        except:
             print("Error rebuilding Part objects")
 
         # Part category
@@ -26,7 +29,7 @@ class Command(BaseCommand):
 
             from part.models import PartCategory
             PartCategory.objects.rebuild()
-        except Exception:
+        except:
             print("Error rebuilding PartCategory objects")
 
         # StockItem model
@@ -35,7 +38,7 @@ class Command(BaseCommand):
 
             from stock.models import StockItem
             StockItem.objects.rebuild()
-        except Exception:
+        except:
             print("Error rebuilding StockItem objects")
 
         # StockLocation model
@@ -44,7 +47,7 @@ class Command(BaseCommand):
 
             from stock.models import StockLocation
             StockLocation.objects.rebuild()
-        except Exception:
+        except:
             print("Error rebuilding StockLocation objects")
 
         # Build model
@@ -53,5 +56,5 @@ class Command(BaseCommand):
 
             from build.models import Build
             Build.objects.rebuild()
-        except Exception:
+        except:
             print("Error rebuilding Build objects")

InvenTree/InvenTree/management/commands/rebuild_thumbnails.py

@@ -1,56 +0,0 @@
-"""Custom management command to rebuild thumbnail images.
-
-- May be required after importing a new dataset, for example
-"""
-
-import logging
-
-from django.core.management.base import BaseCommand
-from django.db.utils import OperationalError, ProgrammingError
-
-from PIL import UnidentifiedImageError
-
-from company.models import Company
-from part.models import Part
-
-logger = logging.getLogger('inventree')
-
-
-class Command(BaseCommand):
-    """Rebuild all thumbnail images."""
-
-    def rebuild_thumbnail(self, model):
-        """Rebuild the thumbnail specified by the "image" field of the provided model."""
-        if not model.image:
-            return
-
-        img = model.image
-
-        logger.info(f"Generating thumbnail image for '{img}'")
-
-        try:
-            model.image.render_variations(replace=False)
-        except FileNotFoundError:
-            logger.warning(f"Warning: Image file '{img}' is missing")
-        except UnidentifiedImageError:
-            logger.warning(f"Warning: Image file '{img}' is not a valid image")
-
-    def handle(self, *args, **kwargs):
-        """Rebuild all thumbnail images."""
-        logger.info("Rebuilding Part thumbnails")
-
-        for part in Part.objects.exclude(image=None):
-            try:
-                self.rebuild_thumbnail(part)
-            except (OperationalError, ProgrammingError):
-                logger.error("ERROR: Database read error.")
-                break
-
-        logger.info("Rebuilding Company thumbnails")
-
-        for company in Company.objects.exclude(image=None):
-            try:
-                self.rebuild_thumbnail(company)
-            except (OperationalError, ProgrammingError):
-                logger.error("ERROR: abase read error.")
-                break

InvenTree/InvenTree/management/commands/remove_mfa.py

@@ -1,33 +0,0 @@
-"""Custom management command to remove MFA for a user."""
-
-from django.contrib.auth import get_user_model
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    """Remove MFA for a user."""
-
-    def add_arguments(self, parser):
-        """Add the arguments."""
-        parser.add_argument('mail', type=str)
-
-    def handle(self, *args, **kwargs):
-        """Remove MFA for the supplied user (by mail)."""
-        # general settings
-        mail = kwargs.get('mail')
-        if not mail:
-            raise KeyError('A mail is required')
-        user = get_user_model()
-        mfa_user = [*set(user.objects.filter(email=mail) | user.objects.filter(emailaddress__email=mail))]
-
-        if len(mfa_user) == 0:
-            print('No user with this mail associated')
-        elif len(mfa_user) > 1:
-            print('More than one user found with this mail')
-        else:
-            # and clean out all MFA methods
-            # backup codes
-            mfa_user[0].staticdevice_set.all().delete()
-            # TOTP tokens
-            mfa_user[0].totpdevice_set.all().delete()
-            print(f'Removed all MFA methods for user {str(mfa_user[0])}')

InvenTree/InvenTree/management/commands/wait_for_db.py

@@ -1,17 +1,22 @@
-"""Custom management command, wait for the database to be ready!"""
+"""
+Custom management command, wait for the database to be ready!
+"""
+
+from django.core.management.base import BaseCommand
+
+from django.db import connection
+from django.db.utils import OperationalError, ImproperlyConfigured
 
 import time
 
-from django.core.management.base import BaseCommand
-from django.db import connection
-from django.db.utils import ImproperlyConfigured, OperationalError
-
 
 class Command(BaseCommand):
-    """Django command to pause execution until the database is ready."""
+    """
+    django command to pause execution until the database is ready
+    """
 
     def handle(self, *args, **kwargs):
-        """Wait till the database is ready."""
+
         self.stdout.write("Waiting for database...")
 
         connected = False

InvenTree/InvenTree/metadata.py

@@ -1,20 +1,23 @@
-"""Custom metadata for DRF."""
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
 
 import logging
 
 from rest_framework import serializers
-from rest_framework.fields import empty
 from rest_framework.metadata import SimpleMetadata
 from rest_framework.utils import model_meta
+from rest_framework.fields import empty
 
 import users.models
-from InvenTree.helpers import str2bool
+
 
 logger = logging.getLogger('inventree')
 
 
 class InvenTreeMetadata(SimpleMetadata):
-    """Custom metadata class for the DRF API.
+    """
+    Custom metadata class for the DRF API.
 
     This custom metadata class imits the available "actions",
     based on the user's role permissions.
@@ -24,31 +27,16 @@ class InvenTreeMetadata(SimpleMetadata):
 
     Additionally, we include some extra information about database models,
     so we can perform lookup for ForeignKey related fields.
+
     """
 
     def determine_metadata(self, request, view):
-        """Overwrite the metadata to adapt to hte request user."""
+        
         self.request = request
         self.view = view
 
         metadata = super().determine_metadata(request, view)
 
-        """
-        Custom context information to pass through to the OPTIONS endpoint,
-        if the "context=True" is supplied to the OPTIONS requst
-
-        Serializer class can supply context data by defining a get_context_data() method (no arguments)
-        """
-
-        context = {}
-
-        if str2bool(request.query_params.get('context', False)):
-
-            if hasattr(self, 'serializer') and hasattr(self.serializer, 'get_context_data'):
-                context = self.serializer.get_context_data()
-
-            metadata['context'] = context
-
         user = request.user
 
         if user is None:
@@ -70,36 +58,30 @@ class InvenTreeMetadata(SimpleMetadata):
 
             actions = metadata.get('actions', None)
 
-            if actions is None:
-                actions = {}
+            if actions is not None:
 
-            check = users.models.RuleSet.check_table_permission
+                check = users.models.RuleSet.check_table_permission
 
-            # Map the request method to a permission type
-            rolemap = {
-                'POST': 'add',
-                'PUT': 'change',
-                'PATCH': 'change',
-                'DELETE': 'delete',
-            }
+                # Map the request method to a permission type
+                rolemap = {
+                    'POST': 'add',
+                    'PUT': 'change',
+                    'PATCH': 'change',
+                    'DELETE': 'delete',
+                }
 
-            # Remove any HTTP methods that the user does not have permission for
-            for method, permission in rolemap.items():
+                # Remove any HTTP methods that the user does not have permission for
+                for method, permission in rolemap.items():
+                    if method in actions and not check(user, table, permission):
+                        del actions[method]
 
-                result = check(user, table, permission)
+                # Add a 'DELETE' action if we are allowed to delete
+                if 'DELETE' in view.allowed_methods and check(user, table, 'delete'):
+                    actions['DELETE'] = True
 
-                if method in actions and not result:
-                    del actions[method]
-
-            # Add a 'DELETE' action if we are allowed to delete
-            if 'DELETE' in view.allowed_methods and check(user, table, 'delete'):
-                actions['DELETE'] = {}
-
-            # Add a 'VIEW' action if we are allowed to view
-            if 'GET' in view.allowed_methods and check(user, table, 'view'):
-                actions['GET'] = {}
-
-            metadata['actions'] = actions
+                # Add a 'VIEW' action if we are allowed to view
+                if 'GET' in view.allowed_methods and check(user, table, 'view'):
+                    actions['GET'] = True
 
         except AttributeError:
             # We will assume that if the serializer class does *not* have a Meta
@@ -109,56 +91,34 @@ class InvenTreeMetadata(SimpleMetadata):
         return metadata
 
     def get_serializer_info(self, serializer):
-        """Override get_serializer_info so that we can add 'default' values to any fields whose Meta.model specifies a default value."""
-        self.serializer = serializer
+        """
+        Override get_serializer_info so that we can add 'default' values
+        to any fields whose Meta.model specifies a default value
+        """
 
         serializer_info = super().get_serializer_info(serializer)
 
         model_class = None
 
-        # Attributes to copy extra attributes from the model to the field (if they don't exist)
-        extra_attributes = [
-            'help_text',
-            'max_length',
-        ]
-
         try:
             model_class = serializer.Meta.model
 
             model_fields = model_meta.get_field_info(model_class)
 
-            model_default_func = getattr(model_class, 'api_defaults', None)
-
-            if model_default_func:
-                model_default_values = model_class.api_defaults(self.request)
-            else:
-                model_default_values = {}
-
             # Iterate through simple fields
             for name, field in model_fields.fields.items():
 
-                if name in serializer_info.keys():
+                if field.has_default() and name in serializer_info.keys():
 
-                    if field.has_default():
+                    default = field.default
 
-                        default = field.default
+                    if callable(default):
+                        try:
+                            default = default()
+                        except:
+                            continue
 
-                        if callable(default):
-                            try:
-                                default = default()
-                            except Exception:
-                                continue
-
-                        serializer_info[name]['default'] = default
-
-                    elif name in model_default_values:
-                        serializer_info[name]['default'] = model_default_values[name]
-
-                    for attr in extra_attributes:
-                        if attr not in serializer_info[name]:
-
-                            if hasattr(field, attr):
-                                serializer_info[name][attr] = getattr(field, attr)
+                    serializer_info[name]['default'] = default
 
             # Iterate through relations
             for name, relation in model_fields.relations.items():
@@ -175,12 +135,8 @@ class InvenTreeMetadata(SimpleMetadata):
                 # This is used to automatically filter AJAX requests
                 serializer_info[name]['filters'] = relation.model_field.get_limit_choices_to()
 
-                for attr in extra_attributes:
-                    if attr not in serializer_info[name] and hasattr(relation.model_field, attr):
-                        serializer_info[name][attr] = getattr(relation.model_field, attr)
-
-                if name in model_default_values:
-                    serializer_info[name]['default'] = model_default_values[name]
+                if 'help_text' not in serializer_info[name] and hasattr(relation.model_field, 'help_text'):
+                    serializer_info[name]['help_text'] = relation.model_field.help_text
 
         except AttributeError:
             pass
@@ -191,7 +147,7 @@ class InvenTreeMetadata(SimpleMetadata):
         # Extract extra information if an instance is available
         if hasattr(serializer, 'instance'):
             instance = serializer.instance
-
+        
         if instance is None and model_class is not None:
             # Attempt to find the instance based on kwargs lookup
             kwargs = getattr(self.view, 'kwargs', None)
@@ -211,7 +167,10 @@ class InvenTreeMetadata(SimpleMetadata):
                         pass
 
         if instance is not None:
-            """If there is an instance associated with this API View, introspect that instance to find any specific API info."""
+            """
+            If there is an instance associated with this API View,
+            introspect that instance to find any specific API info.
+            """
 
             if hasattr(instance, 'api_instance_filters'):
 
@@ -233,15 +192,18 @@ class InvenTreeMetadata(SimpleMetadata):
         return serializer_info
 
     def get_field_info(self, field):
-        """Given an instance of a serializer field, return a dictionary of metadata about it.
+        """
+        Given an instance of a serializer field, return a dictionary
+        of metadata about it.
 
         We take the regular DRF metadata and add our own unique flavor
         """
+
         # Run super method first
         field_info = super().get_field_info(field)
 
         # If a default value is specified for the serializer field, add it!
-        if 'default' not in field_info and field.default != empty:
+        if 'default' not in field_info and not field.default == empty:
             field_info['default'] = field.get_default()
 
         # Force non-nullable fields to read as "required"
@@ -251,12 +213,12 @@ class InvenTreeMetadata(SimpleMetadata):
 
         # Introspect writable related fields
         if field_info['type'] == 'field' and not field_info['read_only']:
-
+            
             # If the field is a PrimaryKeyRelatedField, we can extract the model from the queryset
             if isinstance(field, serializers.PrimaryKeyRelatedField):
                 model = field.queryset.model
             else:
-                logger.debug("Could not extract model for:", field_info.get('label'), '->', field)
+                logger.debug("Could not extract model for:", field_info['label'], '->', field)
                 model = None
 
             if model:

InvenTree/InvenTree/middleware.py

@@ -1,37 +1,21 @@
-"""Middleware for InvenTree."""
-
-import logging
-import sys
-
-from django.conf import settings
-from django.contrib.auth.middleware import PersistentRemoteUserMiddleware
-from django.http import HttpResponse
+from django.shortcuts import HttpResponseRedirect
+from django.urls import reverse_lazy
+from django.db import connection
 from django.shortcuts import redirect
-from django.urls import Resolver404, include, re_path, resolve, reverse_lazy
+import logging
+import time
+import operator
 
-from allauth_2fa.middleware import (AllauthTwoFactorMiddleware,
-                                    BaseRequire2FAMiddleware)
-from error_report.middleware import ExceptionProcessor
 from rest_framework.authtoken.models import Token
 
-from common.models import InvenTreeSetting
-from InvenTree.urls import frontendpatterns
-
 logger = logging.getLogger("inventree")
 
 
 class AuthRequiredMiddleware(object):
-    """Check for user to be authenticated."""
-
     def __init__(self, get_response):
-        """Save response object."""
         self.get_response = get_response
 
     def __call__(self, request):
-        """Check if user needs to be authenticated and is.
-
-        Redirects to login if not authenticated.
-        """
         # Code to be executed for each request before
         # the view (and later middleware) are called.
 
@@ -41,15 +25,9 @@ class AuthRequiredMiddleware(object):
         if request.path_info.startswith('/api/'):
             return self.get_response(request)
 
-        # Is the function exempt from auth requirements?
-        path_func = resolve(request.path).func
-        if getattr(path_func, 'auth_exempt', False) is True:
-            return self.get_response(request)
-
         if not request.user.is_authenticated:
             """
             Normally, a web-based session would use csrftoken based authentication.
-
             However when running an external application (e.g. the InvenTree app or Python library),
             we must validate the user token manually.
             """
@@ -81,88 +59,90 @@ class AuthRequiredMiddleware(object):
 
                     except Token.DoesNotExist:
                         logger.warning(f"Access denied for unknown token {token_key}")
+                        pass
 
             # No authorization was found for the request
             if not authorized:
+                # A logout request will redirect the user to the login screen
+                if request.path_info == reverse_lazy('logout'):
+                    return HttpResponseRedirect(reverse_lazy('login'))
+
                 path = request.path_info
 
                 # List of URL endpoints we *do not* want to redirect to
                 urls = [
-                    reverse_lazy('account_login'),
-                    reverse_lazy('account_logout'),
+                    reverse_lazy('login'),
+                    reverse_lazy('logout'),
                     reverse_lazy('admin:login'),
                     reverse_lazy('admin:logout'),
                 ]
 
-                # Do not redirect requests to any of these paths
-                paths_ignore = [
-                    '/api/',
-                    '/js/',
-                    '/media/',
-                    '/static/',
-                ]
-
-                if path not in urls and not any([path.startswith(p) for p in paths_ignore]):
+                if path not in urls and not path.startswith('/api/'):
                     # Save the 'next' parameter to pass through to the login view
 
-                    return redirect(f'{reverse_lazy("account_login")}?next={request.path}')
-
-                else:
-                    # Return a 401 (Unauthorized) response code for this request
-                    return HttpResponse('Unauthorized', status=401)
+                    return redirect('%s?next=%s' % (reverse_lazy('login'), request.path))
 
         response = self.get_response(request)
 
         return response
 
 
-url_matcher = re_path('', include(frontendpatterns))
+class QueryCountMiddleware(object):
+    """
+    This middleware will log the number of queries run
+    and the total time taken for each request (with a
+    status code of 200). It does not currently support
+    multi-db setups.
 
+    To enable this middleware, set 'log_queries: True' in the local InvenTree config file.
 
-class Check2FAMiddleware(BaseRequire2FAMiddleware):
-    """Check if user is required to have MFA enabled."""
-    def require_2fa(self, request):
-        """Use setting to check if MFA should be enforced for frontend page."""
-        try:
-            if url_matcher.resolve(request.path[1:]):
-                return InvenTreeSetting.get_setting('LOGIN_ENFORCE_MFA')
-        except Resolver404:
-            pass
-        return False
+    Reference: https://www.dabapps.com/blog/logging-sql-queries-django-13/
 
+    Note: 2020-08-15 - This is no longer used, instead we now rely on the django-debug-toolbar addon
+    """
 
-class CustomAllauthTwoFactorMiddleware(AllauthTwoFactorMiddleware):
-    """This function ensures only frontend code triggers the MFA auth cycle."""
-    def process_request(self, request):
-        """Check if requested url is forntend and enforce MFA check."""
-        try:
-            if not url_matcher.resolve(request.path[1:]):
-                super().process_request(request)
-        except Resolver404:
-            pass
+    def __init__(self, get_response):
+        self.get_response = get_response
 
+    def __call__(self, request):
 
-class InvenTreeRemoteUserMiddleware(PersistentRemoteUserMiddleware):
-    """Middleware to check if HTTP-header based auth is enabled and to set it up."""
-    header = settings.REMOTE_LOGIN_HEADER
+        t_start = time.time()
+        response = self.get_response(request)
+        t_stop = time.time()
 
-    def process_request(self, request):
-        """Check if proxy login is enabled."""
-        if not settings.REMOTE_LOGIN:
-            return
+        if response.status_code == 200:
+            total_time = 0
 
-        return super().process_request(request)
+            if len(connection.queries) > 0:
 
+                queries = {}
 
-class InvenTreeExceptionProcessor(ExceptionProcessor):
-    """Custom exception processor that respects blocked errors."""
+                for query in connection.queries:
+                    query_time = query.get('time')
 
-    def process_exception(self, request, exception):
-        """Check if kind is ignored before procesing."""
-        kind, info, data = sys.exc_info()
+                    sql = query.get('sql').split('.')[0]
 
-        # Check if the eror is on the ignore list
-        if kind in settings.IGNORED_ERRORS:
-            return
+                    if sql in queries:
+                        queries[sql] += 1
+                    else:
+                        queries[sql] = 1
 
-        return super().process_exception(request, exception)
+                    if query_time is None:
+                        # django-debug-toolbar monkeypatches the connection
+                        # cursor wrapper and adds extra information in each
+                        # item in connection.queries. The query time is stored
+                        # under the key "duration" rather than "time" and is
+                        # in milliseconds, not seconds.
+                        query_time = float(query.get('duration', 0))
+
+                    total_time += float(query_time)
+
+                logger.debug('{n} queries run, {a:.3f}s / {b:.3f}s'.format(
+                    n=len(connection.queries),
+                    a=total_time,
+                    b=(t_stop - t_start)))
+
+                for x in sorted(queries.items(), key=operator.itemgetter(1), reverse=True):
+                    print(x[0], ':', x[1])
+
+        return response

InvenTree/InvenTree/mixins.py

@@ -1,181 +0,0 @@
-"""Mixins for (API) views in the whole project."""
-
-from django.core.exceptions import FieldDoesNotExist
-
-from rest_framework import generics, mixins, status
-from rest_framework.response import Response
-
-from InvenTree.fields import InvenTreeNotesField
-from InvenTree.helpers import remove_non_printable_characters, strip_html_tags
-
-
-class CleanMixin():
-    """Model mixin class which cleans inputs using the Mozilla bleach tools."""
-
-    # Define a list of field names which will *not* be cleaned
-    SAFE_FIELDS = []
-
-    def create(self, request, *args, **kwargs):
-        """Override to clean data before processing it."""
-        serializer = self.get_serializer(data=self.clean_data(request.data))
-        serializer.is_valid(raise_exception=True)
-        self.perform_create(serializer)
-        headers = self.get_success_headers(serializer.data)
-        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
-
-    def update(self, request, *args, **kwargs):
-        """Override to clean data before processing it."""
-        partial = kwargs.pop('partial', False)
-        instance = self.get_object()
-        serializer = self.get_serializer(instance, data=self.clean_data(request.data), partial=partial)
-        serializer.is_valid(raise_exception=True)
-        self.perform_update(serializer)
-
-        if getattr(instance, '_prefetched_objects_cache', None):
-            # If 'prefetch_related' has been applied to a queryset, we need to
-            # forcibly invalidate the prefetch cache on the instance.
-            instance._prefetched_objects_cache = {}
-
-        return Response(serializer.data)
-
-    def clean_string(self, field: str, data: str) -> str:
-        """Clean / sanitize a single input string.
-
-        Note that this function will *allow* orphaned <>& characters,
-        which would normally be escaped by bleach.
-
-        Nominally, the only thing that will be "cleaned" will be HTML tags
-
-        Ref: https://github.com/mozilla/bleach/issues/192
-
-        """
-
-        cleaned = strip_html_tags(data, field_name=field)
-
-        # By default, newline characters are removed
-        remove_newline = True
-
-        try:
-            if hasattr(self, 'serializer_class'):
-                model = self.serializer_class.Meta.model
-                field = model._meta.get_field(field)
-
-                # The following field types allow newline characters
-                allow_newline = [
-                    InvenTreeNotesField,
-                ]
-
-                for field_type in allow_newline:
-                    if issubclass(type(field), field_type):
-                        remove_newline = False
-                        break
-
-        except AttributeError:
-            pass
-        except FieldDoesNotExist:
-            pass
-
-        cleaned = remove_non_printable_characters(cleaned, remove_newline=remove_newline)
-
-        return cleaned
-
-    def clean_data(self, data: dict) -> dict:
-        """Clean / sanitize data.
-
-        This uses mozillas bleach under the hood to disable certain html tags by
-        encoding them - this leads to script tags etc. to not work.
-        The results can be longer then the input; might make some character combinations
-        `ugly`. Prevents XSS on the server-level.
-
-        Args:
-            data (dict): Data that should be sanatized.
-
-        Returns:
-            dict: Provided data sanatized; still in the same order.
-        """
-
-        clean_data = {}
-
-        for k, v in data.items():
-
-            if k in self.SAFE_FIELDS:
-                ret = v
-            elif isinstance(v, str):
-                ret = self.clean_string(k, v)
-            elif isinstance(v, dict):
-                ret = self.clean_data(v)
-            else:
-                ret = v
-
-            clean_data[k] = ret
-
-        return clean_data
-
-
-class ListAPI(generics.ListAPIView):
-    """View for list API."""
-
-
-class ListCreateAPI(CleanMixin, generics.ListCreateAPIView):
-    """View for list and create API."""
-
-
-class CreateAPI(CleanMixin, generics.CreateAPIView):
-    """View for create API."""
-
-
-class RetrieveAPI(generics.RetrieveAPIView):
-    """View for retreive API."""
-    pass
-
-
-class RetrieveUpdateAPI(CleanMixin, generics.RetrieveUpdateAPIView):
-    """View for retrieve and update API."""
-    pass
-
-
-class CustomDestroyModelMixin:
-    """This mixin was created pass the kwargs from the API to the models."""
-    def destroy(self, request, *args, **kwargs):
-        """Custom destroy method to pass kwargs."""
-        instance = self.get_object()
-        self.perform_destroy(instance, **kwargs)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def perform_destroy(self, instance, **kwargs):
-        """Custom destroy method to pass kwargs."""
-        instance.delete(**kwargs)
-
-
-class CustomRetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin,
-                                         mixins.UpdateModelMixin,
-                                         CustomDestroyModelMixin,
-                                         generics.GenericAPIView):
-    """This APIView was created pass the kwargs from the API to the models."""
-    def get(self, request, *args, **kwargs):
-        """Custom get method to pass kwargs."""
-        return self.retrieve(request, *args, **kwargs)
-
-    def put(self, request, *args, **kwargs):
-        """Custom put method to pass kwargs."""
-        return self.update(request, *args, **kwargs)
-
-    def patch(self, request, *args, **kwargs):
-        """Custom patch method to pass kwargs."""
-        return self.partial_update(request, *args, **kwargs)
-
-    def delete(self, request, *args, **kwargs):
-        """Custom delete method to pass kwargs."""
-        return self.destroy(request, *args, **kwargs)
-
-
-class CustomRetrieveUpdateDestroyAPI(CleanMixin, CustomRetrieveUpdateDestroyAPIView):
-    """This APIView was created pass the kwargs from the API to the models."""
-
-
-class RetrieveUpdateDestroyAPI(CleanMixin, generics.RetrieveUpdateDestroyAPIView):
-    """View for retrieve, update and destroy API."""
-
-
-class UpdateAPI(CleanMixin, generics.UpdateAPIView):
-    """View for update API."""

InvenTree/InvenTree/models.py

@@ -1,366 +1,50 @@
-"""Generic models which provide extra functionality over base Django model types."""
+"""
+Generic models which provide extra functionality over base Django model types.
+"""
+
+from __future__ import unicode_literals
 
-import logging
 import os
-import re
-from datetime import datetime
-from io import BytesIO
+import logging
 
+from django.db import models
 from django.conf import settings
-from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError
-from django.db import models
-from django.db.models.signals import post_save, pre_delete
-from django.dispatch import receiver
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ValidationError
+
+from django.db.models.signals import pre_delete
+from django.dispatch import receiver
 
-from error_report.models import Error
-from mptt.exceptions import InvalidMove
 from mptt.models import MPTTModel, TreeForeignKey
+from mptt.exceptions import InvalidMove
+
+from .validators import validate_tree_name
 
-import InvenTree.format
-import InvenTree.helpers
-from common.models import InvenTreeSetting
-from InvenTree.fields import InvenTreeURLField
-from InvenTree.sanitizer import sanitize_svg
 
 logger = logging.getLogger('inventree')
 
 
 def rename_attachment(instance, filename):
-    """Function for renaming an attachment file. The subdirectory for the uploaded file is determined by the implementing class.
+    """
+    Function for renaming an attachment file.
+    The subdirectory for the uploaded file is determined by the implementing class.
 
-    Args:
+        Args:
         instance: Instance of a PartAttachment object
         filename: name of uploaded file
 
     Returns:
         path to store file, format: '<subdir>/<id>/filename'
     """
+
     # Construct a path to store a file attachment for a given model type
     return os.path.join(instance.getSubdir(), filename)
 
 
-class DataImportMixin(object):
-    """Model mixin class which provides support for 'data import' functionality.
-
-    Models which implement this mixin should provide information on the fields available for import
-    """
-
-    # Define a map of fields avaialble for import
-    IMPORT_FIELDS = {}
-
-    @classmethod
-    def get_import_fields(cls):
-        """Return all available import fields.
-
-        Where information on a particular field is not explicitly provided,
-        introspect the base model to (attempt to) find that information.
-        """
-        fields = cls.IMPORT_FIELDS
-
-        for name, field in fields.items():
-
-            # Attempt to extract base field information from the model
-            base_field = None
-
-            for f in cls._meta.fields:
-                if f.name == name:
-                    base_field = f
-                    break
-
-            if base_field:
-                if 'label' not in field:
-                    field['label'] = base_field.verbose_name
-
-                if 'help_text' not in field:
-                    field['help_text'] = base_field.help_text
-
-            fields[name] = field
-
-        return fields
-
-    @classmethod
-    def get_required_import_fields(cls):
-        """Return all *required* import fields."""
-        fields = {}
-
-        for name, field in cls.get_import_fields().items():
-            required = field.get('required', False)
-
-            if required:
-                fields[name] = field
-
-        return fields
-
-
-class ReferenceIndexingMixin(models.Model):
-    """A mixin for keeping track of numerical copies of the "reference" field.
-
-    Here, we attempt to convert a "reference" field value (char) to an integer,
-    for performing fast natural sorting.
-
-    This requires extra database space (due to the extra table column),
-    but is required as not all supported database backends provide equivalent casting.
-
-    This mixin adds a field named 'reference_int'.
-
-    - If the 'reference' field can be cast to an integer, it is stored here
-    - If the 'reference' field *starts* with an integer, it is stored here
-    - Otherwise, we store zero
-    """
-
-    # Name of the global setting which defines the required reference pattern for this model
-    REFERENCE_PATTERN_SETTING = None
-
-    @classmethod
-    def get_reference_pattern(cls):
-        """Returns the reference pattern associated with this model.
-
-        This is defined by a global setting object, specified by the REFERENCE_PATTERN_SETTING attribute
-        """
-
-        # By default, we return an empty string
-        if cls.REFERENCE_PATTERN_SETTING is None:
-            return ''
-
-        return InvenTreeSetting.get_setting(cls.REFERENCE_PATTERN_SETTING, create=False).strip()
-
-    @classmethod
-    def get_reference_context(cls):
-        """Generate context data for generating the 'reference' field for this class.
-
-        - Returns a python dict object which contains the context data for formatting the reference string.
-        - The default implementation provides some default context information
-        """
-
-        return {
-            'ref': cls.get_next_reference(),
-            'date': datetime.now(),
-        }
-
-    @classmethod
-    def get_most_recent_item(cls):
-        """Return the item which is 'most recent'
-
-        In practice, this means the item with the highest reference value
-        """
-
-        query = cls.objects.all().order_by('-reference_int', '-pk')
-
-        if query.exists():
-            return query.first()
-        else:
-            return None
-
-    @classmethod
-    def get_next_reference(cls):
-        """Return the next available reference value for this particular class."""
-
-        # Find the "most recent" item
-        latest = cls.get_most_recent_item()
-
-        if not latest:
-            # No existing items
-            return 1
-
-        reference = latest.reference.strip
-
-        try:
-            reference = InvenTree.format.extract_named_group('ref', reference, cls.get_reference_pattern())
-        except Exception:
-            # If reference cannot be extracted using the pattern, try just the integer value
-            reference = str(latest.reference_int)
-
-        # Attempt to perform 'intelligent' incrementing of the reference field
-        incremented = InvenTree.helpers.increment(reference)
-
-        try:
-            incremented = int(incremented)
-        except ValueError:
-            pass
-
-        return incremented
-
-    @classmethod
-    def generate_reference(cls):
-        """Generate the next 'reference' field based on specified pattern"""
-
-        fmt = cls.get_reference_pattern()
-        ctx = cls.get_reference_context()
-
-        reference = None
-
-        attempts = set()
-
-        while reference is None:
-            try:
-                ref = fmt.format(**ctx)
-
-                if ref in attempts:
-                    # We are stuck in a loop!
-                    reference = ref
-                    break
-                else:
-                    attempts.add(ref)
-
-                    if cls.objects.filter(reference=ref).exists():
-                        # Handle case where we have duplicated an existing reference
-                        ctx['ref'] = InvenTree.helpers.increment(ctx['ref'])
-                    else:
-                        # We have found an 'unused' reference
-                        reference = ref
-                        break
-
-            except Exception:
-                # If anything goes wrong, return the most recent reference
-                recent = cls.get_most_recent_item()
-                if recent:
-                    reference = recent.reference
-                else:
-                    reference = ""
-
-        return reference
-
-    @classmethod
-    def validate_reference_pattern(cls, pattern):
-        """Ensure that the provided pattern is valid"""
-
-        ctx = cls.get_reference_context()
-
-        try:
-            info = InvenTree.format.parse_format_string(pattern)
-        except Exception as exc:
-            raise ValidationError({
-                "value": _("Improperly formatted pattern") + ": " + str(exc)
-            })
-
-        # Check that only 'allowed' keys are provided
-        for key in info.keys():
-            if key not in ctx.keys():
-                raise ValidationError({
-                    "value": _("Unknown format key specified") + f": '{key}'"
-                })
-
-        # Check that the 'ref' variable is specified
-        if 'ref' not in info.keys():
-            raise ValidationError({
-                'value': _("Missing required format key") + ": 'ref'"
-            })
-
-    @classmethod
-    def validate_reference_field(cls, value):
-        """Check that the provided 'reference' value matches the requisite pattern"""
-
-        pattern = cls.get_reference_pattern()
-
-        value = str(value).strip()
-
-        if len(value) == 0:
-            raise ValidationError(_("Reference field cannot be empty"))
-
-        # An 'empty' pattern means no further validation is required
-        if not pattern:
-            return
-
-        if not InvenTree.format.validate_string(value, pattern):
-            raise ValidationError(_("Reference must match required pattern") + ": " + pattern)
-
-        # Check that the reference field can be rebuild
-        cls.rebuild_reference_field(value, validate=True)
-
-    class Meta:
-        """Metaclass options. Abstract ensures no database table is created."""
-
-        abstract = True
-
-    @classmethod
-    def rebuild_reference_field(cls, reference, validate=False):
-        """Extract integer out of reference for sorting.
-
-        If the 'integer' portion is buried somewhere 'within' the reference,
-        we can first try to extract it using the pattern.
-
-        Example:
-        reference - BO-123-ABC
-        pattern - BO-{ref}-???
-        extracted - 123
-
-        If we cannot extract using the pattern for some reason, fallback to the entire reference
-        """
-
-        try:
-            # Extract named group based on provided pattern
-            reference = InvenTree.format.extract_named_group('ref', reference, cls.get_reference_pattern())
-        except Exception:
-            pass
-
-        reference_int = extract_int(reference)
-
-        if validate:
-            if reference_int > models.BigIntegerField.MAX_BIGINT:
-                raise ValidationError({
-                    "reference": _("Reference number is too large")
-                })
-
-        return reference_int
-
-    reference_int = models.BigIntegerField(default=0)
-
-
-def extract_int(reference, clip=0x7fffffff, allow_negative=False):
-    """Extract an integer out of reference."""
-
-    # Default value if we cannot convert to an integer
-    ref_int = 0
-
-    reference = str(reference).strip()
-
-    # Ignore empty string
-    if len(reference) == 0:
-        return 0
-
-    # Look at the start of the string - can it be "integerized"?
-    result = re.match(r"^(\d+)", reference)
-
-    if result and len(result.groups()) == 1:
-        ref = result.groups()[0]
-        try:
-            ref_int = int(ref)
-        except Exception:
-            ref_int = 0
-    else:
-        # Look at the "end" of the string
-        result = re.search(r'(\d+)$', reference)
-
-        if result and len(result.groups()) == 1:
-            ref = result.groups()[0]
-            try:
-                ref_int = int(ref)
-            except Exception:
-                ref_int = 0
-
-    # Ensure that the returned values are within the range that can be stored in an IntegerField
-    # Note: This will result in large values being "clipped"
-    if clip is not None:
-        if ref_int > clip:
-            ref_int = clip
-        elif ref_int < -clip:
-            ref_int = -clip
-
-    if not allow_negative and ref_int < 0:
-        ref_int = abs(ref_int)
-
-    return ref_int
-
-
 class InvenTreeAttachment(models.Model):
-    """Provides an abstracted class for managing file attachments.
-
-    An attachment can be either an uploaded file, or an external URL
+    """ Provides an abstracted class for managing file attachments.
 
     Attributes:
         attachment: File
@@ -368,50 +52,19 @@ class InvenTreeAttachment(models.Model):
         user: User associated with file upload
         upload_date: Date the file was uploaded
     """
-
     def getSubdir(self):
-        """Return the subdirectory under which attachments should be stored.
-
+        """
+        Return the subdirectory under which attachments should be stored.
         Note: Re-implement this for each subclass of InvenTreeAttachment
         """
+
         return "attachments"
 
-    def save(self, *args, **kwargs):
-        """Provide better validation error."""
-        # Either 'attachment' or 'link' must be specified!
-        if not self.attachment and not self.link:
-            raise ValidationError({
-                'attachment': _('Missing file'),
-                'link': _('Missing external link'),
-            })
-
-        if self.attachment and self.attachment.name.lower().endswith('.svg'):
-            self.attachment.file.file = self.clean_svg(self.attachment)
-
-        super().save(*args, **kwargs)
-
-    def clean_svg(self, field):
-        """Sanitize SVG file before saving."""
-        cleaned = sanitize_svg(field.file.read())
-        return BytesIO(bytes(cleaned, 'utf8'))
-
     def __str__(self):
-        """Human name for attachment."""
-        if self.attachment is not None:
-            return os.path.basename(self.attachment.name)
-        else:
-            return str(self.link)
+        return os.path.basename(self.attachment.name)
 
     attachment = models.FileField(upload_to=rename_attachment, verbose_name=_('Attachment'),
-                                  help_text=_('Select file to attach'),
-                                  blank=True, null=True
-                                  )
-
-    link = InvenTreeURLField(
-        blank=True, null=True,
-        verbose_name=_('Link'),
-        help_text=_('Link to external URL')
-    )
+                                  help_text=_('Select file to attach'))
 
     comment = models.CharField(blank=True, max_length=100, verbose_name=_('Comment'), help_text=_('File comment'))
 
@@ -427,32 +80,44 @@ class InvenTreeAttachment(models.Model):
 
     @property
     def basename(self):
-        """Base name/path for attachment."""
-        if self.attachment:
-            return os.path.basename(self.attachment.name)
-        else:
-            return None
+        return os.path.basename(self.attachment.name)
 
     @basename.setter
     def basename(self, fn):
-        """Function to rename the attachment file.
+        """
+        Function to rename the attachment file.
 
         - Filename cannot be empty
         - Filename cannot contain illegal characters
         - Filename must specify an extension
         - Filename cannot match an existing file
         """
+
         fn = fn.strip()
 
         if len(fn) == 0:
             raise ValidationError(_('Filename must not be empty'))
 
-        attachment_dir = settings.MEDIA_ROOT.joinpath(self.getSubdir())
-        old_file = settings.MEDIA_ROOT.joinpath(self.attachment.name)
-        new_file = settings.MEDIA_ROOT.joinpath(self.getSubdir(), fn).resolve()
+        attachment_dir = os.path.join(
+            settings.MEDIA_ROOT,
+            self.getSubdir()
+        )
+
+        old_file = os.path.join(
+            settings.MEDIA_ROOT,
+            self.attachment.name
+        )
+
+        new_file = os.path.join(
+            settings.MEDIA_ROOT,
+            self.getSubdir(),
+            fn
+        )
+
+        new_file = os.path.abspath(new_file)
 
         # Check that there are no directory tricks going on...
-        if new_file.parent != attachment_dir:
+        if not os.path.dirname(new_file) == attachment_dir:
             logger.error(f"Attempted to rename attachment outside valid directory: '{new_file}'")
             raise ValidationError(_("Invalid attachment directory"))
 
@@ -469,28 +134,26 @@ class InvenTreeAttachment(models.Model):
         if len(fn.split('.')) < 2:
             raise ValidationError(_("Filename missing extension"))
 
-        if not old_file.exists():
+        if not os.path.exists(old_file):
             logger.error(f"Trying to rename attachment '{old_file}' which does not exist")
             return
 
-        if new_file.exists():
+        if os.path.exists(new_file):
             raise ValidationError(_("Attachment with this filename already exists"))
 
         try:
             os.rename(old_file, new_file)
             self.attachment.name = os.path.join(self.getSubdir(), fn)
             self.save()
-        except Exception:
+        except:
             raise ValidationError(_("Error renaming file"))
 
     class Meta:
-        """Metaclass options. Abstract ensures no database table is created."""
-
         abstract = True
 
 
 class InvenTreeTree(MPTTModel):
-    """Provides an abstracted self-referencing tree model for data categories.
+    """ Provides an abstracted self-referencing tree model for data categories.
 
     - Each Category has one parent Category, which can be blank (for a top-level Category).
     - Each Category can have zero-or-more child Categor(y/ies)
@@ -502,7 +165,10 @@ class InvenTreeTree(MPTTModel):
     """
 
     def api_instance_filters(self):
-        """Instance filters for InvenTreeTree models."""
+        """
+        Instance filters for InvenTreeTree models
+        """
+
         return {
             'parent': {
                 'exclude_tree': self.pk,
@@ -510,50 +176,27 @@ class InvenTreeTree(MPTTModel):
         }
 
     def save(self, *args, **kwargs):
-        """Custom save method for InvenTreeTree abstract model"""
 
         try:
             super().save(*args, **kwargs)
         except InvalidMove:
-            # Provide better error for parent selection
             raise ValidationError({
                 'parent': _("Invalid choice"),
             })
 
-        # Re-calculate the 'pathstring' field
-        pathstring = InvenTree.helpers.constructPathString(
-            [item.name for item in self.path]
-        )
-
-        if pathstring != self.pathstring:
-
-            if 'force_insert' in kwargs:
-                del kwargs['force_insert']
-
-            kwargs['force_update'] = True
-
-            self.pathstring = pathstring
-            super().save(*args, **kwargs)
-
-            # Ensure that the pathstring changes are propagated down the tree also
-            for child in self.get_children():
-                child.save(*args, **kwargs)
-
     class Meta:
-        """Metaclass defines extra model properties."""
-
         abstract = True
 
         # Names must be unique at any given level in the tree
         unique_together = ('name', 'parent')
 
     class MPTTMeta:
-        """Set insert order."""
         order_insertion_by = ['name']
 
     name = models.CharField(
         blank=False,
         max_length=100,
+        validators=[validate_tree_name],
         verbose_name=_("Name"),
         help_text=_("Name"),
     )
@@ -573,17 +216,9 @@ class InvenTreeTree(MPTTModel):
                             verbose_name=_("parent"),
                             related_name='children')
 
-    # The 'pathstring' field is calculated each time the model is saved
-    pathstring = models.CharField(
-        blank=True,
-        max_length=250,
-        verbose_name=_('Path'),
-        help_text=_('Path')
-    )
-
     @property
     def item_count(self):
-        """Return the number of items which exist *under* this node in the tree.
+        """ Return the number of items which exist *under* this node in the tree.
 
         Here an 'item' is considered to be the 'leaf' at the end of each branch,
         and the exact nature here will depend on the class implementation.
@@ -593,29 +228,30 @@ class InvenTreeTree(MPTTModel):
         return 0
 
     def getUniqueParents(self):
-        """Return a flat set of all parent items that exist above this node.
-
+        """ Return a flat set of all parent items that exist above this node.
         If any parents are repeated (which would be very bad!), the process is halted
         """
+
         return self.get_ancestors()
 
     def getUniqueChildren(self, include_self=True):
-        """Return a flat set of all child items that exist under this node.
-
+        """ Return a flat set of all child items that exist under this node.
         If any child items are repeated, the repetitions are omitted.
         """
+
         return self.get_descendants(include_self=include_self)
 
     @property
     def has_children(self):
-        """True if there are any children under this item."""
+        """ True if there are any children under this item """
         return self.getUniqueChildren(include_self=False).count() > 0
 
     def getAcceptableParents(self):
-        """Returns a list of acceptable parent items within this model Acceptable parents are ones which are not underneath this item.
-
+        """ Returns a list of acceptable parent items within this model
+        Acceptable parents are ones which are not underneath this item.
         Setting the parent of an item to its own child results in recursion.
         """
+
         contents = ContentType.objects.get_for_model(type(self))
 
         available = contents.get_all_objects_for_this_type()
@@ -633,16 +269,17 @@ class InvenTreeTree(MPTTModel):
 
     @property
     def parentpath(self):
-        """Get the parent path of this category.
+        """ Get the parent path of this category
 
         Returns:
             List of category names from the top level to the parent of this category
         """
+
         return [a for a in self.get_ancestors()]
 
     @property
     def path(self):
-        """Get the complete part of this category.
+        """ Get the complete part of this category.
 
         e.g. ["Top", "Second", "Third", "This"]
 
@@ -651,152 +288,28 @@ class InvenTreeTree(MPTTModel):
         """
         return self.parentpath + [self]
 
-    def __str__(self):
-        """String representation of a category is the full path to that category."""
-        return "{path} - {desc}".format(path=self.pathstring, desc=self.description)
-
-
-class InvenTreeBarcodeMixin(models.Model):
-    """A mixin class for adding barcode functionality to a model class.
-
-    Two types of barcodes are supported:
-
-    - Internal barcodes (QR codes using a strictly defined format)
-    - External barcodes (assign third party barcode data to a model instance)
-
-    The following fields are added to any model which implements this mixin:
-
-    - barcode_data : Raw data associated with an assigned barcode
-    - barcode_hash : A 'hash' of the assigned barcode data used to improve matching
-    """
-
-    class Meta:
-        """Metaclass options for this mixin.
-
-        Note: abstract must be true, as this is only a mixin, not a separate table
-        """
-        abstract = True
-
-    barcode_data = models.CharField(
-        blank=True, max_length=500,
-        verbose_name=_('Barcode Data'),
-        help_text=_('Third party barcode data'),
-    )
-
-    barcode_hash = models.CharField(
-        blank=True, max_length=128,
-        verbose_name=_('Barcode Hash'),
-        help_text=_('Unique hash of barcode data')
-    )
-
-    @classmethod
-    def barcode_model_type(cls):
-        """Return the model 'type' for creating a custom QR code."""
-
-        # By default, use the name of the class
-        return cls.__name__.lower()
-
-    def format_barcode(self, **kwargs):
-        """Return a JSON string for formatting a QR code for this model instance."""
-
-        return InvenTree.helpers.MakeBarcode(
-            self.__class__.barcode_model_type(),
-            self.pk,
-            **kwargs
-        )
-
     @property
-    def barcode(self):
-        """Format a minimal barcode string (e.g. for label printing)"""
+    def pathstring(self):
+        """ Get a string representation for the path of this item.
 
-        return self.format_barcode(brief=True)
+        e.g. "Top/Second/Third/This"
+        """
+        return '/'.join([item.name for item in self.path])
 
-    @classmethod
-    def lookup_barcode(cls, barcode_hash):
-        """Check if a model instance exists with the specified third-party barcode hash."""
+    def __str__(self):
+        """ String representation of a category is the full path to that category """
 
-        return cls.objects.filter(barcode_hash=barcode_hash).first()
-
-    def assign_barcode(self, barcode_hash=None, barcode_data=None, raise_error=True):
-        """Assign an external (third-party) barcode to this object."""
-
-        # Must provide either barcode_hash or barcode_data
-        if barcode_hash is None and barcode_data is None:
-            raise ValueError("Provide either 'barcode_hash' or 'barcode_data'")
-
-        # If barcode_hash is not provided, create from supplier barcode_data
-        if barcode_hash is None:
-            barcode_hash = InvenTree.helpers.hash_barcode(barcode_data)
-
-        # Check for existing item
-        if self.__class__.lookup_barcode(barcode_hash) is not None:
-            if raise_error:
-                raise ValidationError(_("Existing barcode found"))
-            else:
-                return False
-
-        if barcode_data is not None:
-            self.barcode_data = barcode_data
-
-        self.barcode_hash = barcode_hash
-
-        self.save()
-
-        return True
-
-    def unassign_barcode(self):
-        """Unassign custom barcode from this model"""
-
-        self.barcode_data = ''
-        self.barcode_hash = ''
-
-        self.save()
+        return "{path} - {desc}".format(path=self.pathstring, desc=self.description)
 
 
 @receiver(pre_delete, sender=InvenTreeTree, dispatch_uid='tree_pre_delete_log')
 def before_delete_tree_item(sender, instance, using, **kwargs):
-    """Receives pre_delete signal from InvenTreeTree object.
+    """ Receives pre_delete signal from InvenTreeTree object.
 
     Before an item is deleted, update each child object to point to the parent of the object being deleted.
     """
+
     # Update each tree item below this one
     for child in instance.children.all():
         child.parent = instance.parent
         child.save()
-
-
-@receiver(post_save, sender=Error, dispatch_uid='error_post_save_notification')
-def after_error_logged(sender, instance: Error, created: bool, **kwargs):
-    """Callback when a server error is logged.
-
-    - Send a UI notification to all users with staff status
-    """
-
-    if created:
-        try:
-            import common.notifications
-
-            users = get_user_model().objects.filter(is_staff=True)
-
-            link = InvenTree.helpers.construct_absolute_url(
-                reverse('admin:error_report_error_change', kwargs={'object_id': instance.pk})
-            )
-
-            context = {
-                'error': instance,
-                'name': _('Server Error'),
-                'message': _('An error has been logged by the server.'),
-                'link': link
-            }
-
-            common.notifications.trigger_notification(
-                instance,
-                'inventree.error_log',
-                context=context,
-                targets=users,
-                delivery_methods=set([common.notifications.UIMessageNotification]),
-            )
-
-        except Exception as exc:
-            """We do not want to throw an exception while reporting an exception"""
-            logger.error(exc)

InvenTree/InvenTree/permissions.py

@@ -1,6 +1,5 @@
-"""Permission set for InvenTree."""
-
-from functools import wraps
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 from rest_framework import permissions
 
@@ -8,7 +7,9 @@ import users.models
 
 
 class RolePermission(permissions.BasePermission):
-    """Role mixin for API endpoints, allowing us to specify the user "role" which is required for certain operations.
+    """
+    Role mixin for API endpoints, allowing us to specify the user "role"
+    which is required for certain operations.
 
     Each endpoint can have one or more of the following actions:
     - GET
@@ -27,10 +28,14 @@ class RolePermission(permissions.BasePermission):
     to perform the specified action.
 
     For example, a DELETE action will be rejected unless the user has the "part.remove" permission
+
     """
 
     def has_permission(self, request, view):
-        """Determine if the current user has the specified permissions."""
+        """
+        Determine if the current user has the specified permissions
+        """
+
         user = request.user
 
         # Superuser can do it all
@@ -65,19 +70,3 @@ class RolePermission(permissions.BasePermission):
         result = users.models.RuleSet.check_table_permission(user, table, permission)
 
         return result
-
-
-class IsSuperuser(permissions.IsAdminUser):
-    """Allows access only to superuser users."""
-
-    def has_permission(self, request, view):
-        """Check if the user is a superuser."""
-        return bool(request.user and request.user.is_superuser)
-
-
-def auth_exempt(view_func):
-    """Mark a view function as being exempt from auth requirements."""
-    def wrapped_view(*args, **kwargs):
-        return view_func(*args, **kwargs)
-    wrapped_view.auth_exempt = True
-    return wraps(view_func)(wrapped_view)

InvenTree/InvenTree/plugins.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+
+import inspect
+import importlib
+import pkgutil
+
+
+def iter_namespace(pkg):
+
+    return pkgutil.iter_modules(pkg.__path__, pkg.__name__ + ".")
+
+
+def get_modules(pkg):
+    # Return all modules in a given package
+    return [importlib.import_module(name) for finder, name, ispkg in iter_namespace(pkg)]
+
+
+def get_classes(module):
+    # Return all classes in a given module
+    return inspect.getmembers(module, inspect.isclass)
+
+
+def get_plugins(pkg, baseclass):
+    """
+    Return a list of all modules under a given package.
+
+    - Modules must be a subclass of the provided 'baseclass'
+    - Modules must have a non-empty PLUGIN_NAME parameter
+    """
+
+    plugins = []
+
+    modules = get_modules(pkg)
+
+    # Iterate through each module in the package
+    for mod in modules:
+        # Iterate through each class in the module
+        for item in get_classes(mod):
+            plugin = item[1]
+            if issubclass(plugin, baseclass) and plugin.PLUGIN_NAME:
+                plugins.append(plugin)
+
+    return plugins

InvenTree/InvenTree/ready.py

@@ -1,58 +1,48 @@
-"""Functions to check if certain parts of InvenTree are ready."""
-
 import sys
 
 
 def isInTestMode():
-    """Returns True if the database is in testing mode."""
-    return 'test' in sys.argv
+    """
+    Returns True if the database is in testing mode
+    """
+
+    if 'test' in sys.argv:
+        return True
+
+    return False
 
 
-def isImportingData():
-    """Returns True if the database is currently importing data, e.g. 'loaddata' command is performed."""
-    return 'loaddata' in sys.argv
-
-
-def canAppAccessDatabase(allow_test: bool = False, allow_plugins: bool = False):
-    """Returns True if the apps.py file can access database records.
+def canAppAccessDatabase(allow_test=False):
+    """
+    Returns True if the apps.py file can access database records.
 
     There are some circumstances where we don't want the ready function in apps.py
     to touch the database
     """
+
     # If any of the following management commands are being executed,
     # prevent custom "on load" code from running!
     excluded_commands = [
         'flush',
         'loaddata',
         'dumpdata',
+        'makemigrations',
+        'migrate',
         'check',
         'shell',
         'createsuperuser',
         'wait_for_db',
         'prerender',
-        'rebuild_models',
-        'rebuild_thumbnails',
+        'rebuild',
+        'collectstatic',
         'makemessages',
         'compilemessages',
-        'backup',
-        'dbbackup',
-        'mediabackup',
-        'restore',
-        'dbrestore',
-        'mediarestore',
     ]
 
     if not allow_test:
         # Override for testing mode?
         excluded_commands.append('test')
 
-    if not allow_plugins:
-        excluded_commands.extend([
-            'makemigrations',
-            'migrate',
-            'collectstatic',
-        ])
-
     for cmd in excluded_commands:
         if cmd in sys.argv:
             return False

InvenTree/InvenTree/sanitizer.py

@@ -1,67 +0,0 @@
-"""Functions to sanitize user input files."""
-from bleach import clean
-from bleach.css_sanitizer import CSSSanitizer
-
-ALLOWED_ELEMENTS_SVG = [
-    'a', 'animate', 'animateColor', 'animateMotion',
-    'animateTransform', 'circle', 'defs', 'desc', 'ellipse', 'font-face',
-    'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern',
-    'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph',
-    'mpath', 'path', 'polygon', 'polyline', 'radialGradient', 'rect',
-    'set', 'stop', 'svg', 'switch', 'text', 'title', 'tspan', 'use'
-]
-
-ALLOWED_ATTRIBUTES_SVG = [
-    'accent-height', 'accumulate', 'additive', 'alphabetic',
-    'arabic-form', 'ascent', 'attributeName', 'attributeType',
-    'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
-    'class', 'color', 'color-rendering', 'content', 'cx', 'cy', 'd', 'dx',
-    'dy', 'descent', 'display', 'dur', 'end', 'fill', 'fill-opacity',
-    'fill-rule', 'font-family', 'font-size', 'font-stretch', 'font-style',
-    'font-variant', 'font-weight', 'from', 'fx', 'fy', 'g1', 'g2',
-    'glyph-name', 'gradientUnits', 'hanging', 'height', 'horiz-adv-x',
-    'horiz-origin-x', 'id', 'ideographic', 'k', 'keyPoints',
-    'keySplines', 'keyTimes', 'lang', 'marker-end', 'marker-mid',
-    'marker-start', 'markerHeight', 'markerUnits', 'markerWidth',
-    'mathematical', 'max', 'min', 'name', 'offset', 'opacity', 'orient',
-    'origin', 'overline-position', 'overline-thickness', 'panose-1',
-    'path', 'pathLength', 'points', 'preserveAspectRatio', 'r', 'refX',
-    'refY', 'repeatCount', 'repeatDur', 'requiredExtensions',
-    'requiredFeatures', 'restart', 'rotate', 'rx', 'ry', 'slope',
-    'stemh', 'stemv', 'stop-color', 'stop-opacity',
-    'strikethrough-position', 'strikethrough-thickness', 'stroke',
-    'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
-    'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity',
-    'stroke-width', 'systemLanguage', 'target', 'text-anchor', 'to',
-    'transform', 'type', 'u1', 'u2', 'underline-position',
-    'underline-thickness', 'unicode', 'unicode-range', 'units-per-em',
-    'values', 'version', 'viewBox', 'visibility', 'width', 'widths', 'x',
-    'x-height', 'x1', 'x2', 'xlink:actuate', 'xlink:arcrole',
-    'xlink:href', 'xlink:role', 'xlink:show', 'xlink:title',
-    'xlink:type', 'xml:base', 'xml:lang', 'xml:space', 'xmlns',
-    'xmlns:xlink', 'y', 'y1', 'y2', 'zoomAndPan', 'style'
-]
-
-
-def sanitize_svg(file_data: str, strip: bool = True, elements: str = ALLOWED_ELEMENTS_SVG, attributes: str = ALLOWED_ATTRIBUTES_SVG) -> str:
-    """Sanatize a SVG file.
-
-    Args:
-        file_data (str): SVG as string.
-        strip (bool, optional): Should invalid elements get removed. Defaults to True.
-        elements (str, optional): Allowed elements. Defaults to ALLOWED_ELEMENTS_SVG.
-        attributes (str, optional): Allowed attributes. Defaults to ALLOWED_ATTRIBUTES_SVG.
-
-    Returns:
-        str: Sanitzied SVG file.
-    """
-
-    cleaned = clean(
-        file_data,
-        tags=elements,
-        attributes=attributes,
-        strip=strip,
-        strip_comments=strip,
-        css_sanitizer=CSSSanitizer()
-    )
-    return cleaned

InvenTree/InvenTree/serializers.py

@@ -1,46 +1,45 @@
-"""Serializers used in various InvenTree apps."""
+"""
+Serializers used in various InvenTree apps
+"""
+
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 
 import os
-from collections import OrderedDict
+
 from decimal import Decimal
 
+from collections import OrderedDict
+
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError as DjangoValidationError
-from django.db import models
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
-import tablib
 from djmoney.contrib.django_rest_framework.fields import MoneyField
 from djmoney.money import Money
 from djmoney.utils import MONEY_CLASSES, get_currency_field_name
-from rest_framework import serializers
-from rest_framework.exceptions import ValidationError
-from rest_framework.fields import empty
-from rest_framework.serializers import DecimalField
-from rest_framework.utils import model_meta
 
-from common.models import InvenTreeSetting
-from InvenTree.fields import InvenTreeRestURLField, InvenTreeURLField
-from InvenTree.helpers import download_image_from_url
+from rest_framework import serializers
+from rest_framework.utils import model_meta
+from rest_framework.fields import empty
+from rest_framework.exceptions import ValidationError
+from rest_framework.serializers import DecimalField
 
 
 class InvenTreeMoneySerializer(MoneyField):
-    """Custom serializer for 'MoneyField', which ensures that passed values are numerically valid.
+    """
+    Custom serializer for 'MoneyField',
+    which ensures that passed values are numerically valid
 
     Ref: https://github.com/django-money/django-money/blob/master/djmoney/contrib/django_rest_framework/fields.py
     """
 
-    def __init__(self, *args, **kwargs):
-        """Overrite default values."""
-        kwargs["max_digits"] = kwargs.get("max_digits", 19)
-        self.decimal_places = kwargs["decimal_places"] = kwargs.get("decimal_places", 6)
-        kwargs["required"] = kwargs.get("required", False)
-
-        super().__init__(*args, **kwargs)
-
     def get_value(self, data):
-        """Test that the returned amount is a valid Decimal."""
+        """
+        Test that the returned amount is a valid Decimal
+        """
 
         amount = super(DecimalField, self).get_value(data)
 
@@ -50,34 +49,51 @@ class InvenTreeMoneySerializer(MoneyField):
 
         try:
             if amount is not None and amount is not empty:
-                # Convert to a Decimal instance, and round to maximum allowed decimal places
                 amount = Decimal(amount)
-                amount = round(amount, self.decimal_places)
-        except Exception:
+        except:
             raise ValidationError({
-                self.field_name: [_("Must be a valid number")],
+                self.field_name: _("Must be a valid number")
             })
 
         currency = data.get(get_currency_field_name(self.field_name), self.default_currency)
 
         if currency and amount is not None and not isinstance(amount, MONEY_CLASSES) and amount is not empty:
             return Money(amount, currency)
-
+        
         return amount
 
 
-class InvenTreeModelSerializer(serializers.ModelSerializer):
-    """Inherits the standard Django ModelSerializer class, but also ensures that the underlying model class data are checked on validation."""
+class UserSerializer(serializers.ModelSerializer):
+    """ Serializer for User - provides all fields """
 
-    # Switch out URLField mapping
-    serializer_field_mapping = {
-        **serializers.ModelSerializer.serializer_field_mapping,
-        models.URLField: InvenTreeRestURLField,
-        InvenTreeURLField: InvenTreeRestURLField,
-    }
+    class Meta:
+        model = User
+        fields = 'all'
+
+
+class UserSerializerBrief(serializers.ModelSerializer):
+    """ Serializer for User - provides limited information """
+
+    class Meta:
+        model = User
+        fields = [
+            'pk',
+            'username',
+        ]
+
+
+class InvenTreeModelSerializer(serializers.ModelSerializer):
+    """
+    Inherits the standard Django ModelSerializer class,
+    but also ensures that the underlying model class data are checked on validation.
+    """
 
     def __init__(self, instance=None, data=empty, **kwargs):
-        """Custom __init__ routine to ensure that *default* values (as specified in the ORM) are used by the DRF serializers, *if* the values are not provided by the user."""
+        """
+        Custom __init__ routine to ensure that *default* values (as specified in the ORM)
+        are used by the DRF serializers, *if* the values are not provided by the user.
+        """
+
         # If instance is None, we are creating a new instance
         if instance is None and data is not empty:
 
@@ -98,7 +114,6 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
 
                 """
                 Update the field IF (and ONLY IF):
-
                 - The field has a specified default value
                 - The field does not already have a value set
                 """
@@ -110,7 +125,7 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
                     if callable(value):
                         try:
                             value = value()
-                        except Exception:
+                        except:
                             continue
 
                     data[field_name] = value
@@ -118,10 +133,11 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
         super().__init__(instance, data, **kwargs)
 
     def get_initial(self):
-        """Construct initial data for the serializer.
-
+        """
+        Construct initial data for the serializer.
         Use the 'default' values specified by the django model definition
         """
+
         initials = super().get_initial().copy()
 
         # Are we creating a new instance?
@@ -140,25 +156,19 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
                     if callable(value):
                         try:
                             value = value()
-                        except Exception:
+                        except:
                             continue
 
                     initials[field_name] = value
 
         return initials
 
-    def skip_create_fields(self):
-        """Return a list of 'fields' which should be skipped for model creation.
-
-        This is used to 'bypass' a shortcoming of the DRF framework,
-        which does not allow us to have writeable serializer fields which do not exist on the model.
-
-        Default implementation returns an empty list
-        """
-        return []
-
     def save(self, **kwargs):
-        """Catch any django ValidationError thrown at the moment `save` is called, and re-throw as a DRF ValidationError."""
+        """
+        Catch any django ValidationError thrown at the moment save() is called,
+        and re-throw as a DRF ValidationError
+        """
+
         try:
             super().save(**kwargs)
         except (ValidationError, DjangoValidationError) as exc:
@@ -166,19 +176,11 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
 
         return self.instance
 
-    def create(self, validated_data):
-        """Custom create method which supports field adjustment"""
-
-        initial_data = validated_data.copy()
-
-        # Remove any fields which do not exist on the model
-        for field in self.skip_create_fields():
-            initial_data.pop(field, None)
-
-        return super().create(initial_data)
-
     def update(self, instance, validated_data):
-        """Catch any django ValidationError, and re-throw as a DRF ValidationError."""
+        """
+        Catch any django ValidationError, and re-throw as a DRF ValidationError
+        """
+
         try:
             instance = super().update(instance, validated_data)
         except (ValidationError, DjangoValidationError) as exc:
@@ -187,8 +189,8 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
         return instance
 
     def run_validation(self, data=empty):
-        """Perform serializer validation.
-
+        """
+        Perform serializer validation.
         In addition to running validators on the serializer fields,
         this class ensures that the underlying model is also validated.
         """
@@ -196,17 +198,11 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
         # Run any native validation checks first (may raise a ValidationError)
         data = super().run_validation(data)
 
+        # Now ensure the underlying model is correct
+
         if not hasattr(self, 'instance') or self.instance is None:
             # No instance exists (we are creating a new one)
-
-            initial_data = data.copy()
-
-            for field in self.skip_create_fields():
-                # Remove any fields we do not wish to provide to the model
-                initial_data.pop(field, None)
-
-            # Create a (RAM only) instance for extra testing
-            instance = self.Meta.model(**initial_data)
+            instance = self.Meta.model(**data)
         else:
             # Instance already exists (we are updating!)
             instance = self.instance
@@ -236,59 +232,13 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
         return data
 
 
-class UserSerializer(InvenTreeModelSerializer):
-    """Serializer for a User."""
-
-    class Meta:
-        """Metaclass defines serializer fields."""
-        model = User
-        fields = [
-            'pk',
-            'username',
-            'first_name',
-            'last_name',
-            'email'
-        ]
-
-
-class InvenTreeAttachmentSerializerField(serializers.FileField):
-    """Override the DRF native FileField serializer, to remove the leading server path.
-
-    For example, the FileField might supply something like:
-
-    http://127.0.0.1:8000/media/foo/bar.jpg
-
-    Whereas we wish to return:
-
-    /media/foo/bar.jpg
-
-    If the server process is serving the data at 127.0.0.1,
-    but a proxy service (e.g. nginx) is then providing DNS lookup to the outside world,
-    then an attachment which prefixes the "address" of the internal server
-    will not be accessible from the outside world.
-    """
-
-    def to_representation(self, value):
-        """To json-serializable type."""
-        if not value:
-            return None
-
-        return os.path.join(str(settings.MEDIA_URL), str(value))
-
-
 class InvenTreeAttachmentSerializer(InvenTreeModelSerializer):
-    """Special case of an InvenTreeModelSerializer, which handles an "attachment" model.
+    """
+    Special case of an InvenTreeModelSerializer, which handles an "attachment" model.
 
     The only real addition here is that we support "renaming" of the attachment file.
     """
 
-    user_detail = UserSerializer(source='user', read_only=True, many=False)
-
-    attachment = InvenTreeAttachmentSerializerField(
-        required=False,
-        allow_null=False,
-    )
-
     # The 'filename' field must be present in the serializer
     filename = serializers.CharField(
         label=_('Filename'),
@@ -298,367 +248,44 @@ class InvenTreeAttachmentSerializer(InvenTreeModelSerializer):
     )
 
 
-class InvenTreeImageSerializerField(serializers.ImageField):
-    """Custom image serializer.
+class InvenTreeAttachmentSerializerField(serializers.FileField):
+    """
+    Override the DRF native FileField serializer,
+    to remove the leading server path.
 
-    On upload, validate that the file is a valid image file
+    For example, the FileField might supply something like:
+
+    http://127.0.0.1:8000/media/foo/bar.jpg
+
+    Whereas we wish to return:
+
+    /media/foo/bar.jpg
+
+    Why? You can't handle the why!
+
+    Actually, if the server process is serving the data at 127.0.0.1,
+    but a proxy service (e.g. nginx) is then providing DNS lookup to the outside world,
+    then an attachment which prefixes the "address" of the internal server
+    will not be accessible from the outside world.
     """
 
     def to_representation(self, value):
-        """To json-serializable type."""
+
         if not value:
             return None
 
         return os.path.join(str(settings.MEDIA_URL), str(value))
 
 
-class InvenTreeDecimalField(serializers.FloatField):
-    """Custom serializer for decimal fields.
-
-    Solves the following issues:
-    - The normal DRF DecimalField renders values with trailing zeros
-    - Using a FloatField can result in rounding issues: https://code.djangoproject.com/ticket/30290
+class InvenTreeImageSerializerField(serializers.ImageField):
+    """
+    Custom image serializer.
+    On upload, validate that the file is a valid image file
     """
 
-    def to_internal_value(self, data):
-        """Convert to python type."""
-        # Convert the value to a string, and then a decimal
-        try:
-            return Decimal(str(data))
-        except Exception:
-            raise serializers.ValidationError(_("Invalid value"))
+    def to_representation(self, value):
 
-
-class DataFileUploadSerializer(serializers.Serializer):
-    """Generic serializer for uploading a data file, and extracting a dataset.
-
-    - Validates uploaded file
-    - Extracts column names
-    - Extracts data rows
-    """
-
-    # Implementing class should register a target model (database model) to be used for import
-    TARGET_MODEL = None
-
-    class Meta:
-        """Metaclass options."""
-
-        fields = [
-            'data_file',
-        ]
-
-    data_file = serializers.FileField(
-        label=_("Data File"),
-        help_text=_("Select data file for upload"),
-        required=True,
-        allow_empty_file=False,
-    )
-
-    def validate_data_file(self, data_file):
-        """Perform validation checks on the uploaded data file."""
-        self.filename = data_file.name
-
-        name, ext = os.path.splitext(data_file.name)
-
-        # Remove the leading . from the extension
-        ext = ext[1:]
-
-        accepted_file_types = [
-            'xls', 'xlsx',
-            'csv', 'tsv',
-            'xml',
-        ]
-
-        if ext not in accepted_file_types:
-            raise serializers.ValidationError(_("Unsupported file type"))
-
-        # Impose a 50MB limit on uploaded BOM files
-        max_upload_file_size = 50 * 1024 * 1024
-
-        if data_file.size > max_upload_file_size:
-            raise serializers.ValidationError(_("File is too large"))
-
-        # Read file data into memory (bytes object)
-        try:
-            data = data_file.read()
-        except Exception as e:
-            raise serializers.ValidationError(str(e))
-
-        if ext in ['csv', 'tsv', 'xml']:
-            try:
-                data = data.decode()
-            except Exception as e:
-                raise serializers.ValidationError(str(e))
-
-        # Convert to a tablib dataset (we expect headers)
-        try:
-            self.dataset = tablib.Dataset().load(data, ext, headers=True)
-        except Exception as e:
-            raise serializers.ValidationError(str(e))
-
-        if len(self.dataset.headers) == 0:
-            raise serializers.ValidationError(_("No columns found in file"))
-
-        if len(self.dataset) == 0:
-            raise serializers.ValidationError(_("No data rows found in file"))
-
-        return data_file
-
-    def match_column(self, column_name, field_names, exact=False):
-        """Attempt to match a column name (from the file) to a field (defined in the model).
-
-        Order of matching is:
-        - Direct match
-        - Case insensitive match
-        - Fuzzy match
-        """
-        if not column_name:
+        if not value:
             return None
 
-        column_name = str(column_name).strip()
-
-        column_name_lower = column_name.lower()
-
-        if column_name in field_names:
-            return column_name
-
-        for field_name in field_names:
-            if field_name.lower() == column_name_lower:
-                return field_name
-
-        if exact:
-            # Finished available 'exact' matches
-            return None
-
-        # TODO: Fuzzy pattern matching for column names
-
-        # No matches found
-        return None
-
-    def extract_data(self):
-        """Returns dataset extracted from the file."""
-        # Provide a dict of available import fields for the model
-        model_fields = {}
-
-        # Keep track of columns we have already extracted
-        matched_columns = set()
-
-        if self.TARGET_MODEL:
-            try:
-                model_fields = self.TARGET_MODEL.get_import_fields()
-            except Exception:
-                pass
-
-        # Extract a list of valid model field names
-        model_field_names = [key for key in model_fields.keys()]
-
-        # Provide a dict of available columns from the dataset
-        file_columns = {}
-
-        for header in self.dataset.headers:
-            column = {}
-
-            # Attempt to "match" file columns to model fields
-            match = self.match_column(header, model_field_names, exact=True)
-
-            if match is not None and match not in matched_columns:
-                matched_columns.add(match)
-                column['value'] = match
-            else:
-                column['value'] = None
-
-            file_columns[header] = column
-
-        return {
-            'file_fields': file_columns,
-            'model_fields': model_fields,
-            'rows': [row.values() for row in self.dataset.dict],
-            'filename': self.filename,
-        }
-
-    def save(self):
-        """Empty overwrite for save."""
-        ...
-
-
-class DataFileExtractSerializer(serializers.Serializer):
-    """Generic serializer for extracting data from an imported dataset.
-
-    - User provides an array of matched headers
-    - User provides an array of raw data rows
-    """
-
-    # Implementing class should register a target model (database model) to be used for import
-    TARGET_MODEL = None
-
-    class Meta:
-        """Metaclass options."""
-
-        fields = [
-            'columns',
-            'rows',
-        ]
-
-    # Mapping of columns
-    columns = serializers.ListField(
-        child=serializers.CharField(
-            allow_blank=True,
-        ),
-    )
-
-    rows = serializers.ListField(
-        child=serializers.ListField(
-            child=serializers.CharField(
-                allow_blank=True,
-                allow_null=True,
-            ),
-        )
-    )
-
-    def validate(self, data):
-        """Clean data."""
-        data = super().validate(data)
-
-        self.columns = data.get('columns', [])
-        self.rows = data.get('rows', [])
-
-        if len(self.rows) == 0:
-            raise serializers.ValidationError(_("No data rows provided"))
-
-        if len(self.columns) == 0:
-            raise serializers.ValidationError(_("No data columns supplied"))
-
-        self.validate_extracted_columns()
-
-        return data
-
-    @property
-    def data(self):
-        """Returns current data."""
-        if self.TARGET_MODEL:
-            try:
-                model_fields = self.TARGET_MODEL.get_import_fields()
-            except Exception:
-                model_fields = {}
-
-        rows = []
-
-        for row in self.rows:
-            """Optionally pre-process each row, before sending back to the client."""
-
-            processed_row = self.process_row(self.row_to_dict(row))
-
-            if processed_row:
-                rows.append({
-                    "original": row,
-                    "data": processed_row,
-                })
-
-        return {
-            'fields': model_fields,
-            'columns': self.columns,
-            'rows': rows,
-        }
-
-    def process_row(self, row):
-        """Process a 'row' of data, which is a mapped column:value dict.
-
-        Returns either a mapped column:value dict, or None.
-
-        If the function returns None, the column is ignored!
-        """
-        # Default implementation simply returns the original row data
-        return row
-
-    def row_to_dict(self, row):
-        """Convert a "row" to a named data dict."""
-        row_dict = {
-            'errors': {},
-        }
-
-        for idx, value in enumerate(row):
-
-            if idx < len(self.columns):
-                col = self.columns[idx]
-
-                if col:
-                    row_dict[col] = value
-
-        return row_dict
-
-    def validate_extracted_columns(self):
-        """Perform custom validation of header mapping."""
-        if self.TARGET_MODEL:
-            try:
-                model_fields = self.TARGET_MODEL.get_import_fields()
-            except Exception:
-                model_fields = {}
-
-        cols_seen = set()
-
-        for name, field in model_fields.items():
-
-            required = field.get('required', False)
-
-            # Check for missing required columns
-            if required:
-                if name not in self.columns:
-                    raise serializers.ValidationError(_(f"Missing required column: '{name}'"))
-
-        for col in self.columns:
-
-            if not col:
-                continue
-
-            # Check for duplicated columns
-            if col in cols_seen:
-                raise serializers.ValidationError(_(f"Duplicate column: '{col}'"))
-
-            cols_seen.add(col)
-
-    def save(self):
-        """No "save" action for this serializer."""
-        pass
-
-
-class RemoteImageMixin(metaclass=serializers.SerializerMetaclass):
-    """Mixin class which allows downloading an 'image' from a remote URL.
-
-    Adds the optional, write-only `remote_image` field to the serializer
-    """
-
-    def skip_create_fields(self):
-        """Ensure the 'remote_image' field is skipped when creating a new instance"""
-
-        return [
-            'remote_image',
-        ]
-
-    remote_image = serializers.URLField(
-        required=False,
-        allow_blank=False,
-        write_only=True,
-        label=_("URL"),
-        help_text=_("URL of remote image file"),
-    )
-
-    def validate_remote_image(self, url):
-        """Perform custom validation for the remote image URL.
-
-        - Attempt to download the image and store it against this object instance
-        - Catches and re-throws any errors
-        """
-
-        if not url:
-            return
-
-        if not InvenTreeSetting.get_setting('INVENTREE_DOWNLOAD_FROM_URL'):
-            raise ValidationError(_("Downloading images from remote URL is not enabled"))
-
-        try:
-            self.remote_image_file = download_image_from_url(url)
-        except Exception as exc:
-            self.remote_image_file = None
-            raise ValidationError(str(exc))
-
-        return url
+        return os.path.join(str(settings.MEDIA_URL), str(value))

InvenTree/InvenTree/static/bootstrap-table/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js

@@ -0,0 +1,170 @@
+/**
+ * @author: Dennis Hernández
+ * @webSite: http://djhvscf.github.io/Blog
+ * @update: zhixin wen <wenzhixin2010@gmail.com>
+ */
+
+!($ => {
+  const diacriticsMap = {}
+  const defaultAccentsDiacritics = [
+    {base: 'A', letters: '\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F'},
+    {base: 'AA',letters: '\uA732'},
+    {base: 'AE',letters: '\u00C6\u01FC\u01E2'},
+    {base: 'AO',letters: '\uA734'},
+    {base: 'AU',letters: '\uA736'},
+    {base: 'AV',letters: '\uA738\uA73A'},
+    {base: 'AY',letters: '\uA73C'},
+    {base: 'B', letters: '\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181'},
+    {base: 'C', letters: '\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E'},
+    {base: 'D', letters: '\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779'},
+    {base: 'DZ',letters: '\u01F1\u01C4'},
+    {base: 'Dz',letters: '\u01F2\u01C5'},
+    {base: 'E', letters: '\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E'},
+    {base: 'F', letters: '\u0046\u24BB\uFF26\u1E1E\u0191\uA77B'},
+    {base: 'G', letters: '\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E'},
+    {base: 'H', letters: '\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D'},
+    {base: 'I', letters: '\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197'},
+    {base: 'J', letters: '\u004A\u24BF\uFF2A\u0134\u0248'},
+    {base: 'K', letters: '\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2'},
+    {base: 'L', letters: '\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780'},
+    {base: 'LJ',letters: '\u01C7'},
+    {base: 'Lj',letters: '\u01C8'},
+    {base: 'M', letters: '\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C'},
+    {base: 'N', letters: '\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4'},
+    {base: 'NJ',letters: '\u01CA'},
+    {base: 'Nj',letters: '\u01CB'},
+    {base: 'O', letters: '\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C'},
+    {base: 'OI',letters: '\u01A2'},
+    {base: 'OO',letters: '\uA74E'},
+    {base: 'OU',letters: '\u0222'},
+    {base: 'OE',letters: '\u008C\u0152'},
+    {base: 'oe',letters: '\u009C\u0153'},
+    {base: 'P', letters: '\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754'},
+    {base: 'Q', letters: '\u0051\u24C6\uFF31\uA756\uA758\u024A'},
+    {base: 'R', letters: '\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782'},
+    {base: 'S', letters: '\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784'},
+    {base: 'T', letters: '\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786'},
+    {base: 'TZ',letters: '\uA728'},
+    {base: 'U', letters: '\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244'},
+    {base: 'V', letters: '\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245'},
+    {base: 'VY',letters: '\uA760'},
+    {base: 'W', letters: '\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72'},
+    {base: 'X', letters: '\u0058\u24CD\uFF38\u1E8A\u1E8C'},
+    {base: 'Y', letters: '\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE'},
+    {base: 'Z', letters: '\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762'},
+    {base: 'a', letters: '\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250'},
+    {base: 'aa',letters: '\uA733'},
+    {base: 'ae',letters: '\u00E6\u01FD\u01E3'},
+    {base: 'ao',letters: '\uA735'},
+    {base: 'au',letters: '\uA737'},
+    {base: 'av',letters: '\uA739\uA73B'},
+    {base: 'ay',letters: '\uA73D'},
+    {base: 'b', letters: '\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253'},
+    {base: 'c', letters: '\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184'},
+    {base: 'd', letters: '\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A'},
+    {base: 'dz',letters: '\u01F3\u01C6'},
+    {base: 'e', letters: '\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD'},
+    {base: 'f', letters: '\u0066\u24D5\uFF46\u1E1F\u0192\uA77C'},
+    {base: 'g', letters: '\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F'},
+    {base: 'h', letters: '\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265'},
+    {base: 'hv',letters: '\u0195'},
+    {base: 'i', letters: '\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131'},
+    {base: 'j', letters: '\u006A\u24D9\uFF4A\u0135\u01F0\u0249'},
+    {base: 'k', letters: '\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3'},
+    {base: 'l', letters: '\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747'},
+    {base: 'lj',letters: '\u01C9'},
+    {base: 'm', letters: '\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F'},
+    {base: 'n', letters: '\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5'},
+    {base: 'nj',letters: '\u01CC'},
+    {base: 'o', letters: '\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275'},
+    {base: 'oi',letters: '\u01A3'},
+    {base: 'ou',letters: '\u0223'},
+    {base: 'oo',letters: '\uA74F'},
+    {base: 'p',letters: '\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755'},
+    {base: 'q',letters: '\u0071\u24E0\uFF51\u024B\uA757\uA759'},
+    {base: 'r',letters: '\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783'},
+    {base: 's',letters: '\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B'},
+    {base: 't',letters: '\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787'},
+    {base: 'tz',letters: '\uA729'},
+    {base: 'u',letters: '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289'},
+    {base: 'v',letters: '\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C'},
+    {base: 'vy',letters: '\uA761'},
+    {base: 'w',letters: '\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73'},
+    {base: 'x',letters: '\u0078\u24E7\uFF58\u1E8B\u1E8D'},
+    {base: 'y',letters: '\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF'},
+    {base: 'z',letters: '\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763'}
+  ]
+
+  const initNeutraliser = () => {
+    for (const diacritic of defaultAccentsDiacritics) {
+      const letters = diacritic.letters
+      for (let i = 0; i < letters.length; i++) {
+        diacriticsMap[letters[i]] = diacritic.base
+      }
+    }
+  }
+
+  /* eslint-disable no-control-regex */
+  const removeDiacritics = str => str.replace(/[^\u0000-\u007E]/g, a => diacriticsMap[a] || a)
+
+  $.extend($.fn.bootstrapTable.defaults, {
+    searchAccentNeutralise: false
+  })
+
+  $.BootstrapTable = class extends $.BootstrapTable {
+    init () {
+      if (this.options.searchAccentNeutralise) {
+        initNeutraliser()
+      }
+      super.init()
+    }
+
+    initSearch () {
+      if (this.options.sidePagination !== 'server') {
+        let s = this.searchText && this.searchText.toLowerCase()
+        const f = $.isEmptyObject(this.filterColumns) ? null : this.filterColumns
+
+        // Check filter
+        this.data = f ? this.options.data.filter((item, i) => {
+          for (const key in f) {
+            if (item[key] !== f[key]) {
+              return false
+            }
+          }
+          return true
+        }) : this.options.data
+
+        this.data = s ? this.options.data.filter((item, i) => {
+          for (let [key, value] of Object.entries(item)) {
+            key = $.isNumeric(key) ? parseInt(key, 10) : key
+            const column = this.columns[this.fieldsColumnsIndex[key]]
+            const j = this.header.fields.indexOf(key)
+
+            if (column && column.searchFormatter) {
+              value = $.fn.bootstrapTable.utils.calculateObjectValue(column,
+                this.header.formatters[j], [value, item, i], value)
+            }
+
+            const index = this.header.fields.indexOf(key)
+            if (index !== -1 && this.header.searchables[index] && typeof value === 'string') {
+              if (this.options.searchAccentNeutralise) {
+                value = removeDiacritics(value)
+                s = removeDiacritics(s)
+              }
+              if (this.options.strictSearch) {
+                if ((`${value}`).toLowerCase() === s) {
+                  return true
+                }
+              } else {
+                if ((`${value}`).toLowerCase().includes(s)) {
+                  return true
+                }
+              }
+            }
+          }
+          return false
+        }) : this.data
+      }
+    }
+  }
+})(jQuery)

InvenTree/InvenTree/static/bootstrap-table/extensions/accent-neutralise/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Accent Neutralise",
+  "version": "1.0.0",
+  "description": "Plugin to neutralise the words.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/accent-neutralise",
+  "example": "#",
+
+  "plugins": [{
+    "name": "bootstrap-table-accent-neutralise",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/accent-neutralise"
+  }],
+
+  "author": {
+    "name": "djhvscf",
+    "image": "https://avatars1.githubusercontent.com/u/4496763"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/auto-refresh/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Auto Refresh",
+  "version": "1.0.0",
+  "description": "Plugin to automatically refresh the table on an interval.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/auto-refresh",
+  "example": "#",
+
+  "plugins": [{
+    "name": "bootstrap-table-auto-refresh",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/auto-refresh"
+  }],
+
+  "author": {
+    "name": "fenichaler",
+    "image": "https://avatars.githubusercontent.com/u/3437075"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/cookie/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Cookie",
+  "version": "1.2.1",
+  "description": "Plugin to use the cookie of the browser.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/cookie",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/cookie.html",
+
+  "plugins": [{
+    "name": "bootstrap-table-cookie",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/cookie"
+  }],
+
+  "author": {
+    "name": "djhvscf",
+    "image": "https://avatars1.githubusercontent.com/u/4496763"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/copy-rows/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Copy Rows",
+  "version": "1.0.0",
+  "description": "Allows pushing of selected column data to the clipboard.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/copy-rows",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/copy-rows.html",
+
+  "plugins": [{
+    "name": "copy-rows",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/copy-rows"
+  }],
+
+  "author": {
+    "name": "Homer Glascock",
+    "image": "https://avatars1.githubusercontent.com/u/5546710"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/defer-url/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "DeferURL",
+  "version": "1.0.0",
+  "description": "Plugin to defer server side processing.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/defer-url",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/defer-url.html",
+
+  "plugins": [{
+    "name": "bootstrap-table-defer-url",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/defer-url"
+  }],
+
+  "author": {
+    "name": "rubensa",
+    "image": "https://avatars1.githubusercontent.com/u/1469340"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/editable/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Table Editable",
+  "version": "1.1.0",
+  "description": "Use the x-editable to in-place editing your table.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/editable",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/editable.html",
+
+  "plugins": [{
+    "name": "x-editable",
+    "url": "https://github.com/vitalets/x-editable"
+  }],
+
+  "author": {
+    "name": "wenzhixin",
+    "image": "https://avatars1.githubusercontent.com/u/2117018"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/export/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Table Export",
+  "version": "1.1.0",
+  "description": "Export your table data to JSON, XML, CSV, TXT, SQL, Word, Excel, PNG, PDF.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/export",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/export.html",
+
+  "plugins": [{
+    "name": "tableExport.jquery.plugin",
+    "url": "https://github.com/hhurz/tableExport.jquery.plugin"
+  }],
+
+  "author": {
+    "name": "wenzhixin",
+    "image": "https://avatars1.githubusercontent.com/u/2117018"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/filter-control/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Filter Control",
+  "version": "2.1.0",
+  "description": "Plugin to add input/select element on the top of the columns in order to filter the data.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/filter-control",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/filter-control.html",
+
+  "plugins": [{
+    "name": "bootstrap-table-filter-control",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/filter-control"
+  }],
+
+  "author": {
+    "name": "djhvscf",
+    "image": "https://avatars1.githubusercontent.com/u/4496763"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/group-by-v2/extension.json

@@ -0,0 +1,12 @@
+{
+  "name": "Group By V2",
+  "version": "1.0.0",
+  "description": "Group the data by field",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/group-by-v2",
+  "example": "",
+  "plugins": [],
+  "author": {
+    "name": "Knoxvillekm",
+    "image": "https://avatars3.githubusercontent.com/u/11072464"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/group-by/bootstrap-table-group-by.css

@@ -0,0 +1,53 @@
+table.treetable tbody tr td {
+    cursor: default;
+}
+
+table.treetable span {
+    background-position: center left;
+    background-repeat: no-repeat;
+    padding: .2em 0 .2em 1.5em;
+}
+
+table.treetable tr.collapsed span.indenter a {
+    background-image: url(data:image/png;base64,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);
+    padding-right: 12px;
+}
+
+table.treetable tr.expanded span.indenter a {
+    background-image: url(data:image/png;base64,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);
+    padding-right: 12px;
+}
+
+table.treetable tr.branch {
+    background-color: #f9f9f9;
+}
+
+table.treetable tr.selected {
+    background-color: #3875d7;
+    color: #fff;
+}
+
+table.treetable tr span.indenter a {
+    outline: none; /* Expander shows outline after upgrading to 3.0 (#141) */
+}
+
+table.treetable tr.collapsed.selected span.indenter a {
+    background-image: url(data:image/png;base64,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);
+}
+
+table.treetable tr.expanded.selected span.indenter a {
+    background-image: url(data:image/png;base64,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);
+}
+
+table.treetable tr.accept {
+    background-color: #a3bce4;
+    color: #fff
+}
+
+table.treetable tr.collapsed.accept td span.indenter a {
+    background-image: url(data:image/x-png;base64,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);
+}
+
+table.treetable tr.expanded.accept td span.indenter a {
+    background-image: url(data:image/x-png;base64,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);
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/group-by/bootstrap-table-group-by.js

@@ -0,0 +1,243 @@
+/**
+ * @author: Dennis Hernández
+ * @webSite: http://djhvscf.github.io/Blog
+ * @version: v1.1.0
+ */
+
+!function ($) {
+
+    'use strict';
+
+    var originalRowAttr,
+        dataTTId = 'data-tt-id',
+        dataTTParentId = 'data-tt-parent-id',
+        obj = {},
+        parentId = undefined;
+
+    var getParentRowId = function (that, id) {
+        var parentRows = that.$body.find('tr').not('[' + 'data-tt-parent-id]');
+
+        for (var i = 0; i < parentRows.length; i++) {
+            if (i === id) {
+                return $(parentRows[i]).attr('data-tt-id');
+            }
+        }
+
+        return undefined;
+    };
+
+    var sumData = function (that, data) {
+        var sumRow = {};
+        $.each(data, function (i, row) {
+            if (!row.IsParent) {
+                for (var prop in row) {
+                    if (!isNaN(parseFloat(row[prop]))) {
+                        if (that.columns[that.fieldsColumnsIndex[prop]].groupBySumGroup) {
+                            if (sumRow[prop] === undefined) {
+                                sumRow[prop] = 0;
+                            }
+                            sumRow[prop] += +row[prop];
+                        }
+                    }
+                }
+            }
+        });
+        return sumRow;
+    };
+
+    var rowAttr = function (row, index) {
+        //Call the User Defined Function
+        originalRowAttr.apply([row, index]);
+
+        obj[dataTTId.toString()] = index;
+
+        if (!row.IsParent) {
+            obj[dataTTParentId.toString()] = parentId === undefined ? index : parentId;
+        } else {
+            parentId = index;
+            delete obj[dataTTParentId.toString()];
+        }
+
+        return obj;
+    };
+
+    var setObjectKeys = function () {
+        // From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
+        Object.keys = function (o) {
+            if (o !== Object(o)) {
+                throw new TypeError('Object.keys called on a non-object');
+            }
+            var k = [],
+                p;
+            for (p in o) {
+                if (Object.prototype.hasOwnProperty.call(o, p)) {
+                    k.push(p);
+                }
+            }
+            return k;
+        }
+    };
+
+    var getDataArrayFromItem = function (that, item) {
+        var itemDataArray = [];
+        for (var i = 0; i < that.options.groupByField.length; i++) {
+            itemDataArray.push(item[that.options.groupByField[i]]);
+        }
+
+        return itemDataArray;
+    };
+
+    var getNewRow = function (that, result, index) {
+        var newRow = {};
+        for (var i = 0; i < that.options.groupByField.length; i++) {
+            newRow[that.options.groupByField[i].toString()] = result[index][0][that.options.groupByField[i]];
+        }
+
+        newRow.IsParent = true;
+
+        return newRow;
+    };
+
+    var groupBy = function (array, f) {
+        var groups = {};
+        $.each(array, function (i, o) {
+            var group = JSON.stringify(f(o));
+            groups[group] = groups[group] || [];
+            groups[group].push(o);
+        });
+        return Object.keys(groups).map(function (group) {
+            return groups[group];
+        });
+    };
+
+    var makeGrouped = function (that, data) {
+        var newData = [],
+            sumRow = {};
+
+        var result = groupBy(data, function (item) {
+            return getDataArrayFromItem(that, item);
+        });
+
+        for (var i = 0; i < result.length; i++) {
+            result[i].unshift(getNewRow(that, result, i));
+            if (that.options.groupBySumGroup) {
+                sumRow = sumData(that, result[i]);
+                if (!$.isEmptyObject(sumRow)) {
+                    result[i].push(sumRow);
+                }
+            }
+        }
+
+        newData = newData.concat.apply(newData, result);
+
+        if (!that.options.loaded && newData.length > 0) {
+            that.options.loaded = true;
+            that.options.originalData = that.options.data;
+            that.options.data = newData;
+        }
+
+        return newData;
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, {
+        groupBy: false,
+        groupByField: [],
+        groupBySumGroup: false,
+        groupByInitExpanded: undefined, //node, 'all'
+        //internal variables
+        loaded: false,
+        originalData: undefined
+    });
+
+    $.fn.bootstrapTable.methods.push('collapseAll', 'expandAll', 'refreshGroupByField');
+
+    $.extend($.fn.bootstrapTable.COLUMN_DEFAULTS, {
+        groupBySumGroup: false
+    });
+
+    var BootstrapTable = $.fn.bootstrapTable.Constructor,
+        _init = BootstrapTable.prototype.init,
+        _initData = BootstrapTable.prototype.initData;
+
+    BootstrapTable.prototype.init = function () {
+        //Temporal validation
+        if (!this.options.sortName) {
+            if ((this.options.groupBy) && (this.options.groupByField.length > 0)) {
+                var that = this;
+
+                // Compatibility: IE < 9 and old browsers
+                if (!Object.keys) {
+                    $.fn.bootstrapTable.utils.objectKeys();
+                }
+
+                //Make sure that the internal variables are set correctly
+                this.options.loaded = false;
+                this.options.originalData = undefined;
+
+                originalRowAttr = this.options.rowAttributes;
+                this.options.rowAttributes = rowAttr;
+                this.$el.off('post-body.bs.table').on('post-body.bs.table', function () {
+                    that.$el.treetable({
+                        expandable: true,
+                        onNodeExpand: function () {
+                            if (that.options.height) {
+                                that.resetHeader();
+                            }
+                        },
+                        onNodeCollapse: function () {
+                            if (that.options.height) {
+                                that.resetHeader();
+                            }
+                        }
+                    }, true);
+
+                    if (that.options.groupByInitExpanded !== undefined) {
+                        if (typeof that.options.groupByInitExpanded === 'number') {
+                            that.expandNode(that.options.groupByInitExpanded);
+                        } else if (that.options.groupByInitExpanded.toLowerCase() === 'all') {
+                            that.expandAll();
+                        }
+                    }
+                });
+            }
+        }
+        _init.apply(this, Array.prototype.slice.apply(arguments));
+    };
+
+    BootstrapTable.prototype.initData = function (data, type) {
+        //Temporal validation
+        if (!this.options.sortName) {
+            if ((this.options.groupBy) && (this.options.groupByField.length > 0)) {
+
+                this.options.groupByField = typeof this.options.groupByField === 'string' ?
+                    this.options.groupByField.replace('[', '').replace(']', '')
+                        .replace(/ /g, '').toLowerCase().split(',') : this.options.groupByField;
+
+                data = makeGrouped(this, data ? data : this.options.data);
+            }
+        }
+        _initData.apply(this, [data, type]);
+    };
+
+    BootstrapTable.prototype.expandAll = function () {
+        this.$el.treetable('expandAll');
+    };
+
+    BootstrapTable.prototype.collapseAll = function () {
+        this.$el.treetable('collapseAll');
+    };
+
+    BootstrapTable.prototype.expandNode = function (id) {
+        id = getParentRowId(this, id);
+        if (id !== undefined) {
+            this.$el.treetable('expandNode', id);
+        }
+    };
+
+    BootstrapTable.prototype.refreshGroupByField = function (groupByFields) {
+        if (!$.fn.bootstrapTable.utils.compareObjects(this.options.groupByField, groupByFields)) {
+            this.options.groupByField = groupByFields;
+            this.load(this.options.originalData);
+        }
+    };
+}(jQuery);

InvenTree/InvenTree/static/bootstrap-table/extensions/group-by/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Group By",
+  "version": "1.1.0",
+  "description": "Plugin to group the data by fields.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/group-by",
+  "example": "#",
+
+  "plugins": [{
+    "name": "bootstrap-table-group-by",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/group-by"
+  }],
+
+  "author": {
+    "name": "djhvscf",
+    "image": "https://avatars1.githubusercontent.com/u/4496763"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/i18n-enhance/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "i18n Enhance",
+  "version": "1.0.0",
+  "description": "Plugin to add i18n API in order to change column's title and table locale.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/i18n-enhance",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/i18n-enhance.html",
+
+  "plugins": [{
+    "name": "bootstrap-table-i18n-enhance",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/i18n-enhance"
+  }],
+
+  "author": {
+    "name": "Jewway",
+    "image": "https://avatars0.githubusercontent.com/u/3501899"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/key-events/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Key Events",
+  "version": "1.0.0",
+  "description": "Plugin to support the key events in the bootstrap table.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/key-events",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/key-events.html",
+
+  "plugins": [{
+    "name": "bootstrap-table-key-events",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/key-events"
+  }],
+
+  "author": {
+    "name": "djhvscf",
+    "image": "https://avatars1.githubusercontent.com/u/4496763"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/mobile/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Mobile",
+  "version": "1.1.0",
+  "description": "Plugin to support the responsive feature.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/mobile",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/mobile.html",
+
+  "plugins": [{
+    "name": "bootstrap-table-mobile",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/mobile"
+  }],
+
+  "author": {
+    "name": "djhvscf",
+    "image": "https://avatars1.githubusercontent.com/u/4496763"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/multi-column-toggle/bootstrap-table-multi-toggle.js

@@ -0,0 +1,88 @@
+/**
+ * @author Homer Glascock <HopGlascock@gmail.com>
+ * @version: v1.0.0
+ */
+
+ !function ($) {
+    "use strict";
+
+    var sprintf = $.fn.bootstrapTable.utils.sprintf;
+
+    var reInit = function (self) {
+        self.initHeader();
+        self.initSearch();
+        self.initPagination();
+        self.initBody();
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, {
+        showToggleBtn: false,
+        multiToggleDefaults: [], //column names go here
+    });
+
+    $.fn.bootstrapTable.methods.push('hideAllColumns', 'showAllColumns');
+
+    var BootstrapTable = $.fn.bootstrapTable.Constructor,
+        _initToolbar = BootstrapTable.prototype.initToolbar;
+
+    BootstrapTable.prototype.initToolbar = function () {
+
+        _initToolbar.apply(this, Array.prototype.slice.apply(arguments));
+
+        var that = this,
+            $btnGroup = this.$toolbar.find('>.btn-group');
+
+        if (typeof this.options.multiToggleDefaults === 'string') {
+            this.options.multiToggleDefaults = JSON.parse(this.options.multiToggleDefaults);
+        }
+
+        if (this.options.showToggleBtn && this.options.showColumns) {
+            var showbtn = "<button class='btn btn-default hidden' id='showAllBtn'><span class='glyphicon glyphicon-resize-full icon-zoom-in'></span></button>",
+                hidebtn = "<button class='btn btn-default' id='hideAllBtn'><span class='glyphicon glyphicon-resize-small icon-zoom-out'></span></button>";
+
+            $btnGroup.append(showbtn + hidebtn);
+
+            $btnGroup.find('#showAllBtn').click(function () { that.showAllColumns(); 
+                $btnGroup.find('#hideAllBtn').toggleClass('hidden');
+                $btnGroup.find('#showAllBtn').toggleClass('hidden');  
+            });
+            $btnGroup.find('#hideAllBtn').click(function () { that.hideAllColumns(); 
+                $btnGroup.find('#hideAllBtn').toggleClass('hidden');
+                $btnGroup.find('#showAllBtn').toggleClass('hidden');  
+            });
+        }
+    };
+
+    BootstrapTable.prototype.hideAllColumns = function () {
+        var that = this,
+            defaults = that.options.multiToggleDefaults;
+
+        $.each(this.columns, function (index, column) {
+            //if its one of the defaults dont touch it
+            if (defaults.indexOf(column.field) == -1 && column.switchable) {
+                column.visible = false;
+                var $items = that.$toolbar.find('.keep-open input').prop('disabled', false);
+                $items.filter(sprintf('[value="%s"]', index)).prop('checked', false);
+            }
+        });
+
+        reInit(that);
+    };
+
+    BootstrapTable.prototype.showAllColumns = function () {
+        var that = this;
+        $.each(this.columns, function (index, column) {
+            if (column.switchable) {
+                column.visible = true;
+            }
+
+            var $items = that.$toolbar.find('.keep-open input').prop('disabled', false);
+            $items.filter(sprintf('[value="%s"]', index)).prop('checked', true);
+        });
+
+        reInit(that);
+
+        that.toggleColumn(0, that.columns[0].visible, false);
+    };
+    
+}(jQuery);

InvenTree/InvenTree/static/bootstrap-table/extensions/multi-column-toggle/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Multi Column Toggle",
+  "version": "1.0.0",
+  "description": "Allows hiding and showing of multiple columns at once.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/multi-column-toggle",
+  "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/multi-column-toggle.html",
+
+  "plugins": [{
+    "name": "multi-column-toggle",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/multi-column-toggle"
+  }],
+
+  "author": {
+    "name": "Homer Glascock",
+    "image": "https://avatars1.githubusercontent.com/u/5546710"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/multiple-search/bootstrap-table-multiple-search.js

@@ -0,0 +1,71 @@
+/**
+ * @author: Dennis Hernández
+ * @webSite: http://djhvscf.github.io/Blog
+ * @version: v1.0.0
+ */
+
+!function ($) {
+
+    'use strict';
+
+    $.extend($.fn.bootstrapTable.defaults, {
+        multipleSearch: false,
+	    delimeter: " "
+    });
+
+    var BootstrapTable = $.fn.bootstrapTable.Constructor,
+        _initSearch = BootstrapTable.prototype.initSearch;
+
+    BootstrapTable.prototype.initSearch = function () {
+        if (this.options.multipleSearch) {
+            if (this.searchText === undefined) {
+                return;
+            }
+            var strArray = this.searchText.split(this.options.delimeter),
+                that = this,
+                f = $.isEmptyObject(this.filterColumns) ? null : this.filterColumns,
+                dataFiltered = [];
+
+            if (strArray.length === 1) {
+                _initSearch.apply(this, Array.prototype.slice.apply(arguments));
+            } else {
+                for (var i = 0; i < strArray.length; i++) {
+                    var str = strArray[i].trim();
+                    dataFiltered = str ? $.grep(dataFiltered.length === 0 ? this.options.data : dataFiltered, function (item, i) {
+                        for (var key in item) {
+                            key = $.isNumeric(key) ? parseInt(key, 10) : key;
+                            var value = item[key],
+                                column = that.columns[that.fieldsColumnsIndex[key]],
+                                j = $.inArray(key, that.header.fields);
+
+                            // Fix #142: search use formated data
+                            if (column && column.searchFormatter) {
+                                value = $.fn.bootstrapTable.utils.calculateObjectValue(column,
+                                    that.header.formatters[j], [value, item, i], value);
+                            }
+
+                            var index = $.inArray(key, that.header.fields);
+                            if (index !== -1 && that.header.searchables[index] && (typeof value === 'string' || typeof value === 'number')) {
+                                if (that.options.strictSearch) {
+                                    if ((value + '').toLowerCase() === str) {
+                                        return true;
+                                    }
+                                } else {
+                                    if ((value + '').toLowerCase().indexOf(str) !== -1) {
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                        return false;
+                    }) : this.data;
+                }
+
+                this.data = dataFiltered;
+            }
+        } else {
+            _initSearch.apply(this, Array.prototype.slice.apply(arguments));
+        }
+    };
+
+}(jQuery);

InvenTree/InvenTree/static/bootstrap-table/extensions/multiple-search/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Multiple Search",
+  "version": "1.0.0",
+  "description": "Plugin to support the multiple search.",
+  "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/multiple-search",
+  "example": "#",
+
+  "plugins": [{
+    "name": "bootstrap-table-multiple-search",
+    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/multiple-search"
+  }],
+
+  "author": {
+    "name": "djhvscf",
+    "image": "https://avatars1.githubusercontent.com/u/4496763"
+  }
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.css

@@ -0,0 +1,17 @@
+.multiple-select-row-selected {
+    background: lightBlue
+}
+
+.table tbody tr:hover td,
+.table tbody tr:hover th {
+  background-color: transparent;
+}
+
+
+.table-striped tbody tr:nth-child(odd):hover td {
+   background-color: #F9F9F9;
+}
+
+.fixed-table-container tbody .selected td {
+    background: lightBlue;
+}

InvenTree/InvenTree/static/bootstrap-table/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.js

@@ -0,0 +1,127 @@
+/**
+ * @author: Dennis Hernández
+ * @webSite: http://djhvscf.github.io/Blog
+ * @version: v1.0.0
+ */
+
+!function ($) {
+
+    'use strict';
+
+    document.onselectstart = function() {
+        return false;
+    };
+
+    var getTableObjectFromCurrentTarget = function (currentTarget) {
+        currentTarget = $(currentTarget);
+        return currentTarget.is("table") ? currentTarget : currentTarget.parents().find(".table");
+    };
+
+    var getRow = function (target) {
+        target = $(target);
+        return target.parent().parent();
+    };
+
+    var onRowClick = function (e) {
+        var that = getTableObjectFromCurrentTarget(e.currentTarget);
+
+        if (window.event.ctrlKey) {
+            toggleRow(e.currentTarget, that, false, false);
+        }
+
+        if (window.event.button === 0) {
+            if (!window.event.ctrlKey && !window.event.shiftKey) {
+                clearAll(that);
+                toggleRow(e.currentTarget, that, false, false);
+            }
+
+            if (window.event.shiftKey) {
+                selectRowsBetweenIndexes([that.bootstrapTable("getOptions").multipleSelectRowLastSelectedRow.rowIndex, e.currentTarget.rowIndex], that)
+            }
+        }
+    };
+
+    var onCheckboxChange = function (e) {
+        var that = getTableObjectFromCurrentTarget(e.currentTarget);
+        clearAll(that);
+        toggleRow(getRow(e.currentTarget), that, false, false);
+    };
+
+    var toggleRow = function (row, that, clearAll, useShift) {
+        if (clearAll) {
+            row = $(row);
+            that.bootstrapTable("getOptions").multipleSelectRowLastSelectedRow = undefined;
+            row.removeClass(that.bootstrapTable("getOptions").multipleSelectRowCssClass);
+            that.bootstrapTable("uncheck", row.data("index"));    
+        } else {
+            that.bootstrapTable("getOptions").multipleSelectRowLastSelectedRow = row;
+            row = $(row);
+            if (useShift) {
+                row.addClass(that.bootstrapTable("getOptions").multipleSelectRowCssClass);
+                that.bootstrapTable("check", row.data("index"));  
+            } else {
+                if(row.hasClass(that.bootstrapTable("getOptions").multipleSelectRowCssClass)) {
+                    row.removeClass(that.bootstrapTable("getOptions").multipleSelectRowCssClass)
+                    that.bootstrapTable("uncheck", row.data("index"));  
+                } else {
+                    row.addClass(that.bootstrapTable("getOptions").multipleSelectRowCssClass);
+                    that.bootstrapTable("check", row.data("index"));  
+                }
+            }
+        }
+    };
+
+    var selectRowsBetweenIndexes = function (indexes, that) {
+        indexes.sort(function(a, b) {
+            return a - b;
+        });
+
+        for (var i = indexes[0]; i <= indexes[1]; i++) {
+            toggleRow(that.bootstrapTable("getOptions").multipleSelectRowRows[i-1], that, false, true);
+        }
+    };
+
+    var clearAll = function (that) {
+        for (var i = 0; i < that.bootstrapTable("getOptions").multipleSelectRowRows.length; i++) {
+            toggleRow(that.bootstrapTable("getOptions").multipleSelectRowRows[i], that, true, false);
+        }
+    };
+    
+    $.extend($.fn.bootstrapTable.defaults, {
+        multipleSelectRow: false,
+        multipleSelectRowCssClass: 'multiple-select-row-selected',
+        //internal variables used by the extension
+        multipleSelectRowLastSelectedRow: undefined,
+        multipleSelectRowRows: []
+    });
+
+    var BootstrapTable = $.fn.bootstrapTable.Constructor,
+        _init = BootstrapTable.prototype.init,
+        _initBody = BootstrapTable.prototype.initBody;
+
+    BootstrapTable.prototype.init = function () {
+        if (this.options.multipleSelectRow) {
+            var that = this;
+
+            //Make sure that the internal variables have the correct value
+            this.options.multipleSelectRowLastSelectedRow = undefined;
+            this.options.multipleSelectRowRows = [];
+            
+            this.$el.on("post-body.bs.table", function (e) {
+                setTimeout(function () {
+                    that.options.multipleSelectRowRows = that.$body.children();
+                    that.options.multipleSelectRowRows.click(onRowClick);
+                    that.options.multipleSelectRowRows.find("input[type=checkbox]").change(onCheckboxChange);
+                }, 1);
+            });
+        }
+
+        _init.apply(this, Array.prototype.slice.apply(arguments));
+    };
+
+    BootstrapTable.prototype.clearAllMultipleSelectionRow = function () {
+        clearAll(this);
+    };
+
+    $.fn.bootstrapTable.methods.push('clearAllMultipleSelectionRow');
+}(jQuery);