diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html index 77247a29c5..b427da7c44 100644 --- a/InvenTree/templates/InvenTree/settings/settings.html +++ b/InvenTree/templates/InvenTree/settings/settings.html @@ -20,12 +20,11 @@ {% include "InvenTree/settings/user.html" %} {% include "InvenTree/settings/user_settings.html" %} +{% include "InvenTree/settings/user_display.html" %} {% include "InvenTree/settings/user_homepage.html" %} {% include "InvenTree/settings/user_search.html" %} {% include "InvenTree/settings/user_notifications.html" %} -{% include "InvenTree/settings/user_labels.html" %} -{% include "InvenTree/settings/user_reports.html" %} -{% include "InvenTree/settings/user_display.html" %} +{% include "InvenTree/settings/user_reporting.html" %} {% if user.is_staff %} diff --git a/InvenTree/templates/InvenTree/settings/sidebar.html b/InvenTree/templates/InvenTree/settings/sidebar.html index e4f7482366..01daee4bf7 100644 --- a/InvenTree/templates/InvenTree/settings/sidebar.html +++ b/InvenTree/templates/InvenTree/settings/sidebar.html @@ -16,8 +16,6 @@ {% include "sidebar_item.html" with label='user-search' text=text icon="fa-search" %} {% trans "Notifications" as text %} {% include "sidebar_item.html" with label='user-notifications' text=text icon="fa-bell" %} -{% trans "Label Printing" as text %} -{% include "sidebar_item.html" with label='user-labels' text=text icon="fa-tag" %} {% trans "Reporting" as text %} {% include "sidebar_item.html" with label='user-reports' text=text icon="fa-file-pdf" %} diff --git a/InvenTree/templates/InvenTree/settings/user_reports.html b/InvenTree/templates/InvenTree/settings/user_reporting.html similarity index 66% rename from InvenTree/templates/InvenTree/settings/user_reports.html rename to InvenTree/templates/InvenTree/settings/user_reporting.html index e4c9b166c8..44c63a5d50 100644 --- a/InvenTree/templates/InvenTree/settings/user_reports.html +++ b/InvenTree/templates/InvenTree/settings/user_reporting.html @@ -15,6 +15,8 @@