Update version.py

Bump version number to 0.15.7

.devcontainer/docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   db:
     image: postgres:13
@@ -11,12 +13,6 @@ services:
       POSTGRES_USER: inventree_user
       POSTGRES_PASSWORD: inventree_password
 
-  redis:
-    image: redis:7.0
-    restart: always
-    expose:
-      - 6379
-
   inventree:
     build:
       context: ..
@@ -35,8 +31,6 @@ services:
       INVENTREE_DB_HOST: db
       INVENTREE_DB_USER: inventree_user
       INVENTREE_DB_PASSWORD: inventree_password
-      INVENTREE_CACHE_HOST: redis
-      INVENTREE_CACHE_PORT: 6379
       INVENTREE_PLUGINS_ENABLED: True
       INVENTREE_SITE_URL: http://localhost:8000
       INVENTREE_CORS_ORIGIN_ALLOW_ALL: True

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/actions/migration/action.yaml

@@ -13,5 +13,5 @@ runs:
           invoke export-records -f data.json
           python3 ./src/backend/InvenTree/manage.py flush --noinput
           invoke migrate
-          invoke import-records -c -f data.json
-          invoke import-records -c -f data.json
+          invoke import-records -f data.json
+          invoke import-records -f data.json

.github/actions/setup/action.yaml

@@ -44,11 +44,6 @@ runs:
         with:
           python-version: ${{ env.python_version }}
           cache: pip
-          cache-dependency-path: |
-            src/backend/requirements.txt
-            src/backend/requirements-dev.txt
-            contrib/container/requirements.txt
-            contrib/dev_reqs/requirements.txt
       - name: Install Base Python Dependencies
         if: ${{ inputs.python == 'true' }}
         shell: bash
@@ -88,7 +83,7 @@ runs:
 
       # Invoke commands
       - name: Install dev requirements
-        if: ${{ inputs.dev-install == 'true' || inputs.install == 'true' }}
+        if: ${{ inputs.dev-install == 'true' ||inputs.install == 'true' }}
         shell: bash
         run: uv pip install --require-hashes -r src/backend/requirements-dev.txt
       - name: Run invoke install
@@ -98,4 +93,4 @@ runs:
       - name: Run invoke update
         if: ${{ inputs.update == 'true' }}
         shell: bash
-        run: invoke update --uv --skip-backup --skip-static
+        run: invoke update --uv

.github/dependabot.yml

@@ -15,11 +15,22 @@ updates:
       interval: weekly
 
   - package-ecosystem: pip
-    directories:
-    - /contrib/container
-    - /docs
-    - /contrib/dev_reqs
-    - /src/backend
+    directory: /contrib/container
+    schedule:
+      interval: weekly
+
+  - package-ecosystem: pip
+    directory: /docs
+    schedule:
+      interval: weekly
+
+  - package-ecosystem: pip
+    directory: /.github
+    schedule:
+      interval: weekly
+
+  - package-ecosystem: pip
+    directory: /src/backend
     schedule:
       interval: weekly
     groups:
@@ -28,9 +39,16 @@ updates:
           - "*" # Include all dependencies
 
   - package-ecosystem: npm
-    directories:
-    - /src/frontend
-    - /src/backend
+    directory: /src/backend
+    schedule:
+      interval: weekly
+    groups:
+      dependencies:
+        patterns:
+          - "*" # Include all dependencies
+
+  - package-ecosystem: npm
+    directory: /src/frontend
     schedule:
       interval: weekly
     groups:

.github/scripts/version_check.py

@@ -18,9 +18,6 @@ from pathlib import Path
 
 import requests
 
-REPO = os.getenv('GITHUB_REPOSITORY', 'inventree/inventree')
-GITHUB_API_URL = os.getenv('GITHUB_API_URL', 'https://api.github.com')
-
 
 def get_existing_release_tags():
     """Request information on existing releases via the GitHub API."""
@@ -31,7 +28,9 @@ def get_existing_release_tags():
     if token:
         headers = {'Authorization': f'Bearer {token}'}
 
-    response = requests.get(f'{GITHUB_API_URL}/repos/{REPO}/releases', headers=headers)
+    response = requests.get(
+        'https://api.github.com/repos/inventree/inventree/releases', headers=headers
+    )
 
     if response.status_code != 200:
         raise ValueError(
@@ -91,11 +90,6 @@ def check_version_number(version_string, allow_duplicate=False):
 
 
 if __name__ == '__main__':
-    # Ensure that we are running in GH Actions
-    if os.environ.get('GITHUB_ACTIONS', '') != 'true':
-        print('This script is intended to be run within a GitHub Action!')
-        sys.exit(1)
-
     if 'only_version' in sys.argv:
         here = Path(__file__).parent.absolute()
         version_file = here.joinpath(
@@ -103,18 +97,16 @@ if __name__ == '__main__':
         )
         text = version_file.read_text()
         results = re.findall(r"""INVENTREE_API_VERSION = (.*)""", text)
-        # If 2. args is true lower the version number by 1
-        if len(sys.argv) > 2 and sys.argv[2] == 'true':
-            results[0] = str(int(results[0]) - 1)
         print(results[0])
         exit(0)
-
     # GITHUB_REF_TYPE may be either 'branch' or 'tag'
     GITHUB_REF_TYPE = os.environ['GITHUB_REF_TYPE']
 
     # GITHUB_REF may be either 'refs/heads/<branch>' or 'refs/heads/<tag>'
     GITHUB_REF = os.environ['GITHUB_REF']
+
     GITHUB_REF_NAME = os.environ['GITHUB_REF_NAME']
+
     GITHUB_BASE_REF = os.environ['GITHUB_BASE_REF']
 
     # Print out version information, makes debugging actions *much* easier!
@@ -198,7 +190,7 @@ if __name__ == '__main__':
     # Ref: https://getridbug.com/python/how-to-set-environment-variables-in-github-actions-using-python/
     with open(os.getenv('GITHUB_ENV'), 'a') as env_file:
         # Construct tag string
-        tags = ','.join([f'{REPO.lower()}:{tag}' for tag in docker_tags])
+        tags = ','.join([f'inventree/inventree:{tag}' for tag in docker_tags])
 
         env_file.write(f'docker_tags={tags}\n')
 

.github/workflows/check_translations.yaml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:

.github/workflows/docker.yaml

@@ -39,7 +39,7 @@ jobs:
       docker: ${{ steps.filter.outputs.docker }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # pin@v3.0.2
         id: filter
         with:
@@ -66,9 +66,9 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Set Up Python ${{ env.python_version }}
-        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # pin@v5.1.1
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # pin@v5.1.0
         with:
           python-version: ${{ env.python_version }}
       - name: Version Check
@@ -115,19 +115,18 @@ jobs:
       - name: Run Unit Tests
         run: |
           echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> contrib/container/docker.dev.env
-          docker compose --project-directory . -f contrib/container/dev-docker-compose.yml run --rm inventree-dev-server invoke test --disable-pty
-      - name: Run Migration Tests
-        run: |
-          docker compose --project-directory . -f contrib/container/dev-docker-compose.yml run --rm inventree-dev-server invoke test --migrations
+          docker compose --project-directory . -f contrib/container/dev-docker-compose.yml run inventree-dev-server invoke test --disable-pty
+          docker compose --project-directory . -f contrib/container/dev-docker-compose.yml run inventree-dev-server invoke test --migrations --disable-pty
+          docker compose --project-directory . -f contrib/container/dev-docker-compose.yml down
       - name: Clean up test folder
         run: |
           rm -rf InvenTree/_testfolder
       - name: Set up QEMU
         if: github.event_name != 'pull_request'
-        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # pin@v3.2.0
+        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # pin@v3.0.0
       - name: Set up Docker Buildx
         if: github.event_name != 'pull_request'
-        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # pin@v3.6.1
+        uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # pin@v3.3.0
       - name: Set up cosign
         if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # pin@v3.5.0
@@ -141,14 +140,14 @@ jobs:
           fi
       - name: Login to Dockerhub
         if: github.event_name != 'pull_request' && steps.docker_login.outputs.skip_dockerhub_login != 'true'
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3.3.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # pin@v3.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Log into registry ghcr.io
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3.3.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # pin@v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -166,7 +165,7 @@ jobs:
       - name: Push Docker Images
         id: push-docker
         if: github.event_name != 'pull_request'
-        uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # pin@v6.5.0
+        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # pin@v5.3.0
         with:
           context: .
           file: ./contrib/container/Dockerfile

.github/workflows/qc_checks.yaml

@@ -10,9 +10,11 @@ on:
 
 env:
   python_version: 3.9
-  node_version: 20
+  node_version: 18
   # The OS version must be set per job
   server_start_sleep: 60
+  requests_version: 2.31.0
+  pyyaml_version: 6.0.1
 
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   INVENTREE_DB_ENGINE: sqlite3
@@ -38,7 +40,7 @@ jobs:
       force: ${{ steps.force.outputs.force }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # pin@v3.0.2
         id: filter
         with:
@@ -70,7 +72,7 @@ jobs:
     needs: ["pre-commit"]
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -92,9 +94,9 @@ jobs:
     if: needs.paths-filter.outputs.server == 'true' || needs.paths-filter.outputs.frontend == 'true' || needs.paths-filter.outputs.force == 'true'
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Set up Python ${{ env.python_version }}
-        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # pin@v5.1.1
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # pin@v5.1.0
         with:
           python-version: ${{ env.python_version }}
           cache: "pip"
@@ -113,9 +115,9 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Set up Python ${{ env.python_version }}
-        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # pin@v5.1.1
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # pin@v5.1.0
         with:
           python-version: ${{ env.python_version }}
       - name: Check Config
@@ -149,7 +151,7 @@ jobs:
       version: ${{ steps.version.outputs.version }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -159,32 +161,20 @@ jobs:
       - name: Export API Documentation
         run: invoke schema --ignore-warnings --filename src/backend/InvenTree/schema.yml
       - name: Upload schema
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # pin@v4.3.5
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4.3.3
         with:
           name: schema.yml
           path: src/backend/InvenTree/schema.yml
       - name: Download public schema
+        if: needs.paths-filter.outputs.api == 'false'
         run: |
           pip install --require-hashes -r contrib/dev_reqs/requirements.txt >/dev/null 2>&1
-          version="$(python3 .github/scripts/version_check.py only_version ${{ needs.paths-filter.outputs.api }} 2>&1)"
+          version="$(python3 .github/scripts/version_check.py only_version 2>&1)"
           echo "Version: $version"
           url="https://raw.githubusercontent.com/inventree/schema/main/export/${version}/api.yaml"
           echo "URL: $url"
-          code=$(curl -s -o api.yaml $url --write-out '%{http_code}' --silent)
-          if [ "$code" != "200" ]; then
-            exit 1
-          fi
+          curl -s -o api.yaml $url
           echo "Downloaded api.yaml"
-      - name: Running OpenAPI Spec diff action
-        id: breaking_changes
-        uses: oasdiff/oasdiff-action/diff@a2ff6682b27d175162a74c09ace8771bd3d512f8  # pin@main
-        with:
-          base: 'api.yaml'
-          revision: 'src/backend/InvenTree/schema.yml'
-          format: 'html'
-      - name: Echoing diff to step
-        run: echo "${{ steps.breaking_changes.outputs.diff }}" >> $GITHUB_STEP_SUMMARY
-
       - name: Check for differences in API Schema
         if: needs.paths-filter.outputs.api == 'false'
         run: |
@@ -211,13 +201,12 @@ jobs:
       version: ${{ needs.schema.outputs.version }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        name: Checkout Code
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           repository: inventree/schema
           token: ${{ secrets.SCHEMA_PAT }}
       - name: Download schema artifact
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
           name: schema.yml
       - name: Move schema to correct location
@@ -226,9 +215,8 @@ jobs:
           mkdir export/${version}
           mv schema.yml export/${version}/api.yaml
       - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
-        name: Commit schema changes
         with:
-          commit_message: "Update API schema for ${{ env.version }} / ${{ github.sha }}"
+          commit_message: "Update API schema for ${version}"
 
   python:
     name: Tests - inventree-python
@@ -250,7 +238,7 @@ jobs:
       INVENTREE_SITE_URL: http://127.0.0.1:12345
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -281,8 +269,7 @@ jobs:
     continue-on-error: true # continue if a step fails so that coverage gets pushed
     strategy:
       matrix:
-        python_version: [3.9]
-        # python_version: [3.9, 3.12]  # Disabled due to requirement issues
+        python_version: [3.9, 3.12]
 
     env:
       INVENTREE_DB_NAME: ./inventree.sqlite
@@ -292,7 +279,7 @@ jobs:
       python_version: ${{ matrix.python_version }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -308,7 +295,7 @@ jobs:
       - name: Coverage Tests
         run: invoke test --coverage
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # pin@v4.5.0
+        uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # pin@v4.3.1
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -346,7 +333,7 @@ jobs:
           - 6379:6379
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -390,7 +377,7 @@ jobs:
           - 3306:3306
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -429,7 +416,7 @@ jobs:
           - 5432:5432
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -440,7 +427,7 @@ jobs:
       - name: Run Tests
         run: invoke test --migrations --report --coverage
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # pin@v4.5.0
+        uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # pin@v4.3.1
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -460,7 +447,7 @@ jobs:
       INVENTREE_PLUGINS_ENABLED: false
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
         name: Checkout Code
       - name: Environment Setup
         uses: ./.github/actions/setup
@@ -517,7 +504,7 @@ jobs:
       VITE_COVERAGE: true
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -535,7 +522,7 @@ jobs:
       - name: Run Playwright tests
         id: tests
         run: cd src/frontend && npx nyc playwright test
-      - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # pin@v4
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4
         if: ${{ !cancelled() && steps.tests.outcome == 'failure' }}
         with:
           name: playwright-report
@@ -545,7 +532,7 @@ jobs:
         if: always()
         run: cd src/frontend && npx nyc report --report-dir ./coverage --temp-dir .nyc_output --reporter=lcov --exclude-after-remap false
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # pin@v4.5.0
+        uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # pin@v4.3.1
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -558,7 +545,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -573,7 +560,7 @@ jobs:
         run: |
           cd src/backend/InvenTree/web/static
           zip -r frontend-build.zip web/ web/.vite
-      - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # pin@v4.3.5
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4.3.3
         with:
           name: frontend-build
           path: src/backend/InvenTree/web/static/web

.github/workflows/release.yaml

@@ -1,16 +1,13 @@
 # Runs on releases
 
-name: Publish release
+name: Publish release notes
 on:
   release:
     types: [published]
-permissions:
-  contents: read
 
 jobs:
   stable:
     runs-on: ubuntu-latest
-    name: Write release to stable branch
     permissions:
       contents: write
       pull-requests: write
@@ -18,7 +15,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Version Check
         run: |
           pip install --require-hashes -r contrib/dev_reqs/requirements.txt
@@ -31,15 +28,13 @@ jobs:
           branch: stable
           force: true
 
-  build:
+  publish-build:
     runs-on: ubuntu-latest
-    name: Build and attest frontend
     permissions:
-      id-token: write
       contents: write
-      attestations: write
+      pull-requests: write
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:
@@ -48,11 +43,6 @@ jobs:
         run: cd src/frontend && yarn install
       - name: Build frontend
         run: cd src/frontend && npm run compile && npm run build
-      - name: Create SBOM for frontend
-        uses: anchore/sbom-action@v0
-        with:
-          artifact-name: frontend-build.spdx
-          path: src/frontend
       - name: Write version file - SHA
         run: cd src/backend/InvenTree/web/static/web/.vite && echo "$GITHUB_SHA" > sha.txt
       - name: Write version file - TAG
@@ -60,26 +50,11 @@ jobs:
       - name: Zip frontend
         run: |
           cd src/backend/InvenTree/web/static/web
-          zip -r ../frontend-build.zip * .vite
-      - name: Attest Build Provenance
-        id: attest
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-path: "${{ github.workspace }}/src/backend/InvenTree/web/static/frontend-build.zip"
-
-      - name: Upload frontend
-        uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # pin@2.9.0
+          zip -r ../frontend-build.zip *
+      - uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # pin@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: src/backend/InvenTree/web/static/frontend-build.zip
           asset_name: frontend-build.zip
           tag: ${{ github.ref }}
           overwrite: true
-      - name: Upload Attestation
-        uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # pin@2.9.0
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          asset_name: frontend-build.intoto.jsonl
-          file: ${{ steps.attest.outputs.bundle-path}}
-          tag: ${{ github.ref }}
-          overwrite: true

.github/workflows/scorecard.yaml

@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: SARIF file
           path: results.sarif
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
           sarif_file: results.sarif

.github/workflows/translations.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   python_version: 3.9
-  node_version: 20
+  node_version: 18
 
 permissions:
   contents: read
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4.1.7
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # pin@v4.1.5
       - name: Environment Setup
         uses: ./.github/actions/setup
         with:

.gitignore

@@ -108,6 +108,5 @@ src/backend/InvenTree/web/static
 InvenTree/web/static
 
 # Generated docs files
-docs/schema.yml
 docs/docs/api/*.yml
 docs/docs/api/schema/*.yml

.pkgr.yml

@@ -14,10 +14,7 @@ env:
   - INVENTREE_BACKUP_DIR=/opt/inventree/backup
   - INVENTREE_PLUGIN_FILE=/opt/inventree/plugins.txt
   - INVENTREE_CONFIG_FILE=/opt/inventree/config.yaml
-  - APP_REPO=inventree/InvenTree
-before_install: contrib/packager.io/preinstall.sh
 after_install: contrib/packager.io/postinstall.sh
-before_remove: contrib/packager.io/preinstall.sh
 before:
   - contrib/packager.io/before.sh
 dependencies:

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     -   id: check-yaml
     -   id: mixed-line-ending
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.4.1
     hooks:
     - id: ruff-format
       args: [--preview]
@@ -27,46 +27,42 @@ repos:
         --preview
       ]
 -   repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.2.13
+    rev: 0.1.35
     hooks:
       - id: pip-compile
         name: pip-compile requirements-dev.in
-        args: [src/backend/requirements-dev.in, -o, src/backend/requirements-dev.txt, --no-strip-extras, --generate-hashes]
+        args: [src/backend/requirements-dev.in, -o, src/backend/requirements-dev.txt, --python-version=3.9, --no-strip-extras, --generate-hashes]
         files: src/backend/requirements-dev\.(in|txt)$
       - id: pip-compile
         name: pip-compile requirements.txt
-        args: [src/backend/requirements.in, -o, src/backend/requirements.txt, --no-strip-extras, --generate-hashes]
+        args: [src/backend/requirements.in, -o, src/backend/requirements.txt,--python-version=3.9, --no-strip-extras,--generate-hashes]
         files: src/backend/requirements\.(in|txt)$
       - id: pip-compile
         name: pip-compile requirements.txt
-        args: [contrib/dev_reqs/requirements.in, -o, contrib/dev_reqs/requirements.txt, --no-strip-extras, --generate-hashes]
+        args: [contrib/dev_reqs/requirements.in, -o, contrib/dev_reqs/requirements.txt,--python-version=3.9, --no-strip-extras, --generate-hashes]
         files: contrib/dev_reqs/requirements\.(in|txt)$
       - id: pip-compile
         name: pip-compile requirements.txt
-        args: [docs/requirements.in, -o, docs/requirements.txt, --no-strip-extras, --generate-hashes]
+        args: [docs/requirements.in, -o, docs/requirements.txt,--python-version=3.9, --no-strip-extras, --generate-hashes]
         files: docs/requirements\.(in|txt)$
       - id: pip-compile
         name: pip-compile requirements.txt
-        args: [contrib/container/requirements.in, -o, contrib/container/requirements.txt, --python-version=3.11, --no-strip-extras, --generate-hashes]
+        args: [contrib/container/requirements.in, -o, contrib/container/requirements.txt,--python-version=3.11, --no-strip-extras, --generate-hashes]
         files: contrib/container/requirements\.(in|txt)$
 -   repo: https://github.com/Riverside-Healthcare/djLint
     rev: v1.34.1
     hooks:
       - id: djlint-django
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.3.0
+  rev: v2.2.6
   hooks:
   - id: codespell
-    additional_dependencies:
-      - tomli
     exclude: >
       (?x)^(
           docs/docs/stylesheets/.*|
           docs/docs/javascripts/.*|
           docs/docs/webfonts/.* |
           src/frontend/src/locales/.* |
-          pyproject.toml |
-          src/frontend/vite.config.ts |
       )$
 - repo: https://github.com/pre-commit/mirrors-prettier
   rev: "v4.0.0-alpha.8"
@@ -77,7 +73,7 @@ repos:
       - "prettier@^2.4.1"
       - "@trivago/prettier-plugin-sort-imports"
 - repo: https://github.com/pre-commit/mirrors-eslint
-  rev: "v9.6.0"
+  rev: "v9.1.0"
   hooks:
   - id: eslint
     additional_dependencies:
@@ -89,7 +85,7 @@ repos:
       - "@typescript-eslint/parser"
     files: ^src/frontend/.*\.(js|jsx|ts|tsx)$
 -   repo: https://github.com/gitleaks/gitleaks
-    rev: v8.18.4
+    rev: v8.18.2
     hooks:
     -   id: gitleaks
 #-   repo: https://github.com/jumanjihouse/pre-commit-hooks

.vscode/launch.json

@@ -6,37 +6,19 @@
   "configurations": [
     {
       "name": "InvenTree Server",
-      "type": "debugpy",
+      "type": "python",
       "request": "launch",
       "program": "${workspaceFolder}/src/backend/InvenTree/manage.py",
-      "args": [
-        "runserver",
-        // "0.0.0.0:8000", // expose server in network (useful for testing with mobile app)
-        // "--noreload" // disable auto-reload
-      ],
-      "django": true,
-      "justMyCode": true
-    },
-    {
-      "name": "InvenTree Server - Tests",
-      "type": "debugpy",
-      "request": "launch",
-      "program": "${workspaceFolder}/src/backend/InvenTree/manage.py",
-      "args": [
-        "test",
-        // "part.test_api.PartCategoryAPITest", // run only a specific test
-      ],
+      "args": ["runserver"],
       "django": true,
       "justMyCode": true
     },
     {
       "name": "InvenTree Server - 3rd party",
-      "type": "debugpy",
+      "type": "python",
       "request": "launch",
       "program": "${workspaceFolder}/src/backend/InvenTree/manage.py",
-      "args": [
-        "runserver"
-      ],
+      "args": ["runserver"],
       "django": true,
       "justMyCode": false
     },

CONTRIBUTING.md

@@ -39,7 +39,7 @@ InvenTree/
 │  │  ├─ tsconfig.json                 # Settings for frontend compilation
 ├─ .pkgr.yml                           # Build definition for Debian/Ubuntu packages
 ├─ .pre-commit-config.yaml             # Code formatter/linter configuration
-├─ CONTRIBUTING.md                     # Contribution guidelines and overview
+├─ CONTRIBUTING.md                     # Contirbution guidelines and overview
 ├─ Procfile                            # Process definition for Debian/Ubuntu packages
 ├─ README.md                           # General project information and overview
 ├─ runtime.txt                         # Python runtime settings for Debian/Ubuntu packages build

README.md

@@ -66,7 +66,7 @@ InvenTree is designed to be **extensible**, and provides multiple options for **
     <li><a href="https://www.djangoproject.com/">Django</a></li>
     <li><a href="https://www.django-rest-framework.org/">DRF</a></li>
     <li><a href="https://django-q.readthedocs.io/">Django Q</a></li>
-    <li><a href="https://docs.allauth.org/">Django-Allauth</a></li>
+    <li><a href="https://django-allauth.readthedocs.io/">Django-Allauth</a></li>
   </ul>
 </details>
 

codecov.yml

@@ -3,7 +3,6 @@ coverage:
     project:
       default:
         target: 82%
-    patch: off
 
 github_checks:
     annotations: true

contrib/container/.env

@@ -28,7 +28,6 @@ INVENTREE_DB_PASSWORD=pgpassword
 # Un-comment the following lines to enable Redis cache
 # Note that you will also have to run docker-compose with the --profile redis command
 # Refer to settings.py for other cache options
-#INVENTREE_CACHE_ENABLED=True
 #INVENTREE_CACHE_HOST=inventree-cache
 #INVENTREE_CACHE_PORT=6379
 

contrib/container/Dockerfile

@@ -68,9 +68,8 @@ RUN apk add --no-cache \
     # MySQL / MariaDB client
     mariadb-client mariadb-connector-c \
     && \
-    # font support
-    apk --update --upgrade --no-cache add fontconfig ttf-freefont font-terminus font-noto font-noto-cjk font-noto-extra \
-    && fc-cache -f
+    # fonts
+    apk --update --upgrade --no-cache add fontconfig ttf-freefont font-noto terminus-font && fc-cache -f
 
 EXPOSE 8000
 

contrib/container/dev-docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 # Docker compose recipe for InvenTree development server
 # - Runs PostgreSQL as the database backend
 # - Uses built-in django webserver

contrib/container/docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 # Docker compose recipe for a production-ready InvenTree setup, with the following containers:
 # - PostgreSQL as the database backend
 # - gunicorn as the InvenTree web server
@@ -51,9 +53,14 @@ services:
         restart: unless-stopped
 
     # redis acts as database cache manager
+    # only runs under the "redis" profile : https://docs.docker.com/compose/profiles/
     inventree-cache:
         image: redis:7.0
         container_name: inventree-cache
+        depends_on:
+            - inventree-db
+        profiles:
+            - redis
         env_file:
             - .env
         expose:

contrib/container/install_build_packages.sh

@@ -1,7 +1,7 @@
 #!/bin/ash
 
 # Install system packages required for building InvenTree python libraries
-# Note that for postgreslql, we use the version 13, which matches the version used in the InvenTree docker image
+# Note that for postgreslql, we use the 13 version, which matches the version used in the InvenTree docker image
 
 apk add gcc g++ musl-dev openssl-dev libffi-dev cargo python3-dev openldap-dev \
     libstdc++ build-base linux-headers py3-grpcio \

contrib/container/requirements.txt

@@ -4,22 +4,19 @@ asgiref==3.8.1 \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
     # via django
-django==4.2.15 \
-    --hash=sha256:61ee4a130efb8c451ef3467c67ca99fdce400fedd768634efc86a68c18d80d30 \
-    --hash=sha256:c77f926b81129493961e19c0e02188f8d07c112a1162df69bfab178ae447f94a
+django==4.2.14 \
+    --hash=sha256:3ec32bc2c616ab02834b9cac93143a7dc1cdcd5b822d78ac95fc20a38c534240 \
+    --hash=sha256:fc6919875a6226c7ffcae1a7d51e0f2ceaf6f160393180818f6c95f51b1e7b96
     # via django-auth-ldap
 django-auth-ldap==4.8.0 \
     --hash=sha256:4b4b944f3c28bce362f33fb6e8db68429ed8fd8f12f0c0c4b1a4344a7ef225ce \
     --hash=sha256:604250938ddc9fda619f247c7a59b0b2f06e53a7d3f46a156f28aa30dd71a738
-    # via -r contrib/container/requirements.in
 gunicorn==22.0.0 \
     --hash=sha256:350679f91b24062c86e386e198a15438d53a7a8207235a78ba1b53df4c4378d9 \
     --hash=sha256:4a0b436239ff76fb33f11c07a16482c521a7e09c1ce3cc293c2330afe01bec63
-    # via -r contrib/container/requirements.in
 invoke==2.2.0 \
     --hash=sha256:6ea924cc53d4f78e3d98bc436b08069a03077e6f85ad1ddaa8a116d7dad15820 \
     --hash=sha256:ee6cbb101af1a859c7fe84f2a264c059020b0cb7fe3535f9424300ab568f6bd5
-    # via -r contrib/container/requirements.in
 mariadb==1.1.10 \
     --hash=sha256:03d6284ef713d1cad40146576a4cc2d6cbc1662060f2a0e59b174e1694521698 \
     --hash=sha256:1ce87971c02375236ff8933e6c593c748e7b2f2950b86eabfab4289fd250ea63 \
@@ -32,7 +29,6 @@ mariadb==1.1.10 \
     --hash=sha256:a332893e3ef7ceb7970ab4bd7c844bcb4bd68a051ca51313566f9808d7411f2d \
     --hash=sha256:d7b09ec4abd02ed235257feb769f90cd4066e8f536b55b92f5166103d5b66a63 \
     --hash=sha256:dff8b28ce4044574870d7bdd2d9f9f5da8e5f95a7ff6d226185db733060d1a93
-    # via -r contrib/container/requirements.in
 mysqlclient==2.2.4 \
     --hash=sha256:329e4eec086a2336fe3541f1ce095d87a6f169d1cc8ba7b04ac68bcb234c9711 \
     --hash=sha256:33bc9fb3464e7d7c10b1eaf7336c5ff8f2a3d3b88bab432116ad2490beb3bf41 \
@@ -43,7 +39,6 @@ mysqlclient==2.2.4 \
     --hash=sha256:ac44777eab0a66c14cb0d38965572f762e193ec2e5c0723bcd11319cc5b693c5 \
     --hash=sha256:d43987bb9626096a302ca6ddcdd81feaeca65ced1d5fe892a6a66b808326aa54 \
     --hash=sha256:e1ebe3f41d152d7cb7c265349fdb7f1eca86ccb0ca24a90036cde48e00ceb2ab
-    # via -r contrib/container/requirements.in
 packaging==24.0 \
     --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
     --hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
@@ -53,7 +48,6 @@ packaging==24.0 \
 psycopg[binary, pool]==3.1.18 \
     --hash=sha256:31144d3fb4c17d78094d9e579826f047d4af1da6a10427d91dfcfb6ecdf6f12b \
     --hash=sha256:4d5a0a5a8590906daa58ebd5f3cfc34091377354a1acced269dd10faf55da60e
-    # via -r contrib/container/requirements.in
 psycopg-binary==3.1.18 \
     --hash=sha256:02bd4da45d5ee9941432e2e9bf36fa71a3ac21c6536fe7366d1bd3dd70d6b1e7 \
     --hash=sha256:0f68ac2364a50d4cf9bb803b4341e83678668f1881a253e1224574921c69868c \
@@ -137,9 +131,7 @@ pyasn1-modules==0.4.0 \
     # via python-ldap
 python-ldap==3.4.4 \
     --hash=sha256:7edb0accec4e037797705f3a05cbf36a9fde50d08c8f67f2aef99a2628fab828
-    # via
-    #   -r contrib/container/requirements.in
-    #   django-auth-ldap
+    # via django-auth-ldap
 pyyaml==6.0.1 \
     --hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \
     --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \
@@ -192,11 +184,9 @@ pyyaml==6.0.1 \
     --hash=sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585 \
     --hash=sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d \
     --hash=sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f
-    # via -r contrib/container/requirements.in
-setuptools==70.3.0 \
-    --hash=sha256:f171bab1dfbc86b132997f26a119f6056a57950d058587841a0082e8830f9dc5 \
-    --hash=sha256:fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc
-    # via -r contrib/container/requirements.in
+setuptools==69.5.1 \
+    --hash=sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987 \
+    --hash=sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32
 sqlparse==0.5.0 \
     --hash=sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93 \
     --hash=sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663
@@ -225,8 +215,6 @@ uv==0.1.38 \
     --hash=sha256:b0b15e51a0f8240969bc412ed0dd60cfe3f664b30173139ef263d71c596d631f \
     --hash=sha256:ea44c07605d1359a7d82bf42706dd86d341f15f4ca2e1f36e51626a7111c2ad5 \
     --hash=sha256:f87c9711493c53d32012a96b49c4d53aabdf7ed666cbf2c3fb55dd402a6b31a8
-    # via -r contrib/container/requirements.in
 wheel==0.43.0 \
     --hash=sha256:465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85 \
     --hash=sha256:55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81
-    # via -r contrib/container/requirements.in

contrib/dev_reqs/requirements.in

@@ -1,4 +1,4 @@
 # Packages needed for CI/packages
-requests==2.32.3
+requests==2.31.0
 pyyaml==6.0.1
-jc==1.25.3
+jc==1.25.2

contrib/dev_reqs/requirements.txt

@@ -1,8 +1,8 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile contrib/dev_reqs/requirements.in -o contrib/dev_reqs/requirements.txt --no-strip-extras --generate-hashes
-certifi==2024.7.4 \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+#    uv pip compile contrib/dev_reqs/requirements.in -o contrib/dev_reqs/requirements.txt --python-version=3.9 --no-strip-extras --generate-hashes
+certifi==2024.2.2 \
+    --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \
+    --hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1
     # via requests
 charset-normalizer==3.3.2 \
     --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
@@ -100,10 +100,9 @@ idna==3.7 \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
     # via requests
-jc==1.25.3 \
-    --hash=sha256:ea17a8578497f2da92f73924d9d403f4563ba59422fbceff7bb4a16cdf84a54f \
-    --hash=sha256:fa3140ceda6cba1210d1362f363cd79a0514741e8a1dd6167db2b2e2d5f24f7b
-    # via -r contrib/dev_reqs/requirements.in
+jc==1.25.2 \
+    --hash=sha256:26e412a65a478f9da3097653db6277f915cfae5c0f0a3f42026b405936abd358 \
+    --hash=sha256:97ada193495f79550f06fe0cbfb119ff470bcca57c1cc593a5cdb0008720e0b3
 pygments==2.17.2 \
     --hash=sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c \
     --hash=sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367
@@ -160,11 +159,9 @@ pyyaml==6.0.1 \
     --hash=sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585 \
     --hash=sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d \
     --hash=sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f
-    # via -r contrib/dev_reqs/requirements.in
-requests==2.32.3 \
-    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
-    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
-    # via -r contrib/dev_reqs/requirements.in
+requests==2.31.0 \
+    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
+    --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
 ruamel-yaml==0.18.6 \
     --hash=sha256:57b53ba33def16c4f3d807c0ccbc00f8a6081827e81ba2491691b76882d0c636 \
     --hash=sha256:8b27e6a217e786c6fbe5634d8f3f11bc63e0f80f6a5890f28863d9c45aac311b
@@ -221,9 +218,9 @@ ruamel-yaml-clib==0.2.8 \
     --hash=sha256:f481f16baec5290e45aebdc2a5168ebc6d35189ae6fea7a58787613a25f6e875 \
     --hash=sha256:fff3573c2db359f091e1589c3d7c5fc2f86f5bdb6f24252c2d8e539d4e45f412
     # via ruamel-yaml
-urllib3==2.2.2 \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.1 \
+    --hash=sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d \
+    --hash=sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19
     # via requests
 xmltodict==0.13.0 \
     --hash=sha256:341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56 \

contrib/packager.io/before.sh

@@ -6,6 +6,7 @@
 set -eu
 
 # The sha is the second element in APP_PKG_ITERATION
+REPO="inventree/InvenTree"
 VERSION="$APP_PKG_VERSION-$APP_PKG_ITERATION"
 SHA=$(echo $APP_PKG_ITERATION | cut -d'.' -f2)
 
@@ -14,17 +15,17 @@ echo "INFO collection | Getting info from github for commit $SHA"
 curl -L -s -f \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/$APP_REPO/commits/$SHA > commit.json
+  https://api.github.com/repos/$REPO/commits/$SHA > commit.json
 echo "INFO collection | Got commit.json with size $(wc -c commit.json)"
 curl -L -s -f \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/$APP_REPO/commits/$SHA/branches-where-head > branches.json
+  https://api.github.com/repos/$REPO/commits/$SHA/branches-where-head > branches.json
 echo "INFO collection | Got branches.json with size $(wc -c branches.json)"
 curl -L -s -f \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/$APP_REPO/commits/$APP_PKG_VERSION > tag.json
+  https://api.github.com/repos/$REPO/commits/$APP_PKG_VERSION > tag.json
 echo "INFO collection | Got tag.json with size $(wc -c tag.json)"
 
 # Extract info
@@ -59,7 +60,7 @@ if [ "$TAG_SHA" != "$FULL_SHA" ]; then
   echo "INFO frontend | Tag sha '$TAG_SHA' is not the same as commit sha $FULL_SHA, can not download frontend"
 else
   echo "INFO frontend | Getting frontend from github via tag"
-  curl https://github.com/$APP_REPO/releases/download/$APP_PKG_VERSION/frontend-build.zip -L -O -f
+  curl https://github.com/$REPO/releases/download/$APP_PKG_VERSION/frontend-build.zip -L -O -f
   mkdir -p src/backend/InvenTree/web/static
   echo "INFO frontend | Unzipping frontend"
   unzip -qq frontend-build.zip -d src/backend/InvenTree/web/static/web

contrib/packager.io/functions.sh

@@ -4,8 +4,6 @@
 #
 Color_Off='\033[0m'
 On_Red='\033[41m'
-PYTHON_FROM=9
-PYTHON_TO=12
 
 function detect_docker() {
   if [ -n "$(grep docker </proc/1/cgroup)" ]; then
@@ -13,7 +11,6 @@ function detect_docker() {
   else
     DOCKER="no"
   fi
-  echo "# POI04| Running in docker: ${DOCKER}"
 }
 
 function detect_initcmd() {
@@ -31,7 +28,6 @@ function detect_initcmd() {
   if [ "${DOCKER}" == "yes" ]; then
     INIT_CMD="initctl"
   fi
-  echo "# POI05| Using init command: ${INIT_CMD}"
 }
 
 function detect_ip() {
@@ -39,52 +35,37 @@ function detect_ip() {
 
   if [ "${SETUP_NO_CALLS}" == "true" ]; then
     # Use local IP address
-    echo "# POI06| Getting the IP address of the first local IP address"
+    echo "# Getting the IP address of the first local IP address"
     export INVENTREE_IP=$(hostname -I | awk '{print $1}')
   else
     # Use web service to get the IP address
-    echo "# POI06| Getting the IP address of the server via web service"
+    echo "# Getting the IP address of the server via web service"
     export INVENTREE_IP=$(curl -s https://checkip.amazonaws.com)
   fi
 
-  echo "# POI06| IP address is ${INVENTREE_IP}"
+  echo "IP address is ${INVENTREE_IP}"
 }
 
 function detect_python() {
   # Detect if there is already a python version installed in /opt/inventree/env/lib
   if test -f "${APP_HOME}/env/bin/python"; then
-    echo "# POI07| Python environment already present"
+    echo "# Python environment already present"
     # Extract earliest python version initialised from /opt/inventree/env/lib
     SETUP_PYTHON=$(ls -1 ${APP_HOME}/env/bin/python* | sort | head -n 1)
-    echo "# POI07| Found earlier used version: ${SETUP_PYTHON}"
+    echo "# Found earlier used version: ${SETUP_PYTHON}"
   else
-    echo "# POI07| No python environment found - using environment variable: ${SETUP_PYTHON}"
-  fi
-
-  # Try to detect a python between 3.9 and 3.12 in reverse order
-  if [ -z "$(which ${SETUP_PYTHON})" ]; then
-    echo "# POI07| Trying to detecting python3.${PYTHON_FROM} to python3.${PYTHON_TO} - using newest version"
-    for i in $(seq $PYTHON_TO -1 $PYTHON_FROM); do
-      echo "# POI07| Checking for python3.${i}"
-      if [ -n "$(which python3.${i})" ]; then
-        SETUP_PYTHON="python3.${i}"
-        echo "# POI07| Found python3.${i} installed - using for setup ${SETUP_PYTHON}"
-        break
-      fi
-    done
+    echo "# No python environment found - using environment variable: ${SETUP_PYTHON}"
   fi
 
   # Ensure python can be executed - abort if not
   if [ -z "$(which ${SETUP_PYTHON})" ]; then
     echo "${On_Red}"
-    echo "# POI07| Python ${SETUP_PYTHON} not found - aborting!"
-    echo "# POI07| Please ensure python can be executed with the command '$SETUP_PYTHON' by the current user '$USER'."
-    echo "# POI07| If you are using a different python version, please set the environment variable SETUP_PYTHON to the correct command - eg. 'python3.10'."
+    echo "# Python ${SETUP_PYTHON} not found - aborting!"
+    echo "# Please ensure python can be executed with the command '$SETUP_PYTHON' by the current user '$USER'."
+    echo "# If you are using a different python version, please set the environment variable SETUP_PYTHON to the correct command - eg. 'python3.10'."
     echo "${Color_Off}"
     exit 1
   fi
-
-  echo "# POI07| Using python command: ${SETUP_PYTHON}"
 }
 
 function get_env() {
@@ -99,7 +80,7 @@ function get_env() {
   done
 
   if [ -n "${SETUP_DEBUG}" ]; then
-    echo "# POI02| Done getting env $envname: ${!envname}"
+    echo "Done getting env $envname: ${!envname}"
   fi
 }
 
@@ -107,7 +88,7 @@ function detect_local_env() {
   # Get all possible envs for the install
 
   if [ -n "${SETUP_DEBUG}" ]; then
-    echo "# POI02| Printing local envs - before #++#"
+    echo "# Printing local envs - before #++#"
     printenv
   fi
 
@@ -117,7 +98,7 @@ function detect_local_env() {
   done
 
   if [ -n "${SETUP_DEBUG}" ]; then
-    echo "# POI02| Printing local envs - after #++#"
+    echo "# Printing local envs - after #++#"
     printenv
   fi
 }
@@ -125,40 +106,38 @@ function detect_local_env() {
 function detect_envs() {
   # Detect all envs that should be passed to setup commands
 
-  echo "# POI03| Setting base environment variables"
+  echo "# Setting base environment variables"
 
   export INVENTREE_CONFIG_FILE=${INVENTREE_CONFIG_FILE:-${CONF_DIR}/config.yaml}
 
   if test -f "${INVENTREE_CONFIG_FILE}"; then
-    echo "# POI03| Using existing config file: ${INVENTREE_CONFIG_FILE}"
+    echo "# Using existing config file: ${INVENTREE_CONFIG_FILE}"
 
     # Install parser
-    echo "# POI03| Installing requirements"
     pip install --require-hashes -r ${APP_HOME}/contrib/dev_reqs/requirements.txt -q
-    echo "# POI03| Installed requirements"
 
     # Load config
-    export INVENTREE_CONF_DATA=$(cat ${INVENTREE_CONFIG_FILE} | jc --yaml)
+    local CONF=$(cat ${INVENTREE_CONFIG_FILE} | jc --yaml)
 
     # Parse the config file
-    export INVENTREE_MEDIA_ROOT=$(jq -r '.[].media_root' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_STATIC_ROOT=$(jq -r '.[].static_root' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_BACKUP_DIR=$(jq -r '.[].backup_dir' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_PLUGINS_ENABLED=$(jq -r '.[].plugins_enabled' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_PLUGIN_FILE=$(jq -r '.[].plugin_file' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_SECRET_KEY_FILE=$(jq -r '.[].secret_key_file' <<< ${INVENTREE_CONF_DATA})
+    export INVENTREE_MEDIA_ROOT=$(jq -r '.[].media_root' <<< ${CONF})
+    export INVENTREE_STATIC_ROOT=$(jq -r '.[].static_root' <<< ${CONF})
+    export INVENTREE_BACKUP_DIR=$(jq -r '.[].backup_dir' <<< ${CONF})
+    export INVENTREE_PLUGINS_ENABLED=$(jq -r '.[].plugins_enabled' <<< ${CONF})
+    export INVENTREE_PLUGIN_FILE=$(jq -r '.[].plugin_file' <<< ${CONF})
+    export INVENTREE_SECRET_KEY_FILE=$(jq -r '.[].secret_key_file' <<< ${CONF})
 
-    export INVENTREE_DB_ENGINE=$(jq -r '.[].database.ENGINE' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_DB_NAME=$(jq -r '.[].database.NAME' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_DB_USER=$(jq -r '.[].database.USER' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_DB_PASSWORD=$(jq -r '.[].database.PASSWORD' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_DB_HOST=$(jq -r '.[].database.HOST' <<< ${INVENTREE_CONF_DATA})
-    export INVENTREE_DB_PORT=$(jq -r '.[].database.PORT' <<< ${INVENTREE_CONF_DATA})
+    export INVENTREE_DB_ENGINE=$(jq -r '.[].database.ENGINE' <<< ${CONF})
+    export INVENTREE_DB_NAME=$(jq -r '.[].database.NAME' <<< ${CONF})
+    export INVENTREE_DB_USER=$(jq -r '.[].database.USER' <<< ${CONF})
+    export INVENTREE_DB_PASSWORD=$(jq -r '.[].database.PASSWORD' <<< ${CONF})
+    export INVENTREE_DB_HOST=$(jq -r '.[].database.HOST' <<< ${CONF})
+    export INVENTREE_DB_PORT=$(jq -r '.[].database.PORT' <<< ${CONF})
   else
-    echo "# POI03| No config file found: ${INVENTREE_CONFIG_FILE}, using envs or defaults"
+    echo "# No config file found: ${INVENTREE_CONFIG_FILE}, using envs or defaults"
 
     if [ -n "${SETUP_DEBUG}" ]; then
-      echo "# POI03| Print current envs"
+      echo "# Print current envs"
       printenv | grep INVENTREE_
       printenv | grep SETUP_
     fi
@@ -181,43 +160,43 @@ function detect_envs() {
   fi
 
   # For debugging pass out the envs
-  echo "# POI03| Collected environment variables:"
-  echo "# POI03|    INVENTREE_MEDIA_ROOT=${INVENTREE_MEDIA_ROOT}"
-  echo "# POI03|    INVENTREE_STATIC_ROOT=${INVENTREE_STATIC_ROOT}"
-  echo "# POI03|    INVENTREE_BACKUP_DIR=${INVENTREE_BACKUP_DIR}"
-  echo "# POI03|    INVENTREE_PLUGINS_ENABLED=${INVENTREE_PLUGINS_ENABLED}"
-  echo "# POI03|    INVENTREE_PLUGIN_FILE=${INVENTREE_PLUGIN_FILE}"
-  echo "# POI03|    INVENTREE_SECRET_KEY_FILE=${INVENTREE_SECRET_KEY_FILE}"
-  echo "# POI03|    INVENTREE_DB_ENGINE=${INVENTREE_DB_ENGINE}"
-  echo "# POI03|    INVENTREE_DB_NAME=${INVENTREE_DB_NAME}"
-  echo "# POI03|    INVENTREE_DB_USER=${INVENTREE_DB_USER}"
+  echo "# Collected environment variables:"
+  echo "#    INVENTREE_MEDIA_ROOT=${INVENTREE_MEDIA_ROOT}"
+  echo "#    INVENTREE_STATIC_ROOT=${INVENTREE_STATIC_ROOT}"
+  echo "#    INVENTREE_BACKUP_DIR=${INVENTREE_BACKUP_DIR}"
+  echo "#    INVENTREE_PLUGINS_ENABLED=${INVENTREE_PLUGINS_ENABLED}"
+  echo "#    INVENTREE_PLUGIN_FILE=${INVENTREE_PLUGIN_FILE}"
+  echo "#    INVENTREE_SECRET_KEY_FILE=${INVENTREE_SECRET_KEY_FILE}"
+  echo "#    INVENTREE_DB_ENGINE=${INVENTREE_DB_ENGINE}"
+  echo "#    INVENTREE_DB_NAME=${INVENTREE_DB_NAME}"
+  echo "#    INVENTREE_DB_USER=${INVENTREE_DB_USER}"
   if [ -n "${SETUP_DEBUG}" ]; then
-    echo "# POI03|    INVENTREE_DB_PASSWORD=${INVENTREE_DB_PASSWORD}"
+    echo "#    INVENTREE_DB_PASSWORD=${INVENTREE_DB_PASSWORD}"
   fi
-  echo "# POI03|    INVENTREE_DB_HOST=${INVENTREE_DB_HOST}"
-  echo "# POI03|    INVENTREE_DB_PORT=${INVENTREE_DB_PORT}"
+  echo "#    INVENTREE_DB_HOST=${INVENTREE_DB_HOST}"
+  echo "#    INVENTREE_DB_PORT=${INVENTREE_DB_PORT}"
 }
 
 function create_initscripts() {
 
   # Make sure python env exists
   if test -f "${APP_HOME}/env"; then
-    echo "# POI09| python environment already present - skipping"
+    echo "# python environment already present - skipping"
   else
-    echo "# POI09| Setting up python environment"
+    echo "# Setting up python environment"
     sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && ${SETUP_PYTHON} -m venv env"
     sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && env/bin/pip install invoke wheel"
 
     # Check INSTALLER_EXTRA exists and load it
     if test -f "${APP_HOME}/INSTALLER_EXTRA"; then
-      echo "# POI09| Loading extra packages from INSTALLER_EXTRA"
+      echo "# Loading extra packages from INSTALLER_EXTRA"
       source ${APP_HOME}/INSTALLER_EXTRA
     fi
 
     if [ -n "${SETUP_EXTRA_PIP}" ]; then
-      echo "# POI09| Installing extra pip packages"
+      echo "# Installing extra pip packages"
       if [ -n "${SETUP_DEBUG}" ]; then
-        echo "# POI09| Extra pip packages: ${SETUP_EXTRA_PIP}"
+        echo "# Extra pip packages: ${SETUP_EXTRA_PIP}"
       fi
       sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && env/bin/pip install ${SETUP_EXTRA_PIP}"
       # Write extra packages to INSTALLER_EXTRA
@@ -227,45 +206,37 @@ function create_initscripts() {
 
   # Unlink default config if it exists
   if test -f "/etc/nginx/sites-enabled/default"; then
-    echo "# POI09| Unlinking default nginx config\n# POI09| Old file still in /etc/nginx/sites-available/default"
+    echo "# Unlinking default nginx config\n# Old file still in /etc/nginx/sites-available/default"
     sudo unlink /etc/nginx/sites-enabled/default
-    echo "# POI09| Unlinked default nginx config"
   fi
 
   # Create InvenTree specific nginx config
-  echo "# POI09| Stopping nginx"
+  echo "# Stopping nginx"
   ${INIT_CMD} stop nginx
-  echo "# POI09| Stopped nginx"
-  echo "# POI09| Setting up nginx to ${SETUP_NGINX_FILE}"
+  echo "# Setting up nginx to ${SETUP_NGINX_FILE}"
   # Always use the latest nginx config; important if new headers are added / needed for security
   cp ${APP_HOME}/contrib/packager.io/nginx.prod.conf ${SETUP_NGINX_FILE}
   sed -i s/inventree-server:8000/localhost:6000/g ${SETUP_NGINX_FILE}
   sed -i s=var/www=opt/inventree/data=g ${SETUP_NGINX_FILE}
   # Start nginx
-  echo "# POI09| Starting nginx"
+  echo "# Starting nginx"
   ${INIT_CMD} start nginx
-  echo "# POI09| Started nginx"
 
-  echo "# POI09| (Re)creating init scripts"
+  echo "# (Re)creating init scripts"
   # This resets scale parameters to a known state
   inventree scale web="1" worker="1"
 
-  echo "# POI09| Enabling InvenTree on boot"
+  echo "# Enabling InvenTree on boot"
   ${INIT_CMD} enable inventree
-  echo "# POI09| Enabled InvenTree on boot"
 }
 
 function create_admin() {
-  # Create data for admin users - stop with setting SETUP_ADMIN_NOCREATION to true
-  if [ "${SETUP_ADMIN_NOCREATION}" == "true" ]; then
-    echo "# POI10| Admin creation is disabled - skipping"
-    return
-  fi
+  # Create data for admin user
 
   if test -f "${SETUP_ADMIN_PASSWORD_FILE}"; then
-    echo "# POI10| Admin data already exists - skipping"
+    echo "# Admin data already exists - skipping"
   else
-    echo "# POI10| Creating admin user data"
+    echo "# Creating admin user data"
 
     # Static admin data
     export INVENTREE_ADMIN_USER=${INVENTREE_ADMIN_USER:-admin}
@@ -280,15 +251,13 @@ function create_admin() {
 }
 
 function start_inventree() {
-  echo "# POI15| Starting InvenTree"
+  echo "# Starting InvenTree"
   ${INIT_CMD} start inventree
-  echo "# POI15| Started InvenTree"
 }
 
 function stop_inventree() {
-  echo "# POI11| Stopping InvenTree"
+  echo "# Stopping InvenTree"
   ${INIT_CMD} stop inventree
-  echo "# POI11| Stopped InvenTree"
 }
 
 function update_or_install() {
@@ -297,23 +266,23 @@ function update_or_install() {
   chown ${APP_USER}:${APP_GROUP} ${APP_HOME} -R
 
   # Run update as app user
-  echo "# POI12| Updating InvenTree"
-  sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && pip install uv wheel"
-  sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && invoke update --uv | sed -e 's/^/# POI12| u | /;'"
+  echo "# Updating InvenTree"
+  sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && pip install wheel"
+  sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && invoke update | sed -e 's/^/# inv update| /;'"
 
   # Make sure permissions are correct again
-  echo "# POI12| Set permissions for data dir and media: ${DATA_DIR}"
+  echo "# Set permissions for data dir and media: ${DATA_DIR}"
   chown ${APP_USER}:${APP_GROUP} ${DATA_DIR} -R
   chown ${APP_USER}:${APP_GROUP} ${CONF_DIR} -R
 }
 
 function set_env() {
-  echo "# POI13| Setting up InvenTree config values"
+  echo "# Setting up InvenTree config values"
 
   inventree config:set INVENTREE_CONFIG_FILE=${INVENTREE_CONFIG_FILE}
 
   # Changing the config file
-  echo "# POI13| Writing the settings to the config file ${INVENTREE_CONFIG_FILE}"
+  echo "# Writing the settings to the config file ${INVENTREE_CONFIG_FILE}"
   # Media Root
   sed -i s=#media_root:\ \'/home/inventree/data/media\'=media_root:\ \'${INVENTREE_MEDIA_ROOT}\'=g ${INVENTREE_CONFIG_FILE}
   # Static Root
@@ -330,42 +299,37 @@ function set_env() {
   sed -i s=debug:\ True=debug:\ False=g ${INVENTREE_CONFIG_FILE}
 
   # Database engine
-  sed -i s=#\ ENGINE:\ Database\ engine.\ Selection\ from:=ENGINE:\ ${INVENTREE_DB_ENGINE}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#ENGINE:\ sampleengine=ENGINE:\ ${INVENTREE_DB_ENGINE}=g ${INVENTREE_CONFIG_FILE}
   # Database name
-  sed -i s=#\ NAME:\ Database\ name=NAME:\ \'${INVENTREE_DB_NAME}\'=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#NAME:\ \'/path/to/database\'=NAME:\ \'${INVENTREE_DB_NAME}\'=g ${INVENTREE_CONFIG_FILE}
   # Database user
-  sed -i s=#\ USER:\ Database\ username\ \(if\ required\)=USER:\ ${INVENTREE_DB_USER}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#USER:\ sampleuser=USER:\ ${INVENTREE_DB_USER}=g ${INVENTREE_CONFIG_FILE}
   # Database password
-  sed -i s=#\ PASSWORD:\ Database\ password\ \(if\ required\)=PASSWORD:\ ${INVENTREE_DB_PASSWORD}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#PASSWORD:\ samplepassword=PASSWORD:\ ${INVENTREE_DB_PASSWORD}=g ${INVENTREE_CONFIG_FILE}
   # Database host
-  sed -i s=#\ HOST:\ Database\ host\ address\ \(if\ required\)=HOST:\ ${INVENTREE_DB_HOST}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#HOST:\ samplehost=HOST:\ ${INVENTREE_DB_HOST}=g ${INVENTREE_CONFIG_FILE}
   # Database port
-  sed -i s=#\ PORT:\ Database\ host\ port\ \(if\ required\)=PORT:\ ${INVENTREE_DB_PORT}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#PORT:\ 123456=PORT:\ ${INVENTREE_DB_PORT}=g ${INVENTREE_CONFIG_FILE}
 
   # Fixing the permissions
   chown ${APP_USER}:${APP_GROUP} ${DATA_DIR} ${INVENTREE_CONFIG_FILE}
-
-  echo "# POI13| Done setting up InvenTree config values"
 }
 
 function set_site() {
   # Ensure IP is known
   if [ -z "${INVENTREE_IP}" ]; then
-    echo "# POI14| No IP address found - skipping"
+    echo "# No IP address found - skipping"
     return
   fi
 
   # Check if INVENTREE_SITE_URL in inventree config
   if [ -z "$(inventree config:get INVENTREE_SITE_URL)" ]; then
-    echo "# POI14| Setting up InvenTree site URL"
+    echo "# Setting up InvenTree site URL"
     inventree config:set INVENTREE_SITE_URL=http://${INVENTREE_IP}
-  else
-    echo "# POI14| Site URL already set - skipping"
   fi
 }
 
 function final_message() {
-  echo "# POI16| Printing Final message"
   echo -e "####################################################################################"
   echo -e "This InvenTree install uses nginx, the settings for the webserver can be found in"
   echo -e "${SETUP_NGINX_FILE}"
@@ -376,46 +340,3 @@ function final_message() {
   echo -e "   Password: ${INVENTREE_ADMIN_PASSWORD}"
   echo -e "####################################################################################"
 }
-
-
-function update_checks() {
-  echo "# POI08| Running upgrade"
-  local old_version=$1
-  local old_version_rev=$(echo ${old_version} | cut -d'-' -f1 | cut -d'.' -f2)
-  local new_version=$(dpkg-query --show --showformat='${Version}' inventree)
-  local new_version_rev=$(echo ${new_version} | cut -d'-' -f1 | cut -d'.' -f2)
-  echo "# POI08| Old version is: ${old_version} | ${old_version_rev} - updating to ${new_version} | ${old_version_rev}"
-
-  local ABORT=false
-  function check_config_value() {
-    local env_key=$1
-    local config_key=$2
-    local name=$3
-
-    local value=$(inventree config:get ${env_key})
-    if [ -z "${value}" ] || [ "$value" == "null" ]; then
-      value=$(jq -r ".[].${config_key}" <<< ${INVENTREE_CONF_DATA})
-    fi
-    if [ -z "${value}" ] || [ "$value" == "null" ]; then
-      echo "# POI08| No setting for ${name} found - please set it manually either in ${INVENTREE_CONFIG_FILE} under '${config_key}' or with 'inventree config:set ${env_key}=value'"
-      ABORT=true
-    else
-      echo "# POI08| Found setting for ${name} - ${value}"
-    fi
-  }
-
-  # Custom checks if old version is below 0.8.0
-  if [ "${old_version_rev}" -lt "9" ]; then
-    echo "# POI08| Old version is below 0.9.0 - You might be missing some configs"
-
-    # Check for BACKUP_DIR and SITE_URL in INVENTREE_CONF_DATA and config
-    check_config_value "INVENTREE_SITE_URL" "site_url" "site URL"
-    check_config_value "INVENTREE_BACKUP_DIR" "backup_dir" "backup dir"
-
-    if [ "${ABORT}" = true ]; then
-      echo "# POI08| Aborting - please set the missing values and run the update again"
-      exit 1
-    fi
-    echo "# POI08| All checks passed - continuing with the update"
-  fi
-}

contrib/packager.io/postinstall.sh

@@ -3,18 +3,15 @@
 # packager.io postinstall script
 #
 
-echo "# POI01| Running postinstall script - start - $(date)"
 exec > >(tee ${APP_HOME}/log/setup_$(date +"%F_%H_%M_%S").log) 2>&1
 
 PATH=${APP_HOME}/env/bin:${APP_HOME}/:/sbin:/bin:/usr/sbin:/usr/bin:
 
 # import functions
-echo "# POI01| Importing functions"
 . ${APP_HOME}/contrib/packager.io/functions.sh
-echo "# POI01| Functions imported"
 
 # Envs that should be passed to setup commands
-export SETUP_ENVS=PATH,APP_HOME,INVENTREE_MEDIA_ROOT,INVENTREE_STATIC_ROOT,INVENTREE_BACKUP_DIR,INVENTREE_SITE_URL,INVENTREE_PLUGINS_ENABLED,INVENTREE_PLUGIN_FILE,INVENTREE_CONFIG_FILE,INVENTREE_SECRET_KEY_FILE,INVENTREE_DB_ENGINE,INVENTREE_DB_NAME,INVENTREE_DB_USER,INVENTREE_DB_PASSWORD,INVENTREE_DB_HOST,INVENTREE_DB_PORT,INVENTREE_ADMIN_USER,INVENTREE_ADMIN_EMAIL,INVENTREE_ADMIN_PASSWORD,SETUP_NGINX_FILE,SETUP_ADMIN_PASSWORD_FILE,SETUP_NO_CALLS,SETUP_DEBUG,SETUP_EXTRA_PIP,SETUP_PYTHON,SETUP_ADMIN_NOCREATION
+export SETUP_ENVS=PATH,APP_HOME,INVENTREE_MEDIA_ROOT,INVENTREE_STATIC_ROOT,INVENTREE_BACKUP_DIR,INVENTREE_PLUGINS_ENABLED,INVENTREE_PLUGIN_FILE,INVENTREE_CONFIG_FILE,INVENTREE_SECRET_KEY_FILE,INVENTREE_DB_ENGINE,INVENTREE_DB_NAME,INVENTREE_DB_USER,INVENTREE_DB_PASSWORD,INVENTREE_DB_HOST,INVENTREE_DB_PORT,INVENTREE_ADMIN_USER,INVENTREE_ADMIN_EMAIL,INVENTREE_ADMIN_PASSWORD,SETUP_NGINX_FILE,SETUP_ADMIN_PASSWORD_FILE,SETUP_NO_CALLS,SETUP_DEBUG,SETUP_EXTRA_PIP,SETUP_PYTHON
 
 # Get the envs
 detect_local_env
@@ -27,7 +24,6 @@ export SETUP_NGINX_FILE=${SETUP_NGINX_FILE:-/etc/nginx/sites-enabled/inventree.c
 export SETUP_ADMIN_PASSWORD_FILE=${CONF_DIR}/admin_password.txt
 export SETUP_NO_CALLS=${SETUP_NO_CALLS:-false}
 export SETUP_PYTHON=${SETUP_PYTHON:-python3.9}
-export SETUP_ADMIN_NOCREATION=${SETUP_ADMIN_NOCREATION:-false}
 # SETUP_DEBUG can be set to get debug info
 # SETUP_EXTRA_PIP can be set to install extra pip packages
 # SETUP_PYTHON can be set to use a different python version
@@ -39,14 +35,6 @@ detect_initcmd
 detect_ip
 detect_python
 
-# Check if we are updating and need to alert
-echo "# POI08| Checking if update checks are needed"
-if [ -z "$2" ]; then
-  echo "# POI08| Normal install - no need for checks"
-else
-  update_checks $2
-fi
-
 # create processes
 create_initscripts
 create_admin
@@ -63,4 +51,3 @@ start_inventree
 
 # show info
 final_message
-echo "# POI17| Running postinstall script - done - $(date)"

contrib/packager.io/preinstall.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# packager.io preinstall/preremove script
-#
-echo "# PRI01| Running preinstall script - start - $(date)"
-PATH=${APP_HOME}/env/bin:${APP_HOME}/:/sbin:/bin:/usr/sbin:/usr/bin:
-
-# Envs that should be passed to setup commands
-export SETUP_ENVS=PATH,APP_HOME,INVENTREE_MEDIA_ROOT,INVENTREE_STATIC_ROOT,INVENTREE_BACKUP_DIR,INVENTREE_PLUGINS_ENABLED,INVENTREE_PLUGIN_FILE,INVENTREE_CONFIG_FILE,INVENTREE_SECRET_KEY_FILE,INVENTREE_DB_ENGINE,INVENTREE_DB_NAME,INVENTREE_DB_USER,INVENTREE_DB_PASSWORD,INVENTREE_DB_HOST,INVENTREE_DB_PORT,INVENTREE_ADMIN_USER,INVENTREE_ADMIN_EMAIL,INVENTREE_ADMIN_PASSWORD,SETUP_NGINX_FILE,SETUP_ADMIN_PASSWORD_FILE,SETUP_NO_CALLS,SETUP_DEBUG,SETUP_EXTRA_PIP,SETUP_PYTHON
-
-if test -f "${APP_HOME}/env/bin/pip"; then
-  # Check if clear-generated is available
-  if sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && invoke int.clear-generated --help" > /dev/null 2>&1; then
-    echo "# PRI02| Clearing precompiled files"
-    sudo -u ${APP_USER} --preserve-env=$SETUP_ENVS bash -c "cd ${APP_HOME} && invoke int.clear-generated"
-  else
-    echo "# PRI02| Clearing precompiled files - skipping"
-  fi
-else
-  echo "# PRI02| No python environment found - skipping"
-fi
-
-echo "# PRI03| Running preinstall script - done - $(date)"

docs/docs/barcodes/internal.md

@@ -4,11 +4,7 @@ title: Internal Barcodes
 
 ## Internal Barcodes
 
-InvenTree ships with two integrated internal formats for generating barcodes for various items which are available through the built-in InvenTree Barcode plugin. The used format can be selected through the plugin settings of the InvenTree Barcode plugin.
-
-### 1. JSON-based QR Codes
-
-This format uses a simple JSON-style string to uniquely identify an item in the database.
+InvenTree defines an internal format for generating barcodes for various items. This format uses a simple JSON-style string to uniquely identify an item in the database.
 
 Some simple examples of this format are shown below:
 
@@ -16,49 +12,10 @@ Some simple examples of this format are shown below:
 | --- | --- |
 | Part | `{% raw %}{"part": 10}{% endraw %}` |
 | Stock Item | `{% raw %}{"stockitem": 123}{% endraw %}` |
-| Stock Location | `{% raw %}{"stocklocation": 1}{% endraw %}` |
 | Supplier Part | `{% raw %}{"supplierpart": 99}{% endraw %}` |
 
 The numerical ID value used is the *Primary Key* (PK) of the particular object in the database.
 
-#### Downsides
-
-1. The JSON format includes binary only characters (`{% raw %}{{% endraw %}` and `{% raw %}"{% endraw %}`) which requires unnecessary use of the binary QR code encoding which means fewer amount of chars can be encoded with the same version of QR code.
-2. The model name key has not a fixed length. Some model names are longer than others. E.g. a part QR code with the shortest possible id requires 11 chars, while a stock location QR code with the same id would already require 20 chars, which already requires QR code version 2 and quickly version 3.
-
-!!! info "QR code versions"
-    There are 40 different qr code versions from 1-40. They all can encode more data than the previous version, but require more "squares". E.g. a V1 QR codes has 21x21 "squares" while a V2 already has 25x25. For more information see [QR code comparison](https://www.qrcode.com/en/about/version.html).
-
-For a more detailed size analysis of the JSON-based QR codes refer to [this issue](https://github.com/inventree/InvenTree/issues/6612).
-
-### 2. Short alphanumeric QR Codes
-
-While JSON-based QR Codes encode all necessary information, they come with the described downsides. This new, short, alphanumeric only format is build to improve those downsides. The basic format uses an alphanumeric string: `INV-??x`
-
-- `INV-` is a constant prefix. This is configurable in the InvenTree Barcode plugins settings per instance to support environments that use multiple instances.
-- `??` is a two character alphanumeric (`0-9A-Z  $%*+-./:` (45 chars)) code, individual to each model.
-- `x` the actual pk of the model.
-
-Now with an overhead of 6 chars for every model, this format supports the following amount of model instances using the described QR code modes:
-
-| QR code mode | Alphanumeric mode | Mixed mode |
-| --- | --- | --- |
-| v1 M ECL (15%) | `10**14` items (~3.170 items per sec for 1000 years) | `10**20` items (~3.170.979.198 items per sec for 1000 years) |
-| v1 Q ECL (25%) | `10**10` items (~0.317 items per sec for 1000 years) | `10**13` items (~317 items per sec for 1000 years) |
-| v1 H ECL (30%) | `10**4` items (~100 items per day for 100 days) | `10**3` items (~100 items per day for 10 days (*even worse*)) |
-
-!!! info "QR code mixed mode"
-    Normally the QR code data is encoded only in one format (binary, alphanumeric, numeric). But the data can also be split into multiple chunks using different formats. This is especially useful with long model ids, because the first 6 chars can be encoded using the alphanumeric mode and the id using the more efficient numeric mode. Mixed mode is used by default, because the `qrcode` template tag uses a default value for optimize of 1.
-
-Some simple examples of this format are shown below:
-
-| Model Type | Example Barcode |
-| --- | --- |
-| Part | `INV-PA10` |
-| Stock Item | `INV-SI123` |
-| Stock Location | `INV-SL1` |
-| Supplier Part | `INV-SP99` |
-
 ## Report Integration
 
 This barcode format can be used to generate 1D or 2D barcodes (e.g. for [labels and reports](../report/barcodes.md))

docs/docs/build/build.md

@@ -26,6 +26,14 @@ To navigate to the Build Order display, select *Build* from the main navigation
 {% include "img.html" %}
 {% endwith %}
 
+#### Tree View
+
+*Tree View* also provides a tabulated view of Build Orders. Orders are displayed in a hierarchical manner, showing any parent / child relationships between different build orders.
+
+{% with id="build_tree", url="build/build_tree.png", description="Build Tree" %}
+{% include "img.html" %}
+{% endwith %}
+
 #### Calendar View
 
 *Calendar View* shows a calendar display with upcoming build orders, based on the various dates specified for each build.
@@ -71,18 +79,6 @@ Each *Build Order* has an associated *Status* flag, which indicates the state of
 | `Cancelled` | Build has been cancelled |
 | `Completed` | Build has been completed |
 
-**Source Code**
-
-Refer to the source code for the Build Order status codes:
-
-::: build.status_codes.BuildStatus
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
-
 ### Stock Allocations
 
 When a *Build Order* is created, we then have the ability to *allocate* stock items against that build order. The particular parts we need to allocate against the build are specified by the BOM for the part we are assembling.
@@ -103,29 +99,41 @@ For further information, refer to the [stock allocation documentation](./allocat
 
 ## Build Order Display
 
-The detail view for a single build order provides multiple display panels, as follows:
+The detail view for a single build order provides multiple display tabs, as follows:
 
 ### Build Details
 
-The *Build Details* panel provides an overview of the Build Order:
+The *Build Details* tab provides an overview of the Build Order:
 
-{% with id="build_details", url="build/build_panel_details.png", description="Build details panel" %}
+{% with id="build_details", url="build/build_details.png", description="Details tab" %}
 {% include "img.html" %}
 {% endwith %}
 
-### Line Items
+### Allocate Stock
 
-The *Line Items* panel displays all the line items (as defined by the [bill of materials](./bom.md)) required to complete the build order.
+The *Allocate Stock* tab provides an interface to allocate required stock (as specified by the BOM) to the build:
 
-{% with id="build_allocate", url="build/build_panel_line_items.png", description="Build line items panel" %}
+{% with id="build_allocate", url="build/build_allocate.png", description="Allocation tab" %}
 {% include "img.html" %}
 {% endwith %}
 
-The allocation table (as shown above) provides an interface to allocate required stock, and also shows the stock allocation progress for each line item in the build.
+The allocation table (as shown above) shows the stock allocation progress for this build. In the example above, there are two BOM lines, which have been partially allocated.
 
-### Incomplete Outputs
+!!! info "Completed Builds"
+	The *Allocate Stock* tab is not available if the build has been completed!
 
-The *Incomplete Outputs* panel shows the list of in-progress [build outputs](./output.md) (created stock items) associated with this build.
+### Consumed Stock
+
+The *Consumed Stock* tab displays all stock items which have been *consumed* by this build order. These stock items remain in the database after the build order has been completed, but are no longer available for use.
+
+- [Tracked stock items](./allocate.md#tracked-stock) are consumed by specific build outputs
+- [Untracked stock items](./allocate.md#untracked-stock) are consumed by the build order
+
+### Build Outputs
+
+The *Build Outputs* tab shows the [build outputs](./output.md) (created stock items) associated with this build.
+
+As shown below, there are separate panels for *incomplete* and *completed* build outputs.
 
 {% with id="build_outputs", url="build/build_outputs.png", description="Outputs tab" %}
 {% include "img.html" %}
@@ -138,48 +146,11 @@ The *Incomplete Outputs* panel shows the list of in-progress [build outputs](./o
 - Outputs which are "in progress" can be completed or cancelled
 - Completed outputs (which are simply *stock items*) can be viewed in the stock table at the bottom of the screen
 
-### Completed Outputs
-
-This panel displays all the completed build outputs (stock items) which have been created by this build order:
-
-### Allocated Stock
-
-The *Allocated Stock* tab displays all stock items which have been *allocated* to this build order. These stock items are reserved for this build, and will be consumed when the build is completed:
-
-{% with id="allocated_stock_table", url="build/allocated_stock_table.png", description="Allocated Stock Table" %}
-{% include "img.html" %}
-{% endwith %}
-
-### Consumed Stock
-
-The *Consumed Stock* tab displays all stock items which have been *consumed* by this build order. These stock items remain in the database after the build order has been completed, but are no longer available for use.
-
-- [Tracked stock items](./allocate.md#tracked-stock) are consumed by specific build outputs
-- [Untracked stock items](./allocate.md#untracked-stock) are consumed by the build order
-
 ### Child Builds
 
 If there exist any build orders which are *children* of the selected build order, they are displayed in the *Child Builds* tab:
 
-{% with id="build_childs", url="build/build_childs.png", description="Child builds panel" %}
-{% include "img.html" %}
-{% endwith %}
-
-### Test Results
-
-For *trackable* parts, test results can be recorded against each build output. These results are displayed in the *Test Results* panel:
-
-{% with id="build_test_results", url="build/build_panel_test_results.png", description="Test Results panel" %}
-{% include "img.html" %}
-{% endwith %}
-
-This table provides a summary of the test results for each build output, and allows test results to be quickly added for each build output.
-
-### Test Statistics
-
-For *trackable* parts, this panel displays a summary of the test results for all build outputs:
-
-{% with id="build_test_stats", url="build/build_panel_test_statistics.png", description="Test Statistics panel" %}
+{% with id="build_childs", url="build/build_childs.png", description="Child builds tab" %}
 {% include "img.html" %}
 {% endwith %}
 
@@ -263,19 +234,3 @@ Build orders may (optionally) have a target complete date specified. If this dat
 
 - Builds can be filtered by overdue status in the build list
 - Overdue builds will be displayed on the home page
-
-## Build Order Restrictions
-
-There are a number of optional restrictions which can be applied to build orders, which may be enabled or disabled in the system settings:
-
-### Require Active Part
-
-If this option is enabled, build orders can only be created for parts which are marked as [Active](../part/part.md#active-parts).
-
-### Require Locked Part
-
-If this option is enabled, build orders can only be created for parts which are marked as [Locked](../part/part.md#locked-parts).
-
-### Require Valid BOM
-
-If this option is enabled, build orders can only be created for parts which have a valid [Bill of Materials](./bom.md) defined.

docs/docs/develop/contributing.md

@@ -22,9 +22,9 @@ To setup a development environment using [docker](../start/docker.md), run the f
 
 ```bash
 git clone https://github.com/inventree/InvenTree.git && cd InvenTree
-docker compose --project-directory . -f contrib/container/dev-docker-compose.yml run --rm inventree-dev-server invoke install
-docker compose --project-directory . -f contrib/container/dev-docker-compose.yml run --rm inventree-dev-server invoke setup-test --dev
-docker compose --project-directory . -f contrib/container/dev-docker-compose.yml up -d
+docker compose run inventree-dev-server invoke install
+docker compose run inventree-dev-server invoke setup-test --dev
+docker compose up -d
 ```
 
 ### Bare Metal
@@ -52,25 +52,15 @@ invoke setup-dev
 
 ## Branches and Versioning
 
-InvenTree roughly follow the [GitLab flow](https://about.gitlab.com/topics/version-control/what-are-gitlab-flow-best-practices/) branching style, to allow simple management of multiple tagged releases, short-lived branches, and development on the main branch.
-
-There are nominally 5 active branches:
-- `master` - The main development branch
-- `stable` - The latest stable release
-- `l10n` - Translation branch: Source to Crowdin
-- `l10_crowdin` - Translation branch: Source from Crowdin
-- `y.y.x` - Release branch for the currently supported version (e.g. `0.5.x`)
-
-All other branches are removed periodically by maintainers or core team members. This includes old release branches.
-Do not use them as base for feature development or forks as patches from them might not be accepted without rebasing.
+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.
 
 ### Version Numbering
 
 InvenTree version numbering follows the [semantic versioning](https://semver.org/) specification.
 
-### Main Development Branch
+### Master Branch
 
-The HEAD of the "master" branch of InvenTree represents the current "latest" state of code development.
+The HEAD of the "main" or "master" branch of InvenTree represents the current "latest" state of code development.
 
 - All feature branches are merged into master
 - All bug fixes are merged into master
@@ -83,6 +73,7 @@ Feature branches should be branched *from* the *master* branch.
 
 - One major feature per branch / pull request
 - Feature pull requests are merged back *into* the master branch
+- Features *may* also be merged into a release candidate branch
 
 ### Stable Branch
 
@@ -91,24 +82,17 @@ The HEAD of the "stable" branch represents the latest stable release code.
 - Versioned releases are merged into the "stable" branch
 - Bug fix branches are made *from* the "stable" branch
 
+#### Release Candidate Branches
 
-### Bugfix Branches
+- Release candidate branches are made from master, and merged into stable.
+- RC branches are targeted at a major/minor version e.g. "0.5"
+- When a release candidate branch is merged into *stable*, the release is tagged
+
+#### Bugfix Branches
 
 - If a bug is discovered in a tagged release version of InvenTree, a "bugfix" or "hotfix" branch should be made *from* that tagged release
 - 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.
-- A bugfix *might* also be backported from *master* to the *stable* branch automatically if marked with the `backport` label.
-
-### Translation Branches
-
-Crowdin is used for web-based translation management. The handling of files is fully automated, the `l10n` and `l10_crowdin` branches are used to manage the translation process and are not meant to be touched manually by anyone.
-
-The translation process is as follows:
-1. Commits to `master` trigger CI by GitHub Actions
-2. Translation source files are created and automatically pushed to the `l10n` branch - this is the source branch for Crowdin
-3. Crowdin picks up on the new source files and makes them available for translation
-4. Translations made in Crowdin are automatically pushed back to the `l10_crowdin` branch by Crowdin once they are approved
-5. The `l10_crowdin` branch is merged back into `master` by a maintainer periodically
 
 ## API versioning
 
@@ -125,7 +109,7 @@ The core software modules are targeting the following versions:
 | Python | {{ config.extra.min_python_version }} | Minimum required version |
 | Invoke | {{ config.extra.min_invoke_version }} | Minimum required version |
 | Django | {{ config.extra.django_version }} | Pinned version |
-| Node | 20 | Only needed for frontend development |
+| Node | 18 | Only needed for frontend development |
 
 Any other software dependencies are handled by the project package config.
 

docs/docs/develop/devcontainer.md

@@ -18,13 +18,12 @@ You need to make sure that you have the following tools installed before continu
 
 #### Docker Containers
 
-The InvenTree devcontainer setup will install the following docker containers:
+The InvenTree devcontainer setup will install two docker containers:
 
 | Container | Description |
 | --- | --- |
-| inventree | InvenTree host server |
 | db | InvenTree database (postgresql) |
-| redis | Redis server for caching |
+| inventree | InvenTree server |
 
 #### Setup/Installation
 
@@ -67,7 +66,7 @@ If you need to process your queue with background workers, run the `worker` task
 You can either only run InvenTree or use the integrated debugger for debugging. Goto the `Run and debug` side panel make sure `InvenTree Server` is selected. Click on the play button on the left.
 
 !!! tip "Debug with 3rd party"
-    Sometimes you need to debug also some 3rd party packages. Just select `InvenTree Server - 3rd party`
+    Sometimes you need to debug also some 3rd party packages. Just select `InvenTree Servre - 3rd party`
 
 You can now set breakpoints and vscode will automatically pause execution if that point is hit. You can see all variables available in that context and evaluate some code with the debugger console at the bottom. Use the play or step buttons to continue execution.
 
@@ -120,9 +119,3 @@ If you are running a devcontainer in Windows, you may experience some performanc
 For a significant improvement in performance, the source code should be installed into the **WSL 2** filesystem (not on your "Windows" filesystem). This will greatly improve file access performance, and also make the devcontainer much more responsive to file system changes.
 
 You can also refer to the [Improve disk performance guide](https://code.visualstudio.com/remote/advancedcontainers/improve-performance) for more information.
-
-### Redis Caching
-
-The devcontainer setup provides a [redis](https://redis.io/) container which can be used for managing global cache. By default this is disabled, but it can be easily enabled for testing or developing with the [redis cache](../start/config.md#caching) enabled.
-
-To enable the cache, locate the InvenTree configuration file (`./dev/config.yaml`) and set the `cache.enabled` setting to `True`.

docs/docs/extend/how_to_plugin.md

@@ -149,7 +149,7 @@ class SampleActionPlugin(ActionMixin, InvenTreePlugin):
     # metadata
     AUTHOR = "Sample Author"
     DESCRIPTION = "A very basic plugin with one mixin"
-    PUBLISH_DATE = "2222-02-22"
+    PUBLISH_DATE = "22.02.2222"
     VERSION = "1.2.3"  # We recommend semver and increase the major version with each new major release of InvenTree
     WEBSITE = "https://example.com/"
     LICENSE = "MIT"  # use what you want - OSI approved is ♥

docs/docs/extend/machines/overview.md

@@ -6,9 +6,6 @@ title: Machines
 
 InvenTree has a builtin machine registry. There are different machine types available where each type can have different drivers. Drivers and even custom machine types can be provided by plugins.
 
-!!! info "Requires Redis"
-    If the machines features is used in production setup using workers, a shared [redis cache](../../start/docker.md#redis-cache) is required to function properly.
-
 ### Registry
 
 The machine registry is the main component which gets initialized on server start and manages all configured machines.
@@ -24,13 +21,6 @@ The machine registry initialization process can be divided into three stages:
     2. The driver.init_driver function is called for each used driver
     3. The machine.initialize function is called for each machine, which calls the driver.init_machine function for each machine, then the machine.initialized state is set to true
 
-#### Production setup (with a worker)
-
-If a worker is connected, there exist multiple instances of the machine registry (one in each worker thread and one in the main thread) due to the nature of how python handles state in different processes. Therefore the machine instances and drivers are instantiated multiple times (The `__init__` method is called multiple times). But the init functions and update hooks (e.g. `init_machine`) are only called once from the main process.
-
-The registry, driver and machine state (e.g. machine status codes, errors, ...) is stored in the cache. Therefore a shared redis cache is needed. (The local in-memory cache which is used by default is not capable to cache across multiple processes)
-
-
 ### Machine types
 
 Each machine type can provide a different type of connection functionality between inventree and a physical machine. These machine types are already built into InvenTree.
@@ -96,7 +86,6 @@ The machine type class gets instantiated for each machine on server startup and
           - update
           - restart
           - handle_error
-          - clear_errors
           - get_setting
           - set_setting
           - check_setting

docs/docs/extend/plugins.md

@@ -9,7 +9,7 @@ The InvenTree server code supports an extensible plugin architecture, allowing c
 Plugins can be added from multiple sources:
 
 - Plugins can be installed in InvenTrees venv via PIP (python package manager)
-- Custom plugins should be placed in the directory `./data/plugins`.
+- Custom plugins should be placed in the directory `./src/backend/InvenTree/plugins`.
 - InvenTree built-in plugins are located in the directory `./src/backend/InvenTree/plugin/builtin`.
 
 For further information, read more about [installing plugins](./plugins/install.md).

docs/docs/extend/plugins/action.md

@@ -15,14 +15,4 @@ POST {
 }
 ```
 
-### Sample Plugin
-
-A sample action plugin is provided in the `InvenTree` source code, which can be used as a template for creating custom action plugins:
-
-::: plugin.samples.integration.simpleactionplugin.SimpleActionPlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
+For an example of a very simple action plugin, refer to `/src/backend/InvenTree/plugin/samples/integratoni/simpleactionplugin.py`

docs/docs/extend/plugins/api.md

@@ -5,15 +5,3 @@ title: Schedule Mixin
 ## APICallMixin
 
 The APICallMixin class provides basic functionality for integration with an external API.
-
-### Sample Plugin
-
-The following example demonstrates how to use the `APICallMixin` class to make a simple API call:
-
-::: plugin.samples.integration.api_caller.SampleApiCallerPlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []

docs/docs/extend/plugins/barcode.md

@@ -2,11 +2,11 @@
 title: Barcode Mixin
 ---
 
-## Barcode Plugins
+### Barcode Plugins
 
-InvenTree supports decoding of arbitrary barcode data and generation of internal barcode formats via a **Barcode Plugin** interface. Barcode data POSTed to the `/api/barcode/` endpoint will be supplied to all loaded barcode plugins, and the first plugin to successfully interpret the barcode data will return a response to the client.
+InvenTree supports decoding of arbitrary barcode data via a **Barcode Plugin** interface. Barcode data POSTed to the `/api/barcode/` endpoint will be supplied to all loaded barcode plugins, and the first plugin to successfully interpret the barcode data will return a response to the client.
 
-InvenTree can generate native QR codes to represent database objects (e.g. a single StockItem). This barcode can then be used to perform quick lookup of a stock item or location in the database. A client application (for example the InvenTree mobile app) scans a barcode, and sends the barcode data to the InvenTree server. The server then uses the **InvenTreeBarcodePlugin** (found at `src/backend/InvenTree/plugin/builtin/barcodes/inventree_barcode.py`) to decode the supplied barcode data.
+InvenTree can generate native QR codes to represent database objects (e.g. a single StockItem). This barcode can then be used to perform quick lookup of a stock item or location in the database. A client application (for example the InvenTree mobile app) scans a barcode, and sends the barcode data to the InvenTree server. The server then uses the **InvenTreeBarcodePlugin** (found at `/src/backend/InvenTree/plugins/barcode/inventree.py`) to decode the supplied barcode data.
 
 Any third-party barcodes can be decoded by writing a matching plugin to decode the barcode data. These plugins could then perform a server-side action or render a JSON response back to the client for further action.
 
@@ -24,27 +24,15 @@ POST {
 }
 ```
 
-### Builtin Plugin
-
-The InvenTree server includes a builtin barcode plugin which can generate and decode the QR codes. This plugin is enabled by default.
-
-::: plugin.builtin.barcodes.inventree_barcode.InvenTreeInternalBarcodePlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
-
-
-### Example Plugin
-
-Please find below a very simple example that is used to return a part if the barcode starts with `PART-`
+### Example
+Please find below a very simple example that is executed each time a barcode is scanned.
 
 ```python
+from django.utils.translation import gettext_lazy as _
+
+from InvenTree.models import InvenTreeBarcodeMixin
 from plugin import InvenTreePlugin
 from plugin.mixins import BarcodeMixin
-from part.models import Part
 
 class InvenTreeBarcodePlugin(BarcodeMixin, InvenTreePlugin):
 
@@ -54,39 +42,16 @@ class InvenTreeBarcodePlugin(BarcodeMixin, InvenTreePlugin):
     VERSION = "0.0.1"
     AUTHOR = "Michael"
 
-    def scan(self, barcode_data):
-        if barcode_data.startswith("PART-"):
-            try:
-                pk = int(barcode_data.split("PART-")[1])
-                instance = Part.objects.get(pk=pk)
-                label = Part.barcode_model_type()
+    status = 0
+
+    def scan(self, barcode_data):
+
+        self.status = self.status+1
+        print('Started barcode plugin', self.status)
+        print(barcode_data)
+        response = {}
+        return response
 
-                return {label: instance.format_matched_response()}
-            except Part.DoesNotExist:
-                pass
 ```
 
 To try it just copy the file to src/InvenTree/plugins and restart the server. Open the scan barcode window and start to scan codes or type in text manually. Each time the timeout is hit the plugin will execute and printout the result. The timeout can be changed in `Settings->Barcode Support->Barcode Input Delay`.
-
-### Custom Internal Format
-
-To implement a custom internal barcode format, the `generate(...)` method from the Barcode Mixin needs to be overridden. Then the plugin can be selected at `System Settings > Barcodes > Barcode Generation Plugin`.
-
-```python
-from InvenTree.models import InvenTreeBarcodeMixin
-from plugin import InvenTreePlugin
-from plugin.mixins import BarcodeMixin
-
-class InvenTreeBarcodePlugin(BarcodeMixin, InvenTreePlugin):
-    NAME = "MyInternalBarcode"
-    TITLE = "My Internal Barcodes"
-    DESCRIPTION = "support for custom internal barcodes"
-    VERSION = "0.0.1"
-    AUTHOR = "InvenTree contributors"
-
-    def generate(self, model_instance: InvenTreeBarcodeMixin):
-        return f'{model_instance.barcode_model_type()}: {model_instance.pk}'
-```
-
-!!! info "Scanning implementation required"
-    The parsing of the custom format needs to be implemented too, so that the scanning of the generated QR codes resolves to the correct part.

docs/docs/extend/plugins/currency.md

@@ -6,24 +6,7 @@ title: Currency Exchange Mixin
 
 The `CurrencyExchangeMixin` class enabled plugins to provide custom backends for updating currency exchange rate information.
 
-Any implementing classes must provide the `update_exchange_rates` method.
-
-### Builtin Plugin
-
-The default builtin plugin for handling currency exchange rates is the `InvenTreeCurrencyExchangePlugin` class.
-
-::: plugin.builtin.integration.currency_exchange.InvenTreeCurrencyExchange
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
-
-
-### Sample Plugin
-
-A simple example is shown below (with fake data).
+Any implementing classes must provide the `update_exchange_rates` method. A simple example is shown below (with fake data).
 
 ```python
 

docs/docs/extend/plugins/event.md

@@ -15,34 +15,56 @@ When a certain (server-side) event occurs, the background worker passes the even
 {% include 'img.html' %}
 {% endwith %}
 
-### Sample Plugin - All events
+### Example (all events)
 
 Implementing classes must at least provide a `process_event` function:
 
-::: plugin.samples.event.event_sample.EventPluginSample
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
+```python
+class EventPlugin(EventMixin, InvenTreePlugin):
+    """
+    A simple example plugin which responds to events on the InvenTree server.
 
-### Sample Plugin - Specific Events
+    This example simply prints out the event information.
+    A more complex plugin could respond to specific events however it wanted.
+    """
+
+    NAME = "EventPlugin"
+    SLUG = "event"
+    TITLE = "Triggered Events"
+
+    def process_event(self, event, *args, **kwargs):
+        print(f"Processing triggered event: '{event}'")
+```
+
+### Example (specific events)
 
 If you want to process just some specific events, you can also implement the `wants_process_event` function to decide if you want to process this event or not. This function will be executed synchronously, so be aware that it should contain simple logic.
 
 Overall this function can reduce the workload on the background workers significantly since less events are queued to be processed.
 
-::: plugin.samples.event.filtered_event_sample.FilteredEventPluginSample
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
+```python
+class EventPlugin(EventMixin, InvenTreePlugin):
+    """
+    A simple example plugin which responds to 'salesordershipment.completed' event on the InvenTree server.
 
+    This example simply prints out the event information.
+    A more complex plugin can run enhanced logic on this event.
+    """
 
-## Events
+    NAME = "EventPlugin"
+    SLUG = "event"
+    TITLE = "Triggered Events"
+
+    def wants_process_event(self, event):
+        """Here you can decide if this event should be send to `process_event` or not."""
+        return event == "salesordershipment.completed"
+
+    def process_event(self, event, *args, **kwargs):
+        """Here you can run you'r specific logic."""
+        print(f"Sales order was completely shipped: '{args}' '{kwargs}'")
+```
+
+### Events
 
 Events are passed through using a string identifier, e.g. `build.completed`
 

docs/docs/extend/plugins/icon.md

@@ -1,19 +0,0 @@
----
-title: Icon Pack Mixin
----
-
-## IconPackMixin
-
-The IconPackMixin class provides basic functionality for letting plugins expose custom icon packs that are available in the InvenTree UI. This is especially useful to provide a custom crafted icon pack with icons for different location types, e.g. different sizes and styles of drawers, bags, ESD bags, ... which are not available in the standard tabler icons library.
-
-### Sample Plugin
-
-The following example demonstrates how to use the `IconPackMixin` class to add a custom icon pack:
-
-::: plugin.samples.icons.icon_sample.SampleIconPlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []

docs/docs/extend/plugins/install.md

@@ -74,10 +74,10 @@ Admin users can install plugins directly from the web interface, via the "Plugin
 
 #### Local Directory
 
-Custom plugins can be placed in the `data/plugins/` directory, where they will be automatically discovered. This can be useful for developing and testing plugins, but can prove more difficult in production (e.g. when using Docker).
+Custom plugins can be placed in the `src/InvenTree/plugins/` directory, where they will be automatically discovered. This can be useful for developing and testing plugins, but can prove more difficult in production (e.g. when using Docker).
 
 !!! info "Git Tracking"
-    The `data/plugins/` directory is excluded from Git version tracking - any plugin files here will be hidden from Git
+    The `src/backend/InvenTree/plugins/` directory is excluded from Git version tracking - any plugin files here will be hidden from Git
 
 !!! warning "Not Recommended For Production"
     Loading plugins via the local *plugins* directory is not recommended for production. If you cannot use PIP installation (above), specify a custom plugin directory (below) or use a [VCS](https://pip.pypa.io/en/stable/topics/vcs-support/) as a plugin install source.

docs/docs/extend/plugins/label.md

@@ -172,14 +172,6 @@ InvenTree supplies the `InvenTreeLabelPlugin` out of the box, which generates a
 
 The default plugin also features a *DEBUG* mode which generates a raw HTML output, rather than PDF. This can be handy for tracking down any template rendering errors in your labels.
 
-::: plugin.builtin.labels.inventree_label.InvenTreeLabelPlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
-
 ### Available Data
 
 The *label* data are supplied to the plugin in both `PDF` and `PNG` formats. This provides compatibility with a great range of label printers "out of the box". Conversion to other formats, if required, is left as an exercise for the plugin developer.

docs/docs/extend/plugins/locate.md

@@ -29,15 +29,3 @@ If a locate plugin is installed and activated, the [InvenTree mobile app](../../
 ### Implementation
 
 Refer to the [InvenTree source code]({{ sourcefile("src/backend/InvenTree/plugin/samples/locate/locate_sample.py") }}) for a simple implementation example.
-
-### Sample Plugin
-
-A simple example is provided in the InvenTree code base:
-
-::: plugin.samples.locate.locate_sample.SampleLocatePlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []

docs/docs/extend/plugins/panel.md

@@ -52,18 +52,6 @@ Or to add a template file that will be rendered as javascript code, from the plu
 
 Note : see convention for template directory above.
 
-## Sample Plugin
-
-A sample plugin is provided in the InvenTree code base:
-
-::: plugin.samples.integration.custom_panel_sample.CustomPanelSample
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
-
 ## Example Implementations
 
 Refer to the `CustomPanelSample` example class in the `./plugin/samples/integration/` directory, for a fully worked example of how custom UI panels can be implemented.

docs/docs/extend/plugins/report.md

@@ -14,14 +14,48 @@ A plugin which implements the ReportMixin mixin can define the `add_report_conte
 
 Additionally the `add_label_context` method, allowing custom context data to be added to a label template at time of printing.
 
-### Sample Plugin
+### Example
 
-A sample plugin which provides additional context data to the report templates is available:
+A sample plugin which provides additional context data to the report templates can be found [in the InvenTree source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/plugin/samples/integration/report_plugin_sample.py):
 
-::: plugin.samples.integration.report_plugin_sample.SampleReportPlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
+```python
+"""Sample plugin for extending reporting functionality"""
+
+import random
+
+from plugin import InvenTreePlugin
+from plugin.mixins import ReportMixin
+from report.models import PurchaseOrderReport
+
+
+class SampleReportPlugin(ReportMixin, InvenTreePlugin):
+    """Sample plugin which provides extra context data to a report"""
+
+    NAME = "Sample Report Plugin"
+    SLUG = "reportexample"
+    TITLE = "Sample Report Plugin"
+    DESCRIPTION = "A sample plugin which provides extra context data to a report"
+    VERSION = "1.0"
+
+    def some_custom_function(self):
+        """Some custom function which is not required for the plugin to function"""
+        return random.randint(0, 100)
+
+    def add_report_context(self, report_instance, model_instance, request, context):
+
+        """Add example content to the report instance"""
+
+        # We can add any extra context data we want to the report
+
+        # Generate a random string of data
+        context['random_text'] = ''.join(random.choices('abcdefghijklmnopqrstuvwxyz', k=20))
+
+        # Call a custom method
+        context['random_int'] = self.some_custom_function()
+
+        # We can also add extra data to the context which is specific to the report type
+        context['is_purchase_order'] = isinstance(report_instance, PurchaseOrderReport)
+
+        # We can also use the 'request' object to add extra context data
+        context['request_method'] = request.method
+```

docs/docs/extend/plugins/schedule.md

@@ -18,14 +18,45 @@ The ScheduleMixin class provides a plugin with the ability to call functions at
 {% include 'img.html' %}
 {% endwith %}
 
-### SamplePlugin
+### Example
 
 An example of a plugin which supports scheduled tasks:
 
-::: plugin.samples.integration.scheduled_task.ScheduledTaskPlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
+```python
+class ScheduledTaskPlugin(ScheduleMixin, SettingsMixin, InvenTreePlugin):
+    """
+    Sample plugin which runs a scheduled task, and provides user configuration.
+    """
+
+    NAME = "Scheduled Tasks"
+    SLUG = 'schedule'
+
+    SCHEDULED_TASKS = {
+        'global': {
+            'func': 'some_module.function',
+            'schedule': 'H',  # Run every hour
+        },
+        'member': {
+            'func': 'foo',
+            'schedule': 'I',  # Minutes
+            'minutes': 15,
+        },
+    }
+
+    SETTINGS = {
+        'SECRET': {
+            'name': 'A secret',
+            'description': 'User configurable value',
+        },
+    }
+
+    def foo(self):
+        """
+        This function runs every 15 minutes
+        """
+        secret_value = self.get_setting('SECRET')
+        print(f"foo - SECRET = {secret_value})
+```
+
+!!! info "More Info"
+    For more information on any of the methods described below, refer to the InvenTree source code. [A working example is available as a starting point](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/plugin/samples/integration/scheduled_task.py).

docs/docs/extend/plugins/settings.md

@@ -15,7 +15,7 @@ The dict must be formatted similar to the following sample that shows how to use
 
 Take a look at the settings defined in `InvenTree.common.models.InvenTreeSetting` for all possible parameters.
 
-### Example Plugin
+### Example
 
 Below is a simple example of how a plugin can implement settings:
 

docs/docs/extend/plugins/validation.md

@@ -14,35 +14,29 @@ Any of the methods described below can be implemented in a custom plugin to prov
 !!! info "Multi Plugin Support"
     It is possible to have multiple plugins loaded simultaneously which support validation methods. For example when validating a field, if one plugin returns a null value (`None`) then the *next* plugin (if available) will be queried.
 
-## Model Deletion
-
-Any model which inherits the `PluginValidationMixin` class is exposed to the plugin system for custom deletion validation. Before the model is deleted from the database, it is first passed to the plugin ecosystem to check if it really should be deleted.
-
-A custom plugin may implement the `validate_model_deletion` method to perform custom validation on the model instance before it is deleted.
-
-::: plugin.base.integration.ValidationMixin.ValidationMixin.validate_model_deletion
-    options:
-      show_bases: False
-      show_root_heading: False
-      show_root_toc_entry: False
-      show_sources: True
-      summary: False
-      members: []
-
 ## Model Validation
 
 Any model which inherits the `PluginValidationMixin` mixin class is exposed to the plugin system for custom validation. Before the model is saved to the database (either when created, or updated), it is first passed to the plugin ecosystem for validation.
 
 Any plugin which inherits the `ValidationMixin` can implement the `validate_model_instance` method, and run a custom validation routine.
 
-::: plugin.base.integration.ValidationMixin.ValidationMixin.validate_model_instance
-    options:
-      show_bases: False
-      show_root_heading: False
-      show_root_toc_entry: False
-      show_sources: True
-      summary: False
-      members: []
+The `validate_model_instance` method is passed the following arguments:
+
+| Argument | Description |
+| --- | --- |
+| `instance` | The model instance to be validated |
+| `deltas` | A dict of field deltas (if the instance is being updated) |
+
+```python
+def validate_model_instance(self, instance, deltas=None):
+    """Validate the supplied model instance.
+
+    Arguments:
+        instance: The model instance to be validated
+        deltas: A dict of field deltas (if the instance is being updated)
+    """
+    ...
+```
 
 ### Error Messages
 
@@ -58,7 +52,7 @@ To indicate a *field* validation error (i.e. the validation error applies only t
 
 Note that an error can be which corresponds to multiple model instance fields.
 
-### Example Plugin
+### Example
 
 Presented below is a simple working example for a plugin which implements the `validate_model_instance` method:
 
@@ -122,7 +116,7 @@ Validation of the Part IPN (Internal Part Number) field is exposed to custom plu
 
 The `validate_batch_code` method allows plugins to raise an error if a batch code input by the user does not meet a particular pattern.
 
-The `generate_batch_code` method can be implemented to generate a new batch code, based on a set of provided information.
+The `generate_batch_code` method can be implemented to generate a new batch code.
 
 ### Serial Numbers
 
@@ -188,15 +182,3 @@ def increment_serial_number(self, serial: str):
 
     return val
 ```
-
-## Sample Plugin
-
-A sample plugin which implements custom validation routines is provided in the InvenTree source code:
-
-::: plugin.samples.integration.validation_sample.SampleValidatorPlugin
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []

docs/docs/extend/themes.md

@@ -14,7 +14,7 @@ Navigate to the "Settings" page and click on the "Display" tab, you should see t
 {% include 'img.html' %}
 {% endwith %}
 
-The drop-down list let's you select any other color theme found in your static folder (see next section to find out how to [add color themes](#add-color-theme)). Once selected, click on the "Apply Theme" button for the new color theme to be activated.
+The drop-down list let's you select any other color theme found in your static folder (see next section to find out how to [add color themes](#add-color-themes)). Once selected, click on the "Apply Theme" button for the new color theme to be activated.
 
 !!! info "Per-user Setting"
 	Color themes are "user specific" which means that changing the color theme in your own settings won't affect other users.

docs/docs/order/purchase_order.md

@@ -22,20 +22,6 @@ Each Purchase Order has a specific status code which indicates the current state
 | In Progress | The purchase order has been issued to the supplier, and is in progress |
 | Complete | The purchase order has been completed, and is now closed |
 | Cancelled | The purchase order was cancelled, and is now closed |
-| Lost | The purchase order was lost, and is now closed |
-| Returned | The purchase order was returned, and is now closed |
-
-**Source Code**
-
-Refer to the source code for the Purchase Order status codes:
-
-::: order.status_codes.PurchaseOrderStatus
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
 
 ### Purchase Order Currency
 

docs/docs/order/return_order.md

@@ -48,18 +48,6 @@ Each Return Order has a specific status code, as follows:
 | Complete | The return order was marked as complete, and is now closed |
 | Cancelled | The return order was cancelled, and is now closed |
 
-**Source Code**
-
-Refer to the source code for the Return Order status codes:
-
-::: order.status_codes.ReturnOrderStatus
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
-
 ## Create a Return Order
 
 From the Return Order index, click on <span class='badge inventree add'><span class='fas fa-plus-circle'></span> New Return Order</span> which opens the "Create Return Order" form.
@@ -110,7 +98,7 @@ While [line items](#line-items) must reference a particular stock item, extra li
 
 ## Return Order Reports
 
-Custom [reports](../report/templates.md) can be generated against each Return Order.
+Custom [reports](../report/return_order.md) can be generated against each Return Order.
 
 ### Calendar view
 

docs/docs/order/sales_order.md

@@ -20,23 +20,8 @@ Each Sales Order has a specific status code, which represents the state of the o
 | --- | --- |
 | Pending | The sales order has been created, but has not been finalized or submitted |
 | In Progress | The sales order has been issued, and is in progress |
-| Shipped | The sales order has been shipped, but is not yet complete |
-| Complete | The sales order is fully completed, and is now closed |
+| Shipped | The sales order has been completed, and is now closed |
 | Cancelled | The sales order was cancelled, and is now closed |
-| Lost | The sales order was lost, and is now closed |
-| Returned | The sales order was returned, and is now closed |
-
-**Source Code**
-
-Refer to the source code for the Sales Order status codes:
-
-::: order.status_codes.SalesOrderStatus
-    options:
-        show_bases: False
-        show_root_heading: False
-        show_root_toc_entry: False
-        show_source: True
-        members: []
 
 ### Sales Order Currency
 
@@ -98,7 +83,7 @@ To view all the completed shipment, click on the <span class="badge inventree na
 
 ### Complete Order
 
-Once all items in the sales order have been shipped, click on <span class="badge inventree add"><span class='fas fa-check-circle'></span> Complete Order</span> to mark the sales order as shipped. Confirm then click on <span class="badge inventree confirm">Submit</span> to complete the order.
+Once all items in the sales order have been shipped, click on <span class="badge inventree add"><span class='fas fa-check-circle'></span> Complete Order</span> to mark the sales order as complete.
 
 ### Cancel Order
 

docs/docs/part/part.md

@@ -73,15 +73,7 @@ A [Purchase Order](../order/purchase_order.md) allows parts to be ordered from a
 
 If a part is designated as *Salable* it can be sold to external customers. Setting this flag allows parts to be added to sales orders.
 
-## Locked Parts
-
-Parts can be locked to prevent them from being modified. This is useful for parts which are in production and should not be changed. The following restrictions apply to parts which are locked:
-
-- Locked parts cannot be deleted
-- BOM items cannot be created, edited, or deleted when they are part of a locked assembly
-- Part parameters linked to a locked part cannot be created, edited or deleted
-
-## Active Parts
+### Active
 
 By default, all parts are *Active*. Marking a part as inactive means it is not available for many actions, but the part remains in the database. If a part becomes obsolete, it is recommended that it is marked as inactive, rather than deleting it from the database.
 

docs/docs/part/revision.md

@@ -1,78 +0,0 @@
----
-title: Part Revisions
----
-
-## Part Revisions
-
-When creating a complex part (such as an assembly comprised of other parts), it is often necessary to track changes to the part over time. For example, throughout the lifetime of an assembly, it may be necessary to adjust the bill of materials, or update the design of the part.
-
-Rather than overwrite the existing part data, InvenTree allows you to create a new *revision* of the part. This allows you to track changes to the part over time, and maintain a history of the part design.
-
-Crucially, creating a new *revision* ensures that any related data entries which refer to the original part (such as stock items, build orders, purchase orders, etc) are not affected by the change.
-
-### Revisions are Parts
-
-A *revision* of a part is itself a part. This means that each revision of a part has its own part number, stock items, parameters, bill of materials, etc. The only thing that differentiates a *revision* from any other part is that the *revision* is linked to the original part.
-
-### Revision Fields
-
-Each part has two fields which are used to track the revision of the part:
-
-* **Revision**: The revision number of the part. This is a user-defined field, and can be any string value.
-* **Revision Of**: A reference to the part of which *this* part is a revision. This field is used to keep track of the available revisions for any particular part.
-
-### Revision Restrictions
-
-When creating a new revision of a part, there are some restrictions which must be adhered to:
-
-* **Circular References**: A part cannot be a revision of itself. This would create a circular reference which is not allowed.
-* **Unique Revisions**: A part cannot have two revisions with the same revision number. Each revision (of a given part) must have a unique revision code.
-* **Revisions of Revisions**: A single part can have multiple revisions, but a revision cannot have its own revision. This restriction is in place to prevent overly complex part relationships.
-* **Template Revisions**: A part which is a [template part](./template.md) cannot have revisions. This is because the template part is used to create variants, and allowing revisions of templates would create disallowed relationship states in the database. However, variant parts are allowed to have revisions.
-* **Template References**: A part which is a revision of a variant part must point to the same template as the original part. This is to ensure that the revision is correctly linked to the original part.
-
-## Revision Settings
-
-The following options are available to control the behavior of part revisions.
-
-Note that these options can be changed in the InvenTree settings:
-
-{% with id="part_revision_settings", url="part/part_revision_settings.png", description="Part revision settings" %}
-{% include 'img.html' %}
-{% endwith %}
-
-* **Enable Revisions**: If this setting is enabled, parts can have revisions. If this setting is disabled, parts cannot have revisions.
-* **Assembly Revisions Only**: If this setting is enabled, only assembly parts can have revisions. This is useful if you only want to track revisions of assemblies, and not individual parts.
-
-## Create a Revision
-
-To create a new revision for a given part, navigate to the part detail page, and click on the "Revisions" tab.
-
-Select the "Duplicate Part" action, to create a new copy of the selected part. This will open the "Duplicate Part" form:
-
-{% with id="part_create_revision", url="part/part_create_revision.png", description="Create part revision" %}
-{% include 'img.html' %}
-{% endwith %}
-
-In this form, make the following updates:
-
-1. Set the *Revision Of* field to the original part (the one that you are duplicating)
-2. Set the *Revision* field to a unique revision number for the new part revision
-
-Once these changes (and any other required changes) are made, press *Submit* to create the new part.
-
-Once the form is submitted (without any errors), you will be redirected to the new part revision. Here you can see that it is linked to the original part:
-
-{% with id="part_revision_b", url="part/part_revision_b.png", description="Revision B" %}
-{% include 'img.html' %}
-{% endwith %}
-
-## Revision Navigation
-
-When multiple revisions exist for a particular part, you can navigate between revisions using the *Select Part Revision* drop-down which renders at the top of the part page:
-
-{% with id="part_revision_select", url="part/part_revision_select.png", description="Select part revision" %}
-{% include 'img.html' %}
-{% endwith %}
-
-Note that this revision selector is only visible when multiple revisions exist for the part.

docs/docs/part/scheduling.md

@@ -5,7 +5,7 @@ title: Part Scheduling
 ## Part Scheduling
 
 
-The *Scheduling* tab provides an overview of the *predicted* future available quantity of a particular part.
+The *Scheduling* tab provides an overview of the *predicted* future availabile quantity of a particular part.
 
 The *Scheduling* tab displays a chart of estimated future part stock levels. It begins at the current date, with the current stock level. It then projects into the "future", taking information from:
 

docs/docs/part/views.md

@@ -28,6 +28,7 @@ Details provides information about the particular part. Parts details can be dis
 {% with id="part_overview", url="part/part_overview.png", description="Part details" %}
 {% include 'img.html' %}
 {% endwith %}
+<p></p>
 
 A Part is defined in the system by the following parameters:
 
@@ -37,7 +38,7 @@ A Part is defined in the system by the following parameters:
 
 **Description** - Longer form text field describing the Part
 
-**Revision** - An optional revision code denoting the particular version for the part. Used when there are multiple revisions of the same master part object. Read [more about part revisions here](./revision.md).
+**Revision** - An optional revision code denoting the particular version for the part. Used when there are multiple revisions of the same master part object.
 
 **Keywords** - Optional few words to describe the part and make the part search more efficient.
 
@@ -61,7 +62,7 @@ Parts can have multiple defined parameters.
 
 If a part is a *Template Part* then the *Variants* tab will be visible.
 
-[Read about Part templates and variants](./template.md)
+[Read about Part templates](./template.md)
 
 ### Stock
 

docs/docs/releases/0.1.4.md

@@ -61,7 +61,7 @@ Also, dedicated settings sections were added for:
 
 For Category section, read [Category Parameter Templates](#category-parameter-templates)
 
-Other section allows to set the prefix of build, purchase and sales orders.
+Other section allows to set the prefix of build, puchase and sales orders.
 
 ### Category Parameter Templates
 

docs/docs/releases/0.1.6.md

@@ -24,7 +24,7 @@ Refer to the [report documentation](../report/report.md) for further information
 !!! warning "LaTeX Support"
     LaTeX report templates are no longer supported for a number of technical and ideological reasons
 
-[#1292](https://github.com/inventree/InvenTree/pull/1292) adds support for build order / work order reports. Refer to the [report documentation](../report/templates.md) for further information.
+[#1292](https://github.com/inventree/InvenTree/pull/1292) adds support for build order / work order reports. Refer to the [build report documentation](../report/build.md) for further information.
 
 ### Inherited BOM Items
 

docs/docs/releases/0.2.1.md

@@ -32,7 +32,7 @@ Details on how to create and manage manufacturer parts were added
 
 [#1462](https://github.com/inventree/InvenTree/pull/1417) adds the ability to
 create a QR code containing the URL of a StockItem, which can be opened directly
-on a portable device using the camera or a QR code scanner. More details [here](../report/labels.md).
+on a portable device using the camera or a QR code scanner. More details [here](../report/labels.md#url-style-qr-code).
 
 ## Major Bug Fixes
 

docs/docs/releases/0.4.0.md

@@ -29,5 +29,5 @@ title: Release 0.4.0
 | Pull Request | Description |
 | --- | --- |
 | [#1823](https://github.com/inventree/InvenTree/pull/1823) | Fixes link formatting issues for ManufacturerParts |
-| [#1824](https://github.com/inventree/InvenTree/pull/1824) | Selects correct currency code when creating a new PurchaseOrderLineItem |
+| [#1824](https://github.com/inventree/InvenTree/pull/1824) | Selects correct curreny code when creating a new PurchaseOrderLineItem |
 | [#1867](https://github.com/inventree/InvenTree/pull/1867) | Fixes long-running bug when deleting sequential items via the API |

docs/docs/releases/0.7.0.md

@@ -53,7 +53,7 @@ This release also provides a marked improvement in unit testing and code coverag
 [#2372](https://github.com/inventree/InvenTree/pull/2372) provides an overhaul of notifications, allowing users to view their notifications directly in the InvenTree interface.
 
 ### Why are you hiding my name?
-[#2861](https://github.com/inventree/InvenTree/pull/2861) adds several changes to enable admins to remove more of InvenTrees branding. Change logo, hide the about-modal for all but superusers and add custom messages to login and main navbar. Check out [the docs](../start/config.md#customization-options)
+[#2861](https://github.com/inventree/InvenTree/pull/2861) adds several changes to enable admins to remove more of InvenTrees branding. Change logo, hide the about-modal for all but superusers and add custom messages to login and main navbar. Check out [the docs](../start/config.md#customisation-options).
 
 ### Label Printing Plugin
 

docs/docs/report/bom.md

@@ -0,0 +1,186 @@
+---
+title: BOM Generation
+---
+
+## BOM Generation
+
+The bill of materials is an essential part of the documentation that needs to be sent to the factory. A simple csv export is OK to be important into SMT machines. But for human readable documentation it might not be sufficient. Additional information is needed. The Inventree report system allows to generate BOM well formatted BOM reports.
+
+### Context variables
+| Variable | Description |
+| --- | --- |
+| bom_items | Query set that contains all BOM items |
+| bom_items...sub_part | One component of the BOM |
+| bom_items...quantity | Number of parts |
+| bom_items...reference | Reference designators of the part |
+| bom_items...substitutes | Query set that contains substitutes of the part if any exist in the BOM |
+
+### Examples
+
+#### BOM
+
+The following picture shows a simple example for a PCB with just three components from two different parts.
+
+{% with id="report-options", url="report/bom_example.png", description="BOM example" %} {% include 'img.html' %} {% endwith %}
+
+This example has been created using the following html template:
+
+```html
+{% raw %}
+{% extends "report/inventree_report_base.html" %}
+
+{% load i18n %}
+{% load report %}
+{% load inventree_extras %}
+
+{% block page_margin %}
+margin-left: 2cm;
+margin-right: 1cm;
+margin-top: 4cm;
+{% endblock %}
+
+{% block bottom_left %}
+content: "v{{report_revision}} - {% format_date date %}";
+{% endblock %}
+
+{% block bottom_center %}
+content: "InvenTree v{% inventree_version %}";
+{% endblock %}
+
+{% block style %}
+.header-left {
+    text-align: left;
+    float: left;
+}
+table {
+    border: 1px solid #eee;
+    border-radius: 3px;
+    border-collapse: collapse;
+    width: 100%;
+    font-size: 80%;
+}
+table td {
+    border: 1px solid #eee;
+}
+{% endblock %}
+
+{% block header_content %}
+    <div class='header-left'>
+        <h3>{% trans "Bill of Materials" %}</h3>
+    </div>
+{% endblock %}
+
+{% block page_content %}
+<table>
+  <tr> <td>Board</td><td>{{ part.IPN }}</td>  </tr>
+  <tr> <td>Description</td><td>{{ part.description }}</td> </tr>
+  <tr> <td>User</td><td>{{ user }}</td> </tr>
+  <tr> <td>Date</td><td>{{ date }}</td> </tr>
+  <tr> <td>Number of different components (codes)</td><td>{{ bom_items.count }}</td> </tr>
+</table>
+<br>
+<table class='table table-striped table-condensed'>
+    <thead>
+        <tr>
+            <th>{% trans "IPN" %}</th>
+            <th>{% trans "MPN" %}</th>
+            <th>{% trans "Manufacturer" %}</th>
+            <th>{% trans "Quantity" %}</th>
+            <th>{% trans "Reference" %}</th>
+            <th>{% trans "Substitute" %}</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for line in bom_items.all %}
+          <tr>
+            <td>{{ line.sub_part.IPN }}</td>
+            <td>{{ line.sub_part.name }}</td>
+	        <td>
+	          {% for manf in line.sub_part.manufacturer_parts.all %}
+               {{ manf.manufacturer.name }}
+               {% endfor %}
+          </td>
+          <td>{% decimal line.quantity %}</td>
+          <td>{{ line.reference }}</td>
+	        <td>
+	          {% for sub in line.substitutes.all %}
+		    {{ sub.part.IPN }}<br>
+            {% endfor %}
+          </td>
+          </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+{% endblock %}
+{% endraw %}
+```
+
+#### Pick List
+
+When all material has been allocated someone has to pick all things from the warehouse.
+In case you need a printed pick list you can use the following template. This it just the
+table. All other info and CSS has been left out for simplicity. Please have a look at the
+BOM report for details.
+
+{% raw %}
+```html
+<table class='changes-table'>
+  <thead>
+    <tr>
+      <th>Original IPN</th>
+      <th>Allocated Part</th>
+      <th>Location</th>
+      <th>PCS</th>
+    </tr>
+  </thead>
+  <tbody>
+  {% for line in build.allocated_stock.all %}
+    <tr>
+      <td> {{ line.bom_item.sub_part.IPN }} </td>
+      {% if line.stock_item.part.IPN != line.bom_item.sub_part.IPN %}
+        <td class='chg'> {{ line.stock_item.part.IPN }} </td>
+      {% else %}
+        <td> {{ line.stock_item.part.IPN }} </td>
+      {% endif %}
+      <td> {{ line.stock_item.location.pathstring }} </td>
+      <td> {{ line.quantity }} </td>
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>
+```
+{% endraw %}
+
+Here we have a loop that runs through all allocated parts for the build. For each part
+we list the original IPN from the BOM and the IPN of the allocated part. These can differ
+in case you have substitutes or template/variants in the BOM. In case the parts differ
+we use a different format for the table cell e.g. print bold font or red color.
+For the picker we list the full path names of the stock locations and the quantity
+that is needed for the build. This will result in the following printout:
+
+{% with id="picklist", url="report/picklist.png", description="Picklist Example" %} {% include "img.html" %} {% endwith %}
+
+For those of you who would like to replace the "/" by something else because it is hard
+to read in some fonts use the following trick:
+
+{% raw %}
+```html
+ <td> {% for loc in line.stock_item.location.path %}{{ loc.name }}{% if not forloop.last %}-{% endif %}{% endfor %} </td>
+```
+{% endraw %}
+
+Here we use location.path which is a query set that contains the location path up to the
+topmost parent. We use a loop to cycle through that and print the .name of the entry followed
+by a "-". The foorloop.last is a Django trick that allows us to not print the "-" after
+the last entry. The result looks like here:
+
+{% with id="picklist_with_path", url="report/picklist_with_path.png", description="Picklist Example" %} {% include "img.html" %} {% endwith %}
+
+Finally added a `{% raw %}|floatformat:0{% endraw %}` to the quantity that removes the trailing zeros.
+
+### Default Report Template
+
+A default *BOM Report* template is provided out of the box, which is useful for generating simple test reports. Furthermore, it may be used as a starting point for developing custom BOM reports:
+
+View the [source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/report/templates/report/inventree_bill_of_materials_report.html) for the default test report template.

docs/docs/report/build.md

@@ -0,0 +1,324 @@
+---
+title: Build Order Report
+---
+
+## Build Order Report
+
+Custom build order reports may be generated against any given [Build Order](../build/build.md). For example, build order reports can be used to generate work orders.
+
+### Build Filters
+
+A build order report template may define a set of filters against which [Build Order](../build/build.md) items are sorted.
+
+### Context Variables
+
+In addition to the default report context variables, the following context variables are made available to the build order report template for rendering:
+
+| Variable | Description |
+| --- | --- |
+| build | The build object the report is being generated against |
+| part | The [Part](./context_variables.md#part) object that the build references |
+| line_items | A shortcut for [build.line_items](#build) |
+| bom_items | A shortcut for [build.bom_items](#build) |
+| build_outputs | A shortcut for [build.build_outputs](#build) |
+| reference | The build order reference string |
+| quantity | Build order quantity (number of assemblies being built) |
+
+#### build
+
+The following variables are accessed by build.variable
+
+| Variable | Description |
+| --- | --- |
+| active | Boolean that tells if the build is active |
+| batch | Batch code transferred to build parts (optional) |
+| line_items | A query set with all the build line items associated with the build |
+| bom_items | A query set with all BOM items for the part being assembled |
+| build_outputs | A queryset containing all build output ([Stock Item](../stock/stock.md)) objects associated with this build |
+| can_complete | Boolean that tells if the build can be completed. Means: All material allocated and all parts have been build. |
+| are_untracked_parts_allocated | Boolean that tells if all bom_items have allocated stock_items. |
+| creation_date | Date where the build has been created |
+| completion_date | Date the build was completed (or, if incomplete, the expected date of completion) |
+| completed_by | The [User](./context_variables.md#user) that completed the build |
+| is_overdue | Boolean that tells if the build is overdue |
+| is_complete | Boolean that tells if the build is complete |
+| issued_by | The [User](./context_variables.md#user) who created the build |
+| link | External URL for extra information |
+| notes | Text notes |
+| parent | Reference to a parent build object if this is a sub build |
+| part | The [Part](./context_variables.md#part) to be built (from component BOM items) |
+| quantity | Build order quantity (total number of assembly outputs) |
+| completed | The number out outputs which have been completed |
+| reference | Build order reference (required, must be unique) |
+| required_parts | A query set with all parts that are required for the build |
+| responsible | Owner responsible for completing the build. This can be a user or a group. Depending on that further context variables differ |
+| sales_order | References to a [Sales Order](./context_variables.md#salesorder) object for which this build is required (e.g. the output of this build will be used to fulfil a sales order) |
+| status | The status of the build. 20 means 'Production' |
+| sub_build_count | Number of sub builds |
+| sub_builds | Query set with all sub builds |
+| target_date | Date the build will be overdue |
+| take_from | [StockLocation](./context_variables.md#stocklocation) to take stock from to make this build (if blank, can take from anywhere) |
+| title | The full name of the build |
+| description | The description of the build |
+| allocated_stock.all | A query set with all allocated stock items for the build |
+
+As usual items in a query sets can be selected by adding a .n to the set e.g. build.required_parts.0
+will result in the first part of the list. Each query set has again its own context variables.
+
+#### line_items
+
+The `line_items` variable is a list of all build line items associated with the selected build. The following attributes are available for each individual line_item instance:
+
+| Attribute | Description |
+| --- | --- |
+| .build | A reference back to the parent build order |
+| .bom_item | A reference to the BOMItem which defines this line item |
+| .quantity | The required quantity which is to be allocated against this line item |
+| .part | A shortcut for .bom_item.sub_part |
+| .allocations | A list of BuildItem objects which allocate stock items against this line item |
+| .allocated_quantity | The total stock quantity which has been allocated against this line |
+| .unallocated_quantity | The remaining quantity to allocate |
+| .is_fully_allocated | Boolean value, returns True if the line item has sufficient stock allocated against it |
+| .is_overallocated | Boolean value, returns True if the line item has more allocated stock than is required |
+
+#### bom_items
+
+| Attribute | Description |
+| --- | --- |
+| .reference | The reference designators of the components |
+| .quantity | The number of components required to build |
+| .overage | The extra amount required to assembly |
+| .consumable | Boolean field, True if this is a "consumable" part which is not tracked through builds |
+| .sub_part | The part at this position |
+| .substitutes.all | A query set with all allowed substitutes for that part |
+| .note | Extra text field which can contain additional information |
+
+
+#### allocated_stock.all
+
+| Attribute | Description |
+| --- | --- |
+| .bom_item | The bom item where this part belongs to |
+| .stock_item | The allocated [StockItem](./context_variables.md#stockitem) |
+| .quantity | The number of components needed for the build (components in BOM x parts to build) |
+
+### Example
+
+The following example will create a report with header and BOM. In the BOM table substitutes will be listed.
+
+{% raw %}
+```html
+{% extends "report/inventree_report_base.html" %}
+
+{% load i18n %}
+{% load report %}
+{% load barcode %}
+{% load inventree_extras %}
+{% load markdownify %}
+
+{% block page_margin %}
+margin: 2cm;
+margin-top: 4cm;
+{% endblock %}
+
+{% block style %}
+
+.header-right {
+    text-align: right;
+    float: right;
+}
+
+.logo {
+    height: 20mm;
+    vertical-align: middle;
+}
+
+.details {
+    width: 100%;
+    border: 1px solid;
+    border-radius: 3px;
+    padding: 5px;
+    min-height: 42mm;
+}
+
+.details table {
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    width: 65%;
+    table-layout: fixed;
+    font-size: 75%;
+}
+.changes table {
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    width: 100%;
+    table-layout: fixed;
+    font-size: 75%;
+    border: 1px solid;
+}
+
+.changes-table th {
+    font-size: 100%;
+    border: 1px solid;
+}
+
+.changes-table td {
+    border: 1px solid;
+}
+
+.details table td:not(:last-child){
+    white-space: nowrap;
+}
+
+.details table td:last-child{
+    width: 50%;
+    padding-left: 1cm;
+    padding-right: 1cm;
+}
+
+.details-table td {
+    padding-left: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border-bottom: 1px solid #555;
+}
+
+{% endblock %}
+
+{% block bottom_left %}
+content: "v{{report_revision}} - {% format_date date %}";
+{% endblock %}
+
+{% block header_content %}
+    <!-- TODO - Make the company logo asset generic -->
+    <img class='logo' src="{% asset 'company_logo.png' %}" alt="logo" width="150">
+
+    <div class='header-right'>
+        <h3>
+            Build Order {{ build }}
+        </h3>
+        <br>
+    </div>
+
+    <hr>
+{% endblock %}
+
+{% block page_content %}
+
+<div class='details'>
+
+        <table class='details-table'>
+            <tr>
+                <th>{% trans "Build Order" %}</th>
+                <td>{% internal_link build.get_absolute_url build %}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Order" %}</th>
+                <td>{{ reference }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Part" %}</th>
+                <td>{% internal_link part.get_absolute_url part.IPN %}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Quantity" %}</th>
+                <td>{{ build.quantity }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Description" %}</th>
+                <td>{{ build.title }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Issued" %}</th>
+                <td>{% format_date build.creation_date %}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Target Date" %}</th>
+                <td>
+                    {% if build.target_date %}
+                    {% format_date build.target_date %}
+                    {% else %}
+                    <em>Not specified</em>
+                    {% endif %}
+                </td>
+            </tr>
+            {% if build.parent %}
+            <tr>
+                <th>{% trans "Required For" %}</th>
+                <td>{% internal_link build.parent.get_absolute_url build.parent %}</td>
+            </tr>
+            {% endif %}
+            {% if build.issued_by %}
+            <tr>
+                <th>{% trans "Issued By" %}</th>
+                <td>{{ build.issued_by }}</td>
+            </tr>
+            {% endif %}
+            {% if build.responsible %}
+            <tr>
+                <th>{% trans "Responsible" %}</th>
+                <td>{{ build.responsible }}</td>
+            </tr>
+            {% endif %}
+            <tr>
+                <th>{% trans "Sub builds count" %}</th>
+                <td>{{ build.sub_build_count }}</td>
+            </tr>
+	    {% if build.sub_build_count > 0 %}
+            <tr>
+                <th>{% trans "Sub Builds" %}</th>
+                <td>{{ build.sub_builds }}</td>
+            </tr>
+            {% endif %}
+            <tr>
+                <th>{% trans "Overdue" %}</th>
+                <td>{{ build.is_overdue }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Can complete" %}</th>
+                <td>{{ build.can_complete }}</td>
+            </tr>
+        </table>
+</div>
+
+<h3>{% trans "Notes" %}</h3>
+{% if build.notes %}
+{{ build.notes|markdownify }}
+{% endif %}
+
+<h3>{% trans "Parts" %}</h3>
+
+<div class='changes'>
+  <table class='changes-table'>
+    <thead>
+      <tr>
+	<th>Original IPN</th>
+	<th>Reference</th>
+	<th>Replace width IPN</th>
+      </tr>
+    </thead>
+    <tbody>
+  {% for line in build.bom_items %}
+      <tr>
+	<td> {{ line.sub_part.IPN }} </td>
+	<td> {{ line.reference }} </td>
+	<td> {{ line.substitutes.all.0.part.IPN }} </td>
+      </tr>
+  {% endfor %}
+    </tbody>
+  </table>
+</div>
+{% endblock %}
+```
+
+{% endraw %}
+
+This will result a report page like this:
+
+{% with id="report-options", url="build/report-61.png", description="Report Example Builds" %} {% include "img.html" %} {% endwith %}
+
+### Default Report Template
+
+A default *Build Report* template is provided out of the box, which is useful for generating simple test reports. Furthermore, it may be used as a starting point for developing custom BOM reports:
+
+View the [source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/report/templates/report/inventree_build_order_base.html) for the default build report template.

docs/docs/report/context_variables.md

@@ -2,244 +2,64 @@
 title: Context Variables
 ---
 
-
 ## Context Variables
 
-Context variables are provided to each template when it is rendered. The available context variables depend on the model type for which the template is being rendered.
+### Report
 
-### Global Context
+!!! info "Specific Report Context"
+    Specific report types may have additional context variables, see below.
 
-In addition to the model-specific context variables, the following global context variables are available to all templates:
+Each report has access to a number of context variables by default. The following context variables are provided to every report template:
 
 | Variable | Description |
 | --- | --- |
-| base_url | The base URL for the InvenTree instance |
 | date | Current date, represented as a Python datetime.date object |
 | datetime | Current datetime, represented as a Python datetime object |
-| template | The report template instance which is being rendered against |
-| template_description | Description of the report template |
-| template_name | Name of the report template |
-| template_revision | Revision of the report template |
+| page_size | The specified page size for this report, e.g. `A4` or `Letter landscape` |
+| report_template | The report template model instance |
+| report_name | Name of the report template |
+| report_description | Description of the report template |
+| report_revision | Revision of the report template |
+| request | Django request object |
 | user | User who made the request to render the template |
 
-::: report.models.ReportTemplateBase.base_context
-    options:
-        show_source: True
+#### Label
 
-### Report Context
+Certain types of labels have different context variables then other labels.
 
-In addition to the [global context](#global-context), all *report* templates have access to the following context variables:
+##### Stock Item Label
+
+The following variables are made available to the StockItem label template:
 
 | Variable | Description |
-| --- | --- |
-| page_size | The page size of the report |
-| landscape | Boolean value, True if the report is in landscape mode |
-
-Note that custom plugins may also add additional context variables to the report context.
-
-::: report.models.ReportTemplate.get_context
-    options:
-        show_source: True
-
-### Label Context
-
-In addition to the [global context](#global-context), all *label* templates have access to the following context variables:
-
-| Variable | Description |
-| --- | --- |
-| width | The width of the label (in mm) |
-| height | The height of the label (in mm) |
-
-Note that custom plugins may also add additional context variables to the label context.
-
-::: report.models.LabelTemplate.get_context
-    options:
-        show_source: True
-
-
-## Template Types
-
-Templates (whether for generating [reports](./report.md) or [labels](./labels.md)) are rendered against a particular "model" type. The following model types are supported, and can have templates renderer against them:
-
-| Model Type | Description |
-| --- | --- |
-| [build](#build-order) | A [Build Order](../build/build.md) instance |
-| [buildline](#build-line) | A [Build Order Line Item](../build/build.md) instance |
-| [salesorder](#sales-order) | A [Sales Order](../order/sales_order.md) instance |
-| [returnorder](#return-order) | A [Return Order](../order/return_order.md) instance |
-| [purchaseorder](#purchase-order) | A [Purchase Order](../order/purchase_order.md) instance |
-| [stockitem](#stock-item) | A [StockItem](../stock/stock.md#stock-item) instance |
-| [stocklocation](#stock-location) | A [StockLocation](../stock/stock.md#stock-location) instance |
-| [part](#part) | A [Part](../part/part.md) instance |
-
-### Build Order
-
-When printing a report or label against a [Build Order](../build/build.md) object, the following context variables are available:
-
-| Variable | Description |
-| --- | --- |
-| bom_items | Query set of all BuildItem objects associated with the BuildOrder |
-| build | The BuildOrder instance itself |
-| build_outputs | Query set of all BuildItem objects associated with the BuildOrder |
-| line_items | Query set of all build line items associated with the BuildOrder |
-| part | The Part object which is being assembled in the build order |
-| quantity | The total quantity of the part being assembled |
-| reference | The reference field of the BuildOrder |
-| title | The title field of the BuildOrder |
-
-::: build.models.Build.report_context
-    options:
-        show_source: True
-
-### Build Line
-
-When printing a report or label against a [BuildOrderLineItem](../build/build.md) object, the following context variables are available:
-
-| Variable | Description |
-| --- | --- |
-| allocated_quantity | The quantity of the part which has been allocated to this build |
-| allocations | A query set of all StockItem objects which have been allocated to this build line |
-| bom_item | The BomItem associated with this line item |
-| build | The BuildOrder instance associated with this line item |
-| build_line | The build line instance itself |
-| part | The sub-part (component) associated with the linked BomItem instance |
-| quantity | The quantity required for this line item |
-
-::: build.models.BuildLine.report_context
-    options:
-        show_source: True
-
-
-### Sales Order
-
-When printing a report or label against a [SalesOrder](../order/sales_order.md) object, the following context variables are available:
-
-| Variable | Description |
-| --- | --- |
-| customer | The customer object associated with the SalesOrder |
-| description | The description field of the SalesOrder |
-| extra_lines | Query set of all extra lines associated with the SalesOrder |
-| lines | Query set of all line items associated with the SalesOrder |
-| order | The SalesOrder instance itself |
-| reference | The reference field of the SalesOrder |
-| title | The title (string representation) of the SalesOrder |
-
-::: order.models.Order.report_context
-    options:
-        show_source: True
-
-### Return Order
-
-When printing a report or label against a [ReturnOrder](../order/return_order.md) object, the following context variables are available:
-
-| Variable | Description |
-| --- | --- |
-| customer | The customer object associated with the ReturnOrder |
-| description | The description field of the ReturnOrder |
-| extra_lines | Query set of all extra lines associated with the ReturnOrder |
-| lines | Query set of all line items associated with the ReturnOrder |
-| order | The ReturnOrder instance itself |
-| reference | The reference field of the ReturnOrder |
-| title | The title (string representation) of the ReturnOrder |
-
-### Purchase Order
-
-When printing a report or label against a [PurchaseOrder](../order/purchase_order.md) object, the following context variables are available:
-
-| Variable | Description |
-| --- | --- |
-| description | The description field of the PurchaseOrder |
-| extra_lines | Query set of all extra lines associated with the PurchaseOrder |
-| lines | Query set of all line items associated with the PurchaseOrder |
-| order | The PurchaseOrder instance itself |
-| reference | The reference field of the PurchaseOrder |
-| supplier | The supplier object associated with the PurchaseOrder |
-| title | The title (string representation) of the PurchaseOrder |
-
-### Stock Item
-
-When printing a report or label against a [StockItem](../stock/stock.md#stock-item) object, the following context variables are available:
-
-| Variable | Description |
-| --- | --- |
-| barcode_data | Generated barcode data for the StockItem |
-| barcode_hash | Hash of the barcode data |
-| batch | The batch code for the StockItem |
-| child_items | Query set of all StockItem objects which are children of this StockItem |
-| ipn | The IPN (internal part number) of the associated Part |
-| installed_items | Query set of all StockItem objects which are installed in this StockItem |
-| item | The StockItem object itself |
-| name | The name of the associated Part |
-| part | The Part object which is associated with the StockItem |
-| qr_data | Generated QR code data for the StockItem |
-| qr_url | Generated URL for embedding in a QR code |
+| -------- | ----------- |
+| item | The [StockItem](./context_variables.md#stockitem) object itself |
+| part | The [Part](./context_variables.md#part) object which is referenced by the [StockItem](./context_variables.md#stockitem) object |
+| name | The `name` field of the associated Part object |
+| ipn | The `IPN` field of the associated Part object |
+| revision | The `revision` field of the associated Part object |
+| quantity | The `quantity` field of the StockItem object |
+| serial | The `serial` field of the StockItem object |
+| uid | The `uid` field of the StockItem object |
+| tests | Dict object of TestResult data associated with the StockItem |
 | parameters | Dict object containing the parameters associated with the base Part |
-| quantity | The quantity of the StockItem |
-| result_list | FLattened list of TestResult data associated with the stock item |
-| results | Dict object of TestResult data associated with the StockItem |
-| serial | The serial number of the StockItem |
-| stock_item | The StockItem object itself (shadow of 'item') |
-| tests | Dict object of TestResult data associated with the StockItem (shadow of 'results') |
-| test_keys | List of test keys associated with the StockItem |
-| test_template_list | List of test templates associated with the StockItem |
-| test_templates | Dict object of test templates associated with the StockItem |
-
-::: stock.models.StockItem.report_context
-    options:
-        show_source: True
 
 
-### Stock Location
+##### Stock Location Label
 
-When printing a report or label against a [StockLocation](../stock/stock.md#stock-location) object, the following context variables are available:
+The following variables are made available to the StockLocation label template:
 
 | Variable | Description |
-| --- | --- |
-| location | The StockLocation object itself |
-| qr_data | Formatted QR code data for the StockLocation |
-| parent | The parent StockLocation object |
-| stock_location | The StockLocation object itself (shadow of 'location') |
-| stock_items | Query set of all StockItem objects which are located in the StockLocation |
-
-::: stock.models.StockLocation.report_context
-    options:
-        show_source: True
-
-
-### Part
-
-When printing a report or label against a [Part](../part/part.md) object, the following context variables are available:
-
-| Variable | Description |
-| --- | --- |
-| bom_items | Query set of all BomItem objects associated with the Part |
-| category | The PartCategory object associated with the Part |
-| description | The description field of the Part |
-| IPN | The IPN (internal part number) of the Part |
-| name | The name of the Part |
-| parameters | Dict object containing the parameters associated with the Part |
-| part | The Part object itself |
-| qr_data | Formatted QR code data for the Part |
-| qr_url | Generated URL for embedding in a QR code |
-| revision | The revision of the Part |
-| test_template_list | List of test templates associated with the Part |
-| test_templates | Dict object of test templates associated with the Part |
-
-::: part.models.Part.report_context
-    options:
-        show_source: True
-
-## Model Variables
-
-Additional to the context variables provided directly to each template, each model type has a number of attributes and methods which can be accessedd via the template.
-
-For each model type, a subset of the most commonly used attributes are listed below. For a full list of attributes and methods, refer to the source code for the particular model type.
+| -------- | ----------- |
+| location | The [StockLocation](./context_variables.md#stocklocation) object itself |
 
 ### Parts
 
-#### Part
+!!! incomplete "TODO"
+    This section requires further work
 
-Each part object has access to a lot of context variables about the part. The following context variables are provided when accessing a `Part` object from within the template.
+#### Part
+Each part object has access to a lot of context variables about the part. The following context variables are provided when accessing a `Part` object:
 
 | Variable | Description |
 |----------|-------------|
@@ -286,7 +106,6 @@ Each part object has access to a lot of context variables about the part. The fo
 
 #### Part Category
 
-
 | Variable | Description |
 |----------|-------------|
 | name | Name of this category |
@@ -298,7 +117,6 @@ Each part object has access to a lot of context variables about the part. The fo
 
 #### StockItem
 
-
 | Variable | Description |
 |----------|-------------|
 | parent | Link to another [StockItem](./context_variables.md#stockitem) from which this StockItem was created |
@@ -321,7 +139,7 @@ Each part object has access to a lot of context variables about the part. The fo
 | notes | Extra notes field |
 | build | Link to a Build (if this stock item was created from a build) |
 | is_building | Boolean field indicating if this stock item is currently being built (or is "in production") |
-| purchase_order | Link to a [PurchaseOrder](./context_variables.md#purchase-order) (if this stock item was created from a PurchaseOrder) |
+| purchase_order | Link to a [PurchaseOrder](./context_variables.md#purchaseorder) (if this stock item was created from a PurchaseOrder) |
 | infinite | If True this [StockItem](./context_variables.md#stockitem) can never be exhausted |
 | sales_order | Link to a [SalesOrder](./context_variables.md#salesorder) object (if the StockItem has been assigned to a SalesOrder) |
 | purchase_price | The unit purchase price for this [StockItem](./context_variables.md#stockitem) - this is the unit price at time of purchase (if this item was purchased from an external supplier) |
@@ -346,7 +164,6 @@ Each part object has access to a lot of context variables about the part. The fo
 
 #### Company
 
-
 | Variable | Description |
 |----------|-------------|
 | name | Name of the company |
@@ -367,7 +184,6 @@ Each part object has access to a lot of context variables about the part. The fo
 
 #### Address
 
-
 | Variable | Description |
 |----------|-------------|
 | line1 | First line of the postal address |
@@ -378,6 +194,9 @@ Each part object has access to a lot of context variables about the part. The fo
 
 #### Contact
 
+Contacts are added to companies. Actually the company has no link to the contacts.
+You can search the company object of the contact.
+
 | Variable | Description |
 |----------|-------------|
 | company | Company object where the contact belongs to |
@@ -388,7 +207,6 @@ Each part object has access to a lot of context variables about the part. The fo
 
 #### SupplierPart
 
-
 | Variable | Description |
 |----------|-------------|
 | part | Link to the master Part (Obsolete) |
@@ -408,13 +226,24 @@ Each part object has access to a lot of context variables about the part. The fo
 | has_price_breaks | Whether this [SupplierPart](./context_variables.md#supplierpart) has price breaks |
 | manufacturer_string | Format a MPN string for this [SupplierPart](./context_variables.md#supplierpart). Concatenates manufacture name and part number. |
 
+### Manufacturers
+
+!!! incomplete "TODO"
+    This section requires further work
+
+#### Manufacturer
+
+| Variable | Description |
+|----------|-------------|
+
+#### ManufacturerPart
+
+| Variable | Description |
+|----------|-------------|
 
 ### Orders
 
-#### Purchase Order
-
-!!! note "TODO"
-    This section is incomplete
+The [Purchase Order](../order/purchase_order.md) context variables are described in the [Purchase Order](./purchase_order.md) section.
 
 #### SalesOrder
 

docs/docs/report/helpers.md

@@ -18,7 +18,7 @@ Some common functions are provided for use in custom report and label templates.
 
 When making use of helper functions within a template, it can be useful to store the result of the function to a variable, rather than immediately rendering the output.
 
-For example, using the [render_currency](#currency-formatting) helper function, we can store the output to a variable which can be used at a later point in the template:
+For example, using the [render_currency](#rendering-currency) helper function, we can store the output to a variable which can be used at a later point in the template:
 
 ```html
 {% raw %}
@@ -259,31 +259,6 @@ A shortcut function is provided for rendering an image associated with a Company
 
 *Preview* and *thumbnail* image variations can be rendered for the `company_image` tag, in a similar manner to [part image variations](#image-variations)
 
-## Icons
-
-Some models (e.g. part categories and locations) allow to specify a custom icon. To render these icons in a report, there is a `{% raw %}{% icon location.icon %}{% endraw %}` template tag from the report template library available.
-
-This tag renders the required html for the icon.
-
-!!! info "Loading fonts"
-    Additionally the icon fonts need to be loaded into the template. This can be done using the `{% raw %}{% include_icon_fonts %}{% endraw %}` template tag inside of a style block
-
-!!! tip "Custom classes for styling the icon further"
-    The icon template tag accepts an optional `class` argument which can be used to apply a custom class to the rendered icon used to style the icon further e.g. positioning it, changing it's size, ... `{% raw %}{% icon location.icon class="my-class" %}{% endraw %}`.
-
-```html
-{% raw %}
-{% load report %}
-
-{% block style %}
-{% include_icon_fonts %}
-{% endblock style %}
-
-{% icon location.icon %}
-
-{% endraw %}
-```
-
 ## InvenTree Logo
 
 A template tag is provided to load the InvenTree logo image into a report. You can render the logo using the `{% raw %}{% logo_image %}{% endraw %}` tag:
@@ -297,7 +272,7 @@ A template tag is provided to load the InvenTree logo image into a report. You c
 
 ### Custom Logo
 
-If the system administrator has enabled a [custom logo](../start/config.md#customization-options) then this logo will be used instead of the base InvenTree logo.
+If the system administrator has enabled a [custom logo](../start/config.md#customisation-options), then this logo will be used instead of the base InvenTree logo.
 
 This is a useful way to get a custom company logo into your reports.
 
@@ -312,7 +287,7 @@ If you have a custom logo, but explicitly wish to load the InvenTree logo itself
 
 ## Report Assets
 
-[Report Assets](./templates.md#report-assets) are files specifically uploaded by the user for inclusion in generated reports and labels.
+[Report Assets](./report.md#report-assets) are files specifically uploaded by the user for inclusion in generated reports and labels.
 
 You can add asset images to the reports and labels by using the `{% raw %}{% asset ... %}{% endraw %}` template tag:
 

docs/docs/report/labels.md

@@ -11,6 +11,17 @@ Custom labels can be generated using simple HTML templates, with support for QR-
 
 Simple (generic) label templates are supplied 'out of the box' with InvenTree - however support is provided for generation of extremely specific custom labels, to meet any particular requirement.
 
+## Label Types
+
+The following types of labels are available
+
+| Label Type | Description |
+| --- | --- |
+| [Part Labels](./labels/part_labels.md) | Print labels for individual parts |
+| [Stock Labels](./labels/stock_labels.md) | Print labels for individual stock items |
+| [Location Labels](./labels/location_labels.md) | Print labels for individual stock locations
+| [Build Labels](./labels/build_labels.md) | Print labels for individual build order line items |
+
 ## Label Templates
 
 Label templates are written using a mixture of [HTML](https://www.w3schools.com/html/) and [CSS](https://www.w3schools.com/css). [Weasyprint](https://weasyprint.org/) templates support a *subset* of HTML and CSS features. In addition to supporting HTML and CSS formatting, the label templates support the Django templating engine, allowing conditional formatting of the label data.

docs/docs/report/labels/build_labels.md

@@ -0,0 +1,118 @@
+---
+title: Build Labels
+---
+
+## Build Line Labels
+
+Build label templates are used to generate labels for individual build order line items.
+
+### Creating Build Line Label Templates
+
+Build label templates are added (and edited) via the [admin interface](../../settings/admin.md).
+
+### Printing Build Line Labels
+
+Build line labels are printed from the Build Order page, under the *Allocate Stock* tab. Multiple line items can be selected for printing:
+
+{% with id='print_build_labels', url='report/label_build_print.png', description='Print build line labels' %}
+{% include 'img.html' %}
+{% endwith %}
+
+### Context Data
+
+The following context variables are made available to the Build Line label template:
+
+| Variable | Description |
+| --- | --- |
+| build_line | The build_line instance |
+| build | The build order to which the build_line is linked |
+| bom_item | The bom_item to which the build_line is linked |
+| part | The required part for this build_line instance. References bom_item.sub_part |
+| quantity | The total quantity required for the build line |
+| allocated_quantity | The total quantity which has been allocated against the build line |
+| allocations | A queryset containing the allocations made against the build_line |
+
+## Example
+
+A simple example template is shown below:
+
+```html
+{% raw %}
+{% extends "label/label_base.html" %}
+{% load barcode report %}
+{% load inventree_extras %}
+
+{% block style %}
+
+{{ block.super }}
+
+.label {
+  margin: 1mm;
+}
+
+.qr {
+  height: 28mm;
+  width: 28mm;
+  position: relative;
+  top: 0mm;
+  right: 0mm;
+  float: right;
+}
+
+.label-table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 1pt solid black;
+}
+
+.label-table tr {
+  width: 100%;
+  border-bottom: 1pt solid black;
+  padding: 2.5mm;
+}
+
+.label-table td {
+  padding: 3mm;
+}
+
+{% endblock style %}
+
+{% block content %}
+
+<div class='label'>
+<table class='label-table'>
+  <tr>
+    <td>
+      <b>Build Order:</b> {{ build.reference }}<br>
+      <b>Build Qty:</b> {% decimal build.quantity %}<br>
+    </td>
+    <td>
+      <img class='qr' alt='build qr' src='{% qrcode build.barcode %}'>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Part:</b> {{ part.name }}<br>
+      {% if part.IPN %}
+      <b>IPN:</b> {{ part.IPN }}<br>
+      {% endif %}
+      <b>Qty / Unit:</b> {% decimal bom_item.quantity %} {% if part.units %}[{{ part.units }}]{% endif %}<br>
+      <b>Qty Total:</b> {% decimal quantity %} {% if part.units %}[{{ part.units }}]{% endif %}
+    </td>
+    <td>
+      <img class='qr' alt='part qr' src='{% qrcode part.barcode %}'>
+    </td>
+  </tr>
+</table>
+</div>
+
+{% endblock content %}
+
+{% endraw %}
+```
+
+Which results in a label like:
+
+{% with id='build_label_example', url='report/label_build_example.png', description='Example build line labels' %}
+{% include 'img.html' %}
+{% endwith %}

docs/docs/report/labels/location_labels.md

@@ -0,0 +1,24 @@
+---
+title: Location Labels
+---
+
+
+## Stock Location Labels
+
+Stock Location label templates are used to generate labels for individual Stock Locations.
+
+### Creating Stock Location Label Templates
+
+Stock Location label templates are added (and edited) via the admin interface.
+
+### Printing Stock Location Labels
+
+To print a single label from the Stock Location detail view, select the *Print Label* option.
+
+### Context Data
+
+The following variables are made available to the StockLocation label template:
+
+| Variable | Description |
+| -------- | ----------- |
+| location | The [StockLocation](../context_variables.md#stocklocation) object itself |

docs/docs/report/labels/part_labels.md

@@ -0,0 +1,91 @@
+---
+title: Part Labels
+---
+
+
+## Part Labels
+
+Part label templates are used to generate labels for individual Part instances.
+
+### Creating Part Label Templates
+
+Part label templates are added (and edited) via the admin interface.
+
+### Printing Part Labels
+
+Part label can be printed using the following approaches:
+
+To print a single part label from the Part detail view, select the *Print Label* option.
+
+To print multiple part labels, select multiple parts in the part table and select the *Print Labels* option.
+
+### Context Data
+
+The following context variables are made available to the Part label template:
+
+| Variable | Description |
+| -------- | ----------- |
+| part | The [Part](../context_variables.md#part) object |
+| category | The [Part Category](../context_variables.md#part-category) which contains the Part |
+| name | The name of the part |
+| description | The description text for the part |
+| IPN | Internal part number (IPN) for the part |
+| revision | Part revision code |
+| qr_data | String data which can be rendered to a QR code |
+| parameters | Map (Python dictionary) object containing the parameters associated with the part instance |
+
+#### Parameter Values
+
+The part parameter *values* can be accessed by parameter name lookup in the template, as follows:
+
+```html
+{% raw %}
+
+Part: {{ part.name }}
+Length: {{ parameters.length }}
+
+{% endraw %}
+```
+
+!!! warning "Spaces"
+    Note that for parameters which include a `space` character in their name, lookup using the "dot" notation won't work! In this case, try using the [key lookup](../helpers.md#key-access) method:
+
+```html
+{% raw %}
+
+Voltage Rating: {% getkey parameters "Voltage Rating" %}
+{% endraw %}
+```
+
+#### Parameter Data
+
+If you require access to the parameter data itself, and not just the "value" of a particular parameter, you can use the `part_parameter` [helper function](../helpers.md#part-parameters).
+
+For example, the following label template can be used to generate a label which contains parameter data in addition to parameter units:
+
+```html
+{% raw %}
+{% extends "label/label_base.html" %}
+
+{% load report %}
+
+{% block content %}
+
+{% part_parameter part "Width" as width %}
+{% part_parameter part "Length" as length %}
+
+<div>
+    Part: {{ part.full_name }}<br>
+    Width: {{ width.data }} [{{ width.units }}]<br>
+    Length: {{ length.data }} [{{ length.units }}]
+</div>
+
+{% endblock content %}
+{% endraw %}
+```
+
+The following label is produced:
+
+{% with id="report-parameters", url="report/label_with_parameters.png", description="Label with parameters" %}
+{% include 'img.html' %}
+{% endwith %}

docs/docs/report/labels/stock_labels.md

@@ -0,0 +1,61 @@
+---
+title: Stock Labels
+---
+
+
+## Stock Item Labels
+
+Stock Item label templates are used to generate labels for individual Stock Items.
+
+### Creating Stock Item Label Templates
+
+Stock Item label templates are added (and edited) via the admin interface.
+
+### Printing Stock Item Labels
+
+Stock Item labels can be printed using the following approaches:
+
+To print a single stock item from the Stock Item detail view, select the *Print Label* option as shown below:
+
+{% with id='item_label_single', url='report/label_stock_print_single.png', description='Print single stock item label' %}
+{% include 'img.html' %}
+{% endwith %}
+
+To print multiple stock items from the Stock table view, select the *Print Labels* option as shown below:
+
+{% with id='item_label_multiple', url='report/label_stock_print_multiple.png', description='Print multiple stock item labels' %}
+{% include 'img.html' %}
+{% endwith %}
+
+### Context Data
+
+The following variables are made available to the StockItem label template:
+
+| Variable | Description |
+| -------- | ----------- |
+| item | The [StockItem](../context_variables.md#stockitem) object itself |
+| part | The [Part](../context_variables.md#part) object which is referenced by the [StockItem](../context_variables.md#stockitem) object |
+| name | The `name` field of the associated Part object |
+| ipn | The `IPN` field of the associated Part object |
+| revision | The `revision` field of the associated Part object |
+| quantity | The `quantity` field of the StockItem object |
+| serial | The `serial` field of the StockItem object |
+| uid | The `uid` field of the StockItem object |
+| tests | Dict object of TestResult data associated with the StockItem |
+| parameters | Dict object containing the parameters associated with the base Part |
+
+### URL-style QR code
+
+Stock Item labels support [QR code](../barcodes.md#qr-code) containing the stock item URL, which can be
+scanned and opened directly
+on a portable device using the camera or a QR code scanner. To generate a URL-style QR code for stock item in the [label HTML template](../labels.md#label-templates), add the
+following HTML tag:
+
+``` html
+{% raw %}
+<img class='custom_qr_class' src='{% qrcode qr_url %}'>
+{% endraw %}
+```
+
+Make sure to customize the `custom_qr_class` CSS class to define the position of the QR code
+on the label.

docs/docs/report/purchase_order.md

@@ -0,0 +1,65 @@
+---
+title: Purchase Order Report
+---
+
+## Purchase Order Reports
+
+Custom purchase order reports may be generated against any given [Purchase Order](../order/purchase_order.md). For example, purchase order reports could be used to generate a pdf of the order to send to a supplier.
+
+### Purchase Order Filters
+
+The report template can be filtered against available [Purchase Order](../order/purchase_order.md) instances.
+
+### Context Variables
+
+In addition to the default report context variables, the following variables are made available to the purchase order report template for rendering:
+
+| Variable | Description |
+| --- | --- |
+| order | The specific Purchase Order object |
+| reference | The order reference field (can also be accessed as `{% raw %}{{ order.reference }}{% endraw %}`) |
+| description | The order description field |
+| supplier | The [supplier](../order/company.md#suppliers) associated with this purchase order |
+| lines | A list of available line items for this order |
+| extra_lines | A list of available *extra* line items for this order |
+| order.created_by | The user who created the order |
+| order.responsible | The user or group who is responsible for the order |
+| order.creation_date | The date when the order was created |
+| order.target_date | The date when the order should arrive |
+| order.if_overdue | Boolean value that tells if the target date has passed |
+| order.currency | The currency code associated with this order, e.g. 'AUD' |
+| order.contact | The [contact](./context_variables.md#contact)  object associated with this order |
+
+#### Lines
+
+Each line item (available within the `lines` list) has sub variables, as follows:
+
+| Variable | Description |
+| --- | --- |
+| quantity | The quantity of the part to be ordered |
+| part | The [supplierpart ](./context_variables.md#supplierpart) object to be ordered |
+| reference | The reference given in the part of the order |
+| notes | The notes given in the part of the order |
+| target_date | The date when the part should arrive. Each part can have an individual date |
+| price | The unit price the line item |
+| total_line_price | The total price for this line item, calculated from the unit price and quantity |
+| destination | The stock location where the part will be stored |
+
+A simple example below shows how to use the context variables for each line item:
+
+```html
+{% raw %}
+{% for line in lines %}
+Internal Part: {{ line.part.part.name }} - <i>{{ line.part.part.description }}</i>
+SKU: {{ line.part.SKU }}
+Price: {% render_currency line.total_line_price %}
+{% endfor %}
+{% endraw %}
+```
+
+
+### Default Report Template
+
+A default *Purchase Order Report* template is provided out of the box, which is useful for generating simple test reports. Furthermore, it may be used as a starting point for developing custom BOM reports:
+
+View the [source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/report/templates/report/inventree_po_report_base.html) for the default purchase order report template.

docs/docs/report/report.md

@@ -1,14 +1,14 @@
 ---
-title: Report and LabelGeneration
+title: Report Generation
 ---
 
-## Custom Reports
+## Custom Reporting
 
-InvenTree supports a customizable reporting ecosystem, allowing the user to develop document templates that meet their particular needs.
+InvenTree supports a customizable reporting ecosystem, allowing the user to develop reporting templates that meet their particular needs.
 
-PDF files are generated from custom HTML template files which are written by the user.
+PDF reports are generated from custom HTML template files which are written by the user.
 
-Templates can be used to generate *reports* or *labels* which can be  used in a variety of situations to format data in a friendly format for printing, distribution, conformance and testing.
+Reports are used in a variety of situations to format data in a friendly format for printing, distribution, conformance and testing.
 
 In addition to providing the ability for end-users to provide their own reporting templates, some report types offer "built-in" report templates ready for use.
 
@@ -44,3 +44,290 @@ For example, rendering the name of a part (which is available in the particular
 </p></i>
 {% endraw %}
 ```
+
+### Context Variables
+
+!!! info "Context Variables"
+  	Templates will have different variables available to them depending on the report type. Read the detailed information on each available report type for further information.
+
+Please refer to the [Context variables](./context_variables.md) page.
+
+### Conditional Rendering
+
+The django template system allows for conditional rendering, providing conditional flow statements such as:
+
+```
+{% raw %}
+{% if <condition> %}
+{% do_something %}
+{% elif <other_condition> %}
+<!-- something else -->
+{% else %}
+<!-- finally -->
+{% endif %}
+{% endraw %}
+```
+
+```
+{% raw %}
+{% for <item> in <list> %}
+Item: {{ item }}
+{% endfor %}
+{% endraw %}
+```
+
+!!! info "Conditionals"
+    Refer to the [django template language documentation]({% include "django.html" %}/ref/templates/language/) for more information.
+
+### Localization Issues
+
+Depending on your localization scheme, inputting raw numbers into the formatting section template can cause some unintended issues. Consider the block below which specifies the page size for a rendered template:
+
+```html
+{% raw %}
+<head>
+    <style>
+        @page {
+            size: {{ width }}mm {{ height }}mm;
+            margin: 0mm;
+        }
+    </style>
+</head>
+{% endraw %}
+```
+
+If localization settings on the InvenTree server use a comma (`,`) character as a decimal separator, this may produce an output like:
+
+```html
+{% raw %}
+{% endraw %}
+<head>
+    <style>
+        @page {
+            size: 57,3mm 99,0mm;
+            margin: 0mm;
+        }
+    </style>
+</head>
+```
+
+The resulting `{% raw %}<style>{% endraw %}` CSS block will be *invalid*!
+
+So, if you are writing a template which has custom formatting, (or any other sections which cannot handle comma decimal separators) you must wrap that section in a `{% raw %}{% localize off %}{% endraw %}` block:
+
+```html
+{% raw %}
+{% load l10n %}
+<head>
+    <style>
+        @page {
+            {% localize off %}
+            size: {{ width }}mm {{ height }}mm;
+            {% endlocalize %}
+            margin: 0mm;
+        }
+    </style>
+</head>
+{% endraw %}
+```
+
+!!! tip "Close it out"
+    Don't forget to end with a `{% raw %}{% endlocalize %}{% endraw %}` tag!
+
+!!! tip "l10n"
+    You will need to add `{% raw %}{% load l10n %}{% endraw %}` to the top of your template file to use the `{% raw %}{% localize %}{% endraw %}` tag.
+
+### Extending with Plugins
+
+The [ReportMixin plugin class](../extend/plugins/report.md) allows reporting functionality to be extended with custom features.
+
+## Report Types
+
+InvenTree supports the following reporting functionality:
+
+| Report Type | Description |
+| --- | --- |
+| [Test Report](./test.md) | Format results of a test report against for a particular StockItem |
+| [Build Order Report](./build.md) | Format a build order report |
+| [Purchase Order Report](./purchase_order.md) | Format a purchase order report |
+| [Sales Order Report](./sales_order.md) | Format a sales order report |
+| [Return Order Report](./return_order.md) | Format a return order report |
+| [Stock Location Report](./stock_location.md) | Format a stock location report |
+
+### Default Reports
+
+InvenTree is supplied with a number of default templates "out of the box". These are generally quite simple, but serve as a starting point for building custom reports to suit a specific need.
+
+!!! tip "Read the Source"
+    The source code for the default reports is [available on GitHub](https://github.com/inventree/InvenTree/tree/master/src/backend/InvenTree/report/templates/report). Use this as a guide for generating your own reports!
+
+## Creating Reports
+
+Report templates are created (and edited) via the [admin interface](../settings/admin.md), under the *Report* section. Select the certain type of report template you are wanting to create, and press the *Add* button in the top right corner:
+
+{% with id="report-create", url="report/add_report_template.png", description="Create new report" %}
+{% include 'img.html' %}
+{% endwith %}
+
+!!! tip "Staff Access Only"
+    Only users with staff access can upload or edit report template files.
+
+!!! info "Editing Reports"
+    Existing reports can be edited from the admin interface, in the same location as described above. To change the contents of the template, re-upload a template file, to override the existing template data.
+
+### Name and Description
+
+Each report template requires a name and description, which identify and describe the report template.
+
+### Enabled Status
+
+Boolean field which determines if the specific report template is enabled, and available for use. Reports can be disabled to remove them from the list of available templates, but without deleting them from the database.
+
+### Filename Pattern
+
+The filename pattern used to generate the output `.pdf` file. Defaults to "report.pdf".
+
+The filename pattern allows custom rendering with any context variables which are available to the report. For example, a [test report](./test.md) for a particular [Stock Item](../stock/stock.md#stock-item) can use the part name and serial number of the stock item when generating the report name:
+
+{% with id="report-filename-pattern", url="report/filename_pattern.png", description="Report filename pattern" %}
+{% include 'img.html' %}
+{% endwith %}
+
+
+### Report Filters
+
+Each type of report provides a *filters* field, which can be used to filter which items a report can be generated against. The target of the *filters* field depends on the type of report - refer to the documentation on the specific report type for more information.
+
+For example, the [Test Report](./test.md) filter targets the linked [Stock Item](../stock/status.md) object, and can be used to select which stock items are allowed for the given report. Let's say that a certain test report should only be generated for "trackable" stock items. A filter could easily be constructed to accommodate this, by limiting available items to those where the associated [Part](../part/part.md) is *trackable*:
+
+{% with id="report-filter-valid", url="report/filters_valid.png", description="Report filter  selection" %}
+{% include 'img.html' %}
+{% endwith %}
+
+If you enter an invalid option for the filter field, an error message will be displayed:
+
+{% with id="report-filter-invalid", url="report/filters_invalid.png", description="Invalid filter selection" %}
+{% include 'img.html' %}
+{% endwith %}
+
+!!! warning "Advanced Users"
+    Report filtering is an advanced topic, and requires a little bit of knowledge of the underlying data structure!
+
+### Metadata
+
+A JSON field made available to any [plugins](../extend/plugins.md) - but not used by internal code.
+
+## Report Options
+
+A number of global reporting options are available for customizing InvenTree reports:
+
+{% with id="report-options", url="report/report.png", description="Report Options" %}
+{% include 'img.html' %}
+{% endwith %}
+
+### Enable Reports
+
+By default, the reporting feature is disabled. It must be enabled in the global settings.
+
+
+### Default Page Size
+
+The built-in InvenTree report templates (and any reports which are derived from the built-in templates) use the *Page Size* option to set the page size of the generated reports.
+
+!!! info "Override Page Size"
+    Custom report templates do not have to make use of the *Page Size* option, although it is made available to the template context.
+
+### Debug Mode
+
+As templates are rendered directly to a PDF object, it can be difficult to debug problems when the PDF does not render exactly as expected.
+
+Setting the *Debug Mode* option renders the template as raw HTML instead of PDF, allowing the rendering output to be introspected. This feature allows template designers to understand any issues with the generated HTML (before it is passed to the PDF generation engine).
+
+!!! warning "HTML Rendering Limitations"
+    When rendered in debug mode, @page attributes (such as size, etc) will **not** be observed. Additionally, any asset files stored on the InvenTree server will not be rendered. Debug mode is not intended to produce "good looking" documents!
+
+## Report Assets
+
+User can upload asset files (e.g. images) which can be used when generating reports. For example, you may wish to generate a report with your company logo in the header. Asset files are uploaded via the admin interface.
+
+Asset files can be rendered directly into the template as follows
+
+```html
+{% raw %}
+<!-- Need to include the report template tags at the start of the template file -->
+{% load report %}
+
+<!-- Simple stylesheet -->
+<head>
+  <style>
+    .company-logo {
+      height: 50px;
+    }
+  </style>
+</head>
+
+<body>
+<!-- Report template code here -->
+
+<!-- Render an uploaded asset image -->
+<img src="{% asset 'company_image.png' %}" class="company-logo">
+
+<!-- ... -->
+</body>
+
+{% endraw %}
+```
+
+!!! warning "Asset Naming"
+    If the requested asset name does not match the name of an uploaded asset, the template will continue without loading the image.
+
+!!! info "Assets location"
+    You need to ensure your asset images to the report/assets directory in the [data directory](../start/intro.md#file-storage). Upload new assets via the [admin interface](../settings/admin.md) to ensure they are uploaded to the correct location on the server.
+
+
+## Report Snippets
+
+A powerful feature provided by the django / WeasyPrint templating framework is the ability to include external template files. This allows commonly used template features to be broken out into separate files and re-used across multiple templates.
+
+To support this, InvenTree provides report "snippets" - short (or not so short) template files which cannot be rendered by themselves, but can be called from other templates.
+
+Similar to assets files, snippet template files are uploaded via the admin interface.
+
+Snippets are included in a template as follows:
+
+```
+{% raw %}{% include 'snippets/<snippet_name.html>' %}{% endraw %}
+```
+
+For example, consider a stocktake report for a particular stock location, where we wish to render a table with a row for each item in that location.
+
+```html
+{% raw %}
+
+<table class='stock-table'>
+  <thead>
+    <!-- table header data -->
+  </thead>
+  <tbody>
+    {% for item in location.stock_items %}
+    {% include 'snippets/stock_row.html' with item=item %}
+    {% endfor %}
+  </tbody>
+
+{% endraw %}
+```
+
+!!! info "Snippet Arguments"
+    Note above that named argument variables can be passed through to the snippet!
+
+And the snippet file `stock_row.html` may be written as follows:
+
+```html
+{% raw %}
+<!-- stock_row snippet -->
+<tr>
+  <td>{{ item.part.full_name }}</td>
+  <td>{{ item.quantity }}</td>
+</tr>
+{% endraw %}
+```

docs/docs/report/return_order.md

@@ -0,0 +1,26 @@
+---
+title: Return Order Reports
+---
+
+## Return Order Reports
+
+Custom reports may be generated against any given [Return Order](../order/return_order.md). For example, return order reports can be used to generate an RMA request to send to a customer.
+
+### Context Variables
+
+In addition to the default report context variables, the following context variables are made available to the return order report template for rendering:
+
+| Variable | Description |
+| --- | --- |
+| order | The return order object the report is being generated against |
+| description | The description of the order, also accessed through `order.description` |
+| reference | The reference of the order, also accessed through `order.reference` |
+| customer | The customer object related to this order |
+| lines | The list of line items linked to this order |
+| extra_lines | The list of extra line items linked to this order |
+
+### Default Report Template
+
+A default report template is provided out of the box, which can be used as a starting point for developing custom return order report templates.
+
+View the [source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/report/templates/report/inventree_return_order_report_base.html) for the default return order report template.

docs/docs/report/sales_order.md

@@ -0,0 +1,31 @@
+---
+title: Sales Order Reports
+---
+
+## Sales Order Reports
+
+Custom sales order reports may be generated against any given [Sales Order](../order/sales_order.md). For example, a sales order report could be used to generate an invoice to send to a customer.
+
+### Sales Order Filters
+
+The report template can be filtered against available [Sales Order](../order/sales_order.md) instances.
+
+### Context Variables
+
+In addition to the default report context variables, the following variables are made available to the sales order report template for rendering:
+
+| Variable | Description |
+| --- | --- |
+| order | The specific Sales Order object |
+| reference | The order reference field (can also be accessed as `{% raw %}{{ order.description }}{% endraw %}`) |
+| description | The order description field |
+| customer | The [customer](../order/company.md#customers) associated with the particular sales order |
+| lines | A list of available line items for this order |
+| extra_lines | A list of available *extra* line items for this order |
+| order.currency | The currency code associated with this order, e.g. 'CAD' |
+
+### Default Report Template
+
+A default *Sales Order Report* template is provided out of the box, which is useful for generating simple test reports. Furthermore, it may be used as a starting point for developing custom BOM reports:
+
+View the [source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/report/templates/report/inventree_so_report_base.html) for the default sales order report template.

docs/docs/report/samples.md

@@ -1,78 +0,0 @@
----
-title: Sample Templates
----
-
-## Sample Templates
-
-A number of pre-built templates are provided with InvenTree, which can be used as a starting point for creating custom reports and labels.
-
-Users can create their own custom templates, or modify the provided templates to suit their needs.
-
-## Report Templates
-
-The following report templates are provided "out of the box" and can be used as a starting point, or as a reference for creating custom reports templates:
-
-| Template | Model Type | Description |
-| --- | --- | --- |
-| [Bill of Materials](#bill-of-materials-report) | [Part](../part/part.md) | Bill of Materials report |
-| [Build Order](#build-order) | [BuildOrder](../build/build.md) | Build Order report |
-| [Purchase Order](#purchase-order) | [PurchaseOrder](../order/purchase_order.md) | Purchase Order report |
-| [Return Order](#return-order) | [ReturnOrder](../order/return_order.md) | Return Order report |
-| [Sales Order](#sales-order) | [SalesOrder](../order/sales_order.md) | Sales Order report |
-| [Stock Location](#stock-location) | [StockLocation](../stock/stock.md#stock-location) | Stock Location report |
-| [Test Report](#test-report) | [StockItem](../stock/stock.md#stock-item) | Test Report |
-
-### Bill of Materials Report
-
-{{ templatefile("report/inventree_bill_of_materials_report.html") }}
-
-### Build Order
-
-{{ templatefile("report/inventree_build_order_report.html") }}
-
-### Purchase Order
-
-{{ templatefile("report/inventree_bill_of_materials_report.html") }}
-
-### Return Order
-
-{{ templatefile("report/inventree_return_order_report.html") }}
-
-### Sales Order
-
-{{ templatefile("report/inventree_sales_order_report.html") }}
-
-### Stock Location
-
-{{ templatefile("report/inventree_stock_location_report.html") }}
-
-### Test Report
-
-{{ templatefile("report/inventree_test_report.html") }}
-
-## Label Templates
-
-The following label templates are provided "out of the box" and can be used as a starting point, or as a reference for creating custom label templates:
-
-| Template | Model Type | Description |
-| --- | --- | --- |
-| [Build Line](#build-line-label) | [Build line item](../build/build.md) | Build Line label |
-| [Part](#part-label) | [Part](../part/part.md) | Part label |
-| [Stock Item](#stock-item-label) | [StockItem](../stock/stock.md#stock-item) | Stock Item label |
-| [Stock Location](#stock-location-label) | [StockLocation](../stock/stock.md#stock-location) | Stock Location label |
-
-### Build Line Label
-
-{{ templatefile("label/buildline_label.html") }}
-
-### Part Label
-
-{{ templatefile("label/part_label_code128.html") }}
-
-### Stock Item Label
-
-{{ templatefile("label/stockitem_qr.html") }}
-
-### Stock Location Label
-
-{{ templatefile("label/stocklocation_qr_and_text.html") }}

docs/docs/report/stock_location.md

@@ -0,0 +1,16 @@
+---
+title: Stock Location Reports
+---
+
+## Stock location Reports
+
+You can print a formatted report of a stock location. This makes sense if you have several parts inside one location, e.g. a box that is sent out to a manufacturing partner. Whit a report you can create a box content list.
+
+### Context Variables
+You can use all content variables from the [StockLocation](./context_variables.md#stocklocation) object.
+
+### Default Report Template
+
+A default report template is provided out of the box, which can be used as a starting point for developing custom return order report templates.
+
+View the [source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/report/templates/report/inventree_slr_report.html) for the default stock location report template.

docs/docs/report/templates.md

@@ -1,228 +0,0 @@
----
-title: InvenTree Templates
----
-
-## Template Overview
-
-InvenTree supports a customizable reporting ecosystem, allowing the user to develop document templates that meet their particular needs.
-
-PDF files are generated from custom HTML template files which are written by the user.
-
-Templates can be used to generate *reports* or *labels* which can be  used in a variety of situations to format data in a friendly format for printing, distribution, conformance and testing.
-
-In addition to providing the ability for end-users to provide their own reporting templates, some report types offer "built-in" report templates ready for use.
-
-## Template Types
-
-The following types of templates are available:
-
-### Reports
-
-Reports are intended to serve as formal documents, and can be used to generate formatted PDF outputs for a variety of purposes.
-
-Refer to the [report templates](./report.md) documentation for further information.
-
-### Labels
-
-Labels can also be generated using the templating system. Labels are intended to be used for printing small, formatted labels for items, parts, locations, etc.
-
-Refer to the [label templates](./labels.md) documentation for further information.
-
-### Template Model Types
-
-When generating a particular template (to render a report or label output), the template is rendered against a particular "model" type. The model type determines the data that is available to the template, and how it is formatted.
-
-To read more about the model types for which templates can be rendered, and the associated context information, refer to the [context variables](./context_variables.md) documentation.
-
-### Default Reports
-
-InvenTree is supplied with a number of default templates "out of the box" - for generating both labels and reports. These are generally quite simple, but serve as a starting point for building custom reports to suit a specific need.
-
-!!! tip "Read the Source"
-    The source code for the default reports is [available on GitHub]({{ sourcedir("src/backend/InvenTree/report/templates/report") }}). Use this as a guide for generating your own reports!
-
-### Extending with Plugins
-
-The [ReportMixin plugin class](../extend/plugins/report.md) allows reporting functionality to be extended with custom features.
-
-## WeasyPrint Template Rendering
-
-InvenTree report templates utilize the powerful [WeasyPrint](https://weasyprint.org/) PDF generation engine.
-
-To read more about the capabilities of the report templating engine, and how to use it, refer to the [weasyprint documentation](./weasyprint.md).
-
-## Creating Templates
-
-Report and label templates can be created (and edited) via the [admin interface](../settings/admin.md), under the *Report* section.
-
-Select the type of template you are wanting to create (a *Report Template* or *Label Template*) and press the *Add* button in the top right corner:
-
-{% with id="report-list", url="report/report_template_admin.png", description="Report templates in admin interface" %}
-{% include 'img.html' %}
-{% endwith %}
-
-!!! tip "Staff Access Only"
-    Only users with staff access can upload or edit report template files.
-
-!!! info "Editing Reports"
-    Existing reports can be edited from the admin interface, in the same location as described above. To change the contents of the template, re-upload a template file, to override the existing template data.
-
-!!! tip "Template Editor"
-    InvenTree also provides a powerful [template editor](./template_editor.md) which allows for the creation and editing of report templates directly within the browser.
-
-### Name and Description
-
-Each report template requires a name and description, which identify and describe the report template.
-
-### Enabled Status
-
-Boolean field which determines if the specific report template is enabled, and available for use. Reports can be disabled to remove them from the list of available templates, but without deleting them from the database.
-
-### Filename Pattern
-
-The filename pattern used to generate the output `.pdf` file. Defaults to "report.pdf".
-
-The filename pattern allows custom rendering with any context variables which are available to the report. For example, a test report for a particular [Stock Item](../stock/stock.md#stock-item) can use the part name and serial number of the stock item when generating the report name:
-
-{% with id="report-filename-pattern", url="report/filename_pattern.png", description="Report filename pattern" %}
-{% include 'img.html' %}
-{% endwith %}
-
-
-### Template Filters
-
-Each template instance provides a *filters* field, which can be used to filter which items a report or label template can be generated against. The target of the *filters* field depends on the model type associated with the particular template.
-
-As an example, let's say that a certain `StockItem` report should only be generated for "trackable" stock items. A filter could easily be constructed to accommodate this, by limiting available items to those where the associated [Part](../part/part.md) is *trackable*:
-
-{% with id="report-filter-valid", url="report/filters_valid.png", description="Report filter  selection" %}
-{% include 'img.html' %}
-{% endwith %}
-
-If you enter an invalid option for the filter field, an error message will be displayed:
-
-{% with id="report-filter-invalid", url="report/filters_invalid.png", description="Invalid filter selection" %}
-{% include 'img.html' %}
-{% endwith %}
-
-!!! warning "Advanced Users"
-    Report filtering is an advanced topic, and requires a little bit of knowledge of the underlying data structure!
-
-### Metadata
-
-A JSON field made available to any [plugins](../extend/plugins.md) - but not used by internal code.
-
-## Reporting Options
-
-A number of global reporting options are available for customizing InvenTree reports:
-
-{% with id="report-options", url="report/report.png", description="Report Options" %}
-{% include 'img.html' %}
-{% endwith %}
-
-### Enable Reports
-
-By default, the reporting feature is disabled. It must be enabled in the global settings.
-
-
-### Default Page Size
-
-The built-in InvenTree report templates (and any reports which are derived from the built-in templates) use the *Page Size* option to set the page size of the generated reports.
-
-!!! info "Override Page Size"
-    Custom report templates do not have to make use of the *Page Size* option, although it is made available to the template context.
-
-### Debug Mode
-
-As templates are rendered directly to a PDF object, it can be difficult to debug problems when the PDF does not render exactly as expected.
-
-Setting the *Debug Mode* option renders the template as raw HTML instead of PDF, allowing the rendering output to be introspected. This feature allows template designers to understand any issues with the generated HTML (before it is passed to the PDF generation engine).
-
-!!! warning "HTML Rendering Limitations"
-    When rendered in debug mode, @page attributes (such as size, etc) will **not** be observed. Additionally, any asset files stored on the InvenTree server will not be rendered. Debug mode is not intended to produce "good looking" documents!
-
-## Report Assets
-
-User can upload asset files (e.g. images) which can be used when generating reports. For example, you may wish to generate a report with your company logo in the header. Asset files are uploaded via the admin interface.
-
-Asset files can be rendered directly into the template as follows
-
-```html
-{% raw %}
-<!-- Need to include the report template tags at the start of the template file -->
-{% load report %}
-
-<!-- Simple stylesheet -->
-<head>
-  <style>
-    .company-logo {
-      height: 50px;
-    }
-  </style>
-</head>
-
-<body>
-<!-- Report template code here -->
-
-<!-- Render an uploaded asset image -->
-<img src="{% asset 'company_image.png' %}" class="company-logo">
-
-<!-- ... -->
-</body>
-
-{% endraw %}
-```
-
-!!! warning "Asset Naming"
-    If the requested asset name does not match the name of an uploaded asset, the template will continue without loading the image.
-
-!!! info "Assets location"
-    You need to ensure your asset images to the report/assets directory in the [data directory](../start/intro.md#file-storage). Upload new assets via the [admin interface](../settings/admin.md) to ensure they are uploaded to the correct location on the server.
-
-
-## Report Snippets
-
-A powerful feature provided by the django / WeasyPrint templating framework is the ability to include external template files. This allows commonly used template features to be broken out into separate files and re-used across multiple templates.
-
-To support this, InvenTree provides report "snippets" - short (or not so short) template files which cannot be rendered by themselves, but can be called from other templates.
-
-Similar to assets files, snippet template files are uploaded via the admin interface.
-
-Snippets are included in a template as follows:
-
-```
-{% raw %}{% include 'snippets/<snippet_name.html>' %}{% endraw %}
-```
-
-For example, consider a stocktake report for a particular stock location, where we wish to render a table with a row for each item in that location.
-
-```html
-{% raw %}
-
-<table class='stock-table'>
-  <thead>
-    <!-- table header data -->
-  </thead>
-  <tbody>
-    {% for item in location.stock_items %}
-    {% include 'snippets/stock_row.html' with item=item %}
-    {% endfor %}
-  </tbody>
-
-{% endraw %}
-```
-
-!!! info "Snippet Arguments"
-    Note above that named argument variables can be passed through to the snippet!
-
-And the snippet file `stock_row.html` may be written as follows:
-
-```html
-{% raw %}
-<!-- stock_row snippet -->
-<tr>
-  <td>{{ item.part.full_name }}</td>
-  <td>{{ item.quantity }}</td>
-</tr>
-{% endraw %}
-```

docs/docs/report/test.md

@@ -0,0 +1,87 @@
+---
+title: Test Report
+---
+
+## Test Report
+
+InvenTree provides [test result](../stock/test.md) tracking functionality which allows the users to keep track of any tests which have been performed on a given [stock item](../stock/stock.md).
+
+Custom test reports may be generated against any given stock item. All testing data is made available to the template for custom rendering as required.
+
+For example, an "Acceptance Test" report template may be customized to the particular device, with the results for certain tests rendering in a particular part of the page, with any tests which have not passed highlighted.
+
+### Stock Item Filters
+
+A TestReport template may define a set of filters against which stock items are sorted. Any [StockItem](../stock/stock.md) objects which match the provided filters can use the given TestReport.
+
+This allows each TestReport to easily be assigned to a particular StockItem, or even multiple items.
+
+In the example below, a test report template is uploaded and available to any stock items linked to a part with the name *"My Widget"*. Any combination of fields relevant to the StockItem model can be used here.
+
+{% with id="test-report-filters", url="report/test_report_filters.png", description="Test report filters" %}
+{% include 'img.html' %}
+{% endwith %}
+
+
+### Context Variables
+
+In addition to the default report context variables, the following context variables are made available to the TestReport template for rendering:
+
+| Variable | Description |
+| --- | --- |
+| stock_item | The individual [Stock Item](./context_variables.md#stockitem) object for which this test report is being generated |
+| serial | The serial number of the linked Stock Item |
+| part | The [Part](./context_variables.md#part) object of which the stock_item is an instance |
+| parameters | A dict object representing the [parameters](../part/parameter.md) of the referenced part |
+| test_keys | A list of the available 'keys' for the test results recorded against the stock item |
+| test_template_list | A list of the available [test templates](../part/test.md#part-test-templates) for the referenced part |
+| test_template_map | A map / dict of the available test templates |
+| results | A dict of test result objects, where the 'key' for each test result is a shortened version of the test name (see below) |
+| result_list | A list of each test result object |
+| installed_items | A flattened list representing all [Stock Item](./context_variables.md#stockitem) objects which are *installed inside* the referenced [Stock Item](./context_variables.md#stockitem) object |
+
+#### Results
+
+The *results* context variable provides a very convenient method of callout out a particular test result by name.
+
+#### Example
+
+Say for example that a Part "Electronic Widget" has a stock item with serial number #123, and has a test result uploaded called "Firmware Checksum". The templated file can reference this data as follows:
+
+``` html
+<h3>Part: {% raw %}{{ part.name }}{% endraw %}</h3>
+<b>Serial Number: {% raw %}{{ stock_item.serial }}{% endraw %}</b>
+<hr>
+<p>
+Firmware Checksum: {% raw %}{{ results.firmwarechecksum.value }}.
+Uploaded by {{ results.firmwarechecksum.user }}{% endraw %}
+</p>
+```
+
+#### Installed Items
+
+The *installed_items* context variable is a list of all [StockItem](./context_variables.md#stockitem) instances which are installed inside the [StockItem](./context_variables.md#stockitem) referenced by the report template. Each [StockItem](./context_variables.md#stockitem) can be dereferenced as follows:
+
+```html
+{% raw %}
+<table>
+    {% for sub_item in installed_items %}
+    <tr>
+        <td>{{ sub_item.full_name }}</td>
+        <td>Serial Number: {{ sub_item.serial }}</td>
+        <td>Pass: {{ sub_item.passedAllRequiredTests }}</td>
+    </tr>
+    {% endfor %}
+</table>
+{% endraw %}
+```
+
+### Default Report Template
+
+A default *Test Report* template is provided out of the box, which is useful for generating simple test reports. Furthermore, it may be used as a starting point for developing custom test reports:
+
+{% with id="test-report-example", url="report/test_report_example.png", description="Example Test Report" %}
+{% include "img.html" %}
+{% endwith %}
+
+View the [source code](https://github.com/inventree/InvenTree/blob/0.15.x/src/backend/InvenTree/report/templates/report/inventree_test_report_base.html) for the default test report template.

docs/docs/report/weasyprint.md

@@ -1,111 +0,0 @@
----
-title: Weasyprint Templates
----
-
-## WeasyPrint Templates
-
-We use the powerful [WeasyPrint](https://weasyprint.org/) PDF generation engine to create custom reports and labels.
-
-!!! info "WeasyPrint"
-    WeasyPrint is an extremely powerful and flexible reporting library. Refer to the [WeasyPrint docs](https://doc.courtbouillon.org/weasyprint/stable/) for further information.
-
-### Stylesheets
-
-Templates are rendered using standard HTML / CSS - if you are familiar with web page layout, you're ready to go!
-
-### Template Language
-
-Uploaded report template files are passed through the [django template rendering framework]({% include "django.html" %}/topics/templates/), and as such accept the same variable template strings as any other django template file. Different variables are passed to the report template (based on the context of the report) and can be used to customize the contents of the generated PDF.
-
-### Context Variables
-
-!!! info "Context Variables"
-  	Templates will have different variables available to them depending on the report type. Read the detailed information on each available report type for further information.
-
-Please refer to the [Context variables](./context_variables.md) page.
-
-
-### Conditional Rendering
-
-The django template system allows for conditional rendering, providing conditional flow statements such as:
-
-```
-{% raw %}
-{% if <condition> %}
-{% do_something %}
-{% elif <other_condition> %}
-<!-- something else -->
-{% else %}
-<!-- finally -->
-{% endif %}
-{% endraw %}
-```
-
-```
-{% raw %}
-{% for <item> in <list> %}
-Item: {{ item }}
-{% endfor %}
-{% endraw %}
-```
-
-!!! info "Conditionals"
-    Refer to the [django template language documentation]({% include "django.html" %}/ref/templates/language/) for more information.
-
-### Localization Issues
-
-Depending on your localization scheme, inputting raw numbers into the formatting section template can cause some unintended issues. Consider the block below which specifies the page size for a rendered template:
-
-```html
-{% raw %}
-<head>
-    <style>
-        @page {
-            size: {{ width }}mm {{ height }}mm;
-            margin: 0mm;
-        }
-    </style>
-</head>
-{% endraw %}
-```
-
-If localization settings on the InvenTree server use a comma (`,`) character as a decimal separator, this may produce an output like:
-
-```html
-{% raw %}
-{% endraw %}
-<head>
-    <style>
-        @page {
-            size: 57,3mm 99,0mm;
-            margin: 0mm;
-        }
-    </style>
-</head>
-```
-
-The resulting `{% raw %}<style>{% endraw %}` CSS block will be *invalid*!
-
-So, if you are writing a template which has custom formatting, (or any other sections which cannot handle comma decimal separators) you must wrap that section in a `{% raw %}{% localize off %}{% endraw %}` block:
-
-```html
-{% raw %}
-{% load l10n %}
-<head>
-    <style>
-        @page {
-            {% localize off %}
-            size: {{ width }}mm {{ height }}mm;
-            {% endlocalize %}
-            margin: 0mm;
-        }
-    </style>
-</head>
-{% endraw %}
-```
-
-!!! tip "Close it out"
-    Don't forget to end with a `{% raw %}{% endlocalize %}{% endraw %}` tag!
-
-!!! tip "l10n"
-    You will need to add `{% raw %}{% load l10n %}{% endraw %}` to the top of your template file to use the `{% raw %}{% localize %}{% endraw %}` tag.

docs/docs/settings/SSO.md

@@ -132,31 +132,6 @@ In the [settings screen](./global.md), navigate to the *Login Settings* panel. H
 
 Note that [email settings](./email.md) must be correctly configured before SSO will be activated. Ensure that your email setup is correctly configured and operational.
 
-## SSO Group Sync Configuration
-
-InvenTree has the ability to synchronize groups assigned to each user directly from the IdP. To enable this feature, navigate to the *Login Settings* panel in the [settings screen](./global.md) first. Here, the following options are available:
-
-| Setting | Description |
-| --- | --- |
-| Enable SSO group sync | Enable synchronizing InvenTree groups with groups provided by the IdP |
-| SSO group key | The name of the claim containing all groups, e.g. `groups` or `roles` |
-| SSO group map | A mapping from SSO groups to InvenTree groups as JSON, e.g. `{"/inventree/admins": "admin"}`. If the mapped group does not exist once a user signs up, a new group without assigned permissions will be created. |
-| Remove groups outside of SSO | Whether groups should be removed from the user if they are not present in the IdP data |
-
-!!! warning "Remove groups outside of SSO"
-    Disabling this feature might cause security issues as groups that are removed in the IdP will stay assigned in InvenTree
-
-### Keycloak OIDC example configuration
-
-!!! tip "Configuration for different IdPs"
-    The main challenge in enabling the SSO group sync feature is for the SSO admin to configure the IdP such that the groups are correctly represented in in the Django allauth `extra_data` attribute. The SSO group sync feature has been developed and tested using integrated Keycloak users/groups and OIDC. If you are utilizing this feature using another IdP, kindly consider documenting your configuration steps as well.
-
-Keycloak groups are not sent to the OIDC client by default. To enable such functionality, create a new client scope named `groups` in the Keycloak admin console. For this scope, add a new mapper ('By Configuration') and select 'Group Membership'. Give it a descriptive name and set the token claim name to `groups`.
-
-For each OIDC client that relies on those group, explicitly add the `groups` scope to client scopes. The groups will now be sent to client upon request.
-
-**Note:** A group named `foo` will be displayed as `/foo`. For this reason, the example above recommends using group names like `appname/rolename` which will be sent to the client as `/appname/rolename`.
-
 ## Security Considerations
 
 You should use SSL for your website if you want to use this feature. Also set your callback-endpoints to `https://` addresses to reduce the risk of leaking user's tokens.

docs/docs/settings/currency.md

@@ -6,13 +6,13 @@ title: Currency Support
 
 InvenTree provides support for multiple currencies, allowing pricing information to be stored with base currency rates.
 
-### Supported Currencies
+### Configuration
 
-InvenTree uses the [django-money](https://github.com/django-money/django-money) library, which in turn uses the [py-moneyed library](https://py-moneyed.readthedocs.io/en/latest/index.html). `py-moneyed` supports any currency which is defined in the [ISO 3166 standard](https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes) standard.
+To specify which currencies are supported, refer to the [currency configuration](../start/config.md#supported-currencies) section
 
 ### Currency Conversion
 
-Currency conversion is provided via the `django-money` library. Pricing data can be converted seamlessly between the available currencies.
+Currency conversion is provided via the [django-money](https://github.com/django-money/django-money) library. Pricing data can be converted seamlessly between the available currencies.
 
 ### Currency Rate Updates
 
@@ -26,11 +26,6 @@ If a different currency exchange backend is needed, or a custom implementation i
 
 In the [settings screen](./global.md), under the *Pricing* section, the following currency settings are available:
 
-| Setting | Description | Default Value |
-| --- | --- |
-| Default Currency | The selected *default* currency for the system. | USD |
-| Supported Currencies | The list of supported currencies for the system. | AUD, CAD, CNY, EUR, GBP, JPY, NZD, USD |
-
-#### Supported Currencies
-
-While InvenTree can support any of the currencies defined in the ISO 3166 standard, the list of supported currencies can be limited to only those which are relevant to the user. The supported currencies are used to populate the currency selection dropdowns throughout the InvenTree interface.
+{% with id="currency-settings", url="settings/currency.png", description="Currency Exchange Settings" %}
+{% include 'img.html' %}
+{% endwith %}

docs/docs/settings/global.md

@@ -37,10 +37,6 @@ Change how logins, password-forgot, signups are handled.
 | Enable registration | Boolean | Enable self-registration for users on the login-pages | False |
 | Enable SSO | Boolean | Enable SSO on the login-pages | False |
 | Enable SSO registration | Boolean | Enable self-registration for users via SSO on the login-pages | False |
-| Enable SSO group sync | Boolean | Enable synchronizing InvenTree groups directly from the IdP | False |
-| SSO group key | String | The name of the groups claim attribute provided by the IdP | |
-| SSO group map | String (JSON) | A mapping from SSO groups to local InvenTree groups | {} |
-| Remove groups outside of SSO | Boolean | Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues | True |
 | Enable password forgot | Boolean | Enable password forgot function on the login-pages.<br><br>This will let users reset their passwords on their own. For this feature to work you need to configure E-mail | True |
 | E-Mail required | Boolean | Require user to supply e-mail on signup.<br><br>Without a way (e-mail) to contact the user notifications and security features might not work! | False |
 | Enforce MFA | Boolean | Users must use multifactor security.<br><br>This forces each user to setup MFA and use it on each authentication | False |

docs/docs/start/accounts.md

@@ -1,49 +0,0 @@
----
-title: Account Management
----
-
-## User Accounts
-
-By default, InvenTree does not ship with any user accounts. Configuring user accounts is the first step to login to the InvenTree server.
-
-### Administrator Account
-
-You can configure InvenTree to create an administrator account on the first run. This account will have full *superuser* access to the InvenTree server.
-
-This account is created when you first run the InvenTree server instance. The username / password for this account can be configured in the configuration file, or environment variables.
-
-!!! info "More Information"
-    For more information on configuring the administrator account, refer to the [configuration documentation](./config.md#administrator-account).
-
-### Create Superuser
-
-Another way to create an administrator account is to use the `superuser` command. This will create a new superuser account with the specified username and password.
-
-```bash
-invoke superuser
-```
-
-Or, if you are running InvenTree in a Docker container:
-
-```bash
-docker exec -rm -it inventree-server invoke superuser
-```
-
-### User Management
-
-Once you have created an administrator account, you can create and manage additional user accounts from the InvenTree web interface.
-
-## Password Management
-
-### Reset Password via Command Line
-
-If a password has been lost, and other backup options (such as email recovery) are unavailable, the system administrator can reset the password for a user account from the command line.
-
-Log into the machine running the InvenTree server, and run the following command (from the top-level source directory):
-
-```bash
-cd src/backend/InvenTree
-python ./manage.py changepassword <username>
-```
-
-The system will prompt you to enter a new password for the specified user account.

docs/docs/start/config.md

@@ -22,11 +22,7 @@ The InvenTree server tries to locate the `config.yaml` configuration file on sta
 !!! tip "Config File Location"
     When the InvenTree server boots, it will report the location where it expects to find the configuration file
 
-#### Configuration File Template
-
-The configuration file *template* can be found on [GitHub]({{ sourcefile("src/backend/InvenTree/config_template.yaml") }}), and is shown below:
-
-{{ includefile("src/backend/InvenTree/config_template.yaml", "Configuration File Template", format="yaml") }}
+The configuration file *template* can be found on [GitHub]({{ sourcefile("src/backend/InvenTree/config_template.yaml") }})
 
 !!! info "Template File"
     The default configuration file (as defined by the template linked above) will be copied to the specified configuration file location on first run, if a configuration file is not found in that location.
@@ -54,8 +50,6 @@ The following basic options are available:
 | --- | --- | --- | --- |
 | INVENTREE_SITE_URL | site_url | Specify a fixed site URL | *Not specified* |
 | INVENTREE_DEBUG | debug | Enable [debug mode](./intro.md#debug-mode) | True |
-| INVENTREE_DEBUG_QUERYCOUNT | debug_querycount | Enable [query count logging](https://github.com/bradmontgomery/django-querycount) in the terminal | False |
-| INVENTREE_DEBUG_SHELL | debug_shell | Enable [administrator shell](https://github.com/djk2/django-admin-shell) (only in debug mode) | False |
 | INVENTREE_LOG_LEVEL | log_level | Set level of logging to terminal | WARNING |
 | INVENTREE_DB_LOGGING | db_logging | Enable logging of database messages | False |
 | INVENTREE_TIMEZONE | timezone | Server timezone | UTC |
@@ -204,35 +198,6 @@ If running with a MySQL database backend, the following additional options are a
 | --- | --- | --- | --- |
 | INVENTREE_DB_ISOLATION_SERIALIZABLE | database.serializable | Database isolation level configured to "serializable" | False |
 
-## Caching
-
-InvenTree can be configured to use [redis](https://redis.io) as a global cache backend.
-Enabling a global cache can provide significant performance improvements for InvenTree.
-
-### Cache Server
-
-Enabling global caching requires connection to a redis server (which is separate from the InvenTree database and web server). Setup and configuration of this server is outside the scope of this documentation. It is assumed that if you are configuring a cache server, you have already set one up, and are comfortable configuring it.
-
-!!! tip "Docker Support"
-    If you are running [InvenTree under docker](./docker.md), we provide a redis container as part of our docker compose file - so redis caching works out of the box.
-
-### Cache Settings
-
-The following cache settings are available:
-
-| Environment Variable | Configuration File | Description | Default |
-| --- | --- | --- | --- |
-| INVENTREE_CACHE_ENABLED | cache.enabled | Enable redis caching | False |
-| INVENTREE_CACHE_HOST | cache.host | Cache server host | *Not specified* |
-| INVENTREE_CACHE_PORT | cache.port | Cache server port | 6379 |
-| INVENTREE_CACHE_CONNECT_TIMEOUT | cache.connect_timeout | Cache connection timeout (seconds) | 3 |
-| INVENTREE_CACHE_TIMEOUT | cache.timeout | Cache timeout (seconds) | 3 |
-| INVENTREE_CACHE_TCP_KEEPALIVE | cache.tcp_keepalive | Cache TCP keepalive | True |
-| INVENTREE_CACHE_KEEPALIVE_COUNT | cache.keepalive_count | Cache keepalive count | 5 |
-| INVENTREE_CACHE_KEEPALIVE_IDLE | cache.keepalive_idle | Cache keepalive idle | 1 |
-| INVENTREE_CACHE_KEEPALIVE_INTERVAL | cache.keepalive_interval | Cache keepalive interval | 1 |
-| INVENTREE_CACHE_USER_TIMEOUT | cache.user_timeout | Cache user timeout | 1000 |
-
 ## Email Settings
 
 To enable [email functionality](../settings/email.md), email settings must be configured here, either via environment variables or within the configuration file.
@@ -258,6 +223,19 @@ The "sender" email address is the address from which InvenTree emails are sent (
 !!! info "Fallback"
     If `INVENTREE_EMAIL_SENDER` is not provided, the system will fall back to `INVENTREE_EMAIL_USERNAME` (if the username is a valid email address)
 
+## Supported Currencies
+
+The currencies supported by InvenTree must be specified in the [configuration file](#configuration-file).
+
+A list of currency codes (e.g. *AUD*, *CAD*, *JPY*, *USD*) can be specified using the `currencies` variable (or using the `INVENTREE_CURRENCIES` environment variable).
+
+| Environment Variable | Configuration File | Description | Default |
+| --- | --- | --- | --- |
+| INVENTREE_CURRENCIES | currencies | List of supported currencies| `AUD`, `CAD`, `CNY`, `EUR`, `GBP`, `JPY`, `NZD`, `USD` |
+
+!!! tip "More Info"
+    Read the [currencies documentation](../settings/currency.md) for more information on currency support in InvenTree
+
 ## File Storage Locations
 
 InvenTree requires some external directories for storing files:
@@ -299,10 +277,6 @@ Alternatively this location can be specified with the `INVENTREE_BACKUP_DIR` env
 
 InvenTree provides allowance for additional sign-in options. The following options are not enabled by default, and care must be taken by the system administrator when configuring these settings.
 
-| Environment Variable | Configuration File | Description | Default |
-| --- | --- | --- | --- |
-| INVENTREE_MFA_ENABLED | mfa_enabled | Enable or disable multi-factor authentication support for the InvenTree server | True |
-
 ### Single Sign On
 
 Single Sign On (SSO) allows users to sign in to InvenTree using a third-party authentication provider. This functionality is provided by the [django-allauth](https://docs.allauth.org/en/latest/) package.