From ff9d8e7b6ba458d0499d2c4b8a0d0bb7823e6cb8 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Sun, 24 Apr 2022 00:28:27 +0200
Subject: [PATCH] use instance title in version string

---
 InvenTree/part/templatetags/inventree_extras.py            | 7 ++++++-
 InvenTree/report/templates/report/inventree_po_report.html | 2 +-
 InvenTree/report/templates/report/inventree_so_report.html | 2 +-
 .../templates/report/inventree_test_report_base.html       | 2 +-
 InvenTree/templates/email/email.html                       | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index 2d0b0660d6..0400b54ebd 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -220,8 +220,13 @@ def python_version(*args, **kwargs):
 
 
 @register.simple_tag()
-def inventree_version(*args, **kwargs):
+def inventree_version(shortstring=False, *args, **kwargs):
     """ Return InvenTree version string """
+    if shortstring:
+        return _("{title} v{version}".format(
+            title=version.inventreeInstanceTitle(),
+            version=version.inventreeVersion()
+        ))
     return version.inventreeVersion()
 
 
diff --git a/InvenTree/report/templates/report/inventree_po_report.html b/InvenTree/report/templates/report/inventree_po_report.html
index f999644c2e..d1cae75c3b 100644
--- a/InvenTree/report/templates/report/inventree_po_report.html
+++ b/InvenTree/report/templates/report/inventree_po_report.html
@@ -15,7 +15,7 @@ content: "v{{report_revision}} - {{ date.isoformat }}";
 {% endblock %}
 
 {% block bottom_center %}
-content: "InvenTree v{% inventree_version %}";
+content: "{% inventree_version shortstring=True %}";
 {% endblock %}
 
 {% block style %}
diff --git a/InvenTree/report/templates/report/inventree_so_report.html b/InvenTree/report/templates/report/inventree_so_report.html
index 255f0c6a50..5cb4900719 100644
--- a/InvenTree/report/templates/report/inventree_so_report.html
+++ b/InvenTree/report/templates/report/inventree_so_report.html
@@ -16,7 +16,7 @@ content: "v{{report_revision}} - {{ date.isoformat }}";
 {% endblock %}
 
 {% block bottom_center %}
-content: "InvenTree v{% inventree_version %}";
+content: "{% inventree_version shortstring=True %}";
 {% endblock %}
 
 {% block style %}
diff --git a/InvenTree/report/templates/report/inventree_test_report_base.html b/InvenTree/report/templates/report/inventree_test_report_base.html
index d702973c30..73ee55c680 100644
--- a/InvenTree/report/templates/report/inventree_test_report_base.html
+++ b/InvenTree/report/templates/report/inventree_test_report_base.html
@@ -14,7 +14,7 @@ content: "{{ date.isoformat }}";
 {% endblock %}
 
 {% block bottom_center %}
-content: "InvenTree v{% inventree_version %}";
+content: "{% inventree_version shortstring=True %}";
 {% endblock %}
 
 {% block top_center %}
diff --git a/InvenTree/templates/email/email.html b/InvenTree/templates/email/email.html
index 97e9a40f37..0b3c944da4 100644
--- a/InvenTree/templates/email/email.html
+++ b/InvenTree/templates/email/email.html
@@ -32,7 +32,7 @@
             {% block footer_prefix %}
             <!-- Custom footer information goes here -->
             {% endblock %}
-            <p><em><small>{% trans "InvenTree version" %}: {% inventree_version %} - <a href='https://inventree.readthedocs.io'>inventree.readthedocs.io</a></small></em></p>
+            <p><em><small>{% inventree_version shortstring=True %} - <a href='https://inventree.readthedocs.io'>readthedocs.io</a></small></em></p>
             {% block footer_suffix %}
             <!-- Custom footer information goes here -->
             {% endblock %}