From 75b223acc4d7b36a963149a58421a1661c125f33 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Sat, 25 Feb 2023 15:54:51 +1100
Subject: [PATCH] Consolidate label printing and reporting options into a
 single screen (#4415)

---
 InvenTree/templates/InvenTree/settings/settings.html         | 5 ++---
 InvenTree/templates/InvenTree/settings/sidebar.html          | 2 --
 .../settings/{user_reports.html => user_reporting.html}      | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename InvenTree/templates/InvenTree/settings/{user_reports.html => user_reporting.html} (66%)

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 @@
     <table class='table table-striped table-condensed'>
         <tbody>
             {% include "InvenTree/settings/setting.html" with key="REPORT_INLINE" icon='fa-file-pdf' user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="LABEL_INLINE" icon='fa-tag' user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="LABEL_DEFAULT_PRINTER" icon='fa-tag' user_setting=True %}
         </tbody>
     </table>
 </div>