Merge branch 'inventree:master' into matmair/issue2694

This commit is contained in:
Matthias Mair authored and GitHub committed 2022-04-27 17:48:19 +02:00
commit dfd51174cb
72 files changed
+38230 -26790

No files matched your search

@@ -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 %}
@@ -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 %}
@@ -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 %}