From 90bef69a5954cc0b3671a6aa17f2cb90be3e8dea Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Wed, 3 Feb 2021 16:58:06 +1100
Subject: [PATCH 01/17] Adds "report snippet" class allowing re-usable report
 snippets to be uploaded

---
 InvenTree/report/admin.py                     |  8 ++-
 .../report/migrations/0006_reportsnippet.py   | 27 ++++++++
 InvenTree/report/models.py                    | 69 +++++++++++++------
 3 files changed, 81 insertions(+), 23 deletions(-)
 create mode 100644 InvenTree/report/migrations/0006_reportsnippet.py

diff --git a/InvenTree/report/admin.py b/InvenTree/report/admin.py
index 7d6403f5d9..32340921c3 100644
--- a/InvenTree/report/admin.py
+++ b/InvenTree/report/admin.py
@@ -3,7 +3,12 @@ from __future__ import unicode_literals
 
 from django.contrib import admin
 
-from .models import TestReport, ReportAsset
+from .models import ReportSnippet, TestReport, ReportAsset
+
+
+class ReportSnippetAdmin(admin.ModelAdmin):
+
+    list_display = ('name', 'description', 'template')
 
 
 class ReportTemplateAdmin(admin.ModelAdmin):
@@ -16,5 +21,6 @@ class ReportAssetAdmin(admin.ModelAdmin):
     list_display = ('asset', 'description')
 
 
+admin.site.register(ReportSnippet, ReportSnippetAdmin)
 admin.site.register(TestReport, ReportTemplateAdmin)
 admin.site.register(ReportAsset, ReportAssetAdmin)
diff --git a/InvenTree/report/migrations/0006_reportsnippet.py b/InvenTree/report/migrations/0006_reportsnippet.py
new file mode 100644
index 0000000000..c503678345
--- /dev/null
+++ b/InvenTree/report/migrations/0006_reportsnippet.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.0.7 on 2021-02-03 05:57
+
+import django.core.validators
+from django.db import migrations, models
+import report.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report', '0005_auto_20210119_0815'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ReportSnippet',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Template name', max_length=100, unique=True, verbose_name='Name')),
+                ('template', models.FileField(help_text='Report template file', upload_to=report.models.rename_template, validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['html', 'htm', 'tex'])], verbose_name='Template')),
+                ('description', models.CharField(help_text='Report template description', max_length=250, verbose_name='Description')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index 224f2800d8..6b064999d5 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -77,14 +77,18 @@ class WeasyprintReportMixin(WeasyTemplateResponseMixin):
         self.pdf_filename = kwargs.get('filename', 'report.pdf')
 
 
-class ReportTemplateBase(models.Model):
+class ReportBase(models.Model):
     """
-    Reporting template model.
+    Base class for uploading html templates
     """
 
+    class Meta:
+        abstract = True
+
     def __str__(self):
         return "{n} - {d}".format(n=self.name, d=self.description)
 
+
     def getSubdir(self):
         return ''
 
@@ -105,6 +109,47 @@ class ReportTemplateBase(models.Model):
 
         return template
 
+    name = models.CharField(
+        blank=False, max_length=100,
+        verbose_name=_('Name'),
+        help_text=_('Template name'),
+        unique=True,
+    )
+
+    template = models.FileField(
+        upload_to=rename_template,
+        verbose_name=_('Template'),
+        help_text=_("Report template file"),
+        validators=[FileExtensionValidator(allowed_extensions=['html', 'htm', 'tex'])],
+    )
+
+    description = models.CharField(
+        max_length=250,
+        verbose_name=_('Description'),
+        help_text=_("Report template description")
+    )
+
+
+class ReportSnippet(ReportBase):
+    """
+    Report template 'snippet' which can be used to make templates
+    that can then be included in other reports.
+
+    Useful for 'common' template actions, sub-templates, etc
+    """
+
+    def getSubdir(self):
+        return ""
+
+
+class ReportTemplateBase(ReportBase):
+    """
+    Reporting template model.
+
+    Able to be passed context data
+
+    """
+
     def get_context_data(self, request):
         """
         Supply context data to the template for rendering
@@ -147,26 +192,6 @@ class ReportTemplateBase(models.Model):
             wp = WeasyprintReportMixin(request, self.template_name, **kwargs)
             return wp.render_to_response(context, **kwargs)
 
-    name = models.CharField(
-        blank=False, max_length=100,
-        verbose_name=_('Name'),
-        help_text=_('Template name'),
-        unique=True,
-    )
-
-    template = models.FileField(
-        upload_to=rename_template,
-        verbose_name=_('Template'),
-        help_text=_("Report template file"),
-        validators=[FileExtensionValidator(allowed_extensions=['html', 'htm', 'tex'])],
-    )
-
-    description = models.CharField(
-        max_length=250,
-        verbose_name=_('Description'),
-        help_text=_("Report template description")
-    )
-
     enabled = models.BooleanField(
         default=True,
         verbose_name=_('Enabled'),

From cbadb2a888f20c64f6fbffd37e5829d95fbbb3ca Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Wed, 3 Feb 2021 21:54:11 +1100
Subject: [PATCH 02/17] Small refactor, and allow editing of ReportAsset in the
 admin interface

---
 InvenTree/report/admin.py  |  2 +-
 InvenTree/report/models.py | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/InvenTree/report/admin.py b/InvenTree/report/admin.py
index 32340921c3..5034934ccf 100644
--- a/InvenTree/report/admin.py
+++ b/InvenTree/report/admin.py
@@ -18,7 +18,7 @@ class ReportTemplateAdmin(admin.ModelAdmin):
 
 class ReportAssetAdmin(admin.ModelAdmin):
 
-    list_display = ('asset', 'description')
+    list_display = ('id', 'asset', 'description')
 
 
 admin.site.register(ReportSnippet, ReportSnippetAdmin)
diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index 6b064999d5..ba8672f8c1 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -52,9 +52,7 @@ class TexResponse(HttpResponse):
 
 def rename_template(instance, filename):
 
-    filename = os.path.basename(filename)
-
-    return os.path.join('report', 'report_template', instance.getSubdir(), filename)
+    return instance.rename_file(filename)
 
 
 def validate_stock_item_report_filters(filters):
@@ -92,6 +90,13 @@ class ReportBase(models.Model):
     def getSubdir(self):
         return ''
 
+    def rename_file(self, filename):
+        # Function for renaming uploaded file
+
+        filename = os.path.basename(filename)
+
+        return os.path.join('report', 'report_template', self.getSubdir(), filename)
+
     @property
     def extension(self):
         return os.path.splitext(self.template.name)[1].lower()

From 3ccc500e8ec10f6bdd94794d857f121a2d1ba8ff Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 12:58:19 +1100
Subject: [PATCH 03/17] Add more context data to report

---
 InvenTree/report/models.py       | 16 ++++++++++++++--
 InvenTree/templates/js/report.js |  9 +++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index ba8672f8c1..c2b5d729fe 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -175,6 +175,10 @@ class ReportTemplateBase(ReportBase):
 
         context = self.get_context_data(request)
 
+        context['media'] = settings.MEDIA_ROOT
+
+        context['report_name'] = self.name
+        context['report_description'] = self.description
         context['request'] = request
         context['user'] = request.user
         context['datetime'] = datetime.datetime.now()
@@ -194,8 +198,16 @@ class ReportTemplateBase(ReportBase):
                 raise ValidationError("Enable LaTeX support in config.yaml")
         elif self.extension in ['.htm', '.html']:
             # Render HTML template to PDF
-            wp = WeasyprintReportMixin(request, self.template_name, **kwargs)
-            return wp.render_to_response(context, **kwargs)
+            wp = WeasyprintReportMixin(
+                request,
+                self.template_name,
+                base_url=request.build_absolute_uri("/"),
+                presentational_hints=True,
+                **kwargs)
+
+            return wp.render_to_response(
+                context,
+                **kwargs)
 
     enabled = models.BooleanField(
         default=True,
diff --git a/InvenTree/templates/js/report.js b/InvenTree/templates/js/report.js
index da84433bac..6e47706917 100644
--- a/InvenTree/templates/js/report.js
+++ b/InvenTree/templates/js/report.js
@@ -10,6 +10,15 @@ function selectTestReport(reports, items, options={}) {
      * (via AJAX) from the server.
      */
 
+    // If there is only a single report available, just print!
+    if (reports.length == 1) {
+        if (options.success) {
+            options.success(reports[0].pk);
+        }
+
+        return;
+    }
+
     var modal = options.modal || '#modal-form';
 
     var report_list = makeOptionsList(

From 801b945438e112b4727be31606ab211aec6e6274 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 13:33:14 +1100
Subject: [PATCH 04/17] Add current date to report context

---
 InvenTree/report/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index c2b5d729fe..56d06090a1 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -181,6 +181,7 @@ class ReportTemplateBase(ReportBase):
         context['report_description'] = self.description
         context['request'] = request
         context['user'] = request.user
+        context['date'] = datetime.datetime.now().date()
         context['datetime'] = datetime.datetime.now()
 
         if self.extension == '.tex':

From 6230fb3614d8555cfbb0c60b917f4f37d8b29a0f Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 13:41:47 +1100
Subject: [PATCH 05/17] Add custom report template tags

---
 InvenTree/part/templatetags/report.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 InvenTree/part/templatetags/report.py

diff --git a/InvenTree/part/templatetags/report.py b/InvenTree/part/templatetags/report.py
new file mode 100644
index 0000000000..32eec76db0
--- /dev/null
+++ b/InvenTree/part/templatetags/report.py
@@ -0,0 +1,22 @@
+"""
+Custom template tags for report generation
+"""
+
+import os
+
+from django import template
+from django.conf import settings
+
+register = template.Library()
+
+
+@register.simple_tag()
+def asset(filename):
+    """
+    Return fully-qualified path for an upload report asset file.
+    """
+
+    path = os.path.join(settings.MEDIA_ROOT, 'report', 'assets', filename)
+    path = os.path.abspath(path)
+
+    return f"file://{path}"

From cf0c43d89938df092f3bbb66b13f0aa3000a6a73 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 13:54:26 +1100
Subject: [PATCH 06/17] Add report base template

---
 .../report/inventree_report_base.html         | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 InvenTree/report/templates/report/inventree_report_base.html

diff --git a/InvenTree/report/templates/report/inventree_report_base.html b/InvenTree/report/templates/report/inventree_report_base.html
new file mode 100644
index 0000000000..936a9758a9
--- /dev/null
+++ b/InvenTree/report/templates/report/inventree_report_base.html
@@ -0,0 +1,51 @@
+{% load report %}
+
+<head>
+    <style>
+        @page {
+        {% block page_style %}
+            size: {% if page_size %}{{ page_size }}{% else %}A4{% endif %};
+            margin: {% if page_margin %}{{ page_margin }}{% else %}10mm{% endif %};
+        {% endblock %}
+        }
+
+        #page-number:after {
+            counter-increment: page;
+            content: counter(page);
+        }
+
+        #page-count:after {
+            counter-increment: page;
+            content: counter(pages);
+        }
+
+        body {
+            {% block body_style %}
+            font-family: Arial, Helvetica, sans-serif;
+            {% endblock %}
+        }
+
+        {% block style %}
+        {% endblock %}
+
+    </style>
+</head>
+
+<body>
+
+    <div class='page-header'>
+        {% block header_content %}
+        {% endblock %}
+    </div>
+
+    <div class='page-content'>
+        {% block page_content %}
+        {% endblock %}
+    </div>
+    
+    <div class='page-footer'>
+        {% block footer_content %}
+        {% endblock %}
+    </div>
+
+</body>
\ No newline at end of file

From ddbf2a6313def4f9c43ac894545d4e70f6541214 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 14:49:11 +1100
Subject: [PATCH 07/17] Add margin callouts for report template base

---
 .../report/inventree_report_base.html         | 79 +++++++++++++++----
 1 file changed, 63 insertions(+), 16 deletions(-)

diff --git a/InvenTree/report/templates/report/inventree_report_base.html b/InvenTree/report/templates/report/inventree_report_base.html
index 936a9758a9..afcd31f2ed 100644
--- a/InvenTree/report/templates/report/inventree_report_base.html
+++ b/InvenTree/report/templates/report/inventree_report_base.html
@@ -3,29 +3,76 @@
 <head>
     <style>
         @page {
-        {% block page_style %}
-            size: {% if page_size %}{{ page_size }}{% else %}A4{% endif %};
-            margin: {% if page_margin %}{{ page_margin }}{% else %}10mm{% endif %};
-        {% endblock %}
-        }
+            size: A4;
+            margin: 2cm;
+            margin-top: 4cm;
+            font-family: Arial, Helvetica, sans-serif;
+            font-size: 75%;
+            
+            @top-left {
+                {% block top_left %}
+                {% endblock %}
+            }
 
-        #page-number:after {
-            counter-increment: page;
-            content: counter(page);
-        }
+            @top-center {
+                {% block top_center %}
+                {% endblock %}
+            }
 
-        #page-count:after {
-            counter-increment: page;
-            content: counter(pages);
+            @top-right {
+                {% block top_right %}
+                {% endblock %}
+            }
+
+            @bottom-left {
+                {% block bottom_left %}
+                {% endblock %}
+            }
+
+            @bottom-center {
+                {% block bottom_center %}
+                {% endblock %}
+            }
+
+            @bottom-right {
+                {% block bottom_right %}
+                content: "Page " counter(page) " of " counter(pages);
+                {% endblock %}
+            }
         }
 
         body {
-            {% block body_style %}
             font-family: Arial, Helvetica, sans-serif;
+        }
+
+        .header {
+            top: 0px;
+            left: 0px;
+            position: fixed;
+            width: 100%;
+            margin-top: -2.5cm;
+        }
+
+        .content {
+            {% block content_style %}
+            width: 100%;
+            page-break-inside: auto;
+            position: relative;
+            {% endblock %}
+        }
+
+        .footer {
+            {% block footer_style %}
+            bottom: 0px;
+            left: 0px;
+            position: fixed;
+            width: 100%;
+            margin-bottom: -20mm;
             {% endblock %}
         }
 
         {% block style %}
+        /* User defined styles go here */
         {% endblock %}
 
     </style>
@@ -33,17 +80,17 @@
 
 <body>
 
-    <div class='page-header'>
+    <div class='header'>
         {% block header_content %}
         {% endblock %}
     </div>
 
-    <div class='page-content'>
+    <div class='content'>
         {% block page_content %}
         {% endblock %}
     </div>
     
-    <div class='page-footer'>
+    <div class='footer'>
         {% block footer_content %}
         {% endblock %}
     </div>

From a025b7239d3e564c52d0cb1f945e4145b6de0f2d Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 15:29:46 +1100
Subject: [PATCH 08/17] Adds simple test-report template

---
 InvenTree/part/templatetags/report.py         |  22 ----
 .../report/inventree_report_base.html         |   3 +-
 .../report/inventree_test_report.html         | 105 ++++++++++++++++++
 InvenTree/report/templatetags/report.py       |  54 +++++++++
 4 files changed, 161 insertions(+), 23 deletions(-)
 delete mode 100644 InvenTree/part/templatetags/report.py
 create mode 100644 InvenTree/report/templates/report/inventree_test_report.html
 create mode 100644 InvenTree/report/templatetags/report.py

diff --git a/InvenTree/part/templatetags/report.py b/InvenTree/part/templatetags/report.py
deleted file mode 100644
index 32eec76db0..0000000000
--- a/InvenTree/part/templatetags/report.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-Custom template tags for report generation
-"""
-
-import os
-
-from django import template
-from django.conf import settings
-
-register = template.Library()
-
-
-@register.simple_tag()
-def asset(filename):
-    """
-    Return fully-qualified path for an upload report asset file.
-    """
-
-    path = os.path.join(settings.MEDIA_ROOT, 'report', 'assets', filename)
-    path = os.path.abspath(path)
-
-    return f"file://{path}"
diff --git a/InvenTree/report/templates/report/inventree_report_base.html b/InvenTree/report/templates/report/inventree_report_base.html
index afcd31f2ed..c46ddb32e6 100644
--- a/InvenTree/report/templates/report/inventree_report_base.html
+++ b/InvenTree/report/templates/report/inventree_report_base.html
@@ -5,7 +5,6 @@
         @page {
             size: A4;
             margin: 2cm;
-            margin-top: 4cm;
             font-family: Arial, Helvetica, sans-serif;
             font-size: 75%;
             
@@ -46,10 +45,12 @@
         }
 
         .header {
+            {% block header_style %}
             top: 0px;
             left: 0px;
             position: fixed;
             width: 100%;
+            {% endblock %}
             margin-top: -2.5cm;
         }
 
diff --git a/InvenTree/report/templates/report/inventree_test_report.html b/InvenTree/report/templates/report/inventree_test_report.html
new file mode 100644
index 0000000000..7c99eec6ab
--- /dev/null
+++ b/InvenTree/report/templates/report/inventree_test_report.html
@@ -0,0 +1,105 @@
+{% extends "report/inventree_report_base.html" %}
+
+{% load i18n %}
+{% load report %}
+{% load inventree_extras %}
+
+{% block style %}
+.test-table {
+    width: 100%;
+}
+
+{% block bottom_left %}
+content: "{{ date.isoformat }}";
+{% endblock %}
+
+{% block bottom_center %}
+content: "InvenTree v{% inventree_version %}";
+{% endblock %}
+
+{% block top_center %}
+content: "{% trans 'Stock Item Test Report' %}";
+{% endblock %}
+
+.test-row {
+    padding: 3px;
+}
+
+.test-pass {
+    color: #5f5;
+}
+
+.test-fail {
+    color: #F55;
+}
+
+.container {
+    padding: 5px;
+    border: 1px solid;
+}
+
+.text-left {
+    display: inline-block;
+    width: 50%;
+}
+
+.img-right {
+    display: inline;
+    align-content: right;
+    align-items: right;
+    width: 50%;
+}
+
+{% endblock %}
+
+{% block page_content %}
+
+<div class='container'>
+    <div class='text-left'>
+        <h2>
+            {{ stock_item.part.full_name }}
+        </h2>
+    </div>
+    <div class='img-right'>
+        <img src="{% part_image part %}">
+        <hr>
+        <h3>
+            {% trans "Serial Number" %}: {{ stock_item.serial }}
+        </h3>
+    </div>
+</div>
+
+<h3>{% trans "Test Results" %}</h3>
+
+<table class='table test-table'>
+    <thead>
+        <tr>
+            <th>{% trans "Test" %}</th>
+            <th>{% trans "Result" %}</th>
+            <th>{% trans "Value" %}</th>
+            <th>{% trans "User" %}</th>
+            <th>{% trans "Date" %}</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td colspan='5'><hr></td>
+        </tr>
+        {% for test in result_list %}
+        <tr class='test-row'>
+            <td>{{ test.test }}</td>
+            {% if test.result %}
+            <td class='test-pass'>{% trans "Pass" %}</td>
+            {% else %}
+            <td class='test-fail'>{% trans "Fail" %}</td>
+            {% endif %}
+            <td>{{ test.value }}</td>
+            <td>{{ test.user.username }}</td>
+            <td>{{ test.date.date.isoformat }}</td>
+        </tr>
+        {% endfor %}
+    </tbody>
+
+</table>
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/report/templatetags/report.py b/InvenTree/report/templatetags/report.py
new file mode 100644
index 0000000000..1867ffe032
--- /dev/null
+++ b/InvenTree/report/templatetags/report.py
@@ -0,0 +1,54 @@
+"""
+Custom template tags for report generation
+"""
+
+import os
+
+from django import template
+from django.conf import settings
+
+from part.models import Part
+from stock.models import StockItem
+
+register = template.Library()
+
+
+@register.simple_tag()
+def asset(filename):
+    """
+    Return fully-qualified path for an upload report asset file.
+    """
+
+    path = os.path.join(settings.MEDIA_ROOT, 'report', 'assets', filename)
+    path = os.path.abspath(path)
+
+    return f"file://{path}"
+
+
+@register.simple_tag()
+def part_image(part):
+    """
+    Return a fully-qualified path for a part image
+    """
+
+    if type(part) is Part:
+        img = part.image.name
+
+    elif type(part) is StockItem:
+        img = part.part.image.name
+
+    else:
+        img = ''
+
+    path = os.path.join(settings.MEDIA_ROOT, img)
+    path = os.path.abspath(path)
+
+    print("Path:", path)
+
+    if not os.path.exists(path) or not os.path.isfile(path):
+        # Image does not exist
+        # Return the 'blank' image
+        path = os.path.join(settings.STATIC_ROOT, 'img', 'blank_image.png')
+        path = os.path.abspath(path)
+
+    return f"file://{path}"

From 6ebebe03d4e8ed464fdb38f00bc4ee11fa2d1cb3 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 15:38:41 +1100
Subject: [PATCH 09/17] Simplify report snippet class definition

---
 InvenTree/report/admin.py                     | 10 +++---
 .../report/migrations/0006_reportsnippet.py   | 10 ++----
 InvenTree/report/models.py                    | 36 ++++++++++++-------
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/InvenTree/report/admin.py b/InvenTree/report/admin.py
index 5034934ccf..390964b590 100644
--- a/InvenTree/report/admin.py
+++ b/InvenTree/report/admin.py
@@ -6,16 +6,16 @@ from django.contrib import admin
 from .models import ReportSnippet, TestReport, ReportAsset
 
 
-class ReportSnippetAdmin(admin.ModelAdmin):
-
-    list_display = ('name', 'description', 'template')
-
-
 class ReportTemplateAdmin(admin.ModelAdmin):
 
     list_display = ('name', 'description', 'template', 'filters', 'enabled')
 
 
+class ReportSnippetAdmin(admin.ModelAdmin):
+
+    list_display = ('id', 'snippet', 'description')
+
+
 class ReportAssetAdmin(admin.ModelAdmin):
 
     list_display = ('id', 'asset', 'description')
diff --git a/InvenTree/report/migrations/0006_reportsnippet.py b/InvenTree/report/migrations/0006_reportsnippet.py
index c503678345..6875ebb530 100644
--- a/InvenTree/report/migrations/0006_reportsnippet.py
+++ b/InvenTree/report/migrations/0006_reportsnippet.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2021-02-03 05:57
+# Generated by Django 3.0.7 on 2021-02-04 04:37
 
 import django.core.validators
 from django.db import migrations, models
@@ -16,12 +16,8 @@ class Migration(migrations.Migration):
             name='ReportSnippet',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='Template name', max_length=100, unique=True, verbose_name='Name')),
-                ('template', models.FileField(help_text='Report template file', upload_to=report.models.rename_template, validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['html', 'htm', 'tex'])], verbose_name='Template')),
-                ('description', models.CharField(help_text='Report template description', max_length=250, verbose_name='Description')),
+                ('snippet', models.FileField(help_text='Report snippet file', upload_to=report.models.rename_snippet, validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['html', 'htm'])])),
+                ('description', models.CharField(help_text='Snippet file description', max_length=250)),
             ],
-            options={
-                'abstract': False,
-            },
         ),
     ]
diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index 56d06090a1..1c9db7bbb9 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -135,18 +135,6 @@ class ReportBase(models.Model):
     )
 
 
-class ReportSnippet(ReportBase):
-    """
-    Report template 'snippet' which can be used to make templates
-    that can then be included in other reports.
-
-    Useful for 'common' template actions, sub-templates, etc
-    """
-
-    def getSubdir(self):
-        return ""
-
-
 class ReportTemplateBase(ReportBase):
     """
     Reporting template model.
@@ -264,6 +252,30 @@ class TestReport(ReportTemplateBase):
         }
 
 
+def rename_snippet(instance, filename):
+
+    filename = os.path.basename(filename)
+
+    return os.path.join('report', 'snippets', filename)
+
+
+class ReportSnippet(models.Model):
+    """
+    Report template 'snippet' which can be used to make templates
+    that can then be included in other reports.
+
+    Useful for 'common' template actions, sub-templates, etc
+    """
+
+    snippet = models.FileField(
+        upload_to=rename_snippet,
+        help_text=_('Report snippet file'),
+        validators=[FileExtensionValidator(allowed_extensions=['html', 'htm'])],
+    )
+
+    description = models.CharField(max_length=250, help_text=_("Snippet file description"))
+
+
 def rename_asset(instance, filename):
 
     filename = os.path.basename(filename)

From 0de284f1aa8594e4703813c14f4eab6a345563be Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 16:06:01 +1100
Subject: [PATCH 10/17] Unit fixes

---
 InvenTree/report/models.py                                  | 1 -
 .../report/templates/report/inventree_report_base.html      | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index 1c9db7bbb9..6ca0ac1dcd 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -86,7 +86,6 @@ class ReportBase(models.Model):
     def __str__(self):
         return "{n} - {d}".format(n=self.name, d=self.description)
 
-
     def getSubdir(self):
         return ''
 
diff --git a/InvenTree/report/templates/report/inventree_report_base.html b/InvenTree/report/templates/report/inventree_report_base.html
index c46ddb32e6..084b100cab 100644
--- a/InvenTree/report/templates/report/inventree_report_base.html
+++ b/InvenTree/report/templates/report/inventree_report_base.html
@@ -3,8 +3,12 @@
 <head>
     <style>
         @page {
+            {% block page_size %}
             size: A4;
+            {% endblock %}
+            {% block page_margin %}
             margin: 2cm;
+            {% endblock %}
             font-family: Arial, Helvetica, sans-serif;
             font-size: 75%;
             
@@ -50,8 +54,8 @@
             left: 0px;
             position: fixed;
             width: 100%;
-            {% endblock %}
             margin-top: -2.5cm;
+            {% endblock %}
         }
 
         .content {

From 264bd625d3f62ee0a8af9b4f9ec0234847f62a21 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 16:13:03 +1100
Subject: [PATCH 11/17] Remove debug string

---
 InvenTree/report/templatetags/report.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/InvenTree/report/templatetags/report.py b/InvenTree/report/templatetags/report.py
index 1867ffe032..0383aad562 100644
--- a/InvenTree/report/templatetags/report.py
+++ b/InvenTree/report/templatetags/report.py
@@ -43,8 +43,6 @@ def part_image(part):
     path = os.path.join(settings.MEDIA_ROOT, img)
     path = os.path.abspath(path)
 
-    print("Path:", path)
-
     if not os.path.exists(path) or not os.path.isfile(path):
         # Image does not exist
         # Return the 'blank' image

From 59904ace1d7700e52c09d95157da92c69bb5e3dc Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 16:18:28 +1100
Subject: [PATCH 12/17] Revoke support for LaTex reporting

---
 InvenTree/InvenTree/settings.py               | 25 --------
 InvenTree/config_template.yaml                | 13 -----
 .../migrations/0007_auto_20210204_1617.py     | 20 +++++++
 InvenTree/report/models.py                    | 57 +++++--------------
 requirements.txt                              |  1 -
 5 files changed, 35 insertions(+), 81 deletions(-)
 create mode 100644 InvenTree/report/migrations/0007_auto_20210204_1617.py

diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py
index 06908e76bf..d48743f166 100644
--- a/InvenTree/InvenTree/settings.py
+++ b/InvenTree/InvenTree/settings.py
@@ -208,7 +208,6 @@ INSTALLED_APPS = [
     'mptt',                                 # Modified Preorder Tree Traversal
     'markdownx',                            # Markdown editing
     'markdownify',                          # Markdown template rendering
-    'django_tex',                           # LaTeX output
     'django_admin_shell',                   # Python shell for the admin interface
     'djmoney',                              # django-money integration
     'djmoney.contrib.exchange',             # django-money exchange rates
@@ -265,14 +264,6 @@ TEMPLATES = [
             ],
         },
     },
-    # Backend for LaTeX report rendering
-    {
-        'NAME': 'tex',
-        'BACKEND': 'django_tex.engine.TeXEngine',
-        'DIRS': [
-            os.path.join(MEDIA_ROOT, 'report'),
-        ]
-    },
 ]
 
 REST_FRAMEWORK = {
@@ -485,22 +476,6 @@ DATE_INPUT_FORMATS = [
     "%Y-%m-%d",
 ]
 
-# LaTeX rendering settings (django-tex)
-LATEX_SETTINGS = CONFIG.get('latex', {})
-
-# Is LaTeX rendering enabled? (Off by default)
-LATEX_ENABLED = LATEX_SETTINGS.get('enabled', False)
-
-# Set the latex interpreter in the config.yaml settings file
-LATEX_INTERPRETER = LATEX_SETTINGS.get('interpreter', 'pdflatex')
-
-LATEX_INTERPRETER_OPTIONS = LATEX_SETTINGS.get('options', '')
-
-LATEX_GRAPHICSPATH = [
-    # Allow LaTeX files to access the report assets directory
-    os.path.join(MEDIA_ROOT, "report", "assets"),
-]
-
 # crispy forms use the bootstrap templates
 CRISPY_TEMPLATE_PACK = 'bootstrap3'
 
diff --git a/InvenTree/config_template.yaml b/InvenTree/config_template.yaml
index c655ffdc5c..18e3197cca 100644
--- a/InvenTree/config_template.yaml
+++ b/InvenTree/config_template.yaml
@@ -107,19 +107,6 @@ static_root: '../inventree_static'
 # If unspecified, the local user's temp directory will be used
 #backup_dir: '/home/inventree/backup/'
 
-# LaTeX report rendering
-# InvenTree uses the django-tex plugin to enable LaTeX report rendering
-# Ref: https://pypi.org/project/django-tex/
-# Note: Ensure that a working LaTeX toolchain is installed and working *before* starting the server
-latex:
-  # Select the LaTeX interpreter to use for PDF rendering
-  # Note: The intepreter needs to be installed on the system!
-  # e.g. to install pdflatex: apt-get texlive-latex-base
-  enabled: False
-  interpreter: pdflatex 
-  # Extra options to pass through to the LaTeX interpreter
-  options: ''
-
 # Permit custom authentication backends
 #authentication_backends:
 #  - 'django.contrib.auth.backends.ModelBackend'
diff --git a/InvenTree/report/migrations/0007_auto_20210204_1617.py b/InvenTree/report/migrations/0007_auto_20210204_1617.py
new file mode 100644
index 0000000000..b110f63365
--- /dev/null
+++ b/InvenTree/report/migrations/0007_auto_20210204_1617.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2021-02-04 05:17
+
+import django.core.validators
+from django.db import migrations, models
+import report.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report', '0006_reportsnippet'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testreport',
+            name='template',
+            field=models.FileField(help_text='Report template file', upload_to=report.models.rename_template, validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['html', 'htm'])], verbose_name='Template'),
+        ),
+    ]
diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index 6ca0ac1dcd..f401d547e9 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -14,7 +14,6 @@ from django.db import models
 from django.conf import settings
 
 from django.core.validators import FileExtensionValidator
-from django.core.exceptions import ValidationError
 
 import stock.models
 
@@ -29,17 +28,6 @@ except OSError as err:
     print("You may require some further system packages to be installed.")
     sys.exit(1)
 
-# Conditional import if LaTeX templating is enabled
-if settings.LATEX_ENABLED:
-    try:
-        from django_tex.shortcuts import render_to_pdf
-        from django_tex.core import render_template_with_context
-        from django_tex.exceptions import TexError
-    except OSError as err:
-        print("OSError: {e}".format(e=err))
-        print("You may not have a working LaTeX toolchain installed?")
-        sys.exit(1)
-
 from django.http import HttpResponse
 
 
@@ -104,7 +92,7 @@ class ReportBase(models.Model):
     def template_name(self):
         """
         Returns the file system path to the template file.
-        Required for passing the file to an external process (e.g. LaTeX)
+        Required for passing the file to an external process
         """
 
         template = os.path.join('report_template', self.getSubdir(), os.path.basename(self.template.name))
@@ -124,7 +112,7 @@ class ReportBase(models.Model):
         upload_to=rename_template,
         verbose_name=_('Template'),
         help_text=_("Report template file"),
-        validators=[FileExtensionValidator(allowed_extensions=['html', 'htm', 'tex'])],
+        validators=[FileExtensionValidator(allowed_extensions=['html', 'htm'])],
     )
 
     description = models.CharField(
@@ -153,12 +141,11 @@ class ReportTemplateBase(ReportBase):
         """
         Render the template to a PDF file.
 
-        Supported template formats:
-            .tex - Uses django-tex plugin to render LaTeX template against an installed LaTeX engine
-            .html - Uses django-weasyprint plugin to render HTML template against Weasyprint
+        Uses django-weasyprint plugin to render HTML template against Weasyprint
         """
 
-        filename = kwargs.get('filename', 'report.pdf')
+        # TODO: Support custom filename generation!
+        # filename = kwargs.get('filename', 'report.pdf')
 
         context = self.get_context_data(request)
 
@@ -171,31 +158,17 @@ class ReportTemplateBase(ReportBase):
         context['date'] = datetime.datetime.now().date()
         context['datetime'] = datetime.datetime.now()
 
-        if self.extension == '.tex':
-            # Render LaTeX template to PDF
-            if settings.LATEX_ENABLED:
-                # Attempt to render to LaTeX template
-                # If there is a rendering error, return the (partially rendered) template,
-                # so at least we can debug what is going on
-                try:
-                    rendered = render_template_with_context(self.template_name, context)
-                    return render_to_pdf(request, self.template_name, context, filename=filename)
-                except TexError:
-                    return TexResponse(rendered, filename="error.tex")
-            else:
-                raise ValidationError("Enable LaTeX support in config.yaml")
-        elif self.extension in ['.htm', '.html']:
-            # Render HTML template to PDF
-            wp = WeasyprintReportMixin(
-                request,
-                self.template_name,
-                base_url=request.build_absolute_uri("/"),
-                presentational_hints=True,
-                **kwargs)
+        # Render HTML template to PDF
+        wp = WeasyprintReportMixin(
+            request,
+            self.template_name,
+            base_url=request.build_absolute_uri("/"),
+            presentational_hints=True,
+            **kwargs)
 
-            return wp.render_to_response(
-                context,
-                **kwargs)
+        return wp.render_to_response(
+            context,
+            **kwargs)
 
     enabled = models.BooleanField(
         default=True,
diff --git a/requirements.txt b/requirements.txt
index e4ffe6be75..8d237527c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,7 +23,6 @@ coverage==5.3                   # Unit test coverage
 coveralls==2.1.2                # Coveralls linking (for Travis)
 rapidfuzz==0.7.6                # Fuzzy string matching
 django-stdimage==5.1.1          # Advanced ImageField management
-django-tex==1.1.7               # LaTeX PDF export
 django-weasyprint==1.0.1        # HTML PDF export
 django-debug-toolbar==2.2       # Debug / profiling toolbar
 django-admin-shell==0.1.2       # Python shell for the admin interface

From 98d291c2f8893c34f8703b8d952030d743d4e434 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 19:26:43 +1100
Subject: [PATCH 13/17] Add model rule for ReportSnippet

---
 InvenTree/users/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/InvenTree/users/models.py b/InvenTree/users/models.py
index 57cee2774f..351b6f7370 100644
--- a/InvenTree/users/models.py
+++ b/InvenTree/users/models.py
@@ -118,6 +118,7 @@ class RuleSet(models.Model):
         'label_stockitemlabel',
         'label_stocklocationlabel',
         'report_reportasset',
+        'report_reportsnippet',
         'report_testreport',
         'part_partstar',
         'users_owner',

From bc367752707ed10ad47f79ccb03e5a7f21f5783b Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 20:25:01 +1100
Subject: [PATCH 14/17] Copy default test report across

---
 InvenTree/report/apps.py                      | 87 +++++++++++++++++++
 InvenTree/report/models.py                    | 11 +--
 .../report/inventree_test_report.html         | 12 ++-
 3 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/InvenTree/report/apps.py b/InvenTree/report/apps.py
index 138ba20404..bb1c5f0cb7 100644
--- a/InvenTree/report/apps.py
+++ b/InvenTree/report/apps.py
@@ -1,5 +1,92 @@
+import os
+import shutil
+import logging
+
 from django.apps import AppConfig
+from django.conf import settings
+
+
+logger = logging.getLogger(__name__)
 
 
 class ReportConfig(AppConfig):
     name = 'report'
+
+    def ready(self):
+        """
+        This function is called whenever the report app is loaded
+        """
+
+        self.create_default_test_reports()
+
+    def create_default_test_reports(self):
+        """
+        Create database entries for the default TestReport templates,
+        if they do not already exist
+        """
+
+        try:
+            from .models import TestReport
+        except:
+            # Database is not ready yet
+            return
+
+        src_dir = os.path.join(
+            os.path.dirname(os.path.realpath(__file__)),
+            'templates',
+            'report',
+        )
+
+        dst_dir = os.path.join(
+            settings.MEDIA_ROOT,
+            'report',
+            'inventree',  # Stored in secret directory!
+            'test',
+        )
+
+        if not os.path.exists(dst_dir):
+            logger.info(f"Creating missing directory: '{dst_dir}'")
+            os.makedirs(dst_dir, exist_ok=True)
+
+        # List of test reports to copy across
+        reports = [
+            {
+                'file': 'inventree_test_report.html',
+                'name': 'InvenTree Test Report',
+                'description': 'Stock item test report',
+            },
+        ]
+
+        for report in reports:
+
+            # Create destination file name
+            filename = os.path.join(
+                'report',
+                'inventree',
+                'test',
+                report['file']
+            )
+
+            src_file = os.path.join(src_dir, report['file'])
+            dst_file = os.path.join(settings.MEDIA_ROOT, filename)
+
+            if not os.path.exists(dst_file):
+                logger.info(f"Copying test report template '{dst_file}'")
+                shutil.copyfile(src_file, dst_file)
+
+            try:
+                # Check if a report matching the template already exists
+                if TestReport.objects.filter(template=filename).exists():
+                    continue
+
+                logger.info(f"Creating new TestReport for '{report['name']}'")
+
+                TestReport.objects.create(
+                    name=report['name'],
+                    description=report['description'],
+                    template=filename,
+                    filters='',
+                    enabled=True
+                )
+            except:
+                pass
diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index f401d547e9..838e669f69 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -31,13 +31,6 @@ except OSError as err:
 from django.http import HttpResponse
 
 
-class TexResponse(HttpResponse):
-    def __init__(self, content, filename=None):
-        super().__init__(content_type="application/txt")
-        self["Content-Disposition"] = 'filename="{}"'.format(filename)
-        self.write(content)
-
-
 def rename_template(instance, filename):
 
     return instance.rename_file(filename)
@@ -95,10 +88,12 @@ class ReportBase(models.Model):
         Required for passing the file to an external process
         """
 
-        template = os.path.join('report_template', self.getSubdir(), os.path.basename(self.template.name))
+        template = self.template.name
         template = template.replace('/', os.path.sep)
         template = template.replace('\\', os.path.sep)
 
+        template = os.path.join(settings.MEDIA_ROOT, template)
+
         return template
 
     name = models.CharField(
diff --git a/InvenTree/report/templates/report/inventree_test_report.html b/InvenTree/report/templates/report/inventree_test_report.html
index 7c99eec6ab..7ac1930632 100644
--- a/InvenTree/report/templates/report/inventree_test_report.html
+++ b/InvenTree/report/templates/report/inventree_test_report.html
@@ -57,15 +57,21 @@ content: "{% trans 'Stock Item Test Report' %}";
 <div class='container'>
     <div class='text-left'>
         <h2>
-            {{ stock_item.part.full_name }}
+            {{ part.full_name }}
         </h2>
+        <p>{{ part.description }}</p>
+        <p><i>{{ stock_item.location }}</i></p>
     </div>
     <div class='img-right'>
         <img src="{% part_image part %}">
         <hr>
-        <h3>
+        <h4>
+            {% if stock_item.is_serialized %}
             {% trans "Serial Number" %}: {{ stock_item.serial }}
-        </h3>
+            {% else %}
+            {% trans "Quantity" %}: {% decimal stock_item.quantity %}
+            {% endif %}
+        </h4>
     </div>
 </div>
 

From 5aec487c120fdd65208c78d6c1bb20ccb61cd2a2 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 21:15:07 +1100
Subject: [PATCH 15/17] TestReport name no longer needs to be unique

---
 .../migrations/0008_auto_20210204_2100.py      | 18 ++++++++++++++++++
 InvenTree/report/models.py                     |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 InvenTree/report/migrations/0008_auto_20210204_2100.py

diff --git a/InvenTree/report/migrations/0008_auto_20210204_2100.py b/InvenTree/report/migrations/0008_auto_20210204_2100.py
new file mode 100644
index 0000000000..35136676d4
--- /dev/null
+++ b/InvenTree/report/migrations/0008_auto_20210204_2100.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2021-02-04 10:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report', '0007_auto_20210204_1617'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testreport',
+            name='name',
+            field=models.CharField(help_text='Template name', max_length=100, verbose_name='Name'),
+        ),
+    ]
diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index 838e669f69..1e0e5a6335 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -100,7 +100,6 @@ class ReportBase(models.Model):
         blank=False, max_length=100,
         verbose_name=_('Name'),
         help_text=_('Template name'),
-        unique=True,
     )
 
     template = models.FileField(

From a0e7d37a194804d11076d3de3e7df04673901bc3 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 21:15:19 +1100
Subject: [PATCH 16/17] Add setting for enabling / disabling test reports

---
 InvenTree/InvenTree/urls.py                   |  1 +
 InvenTree/common/models.py                    |  7 ++++++
 InvenTree/part/templates/part/part_base.html  |  1 -
 .../report/inventree_test_report.html         |  1 +
 .../stock/templates/stock/item_base.html      |  8 ++-----
 InvenTree/stock/templates/stock/location.html |  3 +--
 .../templates/InvenTree/settings/report.html  | 22 +++++++++++++++++++
 .../templates/InvenTree/settings/tabs.html    |  3 +++
 InvenTree/templates/base.html                 |  1 +
 InvenTree/templates/stock_table.html          |  2 ++
 10 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 InvenTree/templates/InvenTree/settings/report.html

diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 2c56b8eeb1..1df5e83d5d 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -79,6 +79,7 @@ settings_urls = [
     url(r'^theme/?', ColorThemeSelectView.as_view(), name='settings-theme'),
    
     url(r'^global/?', SettingsView.as_view(template_name='InvenTree/settings/global.html'), name='settings-global'),
+    url(r'^report/?', SettingsView.as_view(template_name='InvenTree/settings/report.html'), name='settings-report'),
     url(r'^category/?', SettingCategorySelectView.as_view(), name='settings-category'),
     url(r'^part/?', SettingsView.as_view(template_name='InvenTree/settings/part.html'), name='settings-part'),
     url(r'^stock/?', SettingsView.as_view(template_name='InvenTree/settings/stock.html'), name='settings-stock'),
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 053cc12864..a81d06ed25 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -174,6 +174,13 @@ class InvenTreeSetting(models.Model):
             'validator': bool,
         },
 
+        'REPORT_ENABLE_TEST_REPORT': {
+            'name': _('Test Reports'),
+            'description': _('Enable generation of test reports'),
+            'default': True,
+            'validator': bool,
+        },
+
         'STOCK_ENABLE_EXPIRY': {
             'name': _('Stock Expiry'),
             'description': _('Enable stock expiry functionality'),
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 84eac7e7f4..f35d616a91 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -44,7 +44,6 @@
                 <span id='part-star-icon' class='fas fa-star {% if starred %}icon-yellow{% endif %}'/>
             </button>
 
-            {% settings_value 'BARCODE_ENABLE' as barcodes %}
             {% if barcodes %}
             <!-- Barcode actions menu -->
             <div class='btn-group'>
diff --git a/InvenTree/report/templates/report/inventree_test_report.html b/InvenTree/report/templates/report/inventree_test_report.html
index 7ac1930632..e076a7919e 100644
--- a/InvenTree/report/templates/report/inventree_test_report.html
+++ b/InvenTree/report/templates/report/inventree_test_report.html
@@ -61,6 +61,7 @@ content: "{% trans 'Stock Item Test Report' %}";
         </h2>
         <p>{{ part.description }}</p>
         <p><i>{{ stock_item.location }}</i></p>
+        <p><i>Stock Item ID: {{ stock_item.pk }}</i></p>
     </div>
     <div class='img-right'>
         <img src="{% part_image part %}">
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index d284a74e98..93d60fb3d1 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -120,7 +120,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 </div>
 
 <div class='btn-group action-buttons' role='group'>
-    {% settings_value 'BARCODE_ENABLE' as barcodes %}
+    
     {% if barcodes %}
     <!-- Barcode actions menu -->
     <div class='btn-group'>
@@ -139,19 +139,15 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
     </div>
     {% endif %}
     <!-- Document / label menu -->
-    {% if item.has_labels or item.has_test_reports %}
     <div class='btn-group'>
         <button id='document-options' title='{% trans "Printing actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-print'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
-            {% if item.has_labels %}
             <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
-            {% endif %}
-            {% if item.has_test_reports %}
+            {% if test_report_enabled %}
             <li><a href='#' id='stock-test-report'><span class='fas fa-file-pdf'></span> {% trans "Test Report" %}</a></li>
             {% endif %}
         </ul>
     </div>
-    {% endif %}
     <!-- Stock adjustment menu -->
     <!-- Check permissions and owner -->
     {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 4f8268b037..817b096f74 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -36,8 +36,7 @@
                 <span class='fas fa-plus-circle icon-green'/>
                 </button>
             {% endif %}
-        {% endif %} 
-        {% settings_value 'BARCODE_ENABLE' as barcodes %}
+        {% endif %}
         {% if barcodes %}
         <!-- Barcode actions menu -->
         {% if location %}
diff --git a/InvenTree/templates/InvenTree/settings/report.html b/InvenTree/templates/InvenTree/settings/report.html
new file mode 100644
index 0000000000..0cba8c449b
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/report.html
@@ -0,0 +1,22 @@
+{% extends "InvenTree/settings/settings.html" %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block tabs %}
+{% include "InvenTree/settings/tabs.html" with tab='report' %}
+{% endblock %}
+
+{% block subtitle %}
+{% trans "Report Settings" %}
+{% endblock %}
+
+{% block settings %}
+
+<table class='table table-striped table-condensed'>
+    {% include "InvenTree/settings/header.html" %}
+    <tbody>
+        {% include "InvenTree/settings/setting.html" with key="REPORT_ENABLE_TEST_REPORT" %}
+    </tbody>
+</table>
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/tabs.html b/InvenTree/templates/InvenTree/settings/tabs.html
index ff2bcdb61e..bb660519b8 100644
--- a/InvenTree/templates/InvenTree/settings/tabs.html
+++ b/InvenTree/templates/InvenTree/settings/tabs.html
@@ -15,6 +15,9 @@
     <li {% if tab == 'global' %} class='active' {% endif %}>
         <a href='{% url "settings-global" %}'><span class='fas fa-globe'></span> {% trans "Global" %}</a>
     </li>
+    <li {% if tab == 'report' %} class='active' {% endif %}>
+        <a href='{% url "settings-report" %}'><span class='fas fa-file-pdf'></span> {% trans "Report" %}</a>
+    </li>
     <li{% ifequal tab 'category' %} class='active'{% endifequal %}>
         <a href="{% url 'settings-category' %}"><span class='fa fa-sitemap'></span> {% trans "Categories" %}</a>
     </li>
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index d2b8226982..c1640892de 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -3,6 +3,7 @@
 {% load inventree_extras %}
 
 {% settings_value 'BARCODE_ENABLE' as barcodes %}
+{% settings_value 'REPORT_ENABLE_TEST_REPORT' as test_report_enabled %}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html
index 4caf2f59fd..8eff0f4aed 100644
--- a/InvenTree/templates/stock_table.html
+++ b/InvenTree/templates/stock_table.html
@@ -38,7 +38,9 @@
                 </button>
                 <ul class='dropdown-menu'>
                     <li><a href='#' id='multi-item-print-label' title='{% trans "Print labels" %}'><span class='fas fa-tags'></span> {% trans "Print labels" %}</a></li>
+                    {% if test_report_enabled %}
                     <li><a href='#' id='multi-item-print-test-report' title='{% trans "Print test reports" %}'><span class='fas fa-file-pdf'></span> {% trans "Print test reports" %}</a></li>
+                    {% endif %}
                 </ul>
             </div>
             {% if roles.stock.change or roles.stock.delete %}

From 62a7964dda88ed5ff44726ae714bdc9f747021ee Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 4 Feb 2021 21:17:20 +1100
Subject: [PATCH 17/17] PEP fixes

---
 InvenTree/report/models.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index 1e0e5a6335..422216f9a9 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -28,8 +28,6 @@ except OSError as err:
     print("You may require some further system packages to be installed.")
     sys.exit(1)
 
-from django.http import HttpResponse
-
 
 def rename_template(instance, filename):